From 05d6231a5e3fc80dcbe3b5ec584ff83b5136d45c Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 14 Feb 2010 22:48:42 +0100 Subject: [help] Updated help against new upcoming version * Added logo to the front page * Added a new small topic on the /help IRC command * Added license page and license reference to all pages * Added some links group * Fixed validity errors * Removed legal.xml * Updated Makefile --- help/C/account-irc.page | 7 +++-- help/C/account-jabber.page | 7 +++-- help/C/accounts-window.page | 5 ++- help/C/add-account.page | 36 +++++++++------------- help/C/add-contact.page | 5 ++- help/C/audio-call.page | 18 ++++++----- help/C/audio-video.page | 11 ++++++- help/C/change-status.page | 5 ++- help/C/create-account.page | 5 ++- help/C/disable-account.page | 19 ++++++------ help/C/favorite-rooms.page | 8 +++-- help/C/figures/empathy-logo.png | Bin 0 -> 1813 bytes help/C/geolocation-not-showing.page | 5 ++- help/C/geolocation-privacy.page | 5 ++- help/C/geolocation-supported.page | 5 ++- help/C/geolocation-turn.page | 5 ++- help/C/geolocation-what-is.page | 5 ++- help/C/geolocation.page | 5 ++- help/C/group-conversations.page | 5 ++- help/C/import-account.page | 5 ++- help/C/index.page | 22 ++++++++------ help/C/introduction.page | 5 ++- help/C/irc-commands.page | 28 +++++++++++++++++ help/C/irc-join-pwd.page | 5 ++- help/C/irc-join-room.page | 7 +++-- help/C/irc-manage.page | 8 +++-- help/C/irc-nick-password.page | 5 ++- help/C/irc-send-file.page | 5 ++- help/C/irc-start-conversation.page | 7 +++-- help/C/legal.xml | 9 ------ help/C/license.page | 59 ++++++++++++++++++++++++++++++++++++ help/C/offline-contacts.page | 5 ++- help/C/prev-conv.page | 5 ++- help/C/prob-conn-acctdisabled.page | 5 ++- help/C/prob-conn-auth.page | 5 ++- help/C/prob-conn-name.page | 5 ++- help/C/prob-conn-neterror.page | 5 ++- help/C/prob-conn.page | 5 ++- help/C/remove-account.page | 5 ++- help/C/salut-protocol.page | 5 ++- help/C/send-file.page | 5 ++- help/C/send-message.page | 5 ++- help/C/set-custom-status.page | 5 ++- help/C/share-desktop.page | 5 ++- help/C/status-icons.page | 5 ++- help/C/video-call.page | 17 ++++++----- help/Makefile.am | 5 +-- 47 files changed, 308 insertions(+), 110 deletions(-) create mode 100644 help/C/figures/empathy-logo.png create mode 100644 help/C/irc-commands.page delete mode 100644 help/C/legal.xml create mode 100644 help/C/license.page diff --git a/help/C/account-irc.page b/help/C/account-irc.page index 01da491bc..af41920f4 100644 --- a/help/C/account-irc.page +++ b/help/C/account-irc.page @@ -4,6 +4,7 @@ id="account-irc"> + Additional information necessary for connecting to IRC networks. - Additional information necessary for connecting to IRC networks. - IRC Account Details diff --git a/help/C/account-jabber.page b/help/C/account-jabber.page index 0da383372..efa22d1b5 100644 --- a/help/C/account-jabber.page +++ b/help/C/account-jabber.page @@ -4,6 +4,7 @@ id="account-jabber"> + Advanced options for Jabber and Google Talk accounts. - Advanced options for Jabber and Google Talk accounts. +--> Jabber Account Details diff --git a/help/C/accounts-window.page b/help/C/accounts-window.page index 805646c23..8e25b80a2 100644 --- a/help/C/accounts-window.page +++ b/help/C/accounts-window.page @@ -18,13 +18,16 @@ Shaun McCance shaunm@gnome.org + +

Creative Commons Share Alike 3.0

+ +--> Accounts Window diff --git a/help/C/add-account.page b/help/C/add-account.page index 215a368d3..ddb1e4d3a 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -14,6 +14,7 @@ --> + Milo Casagrande milo@ubuntu.com @@ -22,13 +23,16 @@ Shaun McCance shaunm@gnome.org + +

Creative Commons Share Alike 3.0

+ +--> Add a new account @@ -44,43 +48,33 @@ Accounts, or press F4.

-

Click the Add button.

+

+ Click Add. +

-

From the Add new drop-down list, select the type of account you wish +

From the Protocol drop-down list, select the type of account you wish to add.

 -

If you do not already have a registered account, select Create a new account. +

If you do not already have a registered account, select Create a new account on the server. This feature is not available for all account types, and may not work with some account providers. See for more information.

 - -

Click Create.

-

Enter the required information. For most accounts, you will only need a login ID and a password. Some accounts may require additional information. See for more information.

- + -

Click Connect to enable the new account.

- - - - -

If you close the Accounts window without clicking - Connect, the entire account will be lost, and you will - need to create it again.

-

If you select another account without clicking Connect, - any information you have entered will be lost.

- +

+ Click Save. +

-

To change the name the identifies the account in the Accounts +

To change the name that identifies the account in the Accounts window, select the account from the list on the left and either click on the name or press the space bar. Edit the account name and press Enter when you’re finished.

diff --git a/help/C/add-contact.page b/help/C/add-contact.page index b9a47c8ad..0bf6a0b54 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -18,13 +18,16 @@ Phil Bull philbull@gmail.com + +

Creative Commons Share Alike 3.0

+ +--> Add someone to your list of contacts diff --git a/help/C/audio-call.page b/help/C/audio-call.page index ab1f2471e..dd66ce3d5 100644 --- a/help/C/audio-call.page +++ b/help/C/audio-call.page @@ -13,17 +13,21 @@ --> + Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Start an audio conversation @@ -31,18 +35,18 @@

You can call your contacts and have an audio conversation with them. This features only works with certain types of accounts, and it requires the other person to have an application that supports audio calls.

- +

From the Contact List window, click the audio call - icon next to the name of the contact you wish to call. Alternatively, - right click the contact and choose Audio Call.

+ icon next to the name of the contact you wish to call and choose Audio Call. + Alternatively, right click the contact and choose Audio Call.

A new window will open. When the connection is established, you will @@ -50,12 +54,12 @@ total conversation time.

 -

To end the conversation, choose CallHang up.

+

To end the conversation, choose CallHang up.

To turn an audio conversation into a video conversation, choose - CallSend video, or click the + VideoVideo On, or click the video call toolbar button to select it.

 diff --git a/help/C/audio-video.page b/help/C/audio-video.page index bbc8b0aca..f7589696f 100644 --- a/help/C/audio-video.page +++ b/help/C/audio-video.page @@ -12,17 +12,21 @@ --> + Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Audio and Video Support @@ -132,6 +136,11 @@

No

No

+ +

Facebook Chat

+

No

+

No

+

gadugadu

No

diff --git a/help/C/change-status.page b/help/C/change-status.page index c036e9f7a..ad3b6f7a3 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -19,13 +19,16 @@ Phil Bull philbull@gmail.com + +

Creative Commons Share Alike 3.0

+ +--> Change your status diff --git a/help/C/create-account.page b/help/C/create-account.page index 2935d9f04..c478d7d4f 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -17,13 +17,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Register for a new account diff --git a/help/C/disable-account.page b/help/C/disable-account.page index 5589a5880..789100c50 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -15,6 +15,7 @@ --> + Milo Casagrande milo@ubuntu.com @@ -23,13 +24,16 @@ Shaun McCance shaunm@gnome.org + +

Creative Commons Share Alike 3.0

+ +--> Disable an account @@ -50,17 +54,12 @@

Deselect Enabled on the right side of the - window. This option is after your primary account details, but before - any advanced settings.

- - -

- Click Apply. + window.

-

To re-enable the account, simply select Enabled - and click Apply.

- +

+ To re-enable the account, simply select Enabled. +

diff --git a/help/C/favorite-rooms.page b/help/C/favorite-rooms.page index a86e3644f..6c14d1761 100644 --- a/help/C/favorite-rooms.page +++ b/help/C/favorite-rooms.page @@ -9,17 +9,21 @@ Set, join and manage favorite rooms. + Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Favorite rooms @@ -49,7 +53,7 @@

From the conversation window, choose - ConversationFavorite Chatroom. + ConversationFavorite Chat Room.

diff --git a/help/C/figures/empathy-logo.png b/help/C/figures/empathy-logo.png new file mode 100644 index 000000000..cd58a7134 Binary files /dev/null and b/help/C/figures/empathy-logo.png differ diff --git a/help/C/geolocation-not-showing.page b/help/C/geolocation-not-showing.page index 6a20ceb5b..4bbd5a31b 100644 --- a/help/C/geolocation-not-showing.page +++ b/help/C/geolocation-not-showing.page @@ -17,13 +17,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Geographical position not published diff --git a/help/C/geolocation-privacy.page b/help/C/geolocation-privacy.page index bbfebb313..86bae2ec8 100644 --- a/help/C/geolocation-privacy.page +++ b/help/C/geolocation-privacy.page @@ -17,13 +17,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Geolocation Privacy diff --git a/help/C/geolocation-supported.page b/help/C/geolocation-supported.page index 66042e890..8672b825a 100644 --- a/help/C/geolocation-supported.page +++ b/help/C/geolocation-supported.page @@ -16,13 +16,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Supported services diff --git a/help/C/geolocation-turn.page b/help/C/geolocation-turn.page index 1c2b85628..a3e620c1b 100644 --- a/help/C/geolocation-turn.page +++ b/help/C/geolocation-turn.page @@ -18,13 +18,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Activate/Deactivate geolocation diff --git a/help/C/geolocation-what-is.page b/help/C/geolocation-what-is.page index 1eb1084eb..dd70be3cf 100644 --- a/help/C/geolocation-what-is.page +++ b/help/C/geolocation-what-is.page @@ -18,13 +18,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> What is geolocation diff --git a/help/C/geolocation.page b/help/C/geolocation.page index e738fc42f..8e06875f2 100644 --- a/help/C/geolocation.page +++ b/help/C/geolocation.page @@ -17,13 +17,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Geographical position diff --git a/help/C/group-conversations.page b/help/C/group-conversations.page index bcfe5aa20..e0b2851eb 100644 --- a/help/C/group-conversations.page +++ b/help/C/group-conversations.page @@ -19,13 +19,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Group conversations diff --git a/help/C/import-account.page b/help/C/import-account.page index c25d70b46..c1411cbf6 100644 --- a/help/C/import-account.page +++ b/help/C/import-account.page @@ -27,13 +27,16 @@ Shaun McCance shaunm@gnome.org + +

Creative Commons Share Alike 3.0

+ +--> Import an existing account diff --git a/help/C/index.page b/help/C/index.page index 686085129..219654587 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -4,27 +4,29 @@ id="index"> + Empathy Instant Messenger + Empathy Instant Messenger - + + - + Milo Casagrande milo@ubuntu.com - - + +

Creative Commons Share Alike 3.0

+ - Empathy Instant Messenger + + <media type="image" mime="image/png" src="figures/empathy-logo.png">Empathy Instant Messenger logo</media> + Empathy Instant Messenger +
Text Conversations diff --git a/help/C/introduction.page b/help/C/introduction.page index e3ce7e909..7dc2441e9 100644 --- a/help/C/introduction.page +++ b/help/C/introduction.page @@ -13,13 +13,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Introduction diff --git a/help/C/irc-commands.page b/help/C/irc-commands.page new file mode 100644 index 000000000..8bf07dc86 --- /dev/null +++ b/help/C/irc-commands.page @@ -0,0 +1,28 @@ + + + + + The supported IRC commands. + + + Milo Casagrande + milo@ubuntu.com + + +

Creative Commons Share Alike 3.0

+ + + + Supported IRC commands +

+ To see the list of the supported IRC commands, in a chat room type /help + and press Enter. +

+ +

+ All commands available have a small description on their usage. +

+ + diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page index 0ea91df36..befbaf05a 100644 --- a/help/C/irc-join-pwd.page +++ b/help/C/irc-join-pwd.page @@ -16,13 +16,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Join a protected IRC chat room diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page index ad3a3c575..8a3a74d2e 100644 --- a/help/C/irc-join-room.page +++ b/help/C/irc-join-room.page @@ -4,7 +4,7 @@ id="irc-join-room"> - + Join an IRC channel. @@ -16,13 +16,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Join an IRC chat room diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page index fe7a50ea9..1cd834c79 100644 --- a/help/C/irc-manage.page +++ b/help/C/irc-manage.page @@ -1,7 +1,8 @@ + id="irc-manage" + groups="one two"> @@ -17,13 +18,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Internet Relay Chat (IRC) diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page index 30e8c08be..4d3d02e51 100644 --- a/help/C/irc-nick-password.page +++ b/help/C/irc-nick-password.page @@ -18,13 +18,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Use a nickname password on IRC diff --git a/help/C/irc-send-file.page b/help/C/irc-send-file.page index 81f5d7d2d..4decfba47 100644 --- a/help/C/irc-send-file.page +++ b/help/C/irc-send-file.page @@ -16,13 +16,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Send files over IRC diff --git a/help/C/irc-start-conversation.page b/help/C/irc-start-conversation.page index 6e1e312ae..3d04c8db3 100644 --- a/help/C/irc-start-conversation.page +++ b/help/C/irc-start-conversation.page @@ -4,7 +4,7 @@ id="irc-start-conversation"> - + Start a conversation witn an IRC contact. +--> Chat with somebody on IRC diff --git a/help/C/legal.xml b/help/C/legal.xml deleted file mode 100644 index 86d6173ad..000000000 --- a/help/C/legal.xml +++ /dev/null @@ -1,9 +0,0 @@ - -

This work is licensed under a -Creative Commons -Attribution-Share Alike 3.0 Unported License.

-

As a special exception, the copyright holders give you permission to copy, -modify, and distribute the example code contained in this document under the -terms of your choosing, without restriction.

- diff --git a/help/C/license.page b/help/C/license.page new file mode 100644 index 000000000..312b6cfa0 --- /dev/null +++ b/help/C/license.page @@ -0,0 +1,59 @@ + + + + + + Legal information. + + + License +

+ + This work is distributed under a CreativeCommons Attribution-Share Alike + 3.0 Unported license. +

+

+ You are free: +

+ + + <em>To share</em> +

To copy, distribute and transmit the work.

+ + + <em>To remix</em> +

To adapt the work.

+ + +

+ Under the following conditions: +

+ + + <em>Attribution</em> +

+ You must attribute the work in the manner specified by the author or + licensor (but not in any way that suggests that they endorse you or + your use of the work). +

+ + + <em>Share Alike</em> +

+ If you alter, transform, or build upon this work, you may distribute the + resulting work only under the same, similar or a compatible license. +

+ + +

+ + For the full text of the license, see the + CreativeCommons website, + or read the full Commons Deed. +

+ diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page index 53d5f9c18..33e1de215 100644 --- a/help/C/offline-contacts.page +++ b/help/C/offline-contacts.page @@ -17,13 +17,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Show offline contacts diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page index 3831885ea..a1668dfe1 100644 --- a/help/C/prev-conv.page +++ b/help/C/prev-conv.page @@ -20,13 +20,16 @@ Shaun McCance shaunm@gnome.org + +

Creative Commons Share Alike 3.0

+ +--> View previous conversations diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page index bb84dc5e3..775ef2930 100644 --- a/help/C/prob-conn-acctdisabled.page +++ b/help/C/prob-conn-acctdisabled.page @@ -18,13 +18,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> My account is not enabled diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page index 96426aa67..01d72fa9c 100644 --- a/help/C/prob-conn-auth.page +++ b/help/C/prob-conn-auth.page @@ -20,13 +20,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> I get a message that says "Authentication failed" diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page index 740ca7efa..810feffed 100644 --- a/help/C/prob-conn-name.page +++ b/help/C/prob-conn-name.page @@ -16,13 +16,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> I get a message that says “Name in use” diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page index 9c3c928aa..5e6b6b042 100644 --- a/help/C/prob-conn-neterror.page +++ b/help/C/prob-conn-neterror.page @@ -17,13 +17,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> I get a message that says "Network error" diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page index 49c5dafb9..332b2f56a 100644 --- a/help/C/prob-conn.page +++ b/help/C/prob-conn.page @@ -14,13 +14,16 @@ Phil Bull philbull@gmail.com + +

Creative Commons Share Alike 3.0

+ +--> Problems connecting to an instant messaging service diff --git a/help/C/remove-account.page b/help/C/remove-account.page index b78a2c278..2e025e8ce 100644 --- a/help/C/remove-account.page +++ b/help/C/remove-account.page @@ -17,13 +17,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Remove an account diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page index 01be24a1b..ba060ce22 100644 --- a/help/C/salut-protocol.page +++ b/help/C/salut-protocol.page @@ -18,13 +18,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> What is People Nearby? diff --git a/help/C/send-file.page b/help/C/send-file.page index 61f887829..53c9cafd1 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -21,13 +21,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Send files diff --git a/help/C/send-message.page b/help/C/send-message.page index 97e7d2ec8..fed39f56d 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -16,13 +16,16 @@ Phil Bull philbull@gmail.com + +

Creative Commons Share Alike 3.0

+ +--> Send a message to someone diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page index ed19da095..f503073ef 100644 --- a/help/C/set-custom-status.page +++ b/help/C/set-custom-status.page @@ -19,13 +19,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Set a custom message diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page index da2a85df1..08a7dd6b4 100644 --- a/help/C/share-desktop.page +++ b/help/C/share-desktop.page @@ -13,13 +13,16 @@ Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ +--> Share your desktop diff --git a/help/C/status-icons.page b/help/C/status-icons.page index b3d4ea0ee..be63f994d 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -20,13 +20,16 @@ Shaun McCance shaunm@gnome.org + +

Creative Commons Share Alike 3.0

+ +--> Status Types and Icons diff --git a/help/C/video-call.page b/help/C/video-call.page index 559b288fc..1e8a78ec0 100644 --- a/help/C/video-call.page +++ b/help/C/video-call.page @@ -16,17 +16,21 @@ --> + Milo Casagrande milo@ubuntu.com + +

Creative Commons Share Alike 3.0

+ - Start a video conversation @@ -39,8 +43,8 @@

From the Contact List window, click the video call - icon next to the name of the contact you wish to call. Alternatively, - right click the contact and choose Video Call.

+ icon next to the name of the contact you wish to call and choose Video Call. + Alternatively, right click the contact and choose Video Call.

A new window will open. When the connection is established, you will @@ -48,16 +52,13 @@ total conversation time.

 -

To end the conversation, choose CallHang up.

+

To end the conversation, choose CallHang up.

To turn a video conversation into an audio conversation, choose - CallSend video, or click the + VideoVideo Off, or click the video call toolbar button to deselect it.

 - - - diff --git a/help/Makefile.am b/help/Makefile.am index cb57b08c6..76303c65f 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,7 +1,6 @@ include $(top_srcdir)/gnome-doc-utils.make DOC_ID = empathy -DOC_INCLUDES = legal.xml DOC_FIGURES = \ figures/audio-input-microphone.png \ figures/available.png \ @@ -9,6 +8,7 @@ DOC_FIGURES = \ figures/busy.png \ figures/camera-web.png \ figures/empathy-main-window.png \ + figures/empathy-logo.png \ figures/gtk-add.png \ figures/gtk-edit.png \ figures/gtk-remove.png \ @@ -36,12 +36,14 @@ DOC_PAGES = \ import-account.page \ index.page \ introduction.page \ + irc-commands.page \ irc-join-pwd.page \ irc-join-room.page \ irc-manage.page \ irc-nick-password.page \ irc-send-file.page \ irc-start-conversation.page \ + license.page \ offline-contacts.page \ prev-conv.page \ prob-conn-acctdisabled.page \ @@ -58,6 +60,5 @@ DOC_PAGES = \ status-icons.page \ video-call.page - DOC_LINGUAS = ca cs de el en_GB es fi fr it ru sv dist-hook: doc-dist-hook -- cgit v1.2.3