From 6288040da442c9e7cc7c2f1b8bfab13515a3d4a1 Mon Sep 17 00:00:00 2001 From: Shaun McCance Date: Tue, 1 Sep 2009 14:30:58 -0500 Subject: [help] More reviews and updates for account management topics --- help/C/add-contact.page | 32 ++++----- help/C/change-status.page | 28 ++++---- help/C/disable-account.page | 62 ++++++++--------- help/C/figures/offline.png | Bin 0 -> 405 bytes help/C/index.page | 22 +++--- help/C/prev-conv.page | 159 ++++++++++++++++++-------------------------- help/C/remove-account.page | 62 +++++++---------- help/C/status-icons.page | 128 ++++++++++++++--------------------- help/Makefile.am | 6 +- 9 files changed, 211 insertions(+), 288 deletions(-) create mode 100644 help/C/figures/offline.png diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 14d49a57a..11e11f619 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -1,13 +1,16 @@ + xmlns:e="http://projectmallard.org/experimental/" + type="topic" style="task" + id="add-contact"> Add someone to the contact list. - + + + Phil Bull philbull@gmail.com @@ -23,27 +26,20 @@ -

- Choose ChatAdd Contact. -

+

Choose ChatAdd Contact.

 -

- From the Account drop-down list, select the type of - service the person you want to add to your contacts is using. -

+

From the Account drop-down list, select the account you wish + to use to connect to your contact. Your contact will need to be using the + same service as the account you select.

 -

- In the Identifier text box, type the email address - or the username of the person you want to add to your - contacts list. -

+

In the Identifier field, enter your contact’s login ID, username, + screen name, or other appropriate identifier for the service type.

 -

- In the Alias text box, type their name. -

+

In the Alias field, type your contact’s name as you would like + it to appear in your contact list.

diff --git a/help/C/change-status.page b/help/C/change-status.page index a2e687ffc..2b344246f 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -1,15 +1,18 @@ + xmlns:e="http://projectmallard.org/experimental/" + type="topic" style="task" + id="change-status"> - Change your status, if you are going away from your computer for example. + Change your status to advertise your availability to your contacts. - + + + Phil Bull philbull@gmail.com @@ -23,6 +26,9 @@ Change your status +

You can set your status to indicate your availability to your contacts. + Empathy allows you to select from a list of defined statuses.

+

@@ -36,16 +42,14 @@ -

- For example, if you are busy and do not want to - be disturbed, select Busy. -

+

See for a list of the built-in statuses + and what they mean. You can also add + custom status messages to provide more information about your + availability to your contacts.

-

- If you do not use your computer for a while, or if the screen saver is turned on, - the status will be automatically set to Away. -

+

If you do not use your computer for a while, or if the screensaver is on, + the status will be automatically set to Away.

 diff --git a/help/C/disable-account.page b/help/C/disable-account.page index f24c0f48f..6fbae8590 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -1,21 +1,26 @@ + xmlns:e="http://projectmallard.org/experimental/" + type="topic" style="task" + id="disable-account"> - - Prevent an account from logging-in automatically when you start - Empathy. - + Prevent Empathy from automatically logging in to an account. + + + Milo Casagrande milo@ubuntu.com + + Shaun McCance + shaunm@gnome.org + 2009 GNOME Documentation Project @@ -25,48 +30,33 @@ Disable an account -

- Disabling an account means to deactivate it, temporarily or - permanently. All the conversations you had will be kept in your computer. -

-

- After disabling an account, it is possible to enable it again. -

+

You can disable an account to prevent Empathy from logging in to + it without removing the account entirely. You may wish to disable and re-enable + an account if you only want to be logged in to the account at certain times, + but you still want to use Empathy for other accounts.

-

- From the Contact List window, perform one of the following: -

- - -

- Press F4. -

- - -

- Choose EditAccounts. -

- - +

From the Contact List window, choose Edit + Accounts, or press F4.

 -

- Select the account you wish to disable from the box on the - left of the dialog. -

+

Select the account you wish to disable from the accounts list on the left + side of the window.

 -

- Deselect the Enabled check-box. -

+

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

- Click on Apply. + Click Apply.

+

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

+ diff --git a/help/C/figures/offline.png b/help/C/figures/offline.png new file mode 100644 index 000000000..637be12cb Binary files /dev/null and b/help/C/figures/offline.png differ diff --git a/help/C/index.page b/help/C/index.page index a57596560..ff8a477c5 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -1,11 +1,13 @@ - + + + Milo Casagrande milo@ubuntu.com @@ -19,24 +21,24 @@ Empathy Instant Messenger -
- Audio and video conversations +
+ Text Conversations
-
- Text conversations +
+ Audio and Video Conversations
- Manage accounts + Account Management
- Advanced actions + Advanced Actions
-
- Fix common problems +
+ Common Problems
diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page index b521ada59..11c73c785 100644 --- a/help/C/prev-conv.page +++ b/help/C/prev-conv.page @@ -1,6 +1,7 @@ + xmlns:e="http://projectmallard.org/experimental/" + type="topic" style="tasks" + id="prev-conv"> @@ -8,11 +9,17 @@ Search your previous conversations. - + + + Milo Casagrande milo@ubuntu.com + + Shaun McCance + shaunm@gnome.org + 2009 GNOME Documentation Project @@ -20,134 +27,98 @@ - Previous conversations + View previous conversations + + + Shaun McCance +

Highlighting text is quirky: + #593733. + If there's an actual highlighting going on, independent of the selection + (like in yellow or something), we can use the term "highlight". Otherwise + we need to use the term "select". Watch that bug.

+

Empathy automatically saves all your text conversations you have - with your contacts, and lets you perform two different kinds of search: a - normal text search, or a per-conversation search. -

-

- The normal search is a full text search: it will search the exact text in - all your previous conversations. -

-

- The per-conversation search permits you to limit the text search to a particular - contact and conversation, and permits you to look at all the previous - conversations you had with your contacts. + with your contacts. You can search through all of your + previous conversations or browse previous + conversations by contact and date.

- You do not need to be connected to the Internet to search your previous + You do not need to be connected to the Internet to view and search your previous conversations.

+