From 293a30500849034931fe560fb40fd057e9d9556a Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 14 Jun 2009 16:10:42 -0400 Subject: Added the index.page start page --- help/C/index.page | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 help/C/index.page (limited to 'help/C') diff --git a/help/C/index.page b/help/C/index.page new file mode 100644 index 000000000..369814898 --- /dev/null +++ b/help/C/index.page @@ -0,0 +1,31 @@ + + + + + + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + +Empathy documentation + + + Milo Casagrande +

Documentation for the Empathy instant messaging client.

+ + + -- cgit v1.2.3 From 63af18d35fc97a5396701f8c5c536980fceaebd3 Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Sun, 14 Jun 2009 23:07:23 +0100 Subject: * Added topic on sending files (send_file) * Fix broken link on index page --- help/C/send_file.page | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 help/C/send_file.page (limited to 'help/C') diff --git a/help/C/send_file.page b/help/C/send_file.page new file mode 100644 index 000000000..5c22b124c --- /dev/null +++ b/help/C/send_file.page @@ -0,0 +1,54 @@ + + + + + + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + +How can I send a file to someone? + +

+In the main Empathy window, right-click the contact that you want +to send a file to and click Send file. +

+

+Select the file that you want to send and click Send. The File +transfers window will appear. Wait for your contact to accept the file +transfer, or press Stop to stop the transfer from happening. +

+

+If your contact accepts the file transfer, you can watch the progress of the +transfer and see the estimated amount of time remaining before it is complete. +If they do not accept it, the status of the transfer will change to File +transfer cancelled and the file will not be sent. +

+

+Once a transfer is finished, you can just close the File transfers +window. If you have lots of finished transfers listed in the window, click +Clear to clear the list. This will only remove the files from the +list and will not delete them from your computer. +

+ + +

+ You must be online to send a file to someone. +

+ + + -- cgit v1.2.3 From 1f1a155079ad5f878297e77020c4202134cdc3e3 Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Sun, 14 Jun 2009 23:32:55 +0100 Subject: Add topic on changing your status --- help/C/change_status.page | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 help/C/change_status.page (limited to 'help/C') diff --git a/help/C/change_status.page b/help/C/change_status.page new file mode 100644 index 000000000..a5b6b53a0 --- /dev/null +++ b/help/C/change_status.page @@ -0,0 +1,29 @@ + + + + + Change your status, if you are going away from your computer for example. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + + +How can I change my status? + +

Click the drop-down list at the top of the main Empathy window and select a status from the list. For example, if you are going away from your computer, select Away.

+ + -- cgit v1.2.3 From c0f96feb8f7ae82662b950729effac4046ca83cc Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 14 Jun 2009 18:51:33 -0400 Subject: Added topic on creating accounts --- help/C/create-account.page | 119 +++++++++++++++++++++++++++++++++++++++++++++ help/C/index.page | 56 +++++++++++---------- 2 files changed, 150 insertions(+), 25 deletions(-) create mode 100644 help/C/create-account.page (limited to 'help/C') diff --git a/help/C/create-account.page b/help/C/create-account.page new file mode 100644 index 000000000..d899096ab --- /dev/null +++ b/help/C/create-account.page @@ -0,0 +1,119 @@ + + + + + Create an account with one of the supported services. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + + + Milo Casagrande +

Section about how to create an account.

+ + + + How do I create an account? + +

+ You can freely create an account on any of the following + services. Follow the instructions reported on each website on + how to register your new account. At the end of the + registration process you should have a user + name (or an account ID) and + a password that you will use to + create the account in Empathy. +

+ +

+ Click on the name of the service to visit its website: +

+ +
+ Instant Messaging Services + + + +

+ AIM +

+ + +

+ Google Talk +

+ + +

+ ICQ +

+ + +

+ Jabber +

+ + +

+ MSN +

+ + +

+ Yahoo! +

+ + + +

+ To register a Jabber account you can use the automatic + account creation of Empathy. Not all Jabber service + providers support the automatic creation of accounts, one + service provider known to work with Empathy is jabber.org. +

+

+ If you already have a Jabber account you can use the Salut service. +

+ +
+ +
+ SIP Services + + + +

+ Ekiga +

+ + +

+ FWD +

+ + +

+ Sipphone +

+ + + +
+ + diff --git a/help/C/index.page b/help/C/index.page index 369814898..b23ba2fe5 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -2,30 +2,36 @@ type="guide" id="index"> - - - - - - - Milo Casagrande - milo@ubuntu.com - - - 2009 - GNOME Documentation Project - - + + + + + + + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + Creative Commons Share Alike - - - - -Empathy documentation - - - Milo Casagrande -

Documentation for the Empathy instant messaging client.

- - + + + + + Empathy Documentation + + + Milo Casagrande +

+ Documentation for the Empathy instant messaging + client. +

+ + -- cgit v1.2.3 From f9b0f6cd161a10e2fead1f367e00d5d0215b50ff Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Mon, 15 Jun 2009 00:08:06 +0100 Subject: Change capitalisation --- help/C/send_file.page | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'help/C') diff --git a/help/C/send_file.page b/help/C/send_file.page index 5c22b124c..7376942ef 100644 --- a/help/C/send_file.page +++ b/help/C/send_file.page @@ -29,7 +29,7 @@ to send a file to and click Send file.

Select the file that you want to send and click Send. The File -transfers window will appear. Wait for your contact to accept the file +Transfers window will appear. Wait for your contact to accept the file transfer, or press Stop to stop the transfer from happening.

@@ -39,7 +39,7 @@ If they do not accept it, the status of the transfer will change to File transfer cancelled and the file will not be sent.

-Once a transfer is finished, you can just close the File transfers +Once a transfer is finished, you can just close the File Transfers window. If you have lots of finished transfers listed in the window, click Clear to clear the list. This will only remove the files from the list and will not delete them from your computer. -- cgit v1.2.3 From 530793478eeedac93f25f69c45f207f943c3c274 Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Mon, 15 Jun 2009 00:18:03 +0100 Subject: Change links --- help/C/index.page | 4 +--- help/C/send_file.page | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'help/C') diff --git a/help/C/index.page b/help/C/index.page index b23ba2fe5..b7698a778 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -3,9 +3,7 @@ id="index"> - - - + diff --git a/help/C/send_file.page b/help/C/send_file.page index 7376942ef..a17cd84bb 100644 --- a/help/C/send_file.page +++ b/help/C/send_file.page @@ -3,8 +3,8 @@ id="send_file"> - - + + Send a file from your computer to one of your contacts. -- cgit v1.2.3 From 8429d0c1dff0036ea65a75ee35651816f8544d07 Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Mon, 15 Jun 2009 00:20:46 +0100 Subject: Change title, add link to index --- help/C/create-account.page | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'help/C') diff --git a/help/C/create-account.page b/help/C/create-account.page index d899096ab..a389f3e63 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -3,7 +3,9 @@ id="create-account"> + + Create an account with one of the supported services. @@ -28,7 +30,7 @@ - How do I create an account? + How can I create an account?

You can freely create an account on any of the following -- cgit v1.2.3 From e649179a02b95836fcbfe376e2bb3b111a6f7606 Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Mon, 15 Jun 2009 00:42:30 +0100 Subject: Add "send_message" topic --- help/C/send_message.page | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 help/C/send_message.page (limited to 'help/C') diff --git a/help/C/send_message.page b/help/C/send_message.page new file mode 100644 index 000000000..1d9b2fda8 --- /dev/null +++ b/help/C/send_message.page @@ -0,0 +1,28 @@ + + + + + Send a message to one of your contacts. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + +How can I send a message to someone? + +

In the main Empathy window, double-click the name of the contact that you want to chat with. Alternatively, right-click their name and click Chat. A chat window will open. Type a message into the box at the bottom of the window and press Enter to send it to your contact.

+ + -- cgit v1.2.3 From 5dad754128ba85483b02e87784c17ae678141779 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 14 Jun 2009 19:55:37 -0400 Subject: Added the add-account topic Some cleaning of the index.page (empty line) --- help/C/add-account.page | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ help/C/index.page | 2 -- 2 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 help/C/add-account.page (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page new file mode 100644 index 000000000..3d7a3d13b --- /dev/null +++ b/help/C/add-account.page @@ -0,0 +1,96 @@ + + + + + Add a new account to Empathy. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + + + Milo Casagrande +

Section about how to add a new account to Empathy.

+ + + How can I add a new account? + + + +

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

+ + +

+ Press F4 +

+ + +

+ Choose EditAccounts +

+ + + + +

+ If it is the first time you launch Empathy: +

+ + +

+ From the Type drop-down list choose + the service you wish to add an account for, then click + on the Create button. +

+ + +

+ Otherwise: +

+ + +

+ Click on the Add button. +

+ + +

+ From the Type drop-down list choose + the service you wish to add an account for, then click + on the Create button. +

+ + + + +

+ Fill the required fields with your user + name and password. +

+ + +

+ To enable the new account, select the + Enabled check-box next to + the name of the account in the box on the left of the window. +

+ + + + \ No newline at end of file diff --git a/help/C/index.page b/help/C/index.page index b7698a778..e3f8662db 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -4,8 +4,6 @@ - - -- cgit v1.2.3 From f09080299c239dd1602365cebd98af5a457e2a6d Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 14 Jun 2009 21:49:20 -0400 Subject: Added remove and disable account topics Added link to the add-account topic --- help/C/add-account.page | 1 + help/C/disable-account.page | 78 +++++++++++++++++++++++++++++++++++++++++ help/C/remove-account.page | 85 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100644 help/C/disable-account.page create mode 100644 help/C/remove-account.page (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index 3d7a3d13b..59db36934 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -4,6 +4,7 @@ + Add a new account to Empathy. diff --git a/help/C/disable-account.page b/help/C/disable-account.page new file mode 100644 index 000000000..e17b90ce8 --- /dev/null +++ b/help/C/disable-account.page @@ -0,0 +1,78 @@ + + + + + + Remove an account from Empathy. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + + + Milo Casagrande +

Section about how to disable an account from Empathy.

+ + + How can I disable an account? + +

+ Disabling an account means to deactivete it, temporaly or + permanently. All the conversations you had will be kept in your computer. +

+

+ After disabling an account, you will be able to enable it again. +

+ + + +

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

+ + +

+ Press F4 +

+ + +

+ Choose EditAccounts +

+ + + + +

+ Select the account you wish to disable in the box on the + left of the dialog. +

+ + +

+ Deselect the Enabled check-box. +

+ + + + +

+ If you want to remove an account, see . +

+ + + \ No newline at end of file diff --git a/help/C/remove-account.page b/help/C/remove-account.page new file mode 100644 index 000000000..efa06e5cc --- /dev/null +++ b/help/C/remove-account.page @@ -0,0 +1,85 @@ + + + + + Remove an account from Empathy. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + + + Milo Casagrande +

Section about how to remove an account from Empathy.

+ + + How can I remove an account? + +

+ Removing an account means to delete it from your computer with all + the conversations you had with other people. +

+

+ After removing an account you will not be able to recover it or + the conversations you had. +

+ + + +

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

+ + +

+ Press F4 +

+ + +

+ Choose EditAccounts +

+ + + + +

+ Select the account you wish to remove in the box on the + left of the dialog. +

+ + +

+ Click on the Remove button. +

+ + +

+ A dialog will be shown asking for confirmation. Click on + the Remove button to permanently remove the + account. +

+ + + + +

+ If you only want to disable an account, see . +

+ + + \ No newline at end of file -- cgit v1.2.3 From a5a227c8abb1bb0f7208f797f3bfde3953d29a68 Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Mon, 15 Jun 2009 03:08:15 +0100 Subject: Added page on connection problems. --- help/C/problems_connecting.page | 113 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 help/C/problems_connecting.page (limited to 'help/C') diff --git a/help/C/problems_connecting.page b/help/C/problems_connecting.page new file mode 100644 index 000000000..8042130cd --- /dev/null +++ b/help/C/problems_connecting.page @@ -0,0 +1,113 @@ + + + + + Diagnose common problems with connecting to an instant messaging service. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + +I have a problem connecting to an instant messaging service + + + Phil Bull +

This is a stub. We should identify the most common causes for a user not + being able to connect and document those.

+ + +
+ I get a message that says "Authentication failed" +

+ If you try to connect and an error message appears in the main Empathy + window saying that Authentication failed, your instant messaging + service is not allowing you to connect because it does not recognize your + username or password for some reason. +

+ + +

+ Make sure that you have registered for an account with the service you + are trying to connect to. If you do not have an account, most services + will not allow you to connect. +

+ + +

+ Click the Edit Account button in the error message. Type + your username and password again to make sure that they are correct. + Uncheck the Enabled box next to the name of your account and + then check it again to try to connect to the service again. +

+ + +
+ +
+ I get a message that says "Network error" +

+ If you try to connect and an error message appears in the main Empathy + window which says Network error, Empathy cannot communicate with + the instant messaging service for some reason. +

+ + +

+ Check that you are connected to the Internet or network. +

+ + +

+ Click the Edit Account button in the error message. Expand + the Advanced section and make sure that the details such as + server address and port are correct. You should be able to find these + details from the website of the messaging service. Uncheck the + Enabled box next to the name of your account and then check + it again to try to connect to the service again. +

+ + +
+ +
+ My account is not enabled +

+ If the instant messaging account that you want to use is not enabled in the + drop-down account list when you try to start a new conversation or join a + chat, your account details may not be correct. +

+ + +

+ Click EditAccounts and make sure + that the Enabled checkbox is checked. +

+ + +

+ Make sure that your username and password are correct. +

+ + +

+ Expand the Advanced section of the Accounts + window and make sure that all of the server settings are correct. +

+ + +
+ + -- cgit v1.2.3 From b4e70b513a9c0307c84dc9210b8b7f3dde1a984d Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Mon, 15 Jun 2009 03:22:39 +0100 Subject: * Change links to reflect index page categories * Add sentence on automatic status change to change_status --- help/C/add-account.page | 4 ++-- help/C/change_status.page | 13 +++++++++++-- help/C/create-account.page | 2 +- help/C/disable-account.page | 4 ++-- help/C/index.page | 10 +++++++++- help/C/remove-account.page | 4 ++-- help/C/send_file.page | 2 +- help/C/send_message.page | 2 +- 8 files changed, 29 insertions(+), 12 deletions(-) (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index 59db36934..c0bd7bea9 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -3,7 +3,7 @@ id="add-account"> - + Add a new account to Empathy. @@ -94,4 +94,4 @@ - \ No newline at end of file + diff --git a/help/C/change_status.page b/help/C/change_status.page index a5b6b53a0..a6d13eb05 100644 --- a/help/C/change_status.page +++ b/help/C/change_status.page @@ -3,7 +3,7 @@ id="change_status"> - + Change your status, if you are going away from your computer for example. @@ -24,6 +24,15 @@ How can I change my status? -

Click the drop-down list at the top of the main Empathy window and select a status from the list. For example, if you are going away from your computer, select Away.

+

+Click the drop-down list at the top of the main Empathy window and +select a status from the list. For example, if you are busy and do not want to +be disturbed, select Busy. +

+ +

+If you do not use your computer for a while, Empathy will automatically set +your status to Away. +

diff --git a/help/C/create-account.page b/help/C/create-account.page index a389f3e63..6fdf16ded 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -3,7 +3,7 @@ id="create-account"> - + Create an account with one of the supported services. diff --git a/help/C/disable-account.page b/help/C/disable-account.page index e17b90ce8..1f4983fc1 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -3,7 +3,7 @@ id="disable-account"> - + Remove an account from Empathy. @@ -75,4 +75,4 @@

- \ No newline at end of file + diff --git a/help/C/index.page b/help/C/index.page index e3f8662db..fa1260b20 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -20,7 +20,15 @@ - Empathy Documentation + Empathy Instant Messenger + +
+ Talk to people +
+ +
+ Manage instant messaging accounts +
Milo Casagrande diff --git a/help/C/remove-account.page b/help/C/remove-account.page index efa06e5cc..d073f2586 100644 --- a/help/C/remove-account.page +++ b/help/C/remove-account.page @@ -3,7 +3,7 @@ id="remove-account"> - + Remove an account from Empathy. @@ -82,4 +82,4 @@

- \ No newline at end of file + diff --git a/help/C/send_file.page b/help/C/send_file.page index a17cd84bb..3f5379c2c 100644 --- a/help/C/send_file.page +++ b/help/C/send_file.page @@ -3,7 +3,7 @@ id="send_file"> - + Send a file from your computer to one of your contacts. diff --git a/help/C/send_message.page b/help/C/send_message.page index 1d9b2fda8..54373ac17 100644 --- a/help/C/send_message.page +++ b/help/C/send_message.page @@ -3,7 +3,7 @@ id="send_message"> - + Send a message to one of your contacts. -- cgit v1.2.3 From 6ee9ba692824d3abb9cf010692d3880a863b57c2 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 14 Jun 2009 22:32:17 -0400 Subject: Fixed description of disable-account topic --- help/C/disable-account.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'help/C') diff --git a/help/C/disable-account.page b/help/C/disable-account.page index 1f4983fc1..3f88062e3 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -5,7 +5,7 @@ - Remove an account from Empathy. + Disable an account from Empathy. -- cgit v1.2.3 From 8514fdd6e08d327e01e904de666fbb4414029d61 Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Mon, 15 Jun 2009 03:49:10 +0100 Subject: Add common problems section --- help/C/index.page | 4 ++++ help/C/problems_connecting.page | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'help/C') diff --git a/help/C/index.page b/help/C/index.page index fa1260b20..bd0cb6f17 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -30,6 +30,10 @@ Manage instant messaging accounts +
+ Fix common problems +
+ Milo Casagrande

diff --git a/help/C/problems_connecting.page b/help/C/problems_connecting.page index 8042130cd..574c2dd41 100644 --- a/help/C/problems_connecting.page +++ b/help/C/problems_connecting.page @@ -3,7 +3,7 @@ id="problems_connecting"> - + Diagnose common problems with connecting to an instant messaging service. -- cgit v1.2.3 From 1141d65da420328c1f6ba7373c53a2bf554abcc9 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 14 Jun 2009 22:51:52 -0400 Subject: Rework some sections --- help/C/change_status.page | 59 +++++++++++++++++++------------------- help/C/create-account.page | 4 +-- help/C/send_message.page | 70 +++++++++++++++++++++++++++++++--------------- 3 files changed, 80 insertions(+), 53 deletions(-) (limited to 'help/C') diff --git a/help/C/change_status.page b/help/C/change_status.page index a6d13eb05..c892e4f53 100644 --- a/help/C/change_status.page +++ b/help/C/change_status.page @@ -1,38 +1,39 @@ - - - - Change your status, if you are going away from your computer for example. - - - - Phil Bull - philbull@gmail.com - - - 2009 - GNOME Documentation Project - - + type="guide" + id="change_status"> + + + + Change your status, if you are going away from your computer for example. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + Creative Commons Share Alike - + - How can I change my status? -

-Click the drop-down list at the top of the main Empathy window and -select a status from the list. For example, if you are busy and do not want to -be disturbed, select Busy. -

- -

-If you do not use your computer for a while, Empathy will automatically set -your status to Away. -

+

+ Click the drop-down list at the top of the main Empathy window and + select a status from the list. For example, if you are busy and do not want to + be disturbed, select Busy. +

+ + +

+ If you do not use your computer for a while, Empathy will automatically set + your status to Away. +

+ diff --git a/help/C/create-account.page b/help/C/create-account.page index 6fdf16ded..f6be5ccc9 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -6,7 +6,7 @@ - Create an account with one of the supported services. + Register an account with one of the supported services. @@ -30,7 +30,7 @@ - How can I create an account? + How can I register a new account?

You can freely create an account on any of the following diff --git a/help/C/send_message.page b/help/C/send_message.page index 54373ac17..496341aec 100644 --- a/help/C/send_message.page +++ b/help/C/send_message.page @@ -2,27 +2,53 @@ type="guide" id="send_message"> - - - Send a message to one of your contacts. - - - - Phil Bull - philbull@gmail.com - - - 2009 - GNOME Documentation Project - - + + + Send a message to one of your contacts. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + Creative Commons Share Alike - - - - -How can I send a message to someone? - -

In the main Empathy window, double-click the name of the contact that you want to chat with. Alternatively, right-click their name and click Chat. A chat window will open. Type a message into the box at the bottom of the window and press Enter to send it to your contact.

- + + + + + How can I send a message to someone? + + + +

+ From the main window of Empathy, perform one of the following: +

+ + +

+ Double-click the name of the contact that you want to chat + with +

+ + +

+ Right-click their name and click Chat +

+ + + + +

+ A chat window will open. Type a message into the box at the + bottom of the window and press Enter to send it to + your contact. +

+ + + -- cgit v1.2.3 From 5ea557b78b99877f78ab56ccb5df508f9b100dc9 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 14 Jun 2009 23:10:34 -0400 Subject: Fixed the naming convention of files: use dash, not underscores --- help/C/change-status.page | 39 ++++++++++++++ help/C/change_status.page | 39 -------------- help/C/problems-connecting.page | 113 ++++++++++++++++++++++++++++++++++++++++ help/C/problems_connecting.page | 113 ---------------------------------------- help/C/send-file.page | 54 +++++++++++++++++++ help/C/send-message.page | 54 +++++++++++++++++++ help/C/send_file.page | 54 ------------------- help/C/send_message.page | 54 ------------------- 8 files changed, 260 insertions(+), 260 deletions(-) create mode 100644 help/C/change-status.page delete mode 100644 help/C/change_status.page create mode 100644 help/C/problems-connecting.page delete mode 100644 help/C/problems_connecting.page create mode 100644 help/C/send-file.page create mode 100644 help/C/send-message.page delete mode 100644 help/C/send_file.page delete mode 100644 help/C/send_message.page (limited to 'help/C') diff --git a/help/C/change-status.page b/help/C/change-status.page new file mode 100644 index 000000000..f5a5396e5 --- /dev/null +++ b/help/C/change-status.page @@ -0,0 +1,39 @@ + + + + + Change your status, if you are going away from your computer for example. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + +How can I change my status? + +

+ Click the drop-down list at the top of the main Empathy window and + select a status from the list. For example, if you are busy and do not want to + be disturbed, select Busy. +

+ + +

+ If you do not use your computer for a while, Empathy will automatically set + your status to Away. +

+ + + diff --git a/help/C/change_status.page b/help/C/change_status.page deleted file mode 100644 index c892e4f53..000000000 --- a/help/C/change_status.page +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Change your status, if you are going away from your computer for example. - - - - Phil Bull - philbull@gmail.com - - - 2009 - GNOME Documentation Project - - - Creative Commons Share Alike - - - - -How can I change my status? - -

- Click the drop-down list at the top of the main Empathy window and - select a status from the list. For example, if you are busy and do not want to - be disturbed, select Busy. -

- - -

- If you do not use your computer for a while, Empathy will automatically set - your status to Away. -

- - - diff --git a/help/C/problems-connecting.page b/help/C/problems-connecting.page new file mode 100644 index 000000000..800624f46 --- /dev/null +++ b/help/C/problems-connecting.page @@ -0,0 +1,113 @@ + + + + + Diagnose common problems with connecting to an instant messaging service. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + +I have a problem connecting to an instant messaging service + + + Phil Bull +

This is a stub. We should identify the most common causes for a user not + being able to connect and document those.

+ + +
+ I get a message that says "Authentication failed" +

+ If you try to connect and an error message appears in the main Empathy + window saying that Authentication failed, your instant messaging + service is not allowing you to connect because it does not recognize your + username or password for some reason. +

+ + +

+ Make sure that you have registered for an account with the service you + are trying to connect to. If you do not have an account, most services + will not allow you to connect. +

+ + +

+ Click the Edit Account button in the error message. Type + your username and password again to make sure that they are correct. + Uncheck the Enabled box next to the name of your account and + then check it again to try to connect to the service again. +

+ + +
+ +
+ I get a message that says "Network error" +

+ If you try to connect and an error message appears in the main Empathy + window which says Network error, Empathy cannot communicate with + the instant messaging service for some reason. +

+ + +

+ Check that you are connected to the Internet or network. +

+ + +

+ Click the Edit Account button in the error message. Expand + the Advanced section and make sure that the details such as + server address and port are correct. You should be able to find these + details from the website of the messaging service. Uncheck the + Enabled box next to the name of your account and then check + it again to try to connect to the service again. +

+ + +
+ +
+ My account is not enabled +

+ If the instant messaging account that you want to use is not enabled in the + drop-down account list when you try to start a new conversation or join a + chat, your account details may not be correct. +

+ + +

+ Click EditAccounts and make sure + that the Enabled checkbox is checked. +

+ + +

+ Make sure that your username and password are correct. +

+ + +

+ Expand the Advanced section of the Accounts + window and make sure that all of the server settings are correct. +

+ + +
+ + diff --git a/help/C/problems_connecting.page b/help/C/problems_connecting.page deleted file mode 100644 index 574c2dd41..000000000 --- a/help/C/problems_connecting.page +++ /dev/null @@ -1,113 +0,0 @@ - - - - - Diagnose common problems with connecting to an instant messaging service. - - - - Phil Bull - philbull@gmail.com - - - 2009 - GNOME Documentation Project - - - Creative Commons Share Alike - - - - -I have a problem connecting to an instant messaging service - - - Phil Bull -

This is a stub. We should identify the most common causes for a user not - being able to connect and document those.

- - -
- I get a message that says "Authentication failed" -

- If you try to connect and an error message appears in the main Empathy - window saying that Authentication failed, your instant messaging - service is not allowing you to connect because it does not recognize your - username or password for some reason. -

- - -

- Make sure that you have registered for an account with the service you - are trying to connect to. If you do not have an account, most services - will not allow you to connect. -

- - -

- Click the Edit Account button in the error message. Type - your username and password again to make sure that they are correct. - Uncheck the Enabled box next to the name of your account and - then check it again to try to connect to the service again. -

- - -
- -
- I get a message that says "Network error" -

- If you try to connect and an error message appears in the main Empathy - window which says Network error, Empathy cannot communicate with - the instant messaging service for some reason. -

- - -

- Check that you are connected to the Internet or network. -

- - -

- Click the Edit Account button in the error message. Expand - the Advanced section and make sure that the details such as - server address and port are correct. You should be able to find these - details from the website of the messaging service. Uncheck the - Enabled box next to the name of your account and then check - it again to try to connect to the service again. -

- - -
- -
- My account is not enabled -

- If the instant messaging account that you want to use is not enabled in the - drop-down account list when you try to start a new conversation or join a - chat, your account details may not be correct. -

- - -

- Click EditAccounts and make sure - that the Enabled checkbox is checked. -

- - -

- Make sure that your username and password are correct. -

- - -

- Expand the Advanced section of the Accounts - window and make sure that all of the server settings are correct. -

- - -
- - diff --git a/help/C/send-file.page b/help/C/send-file.page new file mode 100644 index 000000000..bad5099d9 --- /dev/null +++ b/help/C/send-file.page @@ -0,0 +1,54 @@ + + + + + Send a file from your computer to one of your contacts. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + +How can I send a file to someone? + +

+In the main Empathy window, right-click the contact that you want +to send a file to and click Send file. +

+

+Select the file that you want to send and click Send. The File +Transfers window will appear. Wait for your contact to accept the file +transfer, or press Stop to stop the transfer from happening. +

+

+If your contact accepts the file transfer, you can watch the progress of the +transfer and see the estimated amount of time remaining before it is complete. +If they do not accept it, the status of the transfer will change to File +transfer cancelled and the file will not be sent. +

+

+Once a transfer is finished, you can just close the File Transfers +window. If you have lots of finished transfers listed in the window, click +Clear to clear the list. This will only remove the files from the +list and will not delete them from your computer. +

+ + +

+ You must be online to send a file to someone. +

+ + + diff --git a/help/C/send-message.page b/help/C/send-message.page new file mode 100644 index 000000000..9db52c5fe --- /dev/null +++ b/help/C/send-message.page @@ -0,0 +1,54 @@ + + + + + Send a message to one of your contacts. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + + How can I send a message to someone? + + + +

+ From the main window of Empathy, perform one of the following: +

+ + +

+ Double-click the name of the contact that you want to chat + with +

+ + +

+ Right-click their name and click Chat +

+ + + + +

+ A chat window will open. Type a message into the box at the + bottom of the window and press Enter to send it to + your contact. +

+ + + + diff --git a/help/C/send_file.page b/help/C/send_file.page deleted file mode 100644 index 3f5379c2c..000000000 --- a/help/C/send_file.page +++ /dev/null @@ -1,54 +0,0 @@ - - - - - Send a file from your computer to one of your contacts. - - - - Phil Bull - philbull@gmail.com - - - 2009 - GNOME Documentation Project - - - Creative Commons Share Alike - - - - -How can I send a file to someone? - -

-In the main Empathy window, right-click the contact that you want -to send a file to and click Send file. -

-

-Select the file that you want to send and click Send. The File -Transfers window will appear. Wait for your contact to accept the file -transfer, or press Stop to stop the transfer from happening. -

-

-If your contact accepts the file transfer, you can watch the progress of the -transfer and see the estimated amount of time remaining before it is complete. -If they do not accept it, the status of the transfer will change to File -transfer cancelled and the file will not be sent. -

-

-Once a transfer is finished, you can just close the File Transfers -window. If you have lots of finished transfers listed in the window, click -Clear to clear the list. This will only remove the files from the -list and will not delete them from your computer. -

- - -

- You must be online to send a file to someone. -

- - - diff --git a/help/C/send_message.page b/help/C/send_message.page deleted file mode 100644 index 496341aec..000000000 --- a/help/C/send_message.page +++ /dev/null @@ -1,54 +0,0 @@ - - - - - Send a message to one of your contacts. - - - - Phil Bull - philbull@gmail.com - - - 2009 - GNOME Documentation Project - - - Creative Commons Share Alike - - - - - How can I send a message to someone? - - - -

- From the main window of Empathy, perform one of the following: -

- - -

- Double-click the name of the contact that you want to chat - with -

- - -

- Right-click their name and click Chat -

- - - - -

- A chat window will open. Type a message into the box at the - bottom of the window and press Enter to send it to - your contact. -

- - - - -- cgit v1.2.3 From 88ed5023f2167d1a8ec40ba773ea69be8103e2ca Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 14 Jun 2009 23:32:03 -0400 Subject: * Add a custom-message topic for setting a custom presence message (needs more work) * Modified the change-status topic --- help/C/change-status.page | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'help/C') diff --git a/help/C/change-status.page b/help/C/change-status.page index f5a5396e5..e91af879e 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -18,14 +18,27 @@ Creative Commons Share Alike - - + + + + How can I change my status? -How can I change my status? + + +

+ Click on the drop-down list at the top of the main window of + Empathy. +

+ + +

+ Select a status from the list. +

+ +

- Click the drop-down list at the top of the main Empathy window and - select a status from the list. For example, if you are busy and do not want to + For example, if you are busy and do not want to be disturbed, select Busy.

-- cgit v1.2.3 From 016a69a83d9a20aeaa93bcdf20faeef968a888a8 Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Mon, 15 Jun 2009 21:19:47 +0100 Subject: Added "add contact" page. Needs work. --- help/C/add-contact.page | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 help/C/add-contact.page (limited to 'help/C') diff --git a/help/C/add-contact.page b/help/C/add-contact.page new file mode 100644 index 000000000..405d1164b --- /dev/null +++ b/help/C/add-contact.page @@ -0,0 +1,42 @@ + + + + + Add someone to your contact list. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + +How can I add someone to my list of contacts? + + + Phil Bull +

Instructions need review, didn't test with other IM services to confirm + the names of the textboxes. Also, check the name of the Add button.

+ + +

+Click ChatAdd Contact. Type the email +address or username of the person you want to add to your contacts into the +Identifier text box. Type their name into the Alias text +box. Click Add to add the person to your list of contacts. +

+

+You can view your list of contacts in the main Empathy window. +

+ + -- cgit v1.2.3 From 73980629d8f011acb0bd2441c53776153e2a348e Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Thu, 18 Jun 2009 23:49:17 +0200 Subject: Updated xmlns links * Updated the xmlns links in all pages to reflect the new Mallard spec URL --- help/C/add-account.page | 2 +- help/C/add-contact.page | 2 +- help/C/change-status.page | 2 +- help/C/create-account.page | 2 +- help/C/disable-account.page | 2 +- help/C/index.page | 2 +- help/C/problems-connecting.page | 2 +- help/C/remove-account.page | 2 +- help/C/send-file.page | 2 +- help/C/send-message.page | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index c0bd7bea9..c4dfd3286 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -1,4 +1,4 @@ - diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 405d1164b..38b05f7ec 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -1,4 +1,4 @@ - diff --git a/help/C/change-status.page b/help/C/change-status.page index e91af879e..e3b9e1163 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -1,4 +1,4 @@ - diff --git a/help/C/create-account.page b/help/C/create-account.page index f6be5ccc9..43ef340f5 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -1,4 +1,4 @@ - diff --git a/help/C/disable-account.page b/help/C/disable-account.page index 3f88062e3..f3e23f37c 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -1,4 +1,4 @@ - diff --git a/help/C/index.page b/help/C/index.page index bd0cb6f17..bb01a2aa7 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -1,4 +1,4 @@ - diff --git a/help/C/problems-connecting.page b/help/C/problems-connecting.page index 800624f46..e84b03e1a 100644 --- a/help/C/problems-connecting.page +++ b/help/C/problems-connecting.page @@ -1,4 +1,4 @@ - diff --git a/help/C/remove-account.page b/help/C/remove-account.page index d073f2586..5b5f36347 100644 --- a/help/C/remove-account.page +++ b/help/C/remove-account.page @@ -1,4 +1,4 @@ - diff --git a/help/C/send-file.page b/help/C/send-file.page index bad5099d9..13774bb04 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -1,4 +1,4 @@ - diff --git a/help/C/send-message.page b/help/C/send-message.page index 9db52c5fe..79794fca2 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -1,4 +1,4 @@ - -- cgit v1.2.3 From bf2830cb6131a70e549399b38a9a6c994aff39ff Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Fri, 19 Jun 2009 23:29:06 +0100 Subject: * Restructure problems-connecting into a guide and shorten names to "prob-conn" * Update xmlns where missed * Use the page type hint (topic/guide) correctly --- help/C/add-contact.page | 2 +- help/C/change-status.page | 2 +- help/C/prob-conn-acctdisabled.page | 52 +++++++++++++++++ help/C/prob-conn-auth.page | 51 +++++++++++++++++ help/C/prob-conn-neterror.page | 62 ++++++++++++++++++++ help/C/prob-conn.page | 38 +++++++++++++ help/C/problems-connecting.page | 113 ------------------------------------- help/C/send-file.page | 2 +- help/C/send-message.page | 2 +- 9 files changed, 207 insertions(+), 117 deletions(-) create mode 100644 help/C/prob-conn-acctdisabled.page create mode 100644 help/C/prob-conn-auth.page create mode 100644 help/C/prob-conn-neterror.page create mode 100644 help/C/prob-conn.page delete mode 100644 help/C/problems-connecting.page (limited to 'help/C') diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 38b05f7ec..767ac79d7 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -1,5 +1,5 @@ diff --git a/help/C/change-status.page b/help/C/change-status.page index e3b9e1163..27af18388 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -1,5 +1,5 @@ diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page new file mode 100644 index 000000000..0898ad953 --- /dev/null +++ b/help/C/prob-conn-acctdisabled.page @@ -0,0 +1,52 @@ + + + + + + The instant messaging account that you want to use is not enabled in + the list of accounts. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + Creative Commons Share Alike + + + +My account is not enabled + +

+If the instant messaging account that you want to use is not enabled in the +drop-down account list when you try to start a new conversation or join a +chat, your account details may not be correct. +

+ + + +

+ Click EditAccounts and make sure + that the Enabled checkbox is checked. +

+ + +

+ Make sure that your username and password are correct. +

+ + +

+ Expand the Advanced section of the Accounts + window and make sure that all of the server settings are correct. +

+ + + + diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page new file mode 100644 index 000000000..8da582b77 --- /dev/null +++ b/help/C/prob-conn-auth.page @@ -0,0 +1,51 @@ + + + + + + An error message appears in the main window saying that + Authentication failed. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + Creative Commons Share Alike + + + +I get a message that says "Authentication failed" + +

+If you try to connect and an error message appears in the main Empathy +window saying that Authentication failed, your instant messaging +service is not allowing you to connect because it does not recognize your +username or password for some reason. +

+ + + +

+ Make sure that you have registered for an account with the service you + are trying to connect to. If you do not have an account, most services + will not allow you to connect. +

+ + +

+ Click the Edit Account button in the error message. Type + your username and password again to make sure that they are correct. + Uncheck the Enabled box next to the name of your account and + then check it again to try to connect to the service again. +

+ + + + diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page new file mode 100644 index 000000000..291d80ce4 --- /dev/null +++ b/help/C/prob-conn-neterror.page @@ -0,0 +1,62 @@ + + + + + + An error message appears in the main Empathy window which says + Network error. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + Creative Commons Share Alike + + + +I get a message that says "Network error" + +

+If you try to connect and an error message appears in the main Empathy +window which says Network error, Empathy cannot communicate with +the instant messaging service for some reason. +

+ + + +

+ Check that you are connected to the Internet or network. +

+ + + + +

+ Click the Edit Account button in the error message. +

+ + +

+ Expand the Advanced section and make sure that the details + such as server address and port are correct. You should be able to find + these details from the website of the messaging service. +

+ + +

+ Uncheck the Enabled box next to the name of your account and + then check it again to try to connect to the service again. +

+ + + + + + diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page new file mode 100644 index 000000000..b165cfb4d --- /dev/null +++ b/help/C/prob-conn.page @@ -0,0 +1,38 @@ + + + + + + Diagnose common problems with connecting to an instant messaging service. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + +I have a problem connecting to an instant messaging service + + + Phil Bull +

This is a stub. We should identify the most common causes for a user not + being able to connect and document those.

+ + + + Phil Bull +

Check whether gui tags are allowed in section titles and descs.

+ + + diff --git a/help/C/problems-connecting.page b/help/C/problems-connecting.page deleted file mode 100644 index e84b03e1a..000000000 --- a/help/C/problems-connecting.page +++ /dev/null @@ -1,113 +0,0 @@ - - - - - Diagnose common problems with connecting to an instant messaging service. - - - - Phil Bull - philbull@gmail.com - - - 2009 - GNOME Documentation Project - - - Creative Commons Share Alike - - - - -I have a problem connecting to an instant messaging service - - - Phil Bull -

This is a stub. We should identify the most common causes for a user not - being able to connect and document those.

- - -
- I get a message that says "Authentication failed" -

- If you try to connect and an error message appears in the main Empathy - window saying that Authentication failed, your instant messaging - service is not allowing you to connect because it does not recognize your - username or password for some reason. -

- - -

- Make sure that you have registered for an account with the service you - are trying to connect to. If you do not have an account, most services - will not allow you to connect. -

- - -

- Click the Edit Account button in the error message. Type - your username and password again to make sure that they are correct. - Uncheck the Enabled box next to the name of your account and - then check it again to try to connect to the service again. -

- - -
- -
- I get a message that says "Network error" -

- If you try to connect and an error message appears in the main Empathy - window which says Network error, Empathy cannot communicate with - the instant messaging service for some reason. -

- - -

- Check that you are connected to the Internet or network. -

- - -

- Click the Edit Account button in the error message. Expand - the Advanced section and make sure that the details such as - server address and port are correct. You should be able to find these - details from the website of the messaging service. Uncheck the - Enabled box next to the name of your account and then check - it again to try to connect to the service again. -

- - -
- -
- My account is not enabled -

- If the instant messaging account that you want to use is not enabled in the - drop-down account list when you try to start a new conversation or join a - chat, your account details may not be correct. -

- - -

- Click EditAccounts and make sure - that the Enabled checkbox is checked. -

- - -

- Make sure that your username and password are correct. -

- - -

- Expand the Advanced section of the Accounts - window and make sure that all of the server settings are correct. -

- - -
- - diff --git a/help/C/send-file.page b/help/C/send-file.page index 13774bb04..e995dad59 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -1,5 +1,5 @@ diff --git a/help/C/send-message.page b/help/C/send-message.page index 79794fca2..996b4be35 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -1,5 +1,5 @@ -- cgit v1.2.3 From c8c2ab42b1b7fff88b9bfe9ec942e56324dc5ca7 Mon Sep 17 00:00:00 2001 From: Phil Bull Date: Fri, 19 Jun 2009 23:35:38 +0100 Subject: Use a different title style for each topic. The "How can I..." bit at the start of each title was reducing readability. --- help/C/add-account.page | 2 +- help/C/add-contact.page | 2 +- help/C/change-status.page | 2 +- help/C/create-account.page | 5 +++-- help/C/disable-account.page | 5 +++-- help/C/remove-account.page | 4 ++-- help/C/send-file.page | 2 +- help/C/send-message.page | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index c4dfd3286..1428d5455 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -28,7 +28,7 @@

Section about how to add a new account to Empathy.

 - How can I add a new account? + Add a new account diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 767ac79d7..4d6deef46 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -21,7 +21,7 @@ -How can I add someone to my list of contacts? +Add someone to your list of contacts Phil Bull diff --git a/help/C/change-status.page b/help/C/change-status.page index 27af18388..561f04408 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -21,7 +21,7 @@ - How can I change my status? + Change your status diff --git a/help/C/create-account.page b/help/C/create-account.page index 43ef340f5..5a2124f3e 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -6,7 +6,8 @@ - Register an account with one of the supported services. + Register an account with one of the supported messaging services. + @@ -30,7 +31,7 @@ - How can I register a new account? + Register for a new account

You can freely create an account on any of the following diff --git a/help/C/disable-account.page b/help/C/disable-account.page index f3e23f37c..2649c3b6b 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -5,7 +5,8 @@ - Disable an account from Empathy. + Prevent an account from logging-in automatically when you start + Empathy. @@ -28,7 +29,7 @@

Section about how to disable an account from Empathy.

- How can I disable an account? + Disable an account

Disabling an account means to deactivete it, temporaly or diff --git a/help/C/remove-account.page b/help/C/remove-account.page index 5b5f36347..36e22f50a 100644 --- a/help/C/remove-account.page +++ b/help/C/remove-account.page @@ -4,7 +4,7 @@ - Remove an account from Empathy. + Completely remove an account from Empathy. @@ -27,7 +27,7 @@

Section about how to remove an account from Empathy.

- How can I remove an account? + Remove an account

Removing an account means to delete it from your computer with all diff --git a/help/C/send-file.page b/help/C/send-file.page index e995dad59..4613249a0 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -21,7 +21,7 @@ -How can I send a file to someone? +Send a file to someone

In the main Empathy window, right-click the contact that you want diff --git a/help/C/send-message.page b/help/C/send-message.page index 996b4be35..eed065901 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -21,7 +21,7 @@ - How can I send a message to someone? + Send a message to someone -- cgit v1.2.3 From aad2e7ea743988393c5f8023929ab69700d24860 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 21 Jun 2009 20:22:15 +0200 Subject: New file salut-protocol.page: * Wrote small description of what the protocol is Work on the create account topic: * Checked all the links to service registration forms * Removed FWD, service closed up * Reworked terminology: avoided SIP in favor of Telephony * Created another section for Salut * Added link to salut-protocol --- help/C/create-account.page | 97 ++++++++++++++++++++++++++++------------------ help/C/salut-protocol.page | 55 ++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 38 deletions(-) create mode 100644 help/C/salut-protocol.page (limited to 'help/C') diff --git a/help/C/create-account.page b/help/C/create-account.page index 5a2124f3e..6cfe2e552 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -1,15 +1,14 @@ - - - Register an account with one of the supported messaging services. + + Register an account with one of the supported messaging services. - - + + Milo Casagrande milo@ubuntu.com @@ -30,93 +29,115 @@

Section about how to create an account.

- Register for a new account

You can freely create an account on any of the following services. Follow the instructions reported on each website on - how to register your new account. At the end of the - registration process you should have a user - name (or an account ID) and - a password that you will use to - create the account in Empathy. + how to register your new account. +

+

+ At the end of the registration process you should have a user + name (or an account ID) and a password + that you will use to add the account to Empathy.

-

- Click on the name of the service to visit its website: + Click on the name of the service to visit its website.

Instant Messaging Services - +

- AIM + AIM

- Google Talk + Google Talk

- ICQ + ICQ

- Jabber + Jabber

+ +

+ It is possible to use the automatic creation of accounts + with this service and Empathy. Not all the + service providers support it. One service provider known + to work is jabber.org, the default one of the application. +

+

- MSN + MSN

- Yahoo! + Yahoo!

- +
+ +
+ Local Instant Messaging Services

- To register a Jabber account you can use the automatic - account creation of Empathy. Not all Jabber service - providers support the automatic creation of accounts, one - service provider known to work with Empathy is jabber.org. + This service works when you are connected to a local network, + you do not need an Internet connetion in order to use it.

+ + +

+ Salut +

+ +

- If you already have a Jabber account you can use the Salut service. + For more information, see .

- +
- +
- SIP Services + Telephony Services + +

+ These services will let you do voice call over the Internet to + other people using the same service or even to normal phones. +

- Ekiga + Ekiga

- FWD -

- - -

- Sipphone + Sipphone

+ +

+ In order to call normal phones over the Internet, you may need + to subscribe to a paid service. For more information, please + refer to the instructions provided on the website of the + service you will use. +

+
- diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page new file mode 100644 index 000000000..164e20497 --- /dev/null +++ b/help/C/salut-protocol.page @@ -0,0 +1,55 @@ + + + + + + Undesrtanding the Salut protocol. + + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike + + + + + + Milo Casagrande +

+ Need to work on this section, explaining people in clear words + what the hell is this service! +

+ + + What is the <em>Salut</em> service? + +

+ The Salut service is a serverless communication service: + you do not need to connect and authenticate to a central server in + order to use it. +

+

+ This kind of serverless messaging system is restricted to local + network and an active Internet connection is not necessary. +

+

+ The people that use this service inside the same local network + will be auto-discovered, and it will be possibile to send them messages + and files as with other services. +

+

+ All the modern local network should be able to support this kind + of service. +

+ -- cgit v1.2.3 From 60c866ec8d72d4976bc54bb4e21ea9d450357470 Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Sun, 21 Jun 2009 21:53:28 -0500 Subject: Fixed minor typos --- help/C/create-account.page | 4 ++-- help/C/disable-account.page | 2 +- help/C/salut-protocol.page | 8 ++++---- help/C/send-file.page | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'help/C') diff --git a/help/C/create-account.page b/help/C/create-account.page index 6cfe2e552..b8c8b5140 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -18,7 +18,7 @@ GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 @@ -94,7 +94,7 @@ Local Instant Messaging Services

This service works when you are connected to a local network, - you do not need an Internet connetion in order to use it. + you do not need an Internet connection in order to use it.

diff --git a/help/C/disable-account.page b/help/C/disable-account.page index 2649c3b6b..2441c8b2c 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -32,7 +32,7 @@ Disable an account

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

diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page index 164e20497..2d81eb78f 100644 --- a/help/C/salut-protocol.page +++ b/help/C/salut-protocol.page @@ -40,16 +40,16 @@ order to use it.

- This kind of serverless messaging system is restricted to local + This kind of serverless messaging system is restricted to a local area network and an active Internet connection is not necessary.

- The people that use this service inside the same local network - will be auto-discovered, and it will be possibile to send them messages + The people that use this service inside the same local area network + will be auto-discovered, and it will be possible to send them messages and files as with other services.

- All the modern local network should be able to support this kind + All the modern local area networks should be able to support this kind of service.

diff --git a/help/C/send-file.page b/help/C/send-file.page index 4613249a0..3a95c8094 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -40,7 +40,7 @@ transfer cancelled and the file will not be sent.

Once a transfer is finished, you can just close the File Transfers -window. If you have lots of finished transfers listed in the window, click +window. If you have multiple finished transfers listed in the window, click Clear to clear the list. This will only remove the files from the list and will not delete them from your computer.

-- cgit v1.2.3 From d99dc3b2b2eb43afc53208bebdeefaf550b256c1 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Wed, 24 Jun 2009 23:03:55 +0200 Subject: Work on add-contact file: * Reworked the procedure in a numbered list * Checked terminology with the app * Added a note about the connection * Added a seealso link Add a new topic offline-contacts: * Small topic on how to see offline contacts and hide them * Inserted only in the add-contact page as seealso Update the license line with the 3.0 number as talked via email Update some topic form stub to draft --- help/C/add-account.page | 7 ++- help/C/add-contact.page | 107 ++++++++++++++++++++++++------------- help/C/change-status.page | 2 +- help/C/disable-account.page | 7 ++- help/C/index.page | 2 +- help/C/offline-contacts.page | 58 ++++++++++++++++++++ help/C/prob-conn-acctdisabled.page | 2 +- help/C/prob-conn-auth.page | 2 +- help/C/prob-conn-neterror.page | 2 +- help/C/prob-conn.page | 2 +- help/C/remove-account.page | 2 +- help/C/salut-protocol.page | 33 ++++++------ help/C/send-file.page | 2 +- help/C/send-message.page | 2 +- 14 files changed, 160 insertions(+), 70 deletions(-) create mode 100644 help/C/offline-contacts.page (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index 1428d5455..6bb361cd8 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -6,7 +6,7 @@ Add a new account to Empathy. - + Milo Casagrande @@ -17,10 +17,9 @@ GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 - + diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 4d6deef46..bd71edafc 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -1,42 +1,77 @@ - - - - Add someone to your contact list. - - - - Phil Bull - philbull@gmail.com - - - 2009 - GNOME Documentation Project - - - Creative Commons Share Alike - - - - -Add someone to your list of contacts - - + type="topic" + id="add-contact"> + + + + + Add someone to your contact list. + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + + + + Phil Bull

Instructions need review, didn't test with other IM services to confirm - the names of the textboxes. Also, check the name of the Add button.

- + the names of the textboxes. Also, check the name of the Add button.

+ + + Add someone to your list of contacts + + + +

+ 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. +

+ + +

+ 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 Alias text box, type their name. +

+ + +

+ Click Add to add the person to your list of + contacts. +

+ + + +

+ You can view your list of contacts in the main window of + Empathy. +

-

-Click ChatAdd Contact. Type the email -address or username of the person you want to add to your contacts into the -Identifier text box. Type their name into the Alias text -box. Click Add to add the person to your list of contacts. -

-

-You can view your list of contacts in the main Empathy window. -

+ +

+ To add a new person to your list of contacts, you need to be + connected to the Internet and to your account. +

+ diff --git a/help/C/change-status.page b/help/C/change-status.page index 561f04408..7c842f9d7 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -16,7 +16,7 @@ GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 diff --git a/help/C/disable-account.page b/help/C/disable-account.page index 2441c8b2c..2c695182d 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -7,7 +7,7 @@ Prevent an account from logging-in automatically when you start Empathy. - + Milo Casagrande @@ -18,10 +18,9 @@ GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 - + diff --git a/help/C/index.page b/help/C/index.page index bb01a2aa7..737a44f1a 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -15,7 +15,7 @@ GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page new file mode 100644 index 000000000..369234bf2 --- /dev/null +++ b/help/C/offline-contacts.page @@ -0,0 +1,58 @@ + + + + + + How to see the contacts that are not online. + + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + + + + + Milo Casagrande +

+ Small topic on how to see the contacts tha are offline. Need + rework on the terminology used. +

+ + + Display the contacts that are offline + +

+ From the Contact List window, do one of the following: +

+ + + +

+ Choose ViewOffline + Contacts. +

+ + +

+ Press CtrlH. +

+ + + +

+ To hide again the offline contacts, repeat the same procedure above. +

+ + diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page index 0898ad953..509c9a76b 100644 --- a/help/C/prob-conn-acctdisabled.page +++ b/help/C/prob-conn-acctdisabled.page @@ -17,7 +17,7 @@ 2009 GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page index 8da582b77..432960af9 100644 --- a/help/C/prob-conn-auth.page +++ b/help/C/prob-conn-auth.page @@ -17,7 +17,7 @@ 2009 GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page index 291d80ce4..90b389dc8 100644 --- a/help/C/prob-conn-neterror.page +++ b/help/C/prob-conn-neterror.page @@ -17,7 +17,7 @@ 2009 GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page index b165cfb4d..0fed7a2f3 100644 --- a/help/C/prob-conn.page +++ b/help/C/prob-conn.page @@ -17,7 +17,7 @@ GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 diff --git a/help/C/remove-account.page b/help/C/remove-account.page index 36e22f50a..a6d494905 100644 --- a/help/C/remove-account.page +++ b/help/C/remove-account.page @@ -16,7 +16,7 @@ GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page index 2d81eb78f..b579a1d68 100644 --- a/help/C/salut-protocol.page +++ b/help/C/salut-protocol.page @@ -4,24 +4,23 @@ - - Undesrtanding the Salut protocol. - - + + Undesrtanding the Salut protocol. + + - - Milo Casagrande - milo@ubuntu.com - - - 2009 - GNOME Documentation Project - - - Creative Commons Share Alike - - + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + diff --git a/help/C/send-file.page b/help/C/send-file.page index 3a95c8094..099408f87 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -16,7 +16,7 @@ GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 diff --git a/help/C/send-message.page b/help/C/send-message.page index eed065901..69f70b447 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -16,7 +16,7 @@ GNOME Documentation Project - Creative Commons Share Alike + Creative Commons Share Alike 3.0 -- cgit v1.2.3 From 4ee5fa135f9ccb5ffee78c4eaf4eb2451801b486 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Wed, 24 Jun 2009 23:22:15 +0200 Subject: Update all the status of the document: * index.page is at incomplete * the majority of the topics are draft * the salut-protocol is now review --- help/C/add-contact.page | 2 +- help/C/change-status.page | 7 +++++-- help/C/index.page | 2 +- help/C/prob-conn-acctdisabled.page | 2 +- help/C/prob-conn-auth.page | 2 +- help/C/prob-conn-neterror.page | 2 +- help/C/prob-conn.page | 2 +- help/C/remove-account.page | 2 +- help/C/salut-protocol.page | 2 +- help/C/send-file.page | 2 +- help/C/send-message.page | 2 +- 11 files changed, 15 insertions(+), 12 deletions(-) (limited to 'help/C') diff --git a/help/C/add-contact.page b/help/C/add-contact.page index bd71edafc..5db825156 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -6,7 +6,7 @@ Add someone to your contact list. - + Phil Bull diff --git a/help/C/change-status.page b/help/C/change-status.page index 7c842f9d7..32fd6454b 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -4,8 +4,11 @@ - Change your status, if you are going away from your computer for example. - + + Change your status, if you are going away from your computer for + example. + + Phil Bull diff --git a/help/C/index.page b/help/C/index.page index 737a44f1a..731dda2c2 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -4,7 +4,7 @@ - + Milo Casagrande diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page index 509c9a76b..5c8a07f47 100644 --- a/help/C/prob-conn-acctdisabled.page +++ b/help/C/prob-conn-acctdisabled.page @@ -8,7 +8,7 @@ The instant messaging account that you want to use is not enabled in the list of accounts. - + Phil Bull philbull@gmail.com diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page index 432960af9..b09673d47 100644 --- a/help/C/prob-conn-auth.page +++ b/help/C/prob-conn-auth.page @@ -8,7 +8,7 @@ An error message appears in the main window saying that Authentication failed. - + Phil Bull philbull@gmail.com diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page index 90b389dc8..f7bb7281c 100644 --- a/help/C/prob-conn-neterror.page +++ b/help/C/prob-conn-neterror.page @@ -8,7 +8,7 @@ An error message appears in the main Empathy window which says Network error. - + Phil Bull philbull@gmail.com diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page index 0fed7a2f3..8655d1242 100644 --- a/help/C/prob-conn.page +++ b/help/C/prob-conn.page @@ -7,7 +7,7 @@ Diagnose common problems with connecting to an instant messaging service. - + Phil Bull philbull@gmail.com diff --git a/help/C/remove-account.page b/help/C/remove-account.page index a6d494905..f0825436d 100644 --- a/help/C/remove-account.page +++ b/help/C/remove-account.page @@ -5,7 +5,7 @@ Completely remove an account from Empathy. - + Milo Casagrande diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page index b579a1d68..335a21b3e 100644 --- a/help/C/salut-protocol.page +++ b/help/C/salut-protocol.page @@ -7,7 +7,7 @@ Undesrtanding the Salut protocol. - + Milo Casagrande diff --git a/help/C/send-file.page b/help/C/send-file.page index 099408f87..9ac91133a 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -5,7 +5,7 @@ Send a file from your computer to one of your contacts. - + Phil Bull diff --git a/help/C/send-message.page b/help/C/send-message.page index 69f70b447..0704a4e85 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -5,7 +5,7 @@ Send a message to one of your contacts. - + Phil Bull -- cgit v1.2.3 From d0210bf39425cc75021a1d7a06f5068ffa4ca0c5 Mon Sep 17 00:00:00 2001 From: Jim Campbell Date: Wed, 1 Jul 2009 18:02:33 +0200 Subject: Added set-custom-message.page: * Added first draf of how to set a custom message for your status --- help/C/set-custom-status.page | 62 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 help/C/set-custom-status.page (limited to 'help/C') diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page new file mode 100644 index 000000000..33b766714 --- /dev/null +++ b/help/C/set-custom-status.page @@ -0,0 +1,62 @@ + + + + + + + Setting a custom status. + + + + + Jim Campbell + jwcampbell@gmail.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + + + + Set a custom status +

+ Sometimes you may want to set a custom status, for example to let people know that you will be unavailable for a certain period of time. +

+ + + +

+ Click on the drop-down list at the top of the main window of + Empathy. +

+ + +

+ Enter your custom status message into the "Add New Preset" box. +

+ + +

+ Select a generic status type from the drop-down menu. +

+ + +

+ Click on the +Add button to add the custom status to + your list of possible status indicators. +

+ + +

+ Click "Close" and then select your newly-created status from + the drop-down menu at the top of the application. +

+ + + -- cgit v1.2.3 From 85ba725ccfd7b18a325c3bfa900a0bccff3e1e88 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 19 Jul 2009 00:23:44 +0200 Subject: Added a new stub file about description of the status icons Added a seealso link in another document Added the status icons, taken from Empathy data/icons directory * Added SVG and PNG format --- help/C/add-account.page | 28 ++++---- help/C/change-status.page | 29 ++++---- help/C/figures/available.png | Bin 0 -> 689 bytes help/C/figures/available.svg | 104 +++++++++++++++++++++++++++++ help/C/figures/away.png | Bin 0 -> 538 bytes help/C/figures/away.svg | 93 ++++++++++++++++++++++++++ help/C/figures/busy.png | Bin 0 -> 616 bytes help/C/figures/busy.svg | 140 +++++++++++++++++++++++++++++++++++++++ help/C/figures/extended-away.png | Bin 0 -> 752 bytes help/C/figures/extended-away.svg | 120 +++++++++++++++++++++++++++++++++ help/C/index.page | 18 ++--- help/C/status-icons.page | 92 +++++++++++++++++++++++++ 12 files changed, 586 insertions(+), 38 deletions(-) create mode 100644 help/C/figures/available.png create mode 100644 help/C/figures/available.svg create mode 100644 help/C/figures/away.png create mode 100644 help/C/figures/away.svg create mode 100644 help/C/figures/busy.png create mode 100644 help/C/figures/busy.svg create mode 100644 help/C/figures/extended-away.png create mode 100644 help/C/figures/extended-away.svg create mode 100644 help/C/status-icons.page (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index 6bb361cd8..8bdf82e75 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -1,13 +1,13 @@ - + Add a new account to Empathy. - + Milo Casagrande milo@ubuntu.com @@ -16,23 +16,23 @@ 2009 GNOME Documentation Project - + Creative Commons Share Alike 3.0 - + - + Milo Casagrande

Section about how to add a new account to Empathy.

 - + Add a new account - +

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

@@ -49,7 +49,7 @@

- If it is the first time you launch Empathy: + If it is the first time you launch Empathy:

@@ -80,15 +80,15 @@

- Fill the required fields with your user - name and password. + Fill the required fields with your user + name and password.

- To enable the new account, select the - Enabled check-box next to - the name of the account in the box on the left of the window. + To enable the new account, select the + Enabled check-box next to + the name of the account in the box on the left of the window.

diff --git a/help/C/change-status.page b/help/C/change-status.page index 32fd6454b..4bef6f2cc 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -1,15 +1,15 @@ - + + - Change your status, if you are going away from your computer for - example. + Change your status, if you are going away from your computer for example. - + Phil Bull philbull@gmail.com @@ -18,38 +18,37 @@ 2009 GNOME Documentation Project - + Creative Commons Share Alike 3.0 - + - + Change your status

- Click on the drop-down list at the top of the main window of - Empathy. + Click on the drop-down list at the top of the main window of Empathy.

- Select a status from the list. + Select a status from the list.

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

- +

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

- + diff --git a/help/C/figures/available.png b/help/C/figures/available.png new file mode 100644 index 000000000..66b24967a Binary files /dev/null and b/help/C/figures/available.png differ diff --git a/help/C/figures/available.svg b/help/C/figures/available.svg new file mode 100644 index 000000000..8d4cc585f --- /dev/null +++ b/help/C/figures/available.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/help/C/figures/away.png b/help/C/figures/away.png new file mode 100644 index 000000000..ff59e309d Binary files /dev/null and b/help/C/figures/away.png differ diff --git a/help/C/figures/away.svg b/help/C/figures/away.svg new file mode 100644 index 000000000..7e7b0ed6b --- /dev/null +++ b/help/C/figures/away.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/help/C/figures/busy.png b/help/C/figures/busy.png new file mode 100644 index 000000000..fec554d89 Binary files /dev/null and b/help/C/figures/busy.png differ diff --git a/help/C/figures/busy.svg b/help/C/figures/busy.svg new file mode 100644 index 000000000..66fc70945 --- /dev/null +++ b/help/C/figures/busy.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/help/C/figures/extended-away.png b/help/C/figures/extended-away.png new file mode 100644 index 000000000..ca26ae5d8 Binary files /dev/null and b/help/C/figures/extended-away.png differ diff --git a/help/C/figures/extended-away.svg b/help/C/figures/extended-away.svg new file mode 100644 index 000000000..3104dff54 --- /dev/null +++ b/help/C/figures/extended-away.svg @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/help/C/index.page b/help/C/index.page index 731dda2c2..bde2d154a 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -5,7 +5,7 @@ - + Milo Casagrande milo@ubuntu.com @@ -14,26 +14,26 @@ 2009 GNOME Documentation Project - + Creative Commons Share Alike 3.0 - + - + Empathy Instant Messenger - +
Talk to people
- +
Manage instant messaging accounts
- +
Fix common problems
- + Milo Casagrande

@@ -41,5 +41,5 @@ client.

- + diff --git a/help/C/status-icons.page b/help/C/status-icons.page new file mode 100644 index 000000000..60ee748ab --- /dev/null +++ b/help/C/status-icons.page @@ -0,0 +1,92 @@ + + + + + + Understanding the various status icons. + + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + + + + Status icons + +
+ + +
+ + + + + + + + + + + + + + + + + + +
+

+ + Available icon + +

+ 		+

+ This is the default icon for the Available status. +

+
+

+ + Busy icon + +

+ 		+

+ This is the default icon for the Busy status. +

+
+

+ + Away icon + +

+ 		+

+ This is the default icon for the Away status. +

+
+

+ + Extended Away icon + +

+ 		+

+ This is the default icon for the Extended Away status. +

+
+ + -- cgit v1.2.3 From 2a17a62f8634b95cebf3df6763cb064c9f749634 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Tue, 21 Jul 2009 23:24:21 +0200 Subject: Removed the SVG files of the status icons Reworked the send a file topic Completed the status icons topic Completed and added into index the offline contacts topic Removed the comment from the add account page --- help/C/add-account.page | 5 -- help/C/figures/available.svg | 104 ----------------------------- help/C/figures/away.svg | 93 -------------------------- help/C/figures/busy.svg | 140 --------------------------------------- help/C/figures/extended-away.svg | 120 --------------------------------- help/C/offline-contacts.page | 55 ++++++++------- help/C/send-file.page | 123 +++++++++++++++++++++------------- help/C/status-icons.page | 55 ++++++++++++--- 8 files changed, 149 insertions(+), 546 deletions(-) delete mode 100644 help/C/figures/available.svg delete mode 100644 help/C/figures/away.svg delete mode 100644 help/C/figures/busy.svg delete mode 100644 help/C/figures/extended-away.svg (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index 8bdf82e75..d985cf6d4 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -22,11 +22,6 @@ - - Milo Casagrande -

Section about how to add a new account to Empathy.

- - Add a new account diff --git a/help/C/figures/available.svg b/help/C/figures/available.svg deleted file mode 100644 index 8d4cc585f..000000000 --- a/help/C/figures/available.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/help/C/figures/away.svg b/help/C/figures/away.svg deleted file mode 100644 index 7e7b0ed6b..000000000 --- a/help/C/figures/away.svg +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/help/C/figures/busy.svg b/help/C/figures/busy.svg deleted file mode 100644 index 66fc70945..000000000 --- a/help/C/figures/busy.svg +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/help/C/figures/extended-away.svg b/help/C/figures/extended-away.svg deleted file mode 100644 index 3104dff54..000000000 --- a/help/C/figures/extended-away.svg +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page index 369234bf2..0924e7b21 100644 --- a/help/C/offline-contacts.page +++ b/help/C/offline-contacts.page @@ -1,58 +1,57 @@ - + type="topic" + id="offline-contacts"> + - + How to see the contacts that are not online. - - - Milo Casagrande - milo@ubuntu.com - - - 2009 - GNOME Documentation Project - - - Creative Commons Share Alike 3.0 - - + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + - + Milo Casagrande

- Small topic on how to see the contacts tha are offline. Need - rework on the terminology used. + Need to rework on the terminology used.

- - Display the contacts that are offline + + Display offline contacts

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

- Choose ViewOffline - Contacts. + Choose ViewOffline Contacts.

- Press CtrlH. + Press CtrlH.

- +

- To hide again the offline contacts, repeat the same procedure above. + To hide the offline contacts again, repeat the same procedure above.

diff --git a/help/C/send-file.page b/help/C/send-file.page index 9ac91133a..8108fe690 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -2,53 +2,84 @@ type="topic" id="send-file"> - - - Send a file from your computer to one of your contacts. - - - - Phil Bull - philbull@gmail.com - - - 2009 - GNOME Documentation Project - - - Creative Commons Share Alike 3.0 - - - - -Send a file to someone - -

-In the main Empathy window, right-click the contact that you want -to send a file to and click Send file. -

-

-Select the file that you want to send and click Send. The File -Transfers window will appear. Wait for your contact to accept the file -transfer, or press Stop to stop the transfer from happening. -

-

-If your contact accepts the file transfer, you can watch the progress of the -transfer and see the estimated amount of time remaining before it is complete. -If they do not accept it, the status of the transfer will change to File -transfer cancelled and the file will not be sent. -

-

-Once a transfer is finished, you can just close the File Transfers -window. If you have multiple finished transfers listed in the window, click -Clear to clear the list. This will only remove the files from the -list and will not delete them from your computer. -

- - + + + Send a file from your computer to one of your contacts. + + + + + Phil Bull + philbull@gmail.com + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + + + + Send a file to someone + + + +

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

+ + +

+ Right-click on the contact you want to send a file, and select Send file. +

+ + +

+ Click on the contact you want to send a file, and choose Edit + ContactSend file. +

+ + + + +

+ Select the file to send, and click on Send. +

+ + +

+ The File Transfers window will appear. Wait for your contact to accept the + file transfer, or click Stop to halt the transfer. +

+ + + +

+ If your contact accepts the file transfer, you can watch the progress of the + transfer and see the estimated amount of time remaining before it is complete. +

+

+ If they do not accept it, the status of the transfer will change to File + transfer cancelled, and the file will not be sent. +

+

+ Once a transfer is finished, you can close the File Transfers + window. If you have multiple finished transfers listed in the window, click on + Clear to empty the list. This will only remove the files from the + list and will not delete them from your computer. +

+ +

- You must be online to send a file to someone. + In order to send a file to someone, you need to be connected to the Internet, or to + a local area network.

- + diff --git a/help/C/status-icons.page b/help/C/status-icons.page index 60ee748ab..a8d2649cb 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -4,10 +4,12 @@ + Understanding the various status icons. - + + Milo Casagrande @@ -23,14 +25,33 @@ - Status icons + + Milo Casagrande +

+ Need to understand when the extended away icon is used: how many minuts/hours should pass? +

+

+ Need also to check for images to work! +

+ -
- - -
+ Status icons + + + + + + @@ -55,7 +80,10 @@ @@ -69,7 +97,11 @@ @@ -83,7 +115,10 @@ -- cgit v1.2.3 From 036c51af56a5f2a7d9a65c132b5d7a28831c7eb5 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Thu, 23 Jul 2009 20:55:35 +0200 Subject: Reworked the topics, now whould be more consistent and coherent with each other Added a couple of seealso links --- help/C/change-status.page | 2 +- help/C/create-account.page | 86 ++++++++++++++++++++++---------------------- help/C/offline-contacts.page | 28 ++++++++------- help/C/prob-conn-auth.page | 63 +++++++++++++++++++------------- help/C/send-message.page | 29 ++++++++------- help/C/status-icons.page | 6 ++-- 6 files changed, 116 insertions(+), 98 deletions(-) (limited to 'help/C') diff --git a/help/C/change-status.page b/help/C/change-status.page index 4bef6f2cc..c1abde839 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -29,7 +29,7 @@

- Click on the drop-down list at the top of the main window of Empathy. + Click on the drop-down list at the top of the Contact List window.

diff --git a/help/C/create-account.page b/help/C/create-account.page index b8c8b5140..2d3211d1a 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -32,8 +32,8 @@ Register for a new account

- You can freely create an account on any of the following - services. Follow the instructions reported on each website on + You can freely create an account on any of the services listed below. + Follow the instructions reported on each website on how to register your new account.

@@ -50,42 +50,42 @@ -

- AIM -

+

+ AIM +

-

- Google Talk -

+

+ Google Talk +

-

- ICQ -

+

+ ICQ +

-

- Jabber -

- -

- It is possible to use the automatic creation of accounts - with this service and Empathy. Not all the - service providers support it. One service provider known - to work is jabber.org, the default one of the application. -

- +

+ Jabber +

+ +

+ It is possible to use the automatic creation of accounts + with this service and Empathy. Not all the + service providers support it. One service provider known + to work is jabber.org, the default one of the application. +

+ -

- MSN -

+

+ MSN +

-

- Yahoo! -

+

+ Yahoo! +

@@ -98,11 +98,12 @@

-

- Salut -

+

+ Salut +

+

For more information, see . @@ -114,30 +115,31 @@ Telephony Services

- These services will let you do voice call over the Internet to + These services will let you do voice call over the Internet with other people using the same service or even to normal phones.

-

- Ekiga -

+

+ Ekiga +

-

- Sipphone -

+

+ Sipphone +

- In order to call normal phones over the Internet, you may need - to subscribe to a paid service. For more information, please - refer to the instructions provided on the website of the - service you will use. + In order to call normal phones over the Internet, you may need + to subscribe to a paid service. For more information, please + refer to the instructions provided on the website of the + service you will use.

+ diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page index 0924e7b21..2a8bea8ee 100644 --- a/help/C/offline-contacts.page +++ b/help/C/offline-contacts.page @@ -33,25 +33,29 @@ Display offline contacts -

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

- - +

- Choose ViewOffline Contacts. + From the Contact List window, perform one of the following:

+ + +

+ Choose ViewOffline Contacts. +

+ + +

+ Press CtrlH. +

+ +

- Press CtrlH. + To hide the offline contacts again, repeat the same procedure above.

- - -

- To hide the offline contacts again, repeat the same procedure above. -

+ diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page index b09673d47..be0ec4389 100644 --- a/help/C/prob-conn-auth.page +++ b/help/C/prob-conn-auth.page @@ -4,48 +4,61 @@ + An error message appears in the main window saying that - Authentication failed. + "Authentication failed". + + + Phil Bull philbull@gmail.com + 2009 GNOME Documentation Project + Creative Commons Share Alike 3.0 + -I get a message that says "Authentication failed" - -

-If you try to connect and an error message appears in the main Empathy -window saying that Authentication failed, your instant messaging -service is not allowing you to connect because it does not recognize your -username or password for some reason. -

- - - -

- Make sure that you have registered for an account with the service you - are trying to connect to. If you do not have an account, most services - will not allow you to connect. -

- - + + Milo Casagrande

- Click the Edit Account button in the error message. Type - your username and password again to make sure that they are correct. - Uncheck the Enabled box next to the name of your account and - then check it again to try to connect to the service again. + Could be useful to link here how to change your password or how to + recover it. Need to write that section.

- - + + + I get a message that says "Authentication failed" + +

+ If you try to connect and you get a message saying Authentication failed, + your instant messaging service is not allowing you to connect because it does not + recognize your username or password for some reason. +

+ + +

+ Make sure that you have registered for an account with the service you + are trying to connect to. If you do not have an account, most services + will not allow you to connect. +

+ + +

+ Click the Edit Account button in the error message. Type + your username and password again to make sure that they are correct. + Deselect the Enabled box next to the name of your account and + then select it to try to connect to the service again. +

+ + diff --git a/help/C/send-message.page b/help/C/send-message.page index 0704a4e85..3fe0d4f83 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -26,27 +26,26 @@

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

- -

- Double-click the name of the contact that you want to chat - with -

- - -

- Right-click their name and click Chat -

- + +

+ Double-click the name of the contact that you want to chat + with. +

+ + +

+ Right-click on their name and select Chat +

+

- A chat window will open. Type a message into the box at the - bottom of the window and press Enter to send it to - your contact. + A chat window will open. Type a message into the box at the + bottom of the window and press Enter to send it.

diff --git a/help/C/status-icons.page b/help/C/status-icons.page index a8d2649cb..c644d0f6e 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -65,7 +65,7 @@ This is the default icon for the Available status.

- This icon indicates that a contact is availble to have conversations with other + Use this icon when you are availble to have conversations with other people.

@@ -83,7 +83,7 @@ This is the default icon for the Busy status.

- This icon idicates that a contact does not want to be disturbed. + Use this icon when you do not want to be disturbed.

@@ -100,7 +100,7 @@ This is the default icon for the Away status.

- This icon indicates usally that a contact is not in front of the computer. This icon + Use this icon when you are going away from the computer. This icon is used also when you leave the computer and the screensaver turns on.

-- cgit v1.2.3 From 694c11f5e271d1af097cb013881cfdbd829a20ac Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sat, 25 Jul 2009 17:03:43 +0200 Subject: Add TODO comment on prob-conn-neterror.page * need to talk about IRC problem Added new pages: * irc-manage: guide page for all IRC topics * irc-account: topic on how to set up an IRC account Linked the prob-conn-neterror topic from the irc-manage page Modified dialog instead of window for the account page --- help/C/add-account.page | 2 +- help/C/irc-account.page | 123 +++++++++++++++++++++++++++++++++++++++++ help/C/irc-manage.page | 45 +++++++++++++++ help/C/prob-conn-neterror.page | 8 ++- 4 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 help/C/irc-account.page create mode 100644 help/C/irc-manage.page (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index d985cf6d4..8a31cc12c 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -83,7 +83,7 @@

To enable the new account, select the Enabled check-box next to - the name of the account in the box on the left of the window. + the name of the account in the box on the left of the dialog

diff --git a/help/C/irc-account.page b/help/C/irc-account.page new file mode 100644 index 000000000..7a93506b6 --- /dev/null +++ b/help/C/irc-account.page @@ -0,0 +1,123 @@ + + + + + + Create a new IRC account. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + + + + Create an IRC account + + + +

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

+ + +

+ Press F4 +

+ + +

+ Choose EditAccounts +

+ + + + +

+ If it is the first time you launch Empathy: +

+ + +

+ From the Type drop-down list choose + IRC, then click on the Create button. +

+ + +

+ Otherwise: +

+ + +

+ Click on the Add button. +

+ + +

+ From the Type drop-down list choose + IRC, then click on the Create button. +

+ + + + +

+ From the Network drop-down list, select the name of the network + you are creating the account for. +

+ + + +

+ In the Nickname text box, type the name... +

+ + +

+ In the Password text box, type the password you used to register + your nikcname. If you do not have one, leave this field blank. +

+ + +

+ In the Real name text box, type your real name. +

+ +

+ It is not necessary to insert also your real name. +

+ + + +

+ In the Quit message text box, type the text message that will be + sent when you close your session. +

+ + +

+ To enable the new account, select the Enabled check-box + next to the name of the account in the box on the left of the dialog. +

+ + + + +

+ If you want to use different networks at the same time, you need to create an + account with each of the networks you want to use. +

+ + + diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page new file mode 100644 index 000000000..64d691191 --- /dev/null +++ b/help/C/irc-manage.page @@ -0,0 +1,45 @@ + + + + + Manage IRC accounts with Empathy. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + + + + + Milo Casagrande +

+ Guide page for all the IRC related actions. Need to work on this page + if the content starts to grow. In case we don't have a lot of contets for + this page, rework the other. +

+ + + Use IRC + +
+ Manage IRC accounts +
+ +
+ + Fix common problems +
+ + + diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page index f7bb7281c..65a8d1e95 100644 --- a/help/C/prob-conn-neterror.page +++ b/help/C/prob-conn-neterror.page @@ -4,8 +4,9 @@ + - An error message appears in the main Empathy window which says + An error message appears in the main Empathy window which says Network error. @@ -21,6 +22,11 @@ + + I get a message that says "Network error"

-- cgit v1.2.3 From 248776956fb2348ab2a77e38f023fc6da3b6989c Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 26 Jul 2009 17:43:34 +0200 Subject: * New topic: prob-conn-name for handling the "Name in use" IRC error * New topic: irc-nick-password on setting the password for a registered nickname * New topic: irc-join-room on how to enter an IRC channel * Added the new topic in the IRC account page * Reworked the title of the guide page for common problems * Added a small paragraph to the add-account page --- help/C/add-account.page | 6 +++ help/C/irc-account.page | 24 +++++++---- help/C/irc-join-room.page | 57 +++++++++++++++++++++++++ help/C/irc-nick-password.page | 94 ++++++++++++++++++++++++++++++++++++++++++ help/C/prob-conn-name.page | 60 +++++++++++++++++++++++++++ help/C/prob-conn-neterror.page | 6 +-- help/C/prob-conn.page | 16 ++++--- 7 files changed, 247 insertions(+), 16 deletions(-) create mode 100644 help/C/irc-join-room.page create mode 100644 help/C/irc-nick-password.page create mode 100644 help/C/prob-conn-name.page (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index 8a31cc12c..9ab2beced 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -88,4 +88,10 @@ +

+ If you want to change the name that identifies the account in the Accounts + dialog, double-click on the name of the account in the box on the left of the dialog + and type the new name. +

+ diff --git a/help/C/irc-account.page b/help/C/irc-account.page index 7a93506b6..aef11767a 100644 --- a/help/C/irc-account.page +++ b/help/C/irc-account.page @@ -5,7 +5,8 @@ - Create a new IRC account. + + Create a new account. @@ -22,7 +23,7 @@ - Create an IRC account + Create an account @@ -78,9 +79,10 @@

- +

- In the Nickname text box, type the name... + In the Nickname text box, type the name that will identify yourself + in the network you are creating the account.

@@ -95,13 +97,13 @@

- It is not necessary to insert also your real name. + It is not necessary to insert your real name.

- In the Quit message text box, type the text message that will be + In the Quit message text box, type a text message that will be sent when you close your session.

@@ -111,12 +113,18 @@ next to the name of the account in the box on the left of the dialog.

- + + +

+ If you want to change the name that identifies the account in the Accounts + dialog, double-click on the name of the account in the box on the left of the dialog + and type the new name. +

If you want to use different networks at the same time, you need to create an - account with each of the networks you want to use. + account with each one of the networks you want to use.

diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page new file mode 100644 index 000000000..e6dc99177 --- /dev/null +++ b/help/C/irc-join-room.page @@ -0,0 +1,57 @@ + + + + + Entering an IRC channel. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + + + + Join a room + + + +

+ From the Contact List window, choose + RoomJoin. +

+ + +

+ From the Account drop-down list, select the IRC account that + corresponds to the network you want to use. +

+ + +

+ In the Room text box, type the name of the channel you want to + join. Prefix the name with the hash character (#). +

+ + +

+ Click on Join to enter the room. +

+ + + + +

+ To join multiple rooms, you need to repeat the steps above for each room. +

+ + diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page new file mode 100644 index 000000000..3240335a8 --- /dev/null +++ b/help/C/irc-nick-password.page @@ -0,0 +1,94 @@ + + + + + + How to set the password of a nickname. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + + + + Set the nickname password + +

+ Registering a nickname is useful to preserve your identity on IRC and you will be able + to use always the same nickname. In some cirtumstances, some IRC channels may be + configured to accept only registered nickname. +

+ +

+ If you have registered your nickname with a password on a network that supports nickname + registration, you can use that password with Empathy to identify yourself as + the owner of the nickname. +

+ + + +

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

+ + +

+ Press F4 +

+ + +

+ Choose EditAccounts +

+ + + + +

+ Select the IRC account from the box on the left of the dialog. +

+ + +

+ If the account is enabled, disable it by deselecting the Enable + check-box next to the name of the account. +

+ + +

+ In the Password text box, type the password you used to register + your nikcname. +

+ + +

+ Enable the account by selecting the Enabled check-box + next to the name of the account. +

+ + + +

+ Once you are connected, you will receive a message from the nickname server that will + tell you of the established identification. +

+ + +

+ At the moment it is not possible to register a nickname with Empathy, it is + only possible to use the password of an already registered nickname. +

+ + + diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page new file mode 100644 index 000000000..a6ed9115d --- /dev/null +++ b/help/C/prob-conn-name.page @@ -0,0 +1,60 @@ + + + + + + + An error message appears in the main Empathy window which says + "Name in use". + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + Creative Commons Share Alike 3.0 + + + + + + I get a message that says "Name in use" + +

+ This kind of error happens when you try to connect to your IRC account and + you are using a nickname that is being used by someone else on that particular + network. +

+ +

+ To resolve this problem, click on the Edit Account button and + perform one of the following: +

+ + + +

+ Change your nickname. +

+ + +

+ Set the password for that nickname, if you have registered that nickname + within the network you are using. For more information, see + +

+ + + + diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page index 65a8d1e95..cb7dcb049 100644 --- a/help/C/prob-conn-neterror.page +++ b/help/C/prob-conn-neterror.page @@ -7,9 +7,9 @@ An error message appears in the main Empathy window which says - Network error. + "Network error". - + Phil Bull philbull@gmail.com @@ -31,7 +31,7 @@

If you try to connect and an error message appears in the main Empathy -window which says Network error, Empathy cannot communicate with +window which says "Network error", Empathy cannot communicate with the instant messaging service for some reason.

diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page index 8655d1242..b4397b792 100644 --- a/help/C/prob-conn.page +++ b/help/C/prob-conn.page @@ -5,9 +5,10 @@ - Diagnose common problems with connecting to an instant messaging service. + Diagnose common problems connecting to an instant messaging service. - + + Phil Bull philbull@gmail.com @@ -22,7 +23,7 @@ -I have a problem connecting to an instant messaging service +Problems connecting to an instant messaging service Phil Bull @@ -31,8 +32,13 @@ - Phil Bull -

Check whether gui tags are allowed in section titles and descs.

+ Phil Bull +

Check whether gui tags are allowed in section titles and descs.

+ Milo Casagrande +

+ You can... but the end result is not very good: the title is in blue and the + gui element in grey. +

-- cgit v1.2.3 From 50d34cf70f763703db33061d74cac6ca9de6cb32 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Tue, 28 Jul 2009 21:32:11 +0200 Subject: Small typos and corrections --- help/C/add-account.page | 2 +- help/C/irc-account.page | 2 +- help/C/prob-conn-name.page | 4 ++-- help/C/send-message.page | 3 ++- help/C/status-icons.page | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index 9ab2beced..5dea2c79f 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -83,7 +83,7 @@

To enable the new account, select the Enabled check-box next to - the name of the account in the box on the left of the dialog + the name of the account in the box on the left of the dialog.

diff --git a/help/C/irc-account.page b/help/C/irc-account.page index aef11767a..ae0debd60 100644 --- a/help/C/irc-account.page +++ b/help/C/irc-account.page @@ -6,7 +6,7 @@ - Create a new account. + Create an IRC account. diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page index a6ed9115d..3196da8a8 100644 --- a/help/C/prob-conn-name.page +++ b/help/C/prob-conn-name.page @@ -51,8 +51,8 @@

Set the password for that nickname, if you have registered that nickname - within the network you are using. For more information, see - + within the network you are using. For more information, + see .

diff --git a/help/C/send-message.page b/help/C/send-message.page index 3fe0d4f83..99e1e8231 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -37,7 +37,8 @@

- Right-click on their name and select Chat + Right-click on the name of the contact you want to chat with, and + select Chat.

diff --git a/help/C/status-icons.page b/help/C/status-icons.page index c644d0f6e..3e0278ba2 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -73,7 +73,7 @@ + +
+

+ Icon +

+ 		+

+ Description +

+

@@ -41,7 +62,11 @@

- This is the default icon for the Available status. + This is the default icon for the Available status. +

+

+ This icon indicates that a contact is availble to have conversations with other + people.

- This is the default icon for the Busy status. + This is the default icon for the Busy status. +

+

+ This icon idicates that a contact does not want to be disturbed.

- This is the default icon for the Away status. + This is the default icon for the Away status. +

+

+ This icon indicates usally that a contact is not in front of the computer. This icon + is used also when you leave the computer and the screensaver turns on.

- This is the default icon for the Extended Away status. + This is the default icon for the Extended Away status. +

+

+ This icon is used when the Away status has been set a long time ago.

- + Busy icon

-- cgit v1.2.3 From b3cbd871359e6ce20473a67d8018f65292bbf380 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 2 Aug 2009 15:41:31 +0200 Subject: Modified terminology --- help/C/send-message.page | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'help/C') diff --git a/help/C/send-message.page b/help/C/send-message.page index 99e1e8231..46e34601c 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -31,13 +31,13 @@

- Double-click the name of the contact that you want to chat + Double-click the name of the contact that you want to have a conversation with.

- Right-click on the name of the contact you want to chat with, and + Right-click on the name of the contact you want to have a conversation with, and select Chat.

@@ -45,7 +45,7 @@

- A chat window will open. Type a message into the box at the + A new window will open. Type a message into the box at the bottom of the window and press Enter to send it.

-- cgit v1.2.3 From 874528bf52d76adba91fe7a5cf2dfcef78dcde48 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 2 Aug 2009 16:32:50 +0200 Subject: Reworked the index page to insert new topics Added stub pages for the new topics Fixed the xref of various topics to move them in the new index page --- help/C/add-contact.page | 4 ++-- help/C/audio-call.page | 15 +++++++++++++++ help/C/audio-video.page | 15 +++++++++++++++ help/C/change-status.page | 2 +- help/C/group-conversations.page | 15 +++++++++++++++ help/C/index.page | 22 +++++++++++----------- help/C/irc-account.page | 4 ++-- help/C/irc-manage.page | 2 +- help/C/send-file.page | 4 ++-- help/C/send-message.page | 2 +- help/C/share-desktop.page | 15 +++++++++++++++ help/C/video-call.page | 15 +++++++++++++++ 12 files changed, 95 insertions(+), 20 deletions(-) create mode 100644 help/C/audio-call.page create mode 100644 help/C/audio-video.page create mode 100644 help/C/group-conversations.page create mode 100644 help/C/share-desktop.page create mode 100644 help/C/video-call.page (limited to 'help/C') diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 5db825156..003101804 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -3,9 +3,9 @@ id="add-contact"> - + - Add someone to your contact list. + Add someone to the contact list. diff --git a/help/C/audio-call.page b/help/C/audio-call.page new file mode 100644 index 000000000..7f57b9a9a --- /dev/null +++ b/help/C/audio-call.page @@ -0,0 +1,15 @@ + + + + + + Start an audio conversation with one of your contacts. + + + + + Start an audio conversation + + diff --git a/help/C/audio-video.page b/help/C/audio-video.page new file mode 100644 index 000000000..8a4c1add6 --- /dev/null +++ b/help/C/audio-video.page @@ -0,0 +1,15 @@ + + + + + + When it is possibile to have an audio or video canversation. + + + + + Audio and video conversations + + diff --git a/help/C/change-status.page b/help/C/change-status.page index c1abde839..e9204457a 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -3,7 +3,7 @@ id="change-status"> - + Change your status, if you are going away from your computer for example. diff --git a/help/C/group-conversations.page b/help/C/group-conversations.page new file mode 100644 index 000000000..d56a7f86d --- /dev/null +++ b/help/C/group-conversations.page @@ -0,0 +1,15 @@ + + + + + + Start a group conversation with your contacts. + + + + + Group conversations + + diff --git a/help/C/index.page b/help/C/index.page index bde2d154a..340fe95e2 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -22,24 +22,24 @@ Empathy Instant Messenger -
- Talk to people +
+ Audio and video conversations +
+ +
+ Text conversations
- Manage instant messaging accounts + Manage accounts +
+ +
+ Advanced actions
Fix common problems
- - Milo Casagrande -

- Documentation for the Empathy instant messaging - client. -

- - diff --git a/help/C/irc-account.page b/help/C/irc-account.page index ae0debd60..b0d6cd2d9 100644 --- a/help/C/irc-account.page +++ b/help/C/irc-account.page @@ -3,7 +3,7 @@ id="irc-account"> - + Create an IRC account. @@ -23,7 +23,7 @@ - Create an account + Create an IRC account diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page index 64d691191..ff6dae272 100644 --- a/help/C/irc-manage.page +++ b/help/C/irc-manage.page @@ -3,7 +3,7 @@ id="irc-manage"> - + Manage IRC accounts with Empathy. diff --git a/help/C/send-file.page b/help/C/send-file.page index 8108fe690..1ccd30037 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -3,7 +3,7 @@ id="send-file"> - + Send a file from your computer to one of your contacts. @@ -26,7 +26,7 @@ - Send a file to someone + Send files diff --git a/help/C/send-message.page b/help/C/send-message.page index 46e34601c..833e484c2 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -3,7 +3,7 @@ id="send-message"> - + Send a message to one of your contacts. diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page new file mode 100644 index 000000000..776ee487e --- /dev/null +++ b/help/C/share-desktop.page @@ -0,0 +1,15 @@ + + + + + + Share your desktop with one of your contacts. + + + + + Share the desktop + + diff --git a/help/C/video-call.page b/help/C/video-call.page new file mode 100644 index 000000000..a652a975b --- /dev/null +++ b/help/C/video-call.page @@ -0,0 +1,15 @@ + + + + + + Start a video conversation with one of your contacts. + + + + + Start a video conversation + + -- cgit v1.2.3 From 57753450bb5c3885ffcc64f02595624b7c894a0e Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 2 Aug 2009 17:27:25 +0200 Subject: Fixed the note in the IRC nickname password Fixed pkgversion and version of a document --- help/C/irc-nick-password.page | 2 +- help/C/send-file.page | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'help/C') diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page index 3240335a8..998203a89 100644 --- a/help/C/irc-nick-password.page +++ b/help/C/irc-nick-password.page @@ -86,7 +86,7 @@

- At the moment it is not possible to register a nickname with Empathy, it is + At the moment it is not possible to register an IRC nickname with Empathy, it is only possible to use the password of an already registered nickname.

diff --git a/help/C/send-file.page b/help/C/send-file.page index 1ccd30037..e0da892e4 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -5,8 +5,8 @@ Send a file from your computer to one of your contacts. - - + + Phil Bull -- cgit v1.2.3 From 254f9b868d3176b15d79808bf747580185bd6509 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 2 Aug 2009 23:34:52 +0200 Subject: Added two new figures: * The icon for audio conversation * The icon for video conversation Wrote the audio-video page --- help/C/audio-video.page | 59 +++++++++++++++++++++++++++++- help/C/figures/audio-input-microphone.png | Bin 0 -> 650 bytes help/C/figures/camera-web.png | Bin 0 -> 881 bytes 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 help/C/figures/audio-input-microphone.png create mode 100644 help/C/figures/camera-web.png (limited to 'help/C') diff --git a/help/C/audio-video.page b/help/C/audio-video.page index 8a4c1add6..14cadd966 100644 --- a/help/C/audio-video.page +++ b/help/C/audio-video.page @@ -5,11 +5,66 @@ - When it is possibile to have an audio or video canversation. + When it is possible to have an audio or video conversation. - + + Audio and video conversations +

+ When your contacts support audio or video conversations, you will see in the + Contact List window, next to the contacts name, one or two small icons that + represent the different conversations you can have. +

+

+ The icons are: +

+ + + + + + + + + + + + + + + + +
+

+ Icon +

+ 		+

+ Description +

+
+

+ + Icon for audio conversation + +

+ 		+

+ This is the icon that represents the possibility to have an audio conversation. +

+
+

+ + Icon for video conversation + +

+ 		+

+ This is the icon that represents the possibility to have a video conversation. +

+
+ diff --git a/help/C/figures/audio-input-microphone.png b/help/C/figures/audio-input-microphone.png new file mode 100644 index 000000000..f45d15d56 Binary files /dev/null and b/help/C/figures/audio-input-microphone.png differ diff --git a/help/C/figures/camera-web.png b/help/C/figures/camera-web.png new file mode 100644 index 000000000..e5406c5b9 Binary files /dev/null and b/help/C/figures/camera-web.png differ -- cgit v1.2.3 From 25724cfdbcccf201460efc83757c9927c98472d4 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 2 Aug 2009 23:38:56 +0200 Subject: Added seealso links to audio and video call pages --- help/C/audio-call.page | 1 + help/C/video-call.page | 1 + 2 files changed, 2 insertions(+) (limited to 'help/C') diff --git a/help/C/audio-call.page b/help/C/audio-call.page index 7f57b9a9a..294cc2016 100644 --- a/help/C/audio-call.page +++ b/help/C/audio-call.page @@ -4,6 +4,7 @@ + Start an audio conversation with one of your contacts. diff --git a/help/C/video-call.page b/help/C/video-call.page index a652a975b..a6e0a356d 100644 --- a/help/C/video-call.page +++ b/help/C/video-call.page @@ -4,6 +4,7 @@ + Start a video conversation with one of your contacts. -- cgit v1.2.3 From 5751765ea330898b76ca1e5f1dd62a3e14de2761 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Wed, 5 Aug 2009 23:21:30 +0200 Subject: Modified the audio-call page Written some contents for the audio-call page Reworked a little bit some seealso links --- help/C/audio-call.page | 41 +++++++++++++++++++++++++++++++++++++++++ help/C/audio-video.page | 7 ++----- help/C/set-custom-status.page | 7 ++++--- help/C/status-icons.page | 23 ++--------------------- 4 files changed, 49 insertions(+), 29 deletions(-) (limited to 'help/C') diff --git a/help/C/audio-call.page b/help/C/audio-call.page index 294cc2016..476941f94 100644 --- a/help/C/audio-call.page +++ b/help/C/audio-call.page @@ -11,6 +11,47 @@ + Start an audio conversation + + +

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

+ + +

+ Click on the audio call icon next to the name of the contact that you + want to have a conversation with. +

+ + +

+ Right-click on the name of the contact you want to have a conversation with, and + select Audio Call. +

+ + +

+ Select the contact that you want to have a conversation with, and choose + EditContactAudio Call. +

+ + + + +

+ A new window will open. When the connection is established, you will + see written, at the bottom of the window, Connected and the total + conversation time. +

+ + +

+ To close the conversation, click on Hang up. +

+ + + diff --git a/help/C/audio-video.page b/help/C/audio-video.page index 14cadd966..e48468347 100644 --- a/help/C/audio-video.page +++ b/help/C/audio-video.page @@ -14,13 +14,10 @@ Audio and video conversations

- When your contacts support audio or video conversations, you will see in the - Contact List window, next to the contacts name, one or two small icons that + When your contacts support audio or video conversations, you will see, next to + the contacts name in the Contact List window, one or two small icons that represent the different conversations you can have.

-

- The icons are: -

diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page index 33b766714..cf4fcc098 100644 --- a/help/C/set-custom-status.page +++ b/help/C/set-custom-status.page @@ -3,12 +3,13 @@ id="set-custom-status"> - - + + + Setting a custom status. - + Jim Campbell diff --git a/help/C/status-icons.page b/help/C/status-icons.page index 3e0278ba2..118af1957 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -3,13 +3,11 @@ id="status-icons"> - - Understanding the various status icons. - - + + Milo Casagrande @@ -105,23 +103,6 @@

- - - -
-

- - Extended Away icon - -

- 		-

- This is the default icon for the Extended Away status. -

-

- This icon is used when the Away status has been set a long time ago. -

-
-- cgit v1.2.3 From 23a733f9087d62e802571a8000c9d3ec37b3e47a Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sat, 8 Aug 2009 18:33:58 +0200 Subject: Added stub topic for password protected IRC channels Wrote the audio call topic Some work on the video call topic Added a seealso link in create account --- help/C/audio-call.page | 18 ++++++++++-------- help/C/create-account.page | 4 +++- help/C/irc-join-pwd.page | 27 +++++++++++++++++++++++++++ help/C/video-call.page | 43 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 9 deletions(-) create mode 100644 help/C/irc-join-pwd.page (limited to 'help/C') diff --git a/help/C/audio-call.page b/help/C/audio-call.page index 476941f94..1b1d3e040 100644 --- a/help/C/audio-call.page +++ b/help/C/audio-call.page @@ -9,6 +9,7 @@ Start an audio conversation with one of your contacts. + @@ -22,8 +23,8 @@

- Click on the audio call icon next to the name of the contact that you - want to have a conversation with. + Select the contact you want to have a conversation with, and click + on the audio call icon next to their name.

@@ -32,12 +33,6 @@ select Audio Call.

- -

- Select the contact that you want to have a conversation with, and choose - EditContactAudio Call. -

- @@ -53,5 +48,12 @@

+ +

+ To turn an audio conversation into a video one, from the call window select + CallSend video, + or click on the video call icon. +

+ diff --git a/help/C/create-account.page b/help/C/create-account.page index 2d3211d1a..d57f5cca1 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -4,10 +4,12 @@ + Register an account with one of the supported messaging services. - + + Milo Casagrande diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page new file mode 100644 index 000000000..3dcd95d14 --- /dev/null +++ b/help/C/irc-join-pwd.page @@ -0,0 +1,27 @@ + + + + + + Join a password protected room. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Creative Commons Share Alike 3.0 + + + + + Join a protected room + + diff --git a/help/C/video-call.page b/help/C/video-call.page index a6e0a356d..b9d60358e 100644 --- a/help/C/video-call.page +++ b/help/C/video-call.page @@ -13,4 +13,47 @@ Start a video conversation + + +

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

+ + +

+ Select the contact you want to have a conversation with, and click + on the video call icon next to their name. +

+ + +

+ Right-click on the name of the contact you want to have a conversation with, and + select Video Call. +

+ + + + +

+ A new window will open. When the connection is established, you will + see written, at the bottom of the window, Connected and the total + conversation time. +

+ + +

+ To close the conversation, click on Hang up. +

+ + + +

+ To turn a video conversation into an audio one, from the call window deselect + CallSend video, + or click on the video call icon. +

+ + + + -- cgit v1.2.3 From 5e6fc11a838de8923e5d494eb40ee3e65e8a0f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 10 Aug 2009 13:56:33 +0200 Subject: remove obsolete help file --- help/C/empathy.xml | 1395 ---------------------------------------------------- 1 file changed, 1395 deletions(-) delete mode 100644 help/C/empathy.xml (limited to 'help/C') diff --git a/help/C/empathy.xml b/help/C/empathy.xml deleted file mode 100644 index e6a1a7282..000000000 --- a/help/C/empathy.xml +++ /dev/null @@ -1,1395 +0,0 @@ - - - - - -Empathy"> - - - - - - - - - - -]> - -
- - - - &app; Manual V&manrevision; - - - 2008, 2009 - Ubuntu Documentation Project - - - 2009 - GNOME Documentation Project - - - - - GNOME Documentation Project - - - - &legal; - - - - Milo - Casagrande - - GNOME Documentation Project -
milo@ubuntu.com
- - - Ubuntu Documentation Project -
milo@ubuntu.com
- - - - Seth - Dudenhofer - - Ubuntu Documentation Project -
sdudenhofer@gmail.com
- - - - - - - - - - - - - - - - - - - - - - - - Empathy Manual V&manrevision; - &date; - - Milo Casagrande - milo@ubuntu.com - - GNOME Documentation Project - - - - - Empathy Manual V2.1 - January 2009 - - Milo Casagrande - milo@ubuntu.com - - Ubuntu Documentation Project - - - - - Empathy Manual V2.0 - April 2008 - - Milo Casagrande - milo@ubuntu.com - - Seth Dudenhofer - sdudenhofer@gmail.com - - Ubuntu Documentation Project - - - - - - This manual describes version &appversion; of &appname;. - - - Feedback - - To report a bug or make a suggestion regarding the &app; application or - this manual, follow the directions in the GNOME Feedback Page. - - - - - - &appname; is an application for instant messaging. - - - - - - - Empathy - - - empathy - istant messaging - - - - Introduction - - &app; is a multi-protocol instant messaging program for the - GNOME Desktop. With &app; you can keep in touch with all of your - friends through lots of supported instant messaging services. - - - &app; supports the following services: - - - - AIM - - - - - Google Talk - - - - - ICQ - - - - - IRC - - - - - Jabber (or XMPP) - - - - - MSN - - - - - Salut - - - - - SIP - - - - - Yahoo - - - - - And many others... - - - - - - - - Getting Started - - - Starting &appname; - You can start &app; in the following ways: - - - - Applications menu - - Choose - - Internet - Empathy IM Client - . - - - - - Command line - - Type empathy and then press - Enter. - - - - - - - - When You Start &appname; - - When you start &app; the following window is shown. - -
- &app; Main Window - - - - - - - - Shows &app; main window. Contains the titlebar, the - menubar, contact list, status icon and status arrow - button list. - - - - -
- - - - describes the components of - &app;'s main window. - - &app; Main Components - - - - - - - Component - - - Description - - - - - - - Menubar - - - - Contains menus used to perform actions in &app;. - - - - - - Status Drop-Down List - - - - Allows to update the status. - - - - - - Account Button - - - - Opens the Accounts dialog. - - - - - - Contact List - - - - Shows all the available contacts and their - associated status. - - - - - -
- - - - - - Accounts - - To use &app; you need at least one account of the supported services. - - - If you don't already have an account and you don't have your user - name and password, you need to - register a new account (see ). - - - In order to talk with other users, also called - contacts, you need to use the same service - they are using. If, for example, one contact is using the Jabber service, you need to have an - account registered with that service. - - - &app; can handle as many accounts on any supported services as you want and - you can have them all open at the same time. - - - - Registering an Account - - You can freely register an account on any of the following - services. Follow the instructions reported on each website on - how to register your new account. At the end of the - registration process you should have a user - name (or an account ID) and - a password that you will use to - create the account in &app;. - - - Click on the name of the service to visit its website: - - - - - - The AIM service. - - - - - - The Google - Talk service. - - - - - - The ICQ service. - - - - - - The MSN service. - - - - - - The Yahoo service. - - - - - - For registering a SIP account, you can use one of the - following service: - - - - - - - The Ekiga service. - - - - - - The FWD (Free - World Dialup) service. - - - - - - The Sipphone service. - - - - - - For registering a Jabber - account, you can use the automatic - account creation of &app;. Not all Jabber service - providers support the automatic creation of accounts, one - service provider known to work with &app; is jabber.org. - - - If you already have a Jabber account, you can use one of - the following services: - - - - - - Salut - - - - - - - - Adding your Account to &app; - - To add your account to &app;, proceed as follows: - - - - From the main window - (Contact List) - click on the account button or press F4 to open the - Accounts dialog. - - - - - If it is the first time you launch &app;: - - - - From the Type drop-down list choose - the service you wish to add an account for, then click - on the Create button. - - - - - - Otherwise: - - - - Click on the Add button. - - - - - From the Type drop-down list choose - the service you wish to add an account for, then click - on the Create button. - - - - - - - - Fill the required fields with your user - name and - password. Optionally, you can - modify some advanced options. For more information, - see . - - - - - To enable the new account, select the - Enabled check-box next to - the name of the account in the box on the left. - - - - - - - Importing Accounts - - If you use another instant messaging program, you can import - the accounts from that program into &app; - - - - - At the moment &app; can import the accounts only from - the instant messaging program - Pidgin. For more information - about Pidgin, see the Pidgin website. - - - - - To import the accounts into &app;, proceed as follows: - - - - From the main window - (Contact List) - click on the account button or press F4 to open the - Accounts dialog. - - - - - Click on the Import Accounts... - button to open the Import - Accounts dialog. - - - - - Select the accounts you would like to import by - clicking on the Import check-box. - - - - - When you have selected all the desired accounts, click - OK to import them. If you don't - want to import the accounts, click - Cancel. - - - - - When you import a new account into &app;, it will not be - enabled by default. - - - To enable the new account, select the - Enabled check-box next to - the name of the account in the box on the left. - - - - - - - - - Editing an Account - - To edit one of your accounts, i.e. to change the - password or your user - name, proceed as follows: - - - - From the main window - (Contact List) - click on the account button or press F4 to open the - Accounts dialog. - - - - - Select the account you wish to edit in the box on the - left. - - - - - Modify the desired data. - - - - - - - - Based on the type of the account, it is possibile to edit - different settings. - - - - - To modify the identifier of an account, how &app; identifies - an account, proceed as follows: - - - - From the main window - (Contact List) - click on the account button or press F4 to open the - Accounts dialog. - - - - - Select the account you wish to edit in the box on the - left and double-click on its name. - - - - - Change the name of the account as you desire. - - - - - - - - Disabling and Removing an Account - - To disable an account, proceed as follows: - - - - - - From the main window - (Contact List) - click on the account button or press F4 - to open the - Accounts dialog. - - - - - Select the account you wish to disable in the box on the - left of the dialog and deselect the - Enabled check-box. - - - - - - To remove an account, proceed as follows: - - - - - - From the main window - (Contact List) - click on the account button or press F4 - to open the - Accounts dialog. - - - - - Select the account you wish to disable in the box on the - left of the dialog. - - - - - Click on the Remove button. - - - - - A dialog will be shown asking for confirmation. Click on - the Remove button to remove the account. - - - - - - - - Editing Personal Information - - To change your personal information, your alias and your - icon (the image that other contacts will see of you), for each - of your accounts, proceed as follows: - - - - - - From the main - window, select - Edit - Personal Information - . - - - - - From the Account drop-down list, choose - the account you want to edit. - - - - - In the Alias text box, write your new - alias. - - - - - To change your icon, click on the person-looking button and - choose an image file. - - - - - When done, click Close. - - - - - - - - An alias is an alternative way you - can identify yourself. You can use your real - name or a nickname. - - - - - - - Advanced Options - - Based on the service you are using, it is possible to - configure more advanced options to modify the normal behavior of - &app;. - - - To configure these options, when you are adding a new - account, click on the drop-down section - Advanced. - - - - - Jabber (or <acronym>XMPP</acronym>) and Google Talk - - - - - - Encryption required (TLS/SSL) - - - - Select this option in order to use some sort of - encryption during your conversations. - - - - - - Ignore SSL certificate errors - - - - Select this option in order to ignore the errors - that can be generated by some types of security - certificates. Usually these certificates are called - auto-signed. - - - - - Select this option only if you are sure the - certificate is secure and you can trust it. - - - - - - - - Resource - - - - Use this text box to set a name with which you can - identify the running program based on where you are - running it. With this option, and the - Priority one, you can - use your account simultaneously in two different - devices. For example, if you set one device to - desktop and the other - one to mobile, you can - connect with both of them and based on the - Priority value you will receive - messages on one of the two devices or both. - - - This can be useful if you have two devices, a main - one and a portable one, and you move away from the - main one bringing with you the other: you can still - receive messages from your account with the portable - device even if you do not disconnet from the main one. - - - - - If you set the same value for this text box on - both the devices, when you connect with one of - them, the other one will be disconnected, even - if you set a different value with the - Priority spin box. - - - - - - - - Priority - - - - Use this spin box to indicate wich device, set in - the Resource text box, will - receive the new messages. The higher the number, the - higher the priority: you will receive the new - messages on the device with the highest number. - - - You can set values in the range from - -128 to 127. - - - - - If you set the same value of this spin box in - both the devices, you will receive messages on - both of them. - - - - - - - - - In the Override server settings section - you can set options that take precedence over the default settings. - - - - Server - - - - Use this text box to write the name of the - server you want to use for this service. - - - - - - Port - - - - Use this spin box to set the number of the port of - the server to use. - - - You can set values in the range from - 0 to 65,555. - - - - - - Use old SSL - - - - Select this option to use the old version of the - secure protocol for encrypting your connection. - - - - - - - - - Yahoo - - - - - Ignore conference and chatrooms - invitations - - - - Select this option to ignore the invitations that - other people may send you. - - - - - - Room List locale - - - - The value of this text box identifies the language - used to retrieve the room list when connecting to - the Yahoo service. - - - If you need to change this value, use the two letter - code of your language. - - - - - - Charset - - - - The value of this text box identifies the set of the - characters used by &app;. - - - - - It is advise to leave this value to - UTF-8. Change it only - if that charset does not cover your language. - - - - - - - - Server - - - - Use this text box to write the name of the - server you want to use for this service. - - - - - - Port - - - - Use this spin box to set the number of the port of - the server to use. - - - You can set values in the range from - 0 to 65,555. - - - - - - Use Yahoo Japan - - - - Select this option only if you have a Yahoo! Japan - account. With the Yahoo! Japan service you can only - use a Yahoo! Japan account: if you have registered - an account with the English version of the service, - that account will not work. - - - - - - - - - <acronym>AIM</acronym>, GroupWise and <acronym>MSN</acronym> - - - - - Server - - - - Use this text box to write the name of the - server you want to use for this service. - - - - - - Port - - - - Use this spin box to set the number of the port of - the server to use. - - - You can set values in the range from - 0 to 65,555. - - - - - - - - - Salut - - - - - Published Name - - - - Use this text box to write the name that will be - visible to the other users of the network. - - - - - - Email - - - - Use this text box to write your email. - - - - - - Jabber ID - - - - Use this text box to write your Jabber ID, if you - have one. - - - - - - - - - ICQ - - - - - Charset - - - - The value of this text box identifies the set of the - characters used by &app;. - - - - - It is advise to leave this value to - UTF-8. Change it only - if that charset does not cover your language. - - - - - - - - Server - - - - Use this text box to write the name of the - server you want to use for this service. - - - - - - Port - - - - Use this spin box to set the number of the port of - the server to use. - - - You can set values in the range from - 0 to 65,555. - - - - - - - - - Gadu Gadu - - - - Nick - - - Use this text box to write an alternative name to - use with this service. - - - - - - - - - - - - - Contacts and Groups - - All the contacts are handled within &app;'s main window. - - - You can add or remove a contact or you can edit the information - of a particular contact. It is also possibile to arrange - contacts in groups. You can have a group for your work contacts, - one for you family contacts, and so on. - - - Adding and Removing a Contact - - To add a new contact, proceed as follows: - - - - - - From the main - window choose - Chat - Add Contact... - . The New Contact - dialog will be shown. - - - - - From the Account drop-down list, - choose the service used by the contact you are adding. - - - - - In the Identifier text box type the - address of the contact in the form - of - user name@service - domain. - - - - - In the Alias text box type the name - you want to give at the the new contact. - - - - - Click on Add to add the new contact. - - - - - - To remove a contact, proceed as follows: - - - - - - From the main - window, select the contact you would like - to remove and right-click on it. - - - - - From the popup menu, choose Remove to - remove the contact. - - - - - - - - An alias is an alternative way you - can identify that particular contact. You can use the real - name or the nickname of that person. - - - - - - Editing a Contact - - To edit a contact, proceed as follows: - - - - - - From the main - window, select the contact you would like - to modify and choose - Edit - Contact - Edit - , or right-click on it - and choose Edit. - - - - - - From the Edit Contact Information dialog, - you can modify the alias - and the group of the contact. - - - - - An alias is an alternative way you - can identify that particular contact. You can use the real - name or the nickname of that person. - - - - - For more information about groups, see and . - - - - - Adding a Contact to a Group - - To add a contact to one or more groups, proceed as follows: - - - - - - From the main - window, select the contact you would like - to modify and choose - Edit - Contact - Edit - , or right-click on it - and choose Edit. - - - - - From the Groups section, select the - group, or groups, you want to add the contact to. - - - - - When done, click Close. - - - - - - - - Adding a New Group - - To add a new group, proceed as follows: - - - - - - From the main - window, select one contact and choose - Edit - Contact - Edit - , or right-click on it - and choose Edit. - - - - - In the Groups section, write the - name of the group you want to add and then click on - Add Group. - - - - - When done, click Close. - - - - - - - - - -
-- cgit v1.2.3 From a984f5c1916a33edf8145491e57aa3faa08865fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 10 Aug 2009 13:56:47 +0200 Subject: remove invalid tag, and update legal.xml to cc by-sa --- help/C/add-account.page | 2 - help/C/add-contact.page | 2 - help/C/change-status.page | 2 - help/C/create-account.page | 5 +-- help/C/disable-account.page | 2 - help/C/index.page | 2 - help/C/irc-account.page | 2 - help/C/irc-join-pwd.page | 2 - help/C/irc-join-room.page | 2 - help/C/irc-manage.page | 2 - help/C/irc-nick-password.page | 2 - help/C/legal.xml | 85 ++++---------------------------------- help/C/offline-contacts.page | 2 - help/C/prob-conn-acctdisabled.page | 1 - help/C/prob-conn-auth.page | 2 - help/C/prob-conn-name.page | 1 - help/C/prob-conn-neterror.page | 1 - help/C/prob-conn.page | 2 - help/C/remove-account.page | 5 +-- help/C/salut-protocol.page | 2 - help/C/send-file.page | 2 - help/C/send-message.page | 2 - help/C/set-custom-status.page | 2 - help/C/status-icons.page | 2 - 24 files changed, 11 insertions(+), 123 deletions(-) (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index 5dea2c79f..3d18b94a0 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -17,8 +17,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 003101804..529ec07da 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -17,8 +17,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/change-status.page b/help/C/change-status.page index e9204457a..e2b473144 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -19,8 +19,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/create-account.page b/help/C/create-account.page index d57f5cca1..01971e92c 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -20,10 +20,7 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - - + diff --git a/help/C/disable-account.page b/help/C/disable-account.page index 2c695182d..aafd3a513 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -18,8 +18,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/index.page b/help/C/index.page index 340fe95e2..8dd103b53 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -15,8 +15,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/irc-account.page b/help/C/irc-account.page index b0d6cd2d9..3b58c96d5 100644 --- a/help/C/irc-account.page +++ b/help/C/irc-account.page @@ -18,8 +18,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page index 3dcd95d14..7d1d8dd6d 100644 --- a/help/C/irc-join-pwd.page +++ b/help/C/irc-join-pwd.page @@ -17,8 +17,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page index e6dc99177..17fbf8e72 100644 --- a/help/C/irc-join-room.page +++ b/help/C/irc-join-room.page @@ -16,8 +16,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page index ff6dae272..b80c38cda 100644 --- a/help/C/irc-manage.page +++ b/help/C/irc-manage.page @@ -16,8 +16,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page index 998203a89..bc7e565e3 100644 --- a/help/C/irc-nick-password.page +++ b/help/C/irc-nick-password.page @@ -17,8 +17,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/legal.xml b/help/C/legal.xml index ac97e1de4..6f643bec5 100644 --- a/help/C/legal.xml +++ b/help/C/legal.xml @@ -1,76 +1,9 @@ - - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation - License (GFDL), Version 1.1 or any later version published - by the Free Software Foundation with no Invariant Sections, - no Front-Cover Texts, and no Back-Cover Texts. You can find - a copy of the GFDL at this link or in the file COPYING-DOCS - distributed with this manual. - - This manual is part of a collection of GNOME manuals - distributed under the GFDL. If you want to distribute this - manual separately from the collection, you can do so by - adding a copy of the license to the manual, as described in - section 6 of the license. - - - - Many of the names used by companies to distinguish their - products and services are claimed as trademarks. Where those - names appear in any GNOME documentation, and the members of - the GNOME Documentation Project are made aware of those - trademarks, then the names are in capital letters or initial - capital letters. - - - - DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED - UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE - WITH THE FURTHER UNDERSTANDING THAT: - - - - DOCUMENT IS PROVIDED ON AN "AS IS" BASIS, - WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR - IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES - THAT THE DOCUMENT OR MODIFIED VERSION OF THE - DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR - A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE - RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE - OF THE DOCUMENT OR MODIFIED VERSION OF THE - DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR - MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, - YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY - CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY - SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER - OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS - LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED - VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER - EXCEPT UNDER THIS DISCLAIMER; AND - - - - UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL - THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), - CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, - INITIAL WRITER, ANY CONTRIBUTOR, OR ANY - DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION - OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH - PARTIES, BE LIABLE TO ANY PERSON FOR ANY - DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR - CONSEQUENTIAL DAMAGES OF ANY CHARACTER - INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS - OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR - MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR - LOSSES ARISING OUT OF OR RELATING TO USE OF THE - DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, - EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF - THE POSSIBILITY OF SUCH DAMAGES. - - - - - - + +

This work is licensed under a +Creative Commons +Attribution-Share Alike 3.0 United States 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/offline-contacts.page b/help/C/offline-contacts.page index 2a8bea8ee..7cb014d08 100644 --- a/help/C/offline-contacts.page +++ b/help/C/offline-contacts.page @@ -19,8 +19,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page index 5c8a07f47..efae37229 100644 --- a/help/C/prob-conn-acctdisabled.page +++ b/help/C/prob-conn-acctdisabled.page @@ -17,7 +17,6 @@ 2009 GNOME Documentation Project - Creative Commons Share Alike 3.0 diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page index be0ec4389..e47f48a82 100644 --- a/help/C/prob-conn-auth.page +++ b/help/C/prob-conn-auth.page @@ -23,8 +23,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page index 3196da8a8..c475b0253 100644 --- a/help/C/prob-conn-name.page +++ b/help/C/prob-conn-name.page @@ -18,7 +18,6 @@ 2009 GNOME Documentation Project - Creative Commons Share Alike 3.0 diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page index cb7dcb049..5455e19a8 100644 --- a/help/C/prob-conn-neterror.page +++ b/help/C/prob-conn-neterror.page @@ -18,7 +18,6 @@ 2009 GNOME Documentation Project - Creative Commons Share Alike 3.0 diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page index b4397b792..2bc4ab16e 100644 --- a/help/C/prob-conn.page +++ b/help/C/prob-conn.page @@ -18,8 +18,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/remove-account.page b/help/C/remove-account.page index f0825436d..355d4955d 100644 --- a/help/C/remove-account.page +++ b/help/C/remove-account.page @@ -16,10 +16,7 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - - + diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page index 335a21b3e..ddaac93ab 100644 --- a/help/C/salut-protocol.page +++ b/help/C/salut-protocol.page @@ -18,8 +18,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/send-file.page b/help/C/send-file.page index e0da892e4..0768696bf 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -21,8 +21,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/send-message.page b/help/C/send-message.page index 833e484c2..801483004 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -16,8 +16,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page index cf4fcc098..04e49e4ab 100644 --- a/help/C/set-custom-status.page +++ b/help/C/set-custom-status.page @@ -20,8 +20,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - diff --git a/help/C/status-icons.page b/help/C/status-icons.page index 118af1957..d8dccdfb0 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -18,8 +18,6 @@ GNOME Documentation Project - Creative Commons Share Alike 3.0 - -- cgit v1.2.3 From e236e08f5276ff4923f58b3fdcecc296137ac001 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Mon, 10 Aug 2009 21:32:30 +0200 Subject: * wrote share-desktop * rewrote set-custom-status * some rewrote here and there, mostly small fixes --- help/C/add-account.page | 75 +++++++++++------------ help/C/add-contact.page | 34 +++++------ help/C/change-status.page | 9 ++- help/C/create-account.page | 20 +++--- help/C/disable-account.page | 56 +++++++---------- help/C/irc-account.page | 7 +-- help/C/irc-join-pwd.page | 6 +- help/C/irc-nick-password.page | 6 +- help/C/remove-account.page | 58 +++++++----------- help/C/send-file.page | 8 +++ help/C/set-custom-status.page | 138 ++++++++++++++++++++++++++++++++++++------ help/C/share-desktop.page | 75 ++++++++++++++++++++++- 12 files changed, 320 insertions(+), 172 deletions(-) (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index 3d18b94a0..4d8030b45 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -6,8 +6,8 @@ Add a new account to Empathy. - - + + Milo Casagrande milo@ubuntu.com @@ -16,7 +16,6 @@ 2009 GNOME Documentation Project - @@ -28,16 +27,16 @@ From the Contact List window, perform one of the following:

- -

- Press F4 -

- - -

- Choose EditAccounts -

- + +

+ Press F4. +

+ + +

+ Choose EditAccounts. +

+ @@ -45,43 +44,43 @@ If it is the first time you launch Empathy:

- -

- From the Type drop-down list choose - the service you wish to add an account for, then click - on the Create button. -

- + +

+ From the Type drop-down list choose + the service you wish to add an account for, then click + on the Create button. +

+

- Otherwise: + Otherwise:

- -

- Click on the Add button. -

- - -

- From the Type drop-down list choose - the service you wish to add an account for, then click - on the Create button. -

- + +

+ Click on the Add button. +

+ + +

+ From the Type drop-down list choose + the service you wish to add an account for, then click + on the Create button. +

+

- Fill the required fields with your user - name and password. + Fill the required fields with your user + name and password.

- To enable the new account, select the - Enabled check-box next to - the name of the account in the box on the left of the dialog. + To enable the new account, select the + Enabled check-box next to + the name of the account in the box on the left of the dialog.

diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 529ec07da..0227c17ab 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -6,8 +6,8 @@ Add someone to the contact list. - - + + Phil Bull philbull@gmail.com @@ -16,10 +16,9 @@ 2009 GNOME Documentation Project - - + Phil Bull

Instructions need review, didn't test with other IM services to confirm @@ -27,48 +26,43 @@ Add someone to your list of contacts - +

- 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 type of + service the person you want to add to your contacts is using.

- 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 text box, type the email address + or the username of the person you want to add to your + contacts list.

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

- Click Add to add the person to your list of - contacts. + Click Add to add the person to your list of + contacts.

-

- You can view your list of contacts in the main window of - Empathy. -

-

To add a new person to your list of contacts, you need to be - connected to the Internet and to your account. + connected to the Internet and to your account.

diff --git a/help/C/change-status.page b/help/C/change-status.page index e2b473144..a2e687ffc 100644 --- a/help/C/change-status.page +++ b/help/C/change-status.page @@ -8,8 +8,8 @@ Change your status, if you are going away from your computer for example. - - + + Phil Bull philbull@gmail.com @@ -18,7 +18,6 @@ 2009 GNOME Documentation Project - @@ -44,8 +43,8 @@

- If you do not use your computer for a while, or if the screen saver is turned on, Empathy will - automatically set your status to Away. + 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.

diff --git a/help/C/create-account.page b/help/C/create-account.page index 01971e92c..432a1d305 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -1,6 +1,7 @@ + @@ -10,7 +11,6 @@ - Milo Casagrande milo@ubuntu.com @@ -19,17 +19,11 @@ 2009 GNOME Documentation Project - - - Milo Casagrande -

Section about how to create an account.

- - Register for a new account - +

You can freely create an account on any of the services listed below. Follow the instructions reported on each website on @@ -43,7 +37,7 @@

Click on the name of the service to visit its website.

- +
Instant Messaging Services @@ -70,9 +64,9 @@

It is possible to use the automatic creation of accounts - with this service and Empathy. Not all the - service providers support it. One service provider known - to work is jabber.org, the default one of the application. + with this service. Not all the service providers support it. + One service provider known to work is jabber.org, + the default one of the application.

@@ -117,7 +111,7 @@ These services will let you do voice call over the Internet with other people using the same service or even to normal phones.

- +

diff --git a/help/C/disable-account.page b/help/C/disable-account.page index aafd3a513..76878dc71 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -5,10 +5,12 @@ - Prevent an account from logging-in automatically when you start - Empathy. - - + + Prevent an account from logging-in automatically when you start + Empathy. + + + Milo Casagrande milo@ubuntu.com @@ -17,60 +19,48 @@ 2009 GNOME Documentation Project - - - - Milo Casagrande -

Section about how to disable an account from Empathy.

- - + Disable an account

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

- After disabling an account, you will be able to enable it again. + After disabling an account, it is possible to enable it again.

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

- -

- Press F4 -

- - -

- Choose EditAccounts -

- + +

+ Press F4. +

+ + +

+ Choose EditAccounts. +

+

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

- Deselect the Enabled check-box. + Deselect the Enabled check-box.

- - -

- If you want to remove an account, see . -

- diff --git a/help/C/irc-account.page b/help/C/irc-account.page index 3b58c96d5..fb742edc2 100644 --- a/help/C/irc-account.page +++ b/help/C/irc-account.page @@ -8,7 +8,7 @@ Create an IRC account. - + Milo Casagrande milo@ubuntu.com @@ -17,7 +17,6 @@ 2009 GNOME Documentation Project - @@ -31,12 +30,12 @@

- Press F4 + Press F4.

- Choose EditAccounts + Choose EditAccounts.

diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page index 7d1d8dd6d..fdc5086dc 100644 --- a/help/C/irc-join-pwd.page +++ b/help/C/irc-join-pwd.page @@ -6,7 +6,7 @@ Join a password protected room. - + Milo Casagrande @@ -21,5 +21,9 @@ Join a protected room + +

+ At the moment it is not possible to join a password protected room. +

diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page index bc7e565e3..a4233f921 100644 --- a/help/C/irc-nick-password.page +++ b/help/C/irc-nick-password.page @@ -7,7 +7,7 @@ How to set the password of a nickname. - + Milo Casagrande milo@ubuntu.com @@ -42,12 +42,12 @@

- Press F4 + Press F4.

- Choose EditAccounts + Choose EditAccounts.

diff --git a/help/C/remove-account.page b/help/C/remove-account.page index 355d4955d..5728b40d0 100644 --- a/help/C/remove-account.page +++ b/help/C/remove-account.page @@ -1,12 +1,12 @@ - + Completely remove an account from Empathy. - - + + Milo Casagrande milo@ubuntu.com @@ -15,15 +15,9 @@ 2009 GNOME Documentation Project - - - - Milo Casagrande -

Section about how to remove an account from Empathy.

- - + Remove an account

@@ -31,52 +25,46 @@ the conversations you had with other people.

- After removing an account you will not be able to recover it or - the conversations you had. + After removing an account you will not be able to recover it or to recover + the conversations you had.

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

- -

- Press F4 -

- - -

- Choose EditAccounts -

- + +

+ Press F4. +

+ + +

+ Choose EditAccounts. +

+

- Select the account you wish to remove in the box on the - left of the dialog. + Select the account you wish to remove from the box on the + left of the dialog.

- Click on the Remove button. + Click on the Remove button.

- A dialog will be shown asking for confirmation. Click on - the Remove button to permanently remove the - account. + A dialog will be shown asking for confirmation. Click on + the Remove button to permanently remove the + account.

- - -

- If you only want to disable an account, see . -

- diff --git a/help/C/send-file.page b/help/C/send-file.page index 0768696bf..8d3a15e8a 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -7,6 +7,7 @@ Send a file from your computer to one of your contacts. + Phil Bull @@ -57,6 +58,13 @@

+ + +

+ It is possible to send files only using the following services: Jabber, + Google Talk and Salut. +

+

If your contact accepts the file transfer, you can watch the progress of the diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page index 04e49e4ab..3c705af2d 100644 --- a/help/C/set-custom-status.page +++ b/help/C/set-custom-status.page @@ -7,10 +7,10 @@ - Setting a custom status. + Set a personal message for your status. - + Jim Campbell jwcampbell@gmail.com @@ -23,39 +23,141 @@ - Set a custom status + Set a custom message + +

+ Sometimes you may want to set a custom message for your status, for example to let + people know that you will be unavailable for a certain period of time. +

+

+ It is possible to set a custom message based on the different statuses available. +

+ + +

- Sometimes you may want to set a custom status, for example to let people know that you will be unavailable for a certain period of time. -

- - + From the Contact List window, click on the drop-down list at + the top. +

+

- Click on the drop-down list at the top of the main window of - Empathy. + Select the status you want to add a custom message to. You have to select the one + identified with the label Custom Message.

- Enter your custom status message into the "Add New Preset" box. + Enter your custom message in the text box at the top of the window, and + press Enter to set the message.

- Select a generic status type from the drop-down menu. + If you want to set the custom message as a favorite, saving it in order to use it + again, click on the little star on the right of the text box where you wrote your + custom message. +

+

+ If you do not do it, the custom message will not be available the next time you + use Empathy. It will be saved only for the current session. +

+ + + +
+ + Edit, remove and add a custom message + + + +

+ From the Contact List window, click on the drop-down list at + the top.

- - + +

- Click on the +Add button to add the custom status to - your list of possible status indicators. + Select Edit Custom Message.

- + + + +

+ To edit a custom message: +

+ + +

+ From the Saved Presets box, select the status message + you want to edit and double-click on it. +

+ + +

+ Type the new custom message and press Enter to modify it. +

+ + + + +

+ To remove a custom message: +

+ + +

+ From the Saved Presets box, select the status message you want + to remove. +

+ + +

+ Click on the Remove button. +

+ + + + +

+ To add a new custom message, from the Add New Preset section: +

+ + +

+ Click on the drop-down list to select the status you want to set a custom + message to. +

+ + +

+ Click on the text box, and type the new custom message. +

+ + +

+ Click on Add to add the new message to the presets ones. +

+ + + + + +

- Click "Close" and then select your newly-created status from - the drop-down menu at the top of the application. + When finished, click on Close.

+ + +

+ When you edit or add a new custom message, it will not be set as the current + status message. You will need to select it from the Contact List window. +

+ + +
+ diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page index 776ee487e..1987a83db 100644 --- a/help/C/share-desktop.page +++ b/help/C/share-desktop.page @@ -5,11 +5,82 @@ - Share your desktop with one of your contacts. + Share the desktop with your contacts. + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + - Share the desktop + + Share your desktop + +

+ It is possible, with some of your contacts, to share your desktop with them, or to start + using your contacts desktop. You can use + this functionality to show your desktop to your contacts, to ask for help or to + help your contacts resolve a problem. +

+ + +

+ In order to be able to share your desktop or to remotely use your contacts desktop, + it is necessary to have a remote desktop viewer application installed in your system. +

+ + + + +

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

+ + +

+ Select the contact you want to share your desktop with, and choose + EditContactShare my desktop. +

+ + +

+ Right-click on the name of the contact you want to share your desktop with, + and select Share my desktop. +

+ + + + +

+ A request will be sent to the contact you want to share your desktop with. + If they accept, the default remote desktop viewer application will be launched in + order to permit you to disconnect the user that is controlling your desktop. +

+

+ For more information about how to use the remote desktop viewer application, + refer to its help. +

+ + + +

+ When you share your desktop with someone else, it is possible to experience + system performance slowdown and low Internet speed. +

+ + +

+ Not all your contacts might be able to support this functionality. It is necessary + for them to have at least the 2.28 version of Empathy and a remote desktop + viewer application installed in their system. +

+ -- cgit v1.2.3 From 8fcdca98439362cc9c714e62970e028404674a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 12 Aug 2009 18:16:31 +0200 Subject: [help] remove duplicated revision entry --- help/C/send-file.page | 1 - 1 file changed, 1 deletion(-) (limited to 'help/C') diff --git a/help/C/send-file.page b/help/C/send-file.page index 8d3a15e8a..4183a7470 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -7,7 +7,6 @@ Send a file from your computer to one of your contacts. - Phil Bull -- cgit v1.2.3 From 567309e7e26dc92e7cbb9e1be2cde466ffcacc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 12 Aug 2009 18:22:11 +0200 Subject: [help] update / tag contents to match current Mallard spec --- help/C/add-contact.page | 2 +- help/C/irc-manage.page | 2 +- help/C/offline-contacts.page | 2 +- help/C/prob-conn-auth.page | 2 +- help/C/prob-conn.page | 6 +++--- help/C/salut-protocol.page | 2 +- help/C/status-icons.page | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'help/C') diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 0227c17ab..a7cfb83d4 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -20,7 +20,7 @@ - Phil Bull + Phil Bull

Instructions need review, didn't test with other IM services to confirm the names of the textboxes. Also, check the name of the Add button.

 diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page index b80c38cda..cdff237e5 100644 --- a/help/C/irc-manage.page +++ b/help/C/irc-manage.page @@ -20,7 +20,7 @@ - Milo Casagrande + Milo Casagrande

Guide page for all the IRC related actions. Need to work on this page if the content starts to grow. In case we don't have a lot of contets for diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page index 7cb014d08..7ac574dc3 100644 --- a/help/C/offline-contacts.page +++ b/help/C/offline-contacts.page @@ -23,7 +23,7 @@ - Milo Casagrande + Milo Casagrande

Need to rework on the terminology used.

diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page index e47f48a82..19d81bd94 100644 --- a/help/C/prob-conn-auth.page +++ b/help/C/prob-conn-auth.page @@ -27,7 +27,7 @@ - Milo Casagrande + Milo Casagrande

Could be useful to link here how to change your password or how to recover it. Need to write that section. diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page index 2bc4ab16e..e9ec2382d 100644 --- a/help/C/prob-conn.page +++ b/help/C/prob-conn.page @@ -24,15 +24,15 @@ Problems connecting to an instant messaging service - Phil Bull + Phil Bull

This is a stub. We should identify the most common causes for a user not being able to connect and document those.

 - Phil Bull + Phil Bull

Check whether gui tags are allowed in section titles and descs.

- Milo Casagrande + Milo Casagrande

You can... but the end result is not very good: the title is in blue and the gui element in grey. diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page index ddaac93ab..b5fb62c41 100644 --- a/help/C/salut-protocol.page +++ b/help/C/salut-protocol.page @@ -22,7 +22,7 @@ - Milo Casagrande + Milo Casagrande

Need to work on this section, explaining people in clear words what the hell is this service! diff --git a/help/C/status-icons.page b/help/C/status-icons.page index d8dccdfb0..3b0be3a13 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -22,7 +22,7 @@ - Milo Casagrande + Milo Casagrande

Need to understand when the extended away icon is used: how many minuts/hours should pass?

-- cgit v1.2.3 From d437af598ae190650f5f7fb3aab5a79c9758e6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 12 Aug 2009 18:24:24 +0200 Subject: [help] move below , to validate against current schema --- help/C/add-contact.page | 4 ++-- help/C/irc-manage.page | 4 ++-- help/C/offline-contacts.page | 4 ++-- help/C/prob-conn-auth.page | 4 ++-- help/C/salut-protocol.page | 6 +++--- help/C/status-icons.page | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'help/C') diff --git a/help/C/add-contact.page b/help/C/add-contact.page index a7cfb83d4..2a6bde0bd 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -19,14 +19,14 @@ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> </info> + <title>Add someone to your list of contacts + Phil Bull

Instructions need review, didn't test with other IM services to confirm the names of the textboxes. Also, check the name of the Add button.

 - Add someone to your list of contacts -

diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page index cdff237e5..93f4d2d0a 100644 --- a/help/C/irc-manage.page +++ b/help/C/irc-manage.page @@ -19,6 +19,8 @@ + Use IRC + Milo Casagrande

@@ -28,8 +30,6 @@

- Use IRC -
Manage IRC accounts
diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page index 7ac574dc3..80e154239 100644 --- a/help/C/offline-contacts.page +++ b/help/C/offline-contacts.page @@ -22,6 +22,8 @@ + Display offline contacts + Milo Casagrande

@@ -29,8 +31,6 @@

- Display offline contacts -

diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page index 19d81bd94..05b6c7dea 100644 --- a/help/C/prob-conn-auth.page +++ b/help/C/prob-conn-auth.page @@ -26,6 +26,8 @@ + I get a message that says "Authentication failed" + Milo Casagrande

@@ -34,8 +36,6 @@

- I get a message that says "Authentication failed" -

If you try to connect and you get a message saying Authentication failed, your instant messaging service is not allowing you to connect because it does not diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page index b5fb62c41..c8c926922 100644 --- a/help/C/salut-protocol.page +++ b/help/C/salut-protocol.page @@ -20,7 +20,9 @@ - + + What is the <em>Salut</em> service? + Milo Casagrande

@@ -29,8 +31,6 @@

- What is the <em>Salut</em> service? -

The Salut service is a serverless communication service: you do not need to connect and authenticate to a central server in diff --git a/help/C/status-icons.page b/help/C/status-icons.page index 3b0be3a13..eea6cc8f8 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -21,6 +21,8 @@ + Status icons + Milo Casagrande

@@ -31,8 +33,6 @@

- Status icons - -- cgit v1.2.3 From d91fef0b1a6c3d9bed0746b81cf044ababbd76f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 12 Aug 2009 18:25:13 +0200 Subject: [help] add missing to
containing --- help/C/audio-video.page | 2 ++ help/C/status-icons.page | 2 ++ 2 files changed, 4 insertions(+) (limited to 'help/C') diff --git a/help/C/audio-video.page b/help/C/audio-video.page index e48468347..dddb63aab 100644 --- a/help/C/audio-video.page +++ b/help/C/audio-video.page @@ -34,6 +34,7 @@ + +

@@ -62,6 +63,7 @@

diff --git a/help/C/status-icons.page b/help/C/status-icons.page index eea6cc8f8..663436647 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -48,6 +48,7 @@

@@ -101,6 +102,7 @@

-- cgit v1.2.3 From ce43ae4e797fd7ff4157185782b08f550578193d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 12 Aug 2009 18:25:40 +0200 Subject: [help] remove invalid type attribute on element --- help/C/create-account.page | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'help/C') diff --git a/help/C/create-account.page b/help/C/create-account.page index 432a1d305..25af2b077 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -98,8 +98,7 @@

- For more information, see . + For more information, see .

-- cgit v1.2.3 From 0354a7cd79699a75b6d603fef2f6aa7a0cdcc244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 12 Aug 2009 18:26:05 +0200 Subject: [help] fixed attribute name (versione -> version) --- help/C/offline-contacts.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'help/C') diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page index 80e154239..6fa8c51ee 100644 --- a/help/C/offline-contacts.page +++ b/help/C/offline-contacts.page @@ -8,7 +8,7 @@ How to see the contacts that are not online. - + Milo Casagrande -- cgit v1.2.3 From 0a88eb69853c26ec9a79a26950b906eb5d9b2403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 12 Aug 2009 18:26:47 +0200 Subject: [help] embed answer to comment in another element --- help/C/prob-conn.page | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'help/C') diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page index e9ec2382d..40a2356de 100644 --- a/help/C/prob-conn.page +++ b/help/C/prob-conn.page @@ -32,11 +32,13 @@ Phil Bull

Check whether gui tags are allowed in section titles and descs.

- Milo Casagrande -

- You can... but the end result is not very good: the title is in blue and the - gui element in grey. -

+ + Milo Casagrande +

+ You can... but the end result is not very good: the title is in blue and the + gui element in grey. +

+ -- cgit v1.2.3 From 9d41af181cc388a5ee02f3eaa5681ca0bd33566b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 12 Aug 2009 18:27:23 +0200 Subject: [help] set required attributes on revision element --- help/C/salut-protocol.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'help/C') diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page index c8c926922..c9bff910c 100644 --- a/help/C/salut-protocol.page +++ b/help/C/salut-protocol.page @@ -7,7 +7,7 @@ Undesrtanding the Salut protocol. - + Milo Casagrande -- cgit v1.2.3 From 553761acd191a6879caab2a8943b5aae50f46290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 12 Aug 2009 18:29:52 +0200 Subject: [help] remove trailing whitespaces --- help/C/add-account.page | 4 ++-- help/C/add-contact.page | 4 ++-- help/C/audio-call.page | 14 +++++++------- help/C/audio-video.page | 4 ++-- help/C/create-account.page | 4 ++-- help/C/disable-account.page | 6 +++--- help/C/index.page | 4 ++-- help/C/irc-account.page | 20 ++++++++++---------- help/C/irc-join-pwd.page | 4 ++-- help/C/irc-join-room.page | 10 +++++----- help/C/irc-manage.page | 6 +++--- help/C/irc-nick-password.page | 22 +++++++++++----------- help/C/prob-conn-acctdisabled.page | 10 +++++----- help/C/prob-conn-auth.page | 18 +++++++++--------- help/C/prob-conn-name.page | 18 +++++++++--------- help/C/prob-conn-neterror.page | 12 ++++++------ help/C/prob-conn.page | 2 +- help/C/salut-protocol.page | 8 ++++---- help/C/send-file.page | 16 ++++++++-------- help/C/send-message.page | 14 +++++++------- help/C/set-custom-status.page | 6 +++--- help/C/share-desktop.page | 2 +- help/C/status-icons.page | 4 ++-- help/C/video-call.page | 12 ++++++------ 24 files changed, 112 insertions(+), 112 deletions(-) (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index 4d8030b45..2fa344cfb 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -86,8 +86,8 @@

- If you want to change the name that identifies the account in the Accounts - dialog, double-click on the name of the account in the box on the left of the dialog + If you want to change the name that identifies the account in the Accounts + dialog, double-click on the name of the account in the box on the left of the dialog and type the new name.

diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 2a6bde0bd..fbde28774 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -1,7 +1,7 @@ - + @@ -23,7 +23,7 @@ Phil Bull -

Instructions need review, didn't test with other IM services to confirm +

Instructions need review, didn't test with other IM services to confirm the names of the textboxes. Also, check the name of the Add button.

 diff --git a/help/C/audio-call.page b/help/C/audio-call.page index 1b1d3e040..116f4a8f8 100644 --- a/help/C/audio-call.page +++ b/help/C/audio-call.page @@ -12,7 +12,7 @@ - + Start an audio conversation @@ -23,13 +23,13 @@

- Select the contact you want to have a conversation with, and click + Select the contact you want to have a conversation with, and click on the audio call icon next to their name.

- Right-click on the name of the contact you want to have a conversation with, and + Right-click on the name of the contact you want to have a conversation with, and select Audio Call.

@@ -37,8 +37,8 @@

- A new window will open. When the connection is established, you will - see written, at the bottom of the window, Connected and the total + A new window will open. When the connection is established, you will + see written, at the bottom of the window, Connected and the total conversation time.

@@ -50,8 +50,8 @@

- To turn an audio conversation into a video one, from the call window select - CallSend video, + To turn an audio conversation into a video one, from the call window select + CallSend video, or click on the video call icon.

diff --git a/help/C/audio-video.page b/help/C/audio-video.page index dddb63aab..cc118dd56 100644 --- a/help/C/audio-video.page +++ b/help/C/audio-video.page @@ -10,12 +10,12 @@ - + Audio and video conversations

When your contacts support audio or video conversations, you will see, next to - the contacts name in the Contact List window, one or two small icons that + the contacts name in the Contact List window, one or two small icons that represent the different conversations you can have.

diff --git a/help/C/create-account.page b/help/C/create-account.page index 25af2b077..203818c7f 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -25,7 +25,7 @@ Register for a new account

- You can freely create an account on any of the services listed below. + You can freely create an account on any of the services listed below. Follow the instructions reported on each website on how to register your new account.

@@ -108,7 +108,7 @@

These services will let you do voice call over the Internet with - other people using the same service or even to normal phones. + other people using the same service or even to normal phones.

diff --git a/help/C/disable-account.page b/help/C/disable-account.page index 76878dc71..2ded8067a 100644 --- a/help/C/disable-account.page +++ b/help/C/disable-account.page @@ -1,12 +1,12 @@ - + - Prevent an account from logging-in automatically when you start + Prevent an account from logging-in automatically when you start Empathy. @@ -21,7 +21,7 @@ - + Disable an account

diff --git a/help/C/index.page b/help/C/index.page index 8dd103b53..729271b3e 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -23,7 +23,7 @@

Audio and video conversations
- +
Text conversations
@@ -31,7 +31,7 @@
Manage accounts
- +
Advanced actions
diff --git a/help/C/irc-account.page b/help/C/irc-account.page index fb742edc2..1f81eb593 100644 --- a/help/C/irc-account.page +++ b/help/C/irc-account.page @@ -19,7 +19,7 @@ - + Create an IRC account @@ -71,26 +71,26 @@

- From the Network drop-down list, select the name of the network + From the Network drop-down list, select the name of the network you are creating the account for.

- In the Nickname text box, type the name that will identify yourself + In the Nickname text box, type the name that will identify yourself in the network you are creating the account.

- In the Password text box, type the password you used to register + In the Password text box, type the password you used to register your nikcname. If you do not have one, leave this field blank.

- In the Real name text box, type your real name. + In the Real name text box, type your real name.

@@ -100,27 +100,27 @@

- In the Quit message text box, type a text message that will be + In the Quit message text box, type a text message that will be sent when you close your session.

- To enable the new account, select the Enabled check-box + To enable the new account, select the Enabled check-box next to the name of the account in the box on the left of the dialog.

- If you want to change the name that identifies the account in the Accounts - dialog, double-click on the name of the account in the box on the left of the dialog + If you want to change the name that identifies the account in the Accounts + dialog, double-click on the name of the account in the box on the left of the dialog and type the new name.

- If you want to use different networks at the same time, you need to create an + If you want to use different networks at the same time, you need to create an account with each one of the networks you want to use.

diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page index fdc5086dc..e672bbe68 100644 --- a/help/C/irc-join-pwd.page +++ b/help/C/irc-join-pwd.page @@ -19,9 +19,9 @@ - + Join a protected room - +

At the moment it is not possible to join a password protected room.

diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page index 17fbf8e72..379399267 100644 --- a/help/C/irc-join-room.page +++ b/help/C/irc-join-room.page @@ -18,25 +18,25 @@ - + Join a room

- From the Contact List window, choose + From the Contact List window, choose RoomJoin.

- From the Account drop-down list, select the IRC account that + From the Account drop-down list, select the IRC account that corresponds to the network you want to use.

- In the Room text box, type the name of the channel you want to + In the Room text box, type the name of the channel you want to join. Prefix the name with the hash character (#).

@@ -46,7 +46,7 @@

- +

To join multiple rooms, you need to repeat the steps above for each room. diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page index 93f4d2d0a..bb285f248 100644 --- a/help/C/irc-manage.page +++ b/help/C/irc-manage.page @@ -24,8 +24,8 @@ Milo Casagrande

- Guide page for all the IRC related actions. Need to work on this page - if the content starts to grow. In case we don't have a lot of contets for + Guide page for all the IRC related actions. Need to work on this page + if the content starts to grow. In case we don't have a lot of contets for this page, rework the other.

@@ -39,5 +39,5 @@ Fix common problems - + diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page index a4233f921..1a73a2c4f 100644 --- a/help/C/irc-nick-password.page +++ b/help/C/irc-nick-password.page @@ -19,18 +19,18 @@ - + Set the nickname password

- Registering a nickname is useful to preserve your identity on IRC and you will be able - to use always the same nickname. In some cirtumstances, some IRC channels may be + Registering a nickname is useful to preserve your identity on IRC and you will be able + to use always the same nickname. In some cirtumstances, some IRC channels may be configured to accept only registered nickname.

- If you have registered your nickname with a password on a network that supports nickname - registration, you can use that password with Empathy to identify yourself as + If you have registered your nickname with a password on a network that supports nickname + registration, you can use that password with Empathy to identify yourself as the owner of the nickname.

@@ -59,32 +59,32 @@

- If the account is enabled, disable it by deselecting the Enable + If the account is enabled, disable it by deselecting the Enable check-box next to the name of the account.

- In the Password text box, type the password you used to register + In the Password text box, type the password you used to register your nikcname.

- Enable the account by selecting the Enabled check-box - next to the name of the account. + Enable the account by selecting the Enabled check-box + next to the name of the account.

- Once you are connected, you will receive a message from the nickname server that will + Once you are connected, you will receive a message from the nickname server that will tell you of the established identification.

- At the moment it is not possible to register an IRC nickname with Empathy, it is + At the moment it is not possible to register an IRC nickname with Empathy, it is only possible to use the password of an already registered nickname.

diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page index efae37229..71caf567e 100644 --- a/help/C/prob-conn-acctdisabled.page +++ b/help/C/prob-conn-acctdisabled.page @@ -5,7 +5,7 @@ - The instant messaging account that you want to use is not enabled in + The instant messaging account that you want to use is not enabled in the list of accounts. @@ -23,15 +23,15 @@ My account is not enabled

-If the instant messaging account that you want to use is not enabled in the -drop-down account list when you try to start a new conversation or join a +If the instant messaging account that you want to use is not enabled in the +drop-down account list when you try to start a new conversation or join a chat, your account details may not be correct.

- Click EditAccounts and make sure + Click EditAccounts and make sure that the Enabled checkbox is checked.

@@ -42,7 +42,7 @@ chat, your account details may not be correct.

- Expand the Advanced section of the Accounts + Expand the Advanced section of the Accounts window and make sure that all of the server settings are correct.

diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page index 05b6c7dea..e49167299 100644 --- a/help/C/prob-conn-auth.page +++ b/help/C/prob-conn-auth.page @@ -6,7 +6,7 @@ - An error message appears in the main window saying that + An error message appears in the main window saying that "Authentication failed". @@ -31,30 +31,30 @@ Milo Casagrande

- Could be useful to link here how to change your password or how to + Could be useful to link here how to change your password or how to recover it. Need to write that section.

- If you try to connect and you get a message saying Authentication failed, - your instant messaging service is not allowing you to connect because it does not + If you try to connect and you get a message saying Authentication failed, + your instant messaging service is not allowing you to connect because it does not recognize your username or password for some reason.

- Make sure that you have registered for an account with the service you - are trying to connect to. If you do not have an account, most services + Make sure that you have registered for an account with the service you + are trying to connect to. If you do not have an account, most services will not allow you to connect.

- Click the Edit Account button in the error message. Type - your username and password again to make sure that they are correct. - Deselect the Enabled box next to the name of your account and + Click the Edit Account button in the error message. Type + your username and password again to make sure that they are correct. + Deselect the Enabled box next to the name of your account and then select it to try to connect to the service again.

diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page index c475b0253..98e17c36c 100644 --- a/help/C/prob-conn-name.page +++ b/help/C/prob-conn-name.page @@ -6,7 +6,7 @@ - An error message appears in the main Empathy window which says + An error message appears in the main Empathy window which says "Name in use". @@ -23,7 +23,7 @@ @@ -31,16 +31,16 @@ I get a message that says "Name in use"

- This kind of error happens when you try to connect to your IRC account and - you are using a nickname that is being used by someone else on that particular + This kind of error happens when you try to connect to your IRC account and + you are using a nickname that is being used by someone else on that particular network.

- To resolve this problem, click on the Edit Account button and + To resolve this problem, click on the Edit Account button and perform one of the following:

- +

@@ -49,11 +49,11 @@

- Set the password for that nickname, if you have registered that nickname - within the network you are using. For more information, + Set the password for that nickname, if you have registered that nickname + within the network you are using. For more information, see .

- + diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page index 5455e19a8..f15a4c86c 100644 --- a/help/C/prob-conn-neterror.page +++ b/help/C/prob-conn-neterror.page @@ -6,7 +6,7 @@ - An error message appears in the main Empathy window which says + An error message appears in the main Empathy window which says "Network error". @@ -29,8 +29,8 @@ I get a message that says "Network error"

-If you try to connect and an error message appears in the main Empathy -window which says "Network error", Empathy cannot communicate with +If you try to connect and an error message appears in the main Empathy +window which says "Network error", Empathy cannot communicate with the instant messaging service for some reason.

@@ -49,14 +49,14 @@ the instant messaging service for some reason.

- Expand the Advanced section and make sure that the details - such as server address and port are correct. You should be able to find + Expand the Advanced section and make sure that the details + such as server address and port are correct. You should be able to find these details from the website of the messaging service.

- Uncheck the Enabled box next to the name of your account and + Uncheck the Enabled box next to the name of your account and then check it again to try to connect to the service again.

diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page index 40a2356de..137a58770 100644 --- a/help/C/prob-conn.page +++ b/help/C/prob-conn.page @@ -25,7 +25,7 @@ Phil Bull -

This is a stub. We should identify the most common causes for a user not +

This is a stub. We should identify the most common causes for a user not being able to connect and document those.

 diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page index c9bff910c..8b23acac6 100644 --- a/help/C/salut-protocol.page +++ b/help/C/salut-protocol.page @@ -1,14 +1,14 @@ - + Undesrtanding the Salut protocol. - + Milo Casagrande milo@ubuntu.com @@ -17,7 +17,7 @@ 2009 GNOME Documentation Project - + @@ -34,7 +34,7 @@

The Salut service is a serverless communication service: you do not need to connect and authenticate to a central server in - order to use it. + order to use it.

This kind of serverless messaging system is restricted to a local area diff --git a/help/C/send-file.page b/help/C/send-file.page index 4183a7470..7d7b2ab7d 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -52,12 +52,12 @@

- The File Transfers window will appear. Wait for your contact to accept the + The File Transfers window will appear. Wait for your contact to accept the file transfer, or click Stop to halt the transfer.

- +

It is possible to send files only using the following services: Jabber, @@ -66,23 +66,23 @@

- If your contact accepts the file transfer, you can watch the progress of the + If your contact accepts the file transfer, you can watch the progress of the transfer and see the estimated amount of time remaining before it is complete.

- If they do not accept it, the status of the transfer will change to File + If they do not accept it, the status of the transfer will change to File transfer cancelled, and the file will not be sent.

- Once a transfer is finished, you can close the File Transfers - window. If you have multiple finished transfers listed in the window, click on - Clear to empty the list. This will only remove the files from the + Once a transfer is finished, you can close the File Transfers + window. If you have multiple finished transfers listed in the window, click on + Clear to empty the list. This will only remove the files from the list and will not delete them from your computer.

- In order to send a file to someone, you need to be connected to the Internet, or to + In order to send a file to someone, you need to be connected to the Internet, or to a local area network.

diff --git a/help/C/send-message.page b/help/C/send-message.page index 801483004..bdf1c7341 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -6,7 +6,7 @@ Send a message to one of your contacts. - + Phil Bull philbull@gmail.com @@ -15,12 +15,12 @@ 2009 GNOME Documentation Project - + - + Send a message to someone - +

@@ -29,13 +29,13 @@

- Double-click the name of the contact that you want to have a conversation + Double-click the name of the contact that you want to have a conversation with.

- Right-click on the name of the contact you want to have a conversation with, and + Right-click on the name of the contact you want to have a conversation with, and select Chat.

@@ -48,5 +48,5 @@

- + diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page index 3c705af2d..36656a16f 100644 --- a/help/C/set-custom-status.page +++ b/help/C/set-custom-status.page @@ -1,7 +1,7 @@ - + @@ -19,7 +19,7 @@ 2009 GNOME Documentation Project - + @@ -96,7 +96,7 @@

- Type the new custom message and press Enter to modify it. + Type the new custom message and press Enter to modify it.

diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page index 1987a83db..de7957791 100644 --- a/help/C/share-desktop.page +++ b/help/C/share-desktop.page @@ -29,7 +29,7 @@ this functionality to show your desktop to your contacts, to ask for help or to help your contacts resolve a problem.

- +

In order to be able to share your desktop or to remotely use your contacts desktop, diff --git a/help/C/status-icons.page b/help/C/status-icons.page index 663436647..cc561cb89 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -62,7 +62,7 @@ This is the default icon for the Available status.

- Use this icon when you are availble to have conversations with other + Use this icon when you are availble to have conversations with other people.

@@ -98,7 +98,7 @@

Use this icon when you are going away from the computer. This icon - is used also when you leave the computer and the screensaver turns on. + is used also when you leave the computer and the screensaver turns on.

diff --git a/help/C/video-call.page b/help/C/video-call.page index b9d60358e..1f65c6085 100644 --- a/help/C/video-call.page +++ b/help/C/video-call.page @@ -21,13 +21,13 @@

- Select the contact you want to have a conversation with, and click + Select the contact you want to have a conversation with, and click on the video call icon next to their name.

- Right-click on the name of the contact you want to have a conversation with, and + Right-click on the name of the contact you want to have a conversation with, and select Video Call.

@@ -35,8 +35,8 @@

- A new window will open. When the connection is established, you will - see written, at the bottom of the window, Connected and the total + A new window will open. When the connection is established, you will + see written, at the bottom of the window, Connected and the total conversation time.

@@ -48,8 +48,8 @@

- To turn a video conversation into an audio one, from the call window deselect - CallSend video, + To turn a video conversation into an audio one, from the call window deselect + CallSend video, or click on the video call icon.

-- cgit v1.2.3 From 7a91c985c8e9b96764e29948de83fb016da9beda Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Fri, 14 Aug 2009 21:09:26 +0200 Subject: [help] irc-nick-password: * wordings * added a note irc-start-conversation: * added topic for starting a private IRC conversation irc-send-file: * added topic for sending files via IRC (it's not possible) start-conversation: * added topic describing the Ctrl+N way to start a conversation prob-conn-neterror: * reworked the page adding the IRC problem prob-conn-name: * reworked the page prob-conn-acctdisabled: * reworked the page audio-video: * added a note * added table for supported services/protocols Makefile.am: * added new pages --- help/C/audio-video.page | 70 ++++++++++++++++++++++++++++++++ help/C/irc-join-room.page | 5 +-- help/C/irc-manage.page | 11 +++-- help/C/irc-nick-password.page | 19 +++++---- help/C/irc-sending-file.page | 27 +++++++++++++ help/C/irc-start-conversation.page | 62 ++++++++++++++++++++++++++++ help/C/prob-conn-acctdisabled.page | 68 +++++++++++++++++++------------ help/C/prob-conn-auth.page | 52 +++++++++++++++--------- help/C/prob-conn-name.page | 45 +++++++++++---------- help/C/prob-conn-neterror.page | 83 +++++++++++++++++++++----------------- help/C/send-file.page | 16 ++++---- help/C/start-conversation.page | 71 ++++++++++++++++++++++++++++++++ 12 files changed, 400 insertions(+), 129 deletions(-) create mode 100644 help/C/irc-sending-file.page create mode 100644 help/C/irc-start-conversation.page create mode 100644 help/C/start-conversation.page (limited to 'help/C') diff --git a/help/C/audio-video.page b/help/C/audio-video.page index cc118dd56..244ed2c4b 100644 --- a/help/C/audio-video.page +++ b/help/C/audio-video.page @@ -65,5 +65,75 @@ + + +

+ In order to have a video conversation, you need to have a web-cam that is + supported by your operating system, and a working microphone. +

+

+ In order to have an audio conversation, you need to have a sound-card that is + supported by your operating system, and a working microphone. +

+ + +
+ + Supported services + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Protocol / Service + + Video conversations + + Audio conversations +
AIMNoNo
Google TalkYesYes
ICQNoNo
JabberYesYes
MSNNoNo
SalutNoNo
Yahoo!NoNo
+ +
diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page index 379399267..c196f2055 100644 --- a/help/C/irc-join-room.page +++ b/help/C/irc-join-room.page @@ -4,9 +4,9 @@ - Entering an IRC channel. + Join an IRC channel. - + Milo Casagrande milo@ubuntu.com @@ -15,7 +15,6 @@ 2009 GNOME Documentation Project - diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page index bb285f248..081c7e2c3 100644 --- a/help/C/irc-manage.page +++ b/help/C/irc-manage.page @@ -4,9 +4,10 @@ - Manage IRC accounts with Empathy. - - + + Hot to use IRC with Empathy. + + Milo Casagrande milo@ubuntu.com @@ -15,7 +16,6 @@ 2009 GNOME Documentation Project - @@ -31,11 +31,10 @@
- Manage IRC accounts + IRC rooms and conversations
- Fix common problems
diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page index 1a73a2c4f..c0e9328a9 100644 --- a/help/C/irc-nick-password.page +++ b/help/C/irc-nick-password.page @@ -23,7 +23,7 @@ Set the nickname password

- Registering a nickname is useful to preserve your identity on IRC and you will be able + Registering a nickname is useful to preserve your identity on IRC, and to be able to use always the same nickname. In some cirtumstances, some IRC channels may be configured to accept only registered nickname.

@@ -31,8 +31,14 @@

If you have registered your nickname with a password on a network that supports nickname registration, you can use that password with Empathy to identify yourself as - the owner of the nickname. + the owner of that nickname.

+ + +

+ Not all the IRC servers support nickname registration. +

+ @@ -74,14 +80,13 @@ Enable the account by selecting the Enabled check-box next to the name of the account.

+

+ Once connected, you will receive a message from the nickname server that will + tell you of the established identification. +

-

- Once you are connected, you will receive a message from the nickname server that will - tell you of the established identification. -

-

At the moment it is not possible to register an IRC nickname with Empathy, it is diff --git a/help/C/irc-sending-file.page b/help/C/irc-sending-file.page new file mode 100644 index 000000000..804efa9fa --- /dev/null +++ b/help/C/irc-sending-file.page @@ -0,0 +1,27 @@ + + + + + + Send a file from your computer to one of the IRC contacts. + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Send files + +

+ At the moment it is not possible to send files using IRC. +

+ + diff --git a/help/C/irc-start-conversation.page b/help/C/irc-start-conversation.page new file mode 100644 index 000000000..0f73bdad6 --- /dev/null +++ b/help/C/irc-start-conversation.page @@ -0,0 +1,62 @@ + + + + + Start a conversation witn an IRC contact. + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Start a conversation + + + +

+ To start a private conversation with one of the IRC contacts that + are in a room, after you joined a room, from the IRC room contact list perform + one of the following: +

+ + +

+ Double-click the name of contact you want to have a conversation with. +

+ + +

+ Right-click on the name of the contact you want to have a conversation with, + and select Chat. +

+ + + + + + + +

+ The IRC room contact list is not the same as Empathy Contact List, + and is relative only to the IRC room you joined. Different rooms can have different + contacts listed. +

+ + +

+ The IRC room contact list is usually on the right side of the IRC room window. If you + do not see it, choose + ConversationShow Contact List. +

+ + + + diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page index 71caf567e..1daf61406 100644 --- a/help/C/prob-conn-acctdisabled.page +++ b/help/C/prob-conn-acctdisabled.page @@ -8,11 +8,16 @@ The instant messaging account that you want to use is not enabled in the list of accounts. - + + Phil Bull philbull@gmail.com + + Milo Casagrande + milo@ubuntu.com + 2009 GNOME Documentation Project @@ -20,32 +25,43 @@ -My account is not enabled + My account is not enabled -

-If the instant messaging account that you want to use is not enabled in the -drop-down account list when you try to start a new conversation or join a -chat, your account details may not be correct. -

+

+ If the instant messaging account that you want to use is not enabled in the + drop-down account list when you try to start a new conversation or join a + room, your account details may not be correct. +

- - -

- Click EditAccounts and make sure - that the Enabled checkbox is checked. -

- - -

- Make sure that your username and password are correct. -

- - -

- Expand the Advanced section of the Accounts - window and make sure that all of the server settings are correct. -

- - + + +

+ Make sure that you are connected to the Internet, or to a local area network. +

+ + +

+ Choose EditAccounts and select the account + that is not working. +

+ + +

+ Type your username and password again to make sure that they are correct. +

+ + +

+ Check in the Advanced section that all the details are correct. + You should be able to find these details from the website of the messaging service. +

+ + +

+ Check that the Enabled check-box next to the name of your account is selected. + If it is not, select the check-box to enalbe the account. +

+ + diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page index e49167299..3188b261b 100644 --- a/help/C/prob-conn-auth.page +++ b/help/C/prob-conn-auth.page @@ -6,23 +6,23 @@ - An error message appears in the main window saying that - "Authentication failed". + An error message which says "Authentication failed" appears in the main window. - - - - + + + Phil Bull philbull@gmail.com - + + Milo Casagrande + milo@ubuntu.com + 2009 GNOME Documentation Project - @@ -37,26 +37,38 @@

- If you try to connect and you get a message saying Authentication failed, - your instant messaging service is not allowing you to connect because it does not - recognize your username or password for some reason. + This kind of error happens when your instant messaging service is not allowing + you to connect because it does not recognize your username or password for some reason.

- + + +

+ Make sure that you are connected to the Internet, or to a local area network. +

+ + +

+ Make sure that you have registered an account with the service you are trying + to connect to. If you do not have an account, most services will not allow + you to connect. +

+ + +

+ Click on the Edit Account button in the error message. +

+

- Make sure that you have registered for an account with the service you - are trying to connect to. If you do not have an account, most services - will not allow you to connect. + Type your username and password again to make sure that they are correct.

- Click the Edit Account button in the error message. Type - your username and password again to make sure that they are correct. - Deselect the Enabled box next to the name of your account and - then select it to try to connect to the service again. + Deselect the Enabled check-box next to the name of your account, + and then select it again to try to reconnect to the service.

- + diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page index 98e17c36c..3e4edd40c 100644 --- a/help/C/prob-conn-name.page +++ b/help/C/prob-conn-name.page @@ -6,10 +6,10 @@ - An error message appears in the main Empathy window which says - "Name in use". + An error message which says "Name in use" appears in the main window. + Milo Casagrande milo@ubuntu.com @@ -21,39 +21,42 @@ - - I get a message that says "Name in use"

This kind of error happens when you try to connect to your IRC account and - you are using a nickname that is being used by someone else on that particular + you are using a nickname that is already being used by someone else on that particular network.

-

- To resolve this problem, click on the Edit Account button and - perform one of the following: -

- - +

- Change your nickname. + Click on the Edit Account button in the error message.

+ + + +

+ In the Nickname text box, type a new nickname. +

+ + +

+ If you have registered that nickname within the network you are using, + set the password for that nickname. For more information, + see . +

+ + +

- Set the password for that nickname, if you have registered that nickname - within the network you are using. For more information, - see . + Deselect the Enabled check-box next to the name of your account, + and then select it again to try to reconnect to the service.

- + diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page index f15a4c86c..8001ed49b 100644 --- a/help/C/prob-conn-neterror.page +++ b/help/C/prob-conn-neterror.page @@ -6,14 +6,18 @@ - An error message appears in the main Empathy window which says - "Network error". + An error message which says "Network error" appears in the main window. + Phil Bull philbull@gmail.com + + Milo Casagrande + milo@ubuntu.com + 2009 GNOME Documentation Project @@ -21,47 +25,50 @@ - - -I get a message that says "Network error" + I get a message that says "Network error" -

-If you try to connect and an error message appears in the main Empathy -window which says "Network error", Empathy cannot communicate with -the instant messaging service for some reason. -

+

+ This kind of error happens when Empathy cannot communicate + with the instant messaging service for some reason. +

+

+ Also, this kind of error happens when you try to use an IRC account without + setting a nickname. +

- - -

- Check that you are connected to the Internet or network. -

- - - - -

- Click the Edit Account button in the error message. -

- + + +

+ Make sure that you are connected to the Internet, or to a local area network. +

+ + +

+ Click on the Edit Account button in the error message. +

+ + + -

- Expand the Advanced section and make sure that the details - such as server address and port are correct. You should be able to find - these details from the website of the messaging service. -

+

+ Check in the Advanced section that all the details are correct. + You should be able to find these details from the website of the messaging service. +

-

- Uncheck the Enabled box next to the name of your account and - then check it again to try to connect to the service again. -

+

+ In the case of an IRC account, type your nickname in the Nickname + text box. +

- - - + + + +

+ Deselect the Enabled check-box next to the name of your account, + and then select it again to try to reconnect to the service. +

+ + diff --git a/help/C/send-file.page b/help/C/send-file.page index 7d7b2ab7d..bbe4302cf 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -7,7 +7,7 @@ Send a file from your computer to one of your contacts. - + Phil Bull philbull@gmail.com @@ -65,6 +65,13 @@

+ +

+ In order to send a file to someone, you need to be connected to the Internet, or to + a local area network. +

+ +

If your contact accepts the file transfer, you can watch the progress of the transfer and see the estimated amount of time remaining before it is complete. @@ -80,11 +87,4 @@ list and will not delete them from your computer.

- -

- In order to send a file to someone, you need to be connected to the Internet, or to - a local area network. -

- - diff --git a/help/C/start-conversation.page b/help/C/start-conversation.page new file mode 100644 index 000000000..d7123c4e4 --- /dev/null +++ b/help/C/start-conversation.page @@ -0,0 +1,71 @@ + + + + + + + General method to start a conversation. + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Start a conversation + + + +

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

+ + +

+ Choose ChatNew conversation. +

+ + +

+ Press CtrlN. +

+ + + + +

+ From the Account drop-down list, select the account you want to + use for the conversation. +

+

+ This one is one of your accounts. +

+ + +

+ In the Contact ID text box, type the identifier of the contact you want to + have a conversation with. +

+

+ You have to enter the identifier as it has been inserted when adding a new contact to + your contact list. If you are trying to start a conversation using one of your IRC + accounts or a SIP account, you have to enter the exact nickname or the + exact SIP address of the contact. +

+ + +

+ To start a text conversation, click on Chat; to start + an audio conversation, click on Call. +

+ + + + -- cgit v1.2.3 From 0f931106903b01f7ec5a56e357dc704e913ab720 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Fri, 14 Aug 2009 21:29:00 +0200 Subject: [help] Remove comment sections * Removed comment sections as they show up in the po * Fixed some revision sections --- help/C/add-contact.page | 6 ----- help/C/irc-manage.page | 9 ------- help/C/offline-contacts.page | 13 ++-------- help/C/prob-conn-auth.page | 11 ++------- help/C/prob-conn.page | 56 +++++++++++++++----------------------------- help/C/status-icons.page | 12 ---------- 6 files changed, 23 insertions(+), 84 deletions(-) (limited to 'help/C') diff --git a/help/C/add-contact.page b/help/C/add-contact.page index fbde28774..e435a9404 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -21,12 +21,6 @@ Add someone to your list of contacts - - Phil Bull -

Instructions need review, didn't test with other IM services to confirm - the names of the textboxes. Also, check the name of the Add button.

- -

diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page index 081c7e2c3..bceef3660 100644 --- a/help/C/irc-manage.page +++ b/help/C/irc-manage.page @@ -21,15 +21,6 @@ Use IRC - - Milo Casagrande -

- Guide page for all the IRC related actions. Need to work on this page - if the content starts to grow. In case we don't have a lot of contets for - this page, rework the other. -

- -
IRC rooms and conversations
diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page index 6fa8c51ee..b3f30f6cd 100644 --- a/help/C/offline-contacts.page +++ b/help/C/offline-contacts.page @@ -7,9 +7,8 @@ How to see the contacts that are not online. - - - + + Milo Casagrande milo@ubuntu.com @@ -18,19 +17,11 @@ 2009 GNOME Documentation Project - Display offline contacts - - Milo Casagrande -

- Need to rework on the terminology used. -

- -

diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page index 3188b261b..a0d5c187d 100644 --- a/help/C/prob-conn-auth.page +++ b/help/C/prob-conn-auth.page @@ -6,7 +6,8 @@ - An error message which says "Authentication failed" appears in the main window. + An error message which says "Authentication failed" appears + in the main window. @@ -28,14 +29,6 @@ I get a message that says "Authentication failed" - - Milo Casagrande -

- Could be useful to link here how to change your password or how to - recover it. Need to write that section. -

- -

This kind of error happens when your instant messaging service is not allowing you to connect because it does not recognize your username or password for some reason. diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page index 137a58770..400793a7b 100644 --- a/help/C/prob-conn.page +++ b/help/C/prob-conn.page @@ -2,43 +2,25 @@ type="guide" id="prob-conn"> - - - - Diagnose common problems connecting to an instant messaging service. - - - - - Phil Bull - philbull@gmail.com - - - 2009 - GNOME Documentation Project - + + + + Diagnose common problems connecting to an instant messaging service. + + + + + + Phil Bull + philbull@gmail.com + + + 2009 + GNOME Documentation Project + + + - - - -Problems connecting to an instant messaging service - - - Phil Bull -

This is a stub. We should identify the most common causes for a user not - being able to connect and document those.

- - - - Phil Bull -

Check whether gui tags are allowed in section titles and descs.

- - Milo Casagrande -

- You can... but the end result is not very good: the title is in blue and the - gui element in grey. -

- - + Problems connecting to an instant messaging service diff --git a/help/C/status-icons.page b/help/C/status-icons.page index cc561cb89..5510f92c0 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -8,7 +8,6 @@ - Milo Casagrande milo@ubuntu.com @@ -17,22 +16,11 @@ 2009 GNOME Documentation Project - Status icons - - Milo Casagrande -

- Need to understand when the extended away icon is used: how many minuts/hours should pass? -

-

- Need also to check for images to work! -

- - -- cgit v1.2.3 From 1b68597e6f4da4c6cdf6e6567aa70b0844dfaf04 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Fri, 14 Aug 2009 21:56:01 +0200 Subject: [help] Fixed last revision sections * Fixed some revision sections * Added credit and copyright where missing --- help/C/audio-call.page | 10 +++++++++- help/C/audio-video.page | 11 ++++++++++- help/C/group-conversations.page | 2 ++ help/C/index.page | 6 ++---- help/C/irc-join-pwd.page | 2 -- help/C/irc-nick-password.page | 1 - help/C/salut-protocol.page | 13 ++----------- help/C/send-file.page | 1 - help/C/send-message.page | 5 ++--- help/C/set-custom-status.page | 5 ++++- help/C/share-desktop.page | 1 - help/C/status-icons.page | 1 + help/C/video-call.page | 11 ++++++++++- 13 files changed, 42 insertions(+), 27 deletions(-) (limited to 'help/C') diff --git a/help/C/audio-call.page b/help/C/audio-call.page index 116f4a8f8..575c6af1e 100644 --- a/help/C/audio-call.page +++ b/help/C/audio-call.page @@ -10,7 +10,15 @@ - + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + Start an audio conversation diff --git a/help/C/audio-video.page b/help/C/audio-video.page index 244ed2c4b..f1f01f62f 100644 --- a/help/C/audio-video.page +++ b/help/C/audio-video.page @@ -8,7 +8,16 @@ When it is possible to have an audio or video conversation. - + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + Audio and video conversations diff --git a/help/C/group-conversations.page b/help/C/group-conversations.page index d56a7f86d..ee5eb8217 100644 --- a/help/C/group-conversations.page +++ b/help/C/group-conversations.page @@ -11,5 +11,7 @@ Group conversations + + diff --git a/help/C/index.page b/help/C/index.page index 729271b3e..068226625 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -3,9 +3,8 @@ id="index"> - - - + + Milo Casagrande milo@ubuntu.com @@ -14,7 +13,6 @@ 2009 GNOME Documentation Project - diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page index e672bbe68..67de473bd 100644 --- a/help/C/irc-join-pwd.page +++ b/help/C/irc-join-pwd.page @@ -7,7 +7,6 @@ Join a password protected room. - Milo Casagrande milo@ubuntu.com @@ -16,7 +15,6 @@ 2009 GNOME Documentation Project - diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page index c0e9328a9..63cdd0965 100644 --- a/help/C/irc-nick-password.page +++ b/help/C/irc-nick-password.page @@ -16,7 +16,6 @@ 2009 GNOME Documentation Project - diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page index 8b23acac6..eb0461bfd 100644 --- a/help/C/salut-protocol.page +++ b/help/C/salut-protocol.page @@ -7,8 +7,8 @@ Undesrtanding the Salut protocol. - - + + Milo Casagrande milo@ubuntu.com @@ -17,20 +17,11 @@ 2009 GNOME Documentation Project - What is the <em>Salut</em> service? - - Milo Casagrande -

- Need to work on this section, explaining people in clear words - what the hell is this service! -

- -

The Salut service is a serverless communication service: you do not need to connect and authenticate to a central server in diff --git a/help/C/send-file.page b/help/C/send-file.page index bbe4302cf..65ac170d3 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -20,7 +20,6 @@ 2009 GNOME Documentation Project - diff --git a/help/C/send-message.page b/help/C/send-message.page index bdf1c7341..997236ccb 100644 --- a/help/C/send-message.page +++ b/help/C/send-message.page @@ -5,8 +5,8 @@ Send a message to one of your contacts. - - + + Phil Bull philbull@gmail.com @@ -15,7 +15,6 @@ 2009 GNOME Documentation Project - diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page index 36656a16f..8941aa728 100644 --- a/help/C/set-custom-status.page +++ b/help/C/set-custom-status.page @@ -15,11 +15,14 @@ Jim Campbell jwcampbell@gmail.com + + Milo Casagrande + milo@ubuntu.com + 2009 GNOME Documentation Project - diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page index de7957791..b855a47f6 100644 --- a/help/C/share-desktop.page +++ b/help/C/share-desktop.page @@ -17,7 +17,6 @@ 2009 GNOME Documentation Project - diff --git a/help/C/status-icons.page b/help/C/status-icons.page index 5510f92c0..35c91e543 100644 --- a/help/C/status-icons.page +++ b/help/C/status-icons.page @@ -8,6 +8,7 @@ + Milo Casagrande milo@ubuntu.com diff --git a/help/C/video-call.page b/help/C/video-call.page index 1f65c6085..412644b4f 100644 --- a/help/C/video-call.page +++ b/help/C/video-call.page @@ -9,7 +9,16 @@ Start a video conversation with one of your contacts. - + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + Start a video conversation -- cgit v1.2.3 From 432cd81fa944fad28041c93c3ad519fca407ca05 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 16 Aug 2009 22:23:41 +0200 Subject: [help] Added new topic: small introduction Updated the pictures of the main window Added the new file to help Makefile --- help/C/figures/empathy-main-window.png | Bin 8902 -> 7703 bytes help/C/introduction.page | 45 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 help/C/introduction.page (limited to 'help/C') diff --git a/help/C/figures/empathy-main-window.png b/help/C/figures/empathy-main-window.png index 12a6a33fc..bb803442f 100644 Binary files a/help/C/figures/empathy-main-window.png and b/help/C/figures/empathy-main-window.png differ diff --git a/help/C/introduction.page b/help/C/introduction.page new file mode 100644 index 000000000..8305fab29 --- /dev/null +++ b/help/C/introduction.page @@ -0,0 +1,45 @@ + + + + + + + Introduction to the Empathy instant messenger. + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Introduction + +

+ Empathy is an instant messaging application for the GNOME Desktop. + It supports text messaging, voice & video call even using SIP, + file transfers and all the most used messaging systems such as MSN and Google Talk. +

+

+ Empathy includes features that help you better collaborate while at work, + and that let you easily keep in touch with your friends. +

+

+ You can group all the conversations on a single window, or have multiple windows for + different kind of conversations; easily search through your previous conversations, and + share your desktop in just two clicks. +

+ +

+ + Empathy main window + +

+ + -- cgit v1.2.3 From af580dfdb1095e9fa76fdc5b8c9f548e1463a3ab Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Sun, 16 Aug 2009 22:25:37 +0200 Subject: [help] Removed unused picture (extended-away) --- help/C/figures/extended-away.png | Bin 752 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 help/C/figures/extended-away.png (limited to 'help/C') diff --git a/help/C/figures/extended-away.png b/help/C/figures/extended-away.png deleted file mode 100644 index ca26ae5d8..000000000 Binary files a/help/C/figures/extended-away.png and /dev/null differ -- cgit v1.2.3 From 80796607c55a6e27e051cd6ca0d43df43ddcb238 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Mon, 17 Aug 2009 14:38:43 +0200 Subject: [help] Wrote the group conversations topic Removed one image from the Makefile, image removed yesterday --- help/C/group-conversations.page | 75 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 2 deletions(-) (limited to 'help/C') diff --git a/help/C/group-conversations.page b/help/C/group-conversations.page index ee5eb8217..dff7eb478 100644 --- a/help/C/group-conversations.page +++ b/help/C/group-conversations.page @@ -8,10 +8,81 @@ Start a group conversation with your contacts. - + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + Group conversations - +

+ Group conversations permits you to have text conversations with more than one + contact at the same time. +

+

+ To have a group conversation you need to have a registered account with either + Jabber or Google Talk, or a Salut account. +

+ +

+ You can have a group conversation with contacts that are using the same service + as yours. +

+ + + +

+ From the Contact List window, choose RoomJoin. +

+ + +

+ From the Account drop-down list, select the account you want to use + for the group conversation. +

+ + +

+ In the Room text box, type the name you want to give to the conversation. +

+ +

+ This will be the name of the room you are going to have a conversation. This + name will be publicly available for other people to join. It is not possible + to create a private room. +

+ + + +

+ To invite other contacts to join the group conversation, from the + Contact List window, select the contact you want to invite, + and perform one of the following: +

+ + +

+ Right-click on the contact, and select Invite to chatroom. +

+ + +

+ Choose EditContactInvite to chatroom. +

+ + +

+ If you have more than one group conversation open, select the one you want to invite + your contacts. +

+ + -- cgit v1.2.3 From 1e19000ef22ebfadf394ef823d6562bbac3ecb57 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Mon, 17 Aug 2009 23:01:18 +0200 Subject: [help] Reworked two topics, added a new one * introduction: some wordings * group-conversations: moved from advanced to text conversations section reworked the topic * prev-conv: added stub topic for searching previous conversations --- help/C/group-conversations.page | 62 +++++++++++++++++++++++++++++++++++++---- help/C/introduction.page | 9 +++--- help/C/prev-conv.page | 24 ++++++++++++++++ 3 files changed, 86 insertions(+), 9 deletions(-) create mode 100644 help/C/prev-conv.page (limited to 'help/C') diff --git a/help/C/group-conversations.page b/help/C/group-conversations.page index dff7eb478..fcc0b4365 100644 --- a/help/C/group-conversations.page +++ b/help/C/group-conversations.page @@ -3,12 +3,13 @@ id="group-conversations"> - + - Start a group conversation with your contacts. + Start or join a group conversation with your contacts. + Milo Casagrande milo@ubuntu.com @@ -30,12 +31,18 @@ To have a group conversation you need to have a registered account with either Jabber or Google Talk, or a Salut account.

+

- You can have a group conversation with contacts that are using the same service - as yours. + You can have a group conversation only with the contacts that are using the + same service as yours.

+ +
+ + Start a group conversation +

@@ -48,6 +55,15 @@ for the group conversation.

+ +

+ In the Server text box, type the name of server in which the conversation + will be hosted. +

+

+ Leave it empty if it will be on the current server. +

+

In the Room text box, type the name you want to give to the conversation. @@ -74,7 +90,7 @@

- Choose EditContactInvite to chatroom. + Choose EditContactInvite to chatroom.

@@ -84,5 +100,41 @@

+ +
+ +
+ + Join a group conversation + + + +

+ From the Contact List window, choose + RoomJoin. +

+ + +

+ Expand the Room List section to see all the existing rooms. +

+ + +

+ Double-click on the name of a room to join it. +

+ + + +

+ It is not possible to join all existing rooms. Some of the rooms might require a + password, or might be invitation only. Empathy does not support these + kind of rooms. +

+ + + +
diff --git a/help/C/introduction.page b/help/C/introduction.page index 8305fab29..58311b17b 100644 --- a/help/C/introduction.page +++ b/help/C/introduction.page @@ -5,6 +5,7 @@ + Introduction to the Empathy instant messenger. @@ -23,22 +24,22 @@

Empathy is an instant messaging application for the GNOME Desktop. - It supports text messaging, voice & video call even using SIP, - file transfers and all the most used messaging systems such as MSN and Google Talk. + It supports text messaging, voice & video call, file transfers and all the + most used messaging systems such as MSN and Google Talk.

Empathy includes features that help you better collaborate while at work, and that let you easily keep in touch with your friends.

- You can group all the conversations on a single window, or have multiple windows for + You can group all the conversations in a single window, or have multiple windows for different kind of conversations; easily search through your previous conversations, and share your desktop in just two clicks.

- Empathy main window + Empathy main window.

diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page new file mode 100644 index 000000000..ed59892be --- /dev/null +++ b/help/C/prev-conv.page @@ -0,0 +1,24 @@ + + + + + + Search your previous conversations. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Previous conversations + + -- cgit v1.2.3 From 447b48d17a454ccf32ab21f7426cdd28b1399979 Mon Sep 17 00:00:00 2001 From: Shaun McCance Date: Tue, 18 Aug 2009 10:02:01 -0500 Subject: [help] Fixed validity errors in audio-video and salut-protocol --- help/C/audio-video.page | 54 +++++++++++++++++++++++----------------------- help/C/salut-protocol.page | 4 ++-- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'help/C') diff --git a/help/C/audio-video.page b/help/C/audio-video.page index f1f01f62f..cef06e126 100644 --- a/help/C/audio-video.page +++ b/help/C/audio-video.page @@ -93,52 +93,52 @@
- - + - + +

- - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + +
+

Protocol / Service -

+

Video conversations -

+

Audio conversations -

AIMNoNo

AIM

No

No
Google TalkYesYes

Google Talk

Yes

Yes
ICQNoNo

ICQ

No

No
JabberYesYes

Jabber

Yes

Yes
MSNNoNo

MSN

No

No
SalutNoNo

Salut

No

No
Yahoo!NoNo

Yahoo!

No

No
diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page index eb0461bfd..176921e4c 100644 --- a/help/C/salut-protocol.page +++ b/help/C/salut-protocol.page @@ -7,8 +7,8 @@ Undesrtanding the Salut protocol. - - + + Milo Casagrande milo@ubuntu.com -- cgit v1.2.3 From 2492382f950439be2e9b44362e091155b0589616 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Tue, 18 Aug 2009 23:21:44 +0200 Subject: [help] Wrote most of the previous conversations topic, needs more work --- help/C/prev-conv.page | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) (limited to 'help/C') diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page index ed59892be..de9e0f246 100644 --- a/help/C/prev-conv.page +++ b/help/C/prev-conv.page @@ -21,4 +21,107 @@ Previous conversations +

+ Empathy automatically saves all your text conversations with your contacts, + and you can 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 search to a particular + contact and conversation, and permits you to look at all the previous + conversations you had with your contacts. +

+ + +

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

+ + + + +

+ To start searching your previous conversations, perform one of the following: +

+ + +

+ Press F3. +

+ + +

+ Choose ViewPrevious Conversations. +

+ + + + +

+ Based on the kind of search you want to perform, see + or + for more information. +

+ + + + + + + -- cgit v1.2.3 From 8bbfd2d8f92eb025364b9f8cda055259a6fd15ce Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Wed, 19 Aug 2009 23:15:24 +0200 Subject: [help] Wrote the previous conversations and the geolocation topics * Added al the new pages to Makefile * Fixed a typo in irc-manage --- help/C/geolocation-not-showing.page | 37 +++++++++++++++ help/C/geolocation-privacy.page | 89 +++++++++++++++++++++++++++++++++++++ help/C/geolocation-supported.page | 47 ++++++++++++++++++++ help/C/geolocation-turn.page | 59 ++++++++++++++++++++++++ help/C/geolocation-what-is.page | 58 ++++++++++++++++++++++++ help/C/geolocation.page | 33 ++++++++++++++ help/C/irc-manage.page | 2 +- help/C/prev-conv.page | 44 ++++++++++++++---- 8 files changed, 359 insertions(+), 10 deletions(-) create mode 100644 help/C/geolocation-not-showing.page create mode 100644 help/C/geolocation-privacy.page create mode 100644 help/C/geolocation-supported.page create mode 100644 help/C/geolocation-turn.page create mode 100644 help/C/geolocation-what-is.page create mode 100644 help/C/geolocation.page (limited to 'help/C') diff --git a/help/C/geolocation-not-showing.page b/help/C/geolocation-not-showing.page new file mode 100644 index 000000000..845f7e74b --- /dev/null +++ b/help/C/geolocation-not-showing.page @@ -0,0 +1,37 @@ + + + + + + Empathy does not publish my geographical position. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Geographical position not published + +

+ If your contacts cannot see your location, Empathy might not be able + to discover with a good margin of precision your geographical position. +

+

+ In this case, your position will not be published, but you are still able to + see the location of your contacts. +

+

+ If you want to publish your geographical position, you can try to use an + external device such as a GPS. +

+ + diff --git a/help/C/geolocation-privacy.page b/help/C/geolocation-privacy.page new file mode 100644 index 000000000..23694e2b7 --- /dev/null +++ b/help/C/geolocation-privacy.page @@ -0,0 +1,89 @@ + + + + + + What information are sent and to who. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Geolocation privacy + +
+ What are the information sent +

+ What is possible to send is: your country, region, locality, area, street, building, + floor, room, and postal code, longitude, latitude and altitude, speed and bearing. +

+

+ The accuracy and the quantity of information about your geographical position are based + on the software or on the infrastructure used to discover your position. +

+

+ Different kind of networks may have different accuracy settings, and may send + different information. The use of external devices such as GPS or mobile phone + will increase the accuracy of the information sent. +

+

+ When the privacy mode is enabled, nothing more precise than your city will be + sent, even if you are using an external device. +

+
+ +
+ Who can see the information sent +

+ Only your contacts can see your geographical position. +

+
+ +
+ What is the privacy mode +

+ The privacy mode, enabled by default, is a reduced accuracy mode that will + decrease the accuracy of the geographical position sent to your contacts. +

+
+ +
+ Privacy overview +

+ Overview of the various geolocation privacy settings in Empathy. +

+ + +

+ Geolocation is not enabled by default. +

+ + +

+ Privacy mode is enabled by default. +

+ + +

+ Privacy mode prevails even when using external and more precise devices. +

+ + +

+ Only your contacts can see your position. +

+ + +
+ + diff --git a/help/C/geolocation-supported.page b/help/C/geolocation-supported.page new file mode 100644 index 000000000..f67b43755 --- /dev/null +++ b/help/C/geolocation-supported.page @@ -0,0 +1,47 @@ + + + + + Services that supports geolocation and compatibility. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Supported services + +

+ The geolocation feature at the moment is compatible only with the Jabber service. + In order to use it, you and your contacts need to have a Jabber account. +

+ + +

+ It is necessary that also the server you are using supports the geolocation + feature. Most of the Jabber servers support it. See your service website + documentation for more information. +

+ + +
+ Compatibility + +

+ Empathy geolocation feature is not compatible with other geographical + position services such as Google Latitude, Yahoo Fire Eagle + or Brightkite. +

+ +
+ + diff --git a/help/C/geolocation-turn.page b/help/C/geolocation-turn.page new file mode 100644 index 000000000..6c01be90b --- /dev/null +++ b/help/C/geolocation-turn.page @@ -0,0 +1,59 @@ + + + + + + + How to activate and deactivate geolocation in Empathy. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Activate/Deactivate geolocation + + + +

+ Choose EditPreferences. +

+ + +

+ Select the Location tab. +

+ + +

+ Select Publish location to my contacts to activate geolocation. +

+

+ To deactivate geolocation, deselect it. +

+ + +

+ To increase the accuracy of your position, deselect + Reduce location accuracy. +

+ + +

+ If you have an external device like a GPS or want to send a more accurate + position, select the appropriate option in the Geoclue Settings + section. +

+ + + + diff --git a/help/C/geolocation-what-is.page b/help/C/geolocation-what-is.page new file mode 100644 index 000000000..fdbf0adbd --- /dev/null +++ b/help/C/geolocation-what-is.page @@ -0,0 +1,58 @@ + + + + + + + Understanding geolocation. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + What is geolocation + +

+ With geolocation it is intended the possibility to identify the real + geographical position of a computer or a device connected to the Internet. +

+

+ With geolocation in Empathy you can: +

+ + +

+ Publish your geographical position to your contacts. +

+ + +

+ See your contacts geographical position and quickly contact them. +

+ + +

+ Set the accuracy of your position and the device used to discover your + position. +

+ + + + +

+ In order to see your contacts geographical position, they need to use a + service and an application that support geolocation. +

+ + + diff --git a/help/C/geolocation.page b/help/C/geolocation.page new file mode 100644 index 000000000..409d22f49 --- /dev/null +++ b/help/C/geolocation.page @@ -0,0 +1,33 @@ + + + + + + Use and understand geolocation in Empathy. + + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Geographical position + +
+ Geolocation +
+ +
+ Fix common problems +
+ + diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page index bceef3660..07b6163f0 100644 --- a/help/C/irc-manage.page +++ b/help/C/irc-manage.page @@ -5,7 +5,7 @@ - Hot to use IRC with Empathy. + How to use IRC with Empathy. diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page index de9e0f246..b521ada59 100644 --- a/help/C/prev-conv.page +++ b/help/C/prev-conv.page @@ -8,6 +8,7 @@ Search your previous conversations. + Milo Casagrande milo@ubuntu.com @@ -22,16 +23,16 @@ Previous conversations

- Empathy automatically saves all your text conversations with your contacts, - and you can perform two different kinds of search: a normal text search, or a - per-conversation search. + 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 search to a particular + 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.

@@ -46,7 +47,8 @@

- To start searching your previous conversations, perform one of the following: + To start searching your previous conversations, from the Contact List + window, perform one of the following:

@@ -92,7 +94,10 @@

Click on the result to see the exact text you were searching for on the - bottom pane. The search result will be highlighted. + bottom pane. +

+

+ The search results will be highlighted.

@@ -114,11 +119,32 @@

From the left top pane, select the contact you want to look the previous - conversations of. + conversations of. The previous conversations will be shown on the right pane. +

+

+ By default, the last conversation you had will be shown. +

+ +

+ Based on your account selected and the service of that account, it will + be possible to select contacts, IRC rooms or group conversations. +

+ + + +

+ From the left bottom pane, you can browse your conversations by date. Based + on the contact selected, the date in which you had a conversation will + be highlighted in bold text. +

+ + +

+ To perform a text search, type the text you want to search in the text box + at the top of the window.

- Based on your account selected, and the service of the account, in this - pane it will be possible to select contacts, IRC rooms or group conversations. + The search results will be highlighted.

-- cgit v1.2.3 From 92954d703c6fa0eefe4b0963c9d28842c06fc10d Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Thu, 20 Aug 2009 17:03:19 +0200 Subject: [help] Moved license from US version to unported one --- help/C/legal.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'help/C') diff --git a/help/C/legal.xml b/help/C/legal.xml index 6f643bec5..86d6173ad 100644 --- a/help/C/legal.xml +++ b/help/C/legal.xml @@ -1,8 +1,8 @@ + href="http://creativecommons.org/licenses/by-sa/3.0/">

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

+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.

-- cgit v1.2.3 From 7982aefa5551c0aea59e85f9cef68b40016ad329 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Thu, 20 Aug 2009 21:00:29 +0200 Subject: [help] Modified the description of a topic, removed useless spaces --- help/C/set-custom-status.page | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'help/C') diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page index 8941aa728..2fe944085 100644 --- a/help/C/set-custom-status.page +++ b/help/C/set-custom-status.page @@ -7,7 +7,7 @@ - Set a personal message for your status. + Add, edit or delete personal messages for your status. @@ -30,7 +30,7 @@

Sometimes you may want to set a custom message for your status, for example to let - people know that you will be unavailable for a certain period of time. + people know that you will be unavailable for a certain period of time.

It is possible to set a custom message based on the different statuses available. @@ -40,30 +40,30 @@

From the Contact List window, click on the drop-down list at - the top. + the top.

Select the status you want to add a custom message to. You have to select the one - identified with the label Custom Message. + identified with the label Custom Message.

Enter your custom message in the text box at the top of the window, and - press Enter to set the message. + press Enter to set the message.

If you want to set the custom message as a favorite, saving it in order to use it - again, click on the little star on the right of the text box where you wrote your - custom message. + again, click on the little star on the right of the text box where you wrote your + custom message.

If you do not do it, the custom message will not be available the next time you - use Empathy. It will be saved only for the current session. + use Empathy. It will be saved only for the current session.

@@ -76,7 +76,7 @@

From the Contact List window, click on the drop-down list at - the top. + the top.

@@ -94,7 +94,7 @@

From the Saved Presets box, select the status message - you want to edit and double-click on it. + you want to edit and double-click on it.

@@ -112,7 +112,7 @@

From the Saved Presets box, select the status message you want - to remove. + to remove.

@@ -130,7 +130,7 @@

Click on the drop-down list to select the status you want to set a custom - message to. + message to.

@@ -157,7 +157,7 @@

When you edit or add a new custom message, it will not be set as the current - status message. You will need to select it from the Contact List window. + status message. You will need to select it from the Contact List window.

-- cgit v1.2.3 From 889874e15d3c5848e89af1b488f1e31be8813da8 Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Fri, 21 Aug 2009 10:35:43 +0200 Subject: [help] Set a fixed 2column style even for the index page Converted some notes into tips --- help/C/add-account.page | 12 +++++++----- help/C/audio-call.page | 2 +- help/C/create-account.page | 2 +- help/C/geolocation-what-is.page | 2 +- help/C/index.page | 1 + help/C/introduction.page | 2 +- help/C/irc-account.page | 2 +- help/C/irc-join-room.page | 2 +- help/C/set-custom-status.page | 2 +- help/C/share-desktop.page | 2 +- help/C/video-call.page | 2 +- 11 files changed, 17 insertions(+), 14 deletions(-) (limited to 'help/C') diff --git a/help/C/add-account.page b/help/C/add-account.page index 2fa344cfb..5821a856c 100644 --- a/help/C/add-account.page +++ b/help/C/add-account.page @@ -85,10 +85,12 @@ -

- If you want to change the name that identifies the account in the Accounts - dialog, double-click on the name of the account in the box on the left of the dialog - and type the new name. -

+ +

+ If you want to change the name that identifies the account in the Accounts + dialog, double-click on the name of the account in the box on the left of the dialog + and type the new name. +

+ diff --git a/help/C/audio-call.page b/help/C/audio-call.page index 575c6af1e..8c18b9453 100644 --- a/help/C/audio-call.page +++ b/help/C/audio-call.page @@ -56,7 +56,7 @@

- +

To turn an audio conversation into a video one, from the call window select CallSend video, diff --git a/help/C/create-account.page b/help/C/create-account.page index 203818c7f..46f58395e 100644 --- a/help/C/create-account.page +++ b/help/C/create-account.page @@ -61,7 +61,7 @@

Jabber

- +

It is possible to use the automatic creation of accounts with this service. Not all the service providers support it. diff --git a/help/C/geolocation-what-is.page b/help/C/geolocation-what-is.page index fdbf0adbd..77fcff8dd 100644 --- a/help/C/geolocation-what-is.page +++ b/help/C/geolocation-what-is.page @@ -48,7 +48,7 @@ - +

In order to see your contacts geographical position, they need to use a service and an application that support geolocation. diff --git a/help/C/index.page b/help/C/index.page index 068226625..a57596560 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -1,5 +1,6 @@ diff --git a/help/C/introduction.page b/help/C/introduction.page index 58311b17b..23255b7b1 100644 --- a/help/C/introduction.page +++ b/help/C/introduction.page @@ -38,7 +38,7 @@

- + Empathy main window.

diff --git a/help/C/irc-account.page b/help/C/irc-account.page index 1f81eb593..dd43fbb97 100644 --- a/help/C/irc-account.page +++ b/help/C/irc-account.page @@ -118,7 +118,7 @@ and type the new name.

- +

If you want to use different networks at the same time, you need to create an account with each one of the networks you want to use. diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page index c196f2055..8461b1de1 100644 --- a/help/C/irc-join-room.page +++ b/help/C/irc-join-room.page @@ -46,7 +46,7 @@ - +

To join multiple rooms, you need to repeat the steps above for each room.

diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page index 2fe944085..6b9dabe50 100644 --- a/help/C/set-custom-status.page +++ b/help/C/set-custom-status.page @@ -154,7 +154,7 @@ - +

When you edit or add a new custom message, it will not be set as the current status message. You will need to select it from the Contact List window. diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page index b855a47f6..06a3d7c40 100644 --- a/help/C/share-desktop.page +++ b/help/C/share-desktop.page @@ -29,7 +29,7 @@ help your contacts resolve a problem.

- +

In order to be able to share your desktop or to remotely use your contacts desktop, it is necessary to have a remote desktop viewer application installed in your system. diff --git a/help/C/video-call.page b/help/C/video-call.page index 412644b4f..6f918ee6e 100644 --- a/help/C/video-call.page +++ b/help/C/video-call.page @@ -55,7 +55,7 @@

- +

To turn a video conversation into an audio one, from the call window deselect CallSend video, -- cgit v1.2.3 From f0675e594614857d8b5396aa584d7e8b08ff161c Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Fri, 21 Aug 2009 12:13:41 +0200 Subject: [help] Added topic about favorite rooms Added new file to Makefile.am Removed some useless spaces from add-contact --- help/C/add-contact.page | 10 ++-- help/C/favorite-rooms.page | 135 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 5 deletions(-) create mode 100644 help/C/favorite-rooms.page (limited to 'help/C') diff --git a/help/C/add-contact.page b/help/C/add-contact.page index e435a9404..14d49a57a 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -30,14 +30,14 @@

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

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

@@ -48,7 +48,7 @@

Click Add to add the person to your list of - contacts. + contacts.

@@ -56,7 +56,7 @@

To add a new person to your list of contacts, you need to be - connected to the Internet and to your account. + connected to the Internet and to your account.

diff --git a/help/C/favorite-rooms.page b/help/C/favorite-rooms.page new file mode 100644 index 000000000..747c09d66 --- /dev/null +++ b/help/C/favorite-rooms.page @@ -0,0 +1,135 @@ + + + + + + + + Set, join and manage favorite rooms. + + + Milo Casagrande + milo@ubuntu.com + + + 2009 + GNOME Documentation Project + + + + + Favorite rooms + +
+ Set a room as a favorite + + +

+ Join a room. +

+ + +

+ See for more information on how to join + an IRC room. +

+ + +

+ See for more information on how to + start or join a group conversation. +

+ + + + +

+ From the conversation window, choose + ConversationFavorite Chatroom. +

+ + +
+ +
+ Join favorite rooms + + +

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

+ + +

+ Press F5. +

+ + +

+ Choose RoomJoin Favorites, to + join all your favorite rooms. +

+ + +

+ Choose Room, and select the favorite room you want to join. +

+ + + + + +

+ To join a favorite room, you need to be connected to the Internet and to + your account. +

+ +
+ +
+ Manage favorite rooms + + +

+ From the Contact List window, choose + RoomManage Favorites. +

+ + +

+ From the Account drop-down list, select the account you want to + manage the favorite rooms of. +

+

+ Select All to see all you favorite rooms. +

+ + +

+ Select the favorite room you want to manage: +

+ + +

+ Select the Auto-Connect check-box in order to automatically + join that room when you connect to your account. +

+ + +

+ Click on Remove to remove the room from your favorites. +

+ + + + +

+ When done, click Close. +

+ + +
+ + -- cgit v1.2.3 From a198698ff45b4b4fd214dbf45b9eb6d348984bac Mon Sep 17 00:00:00 2001 From: Milo Casagrande Date: Fri, 21 Aug 2009 15:19:53 +0200 Subject: [help] Reworked the send-file topic --- help/C/send-file.page | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'help/C') diff --git a/help/C/send-file.page b/help/C/send-file.page index 65ac170d3..960d0cc46 100644 --- a/help/C/send-file.page +++ b/help/C/send-file.page @@ -51,19 +51,34 @@

- The File Transfers window will appear. Wait for your contact to accept the - file transfer, or click Stop to halt the transfer. + The File Transfers window will appear. +

+

+ Wait for your contact to accept the file transfer, or click + Stop to halt the transfer. +

+ + +

+ Once the transfer is finished, it is possible to close the File Transfers + window.

+ +

+ If you have multiple finished transfers listed in the window, click on + Clear to empty the list. This will only remove the files from the + list and will not delete them from your computer. +

+

It is possible to send files only using the following services: Jabber, Google Talk and Salut.

-

In order to send a file to someone, you need to be connected to the Internet, or to @@ -71,19 +86,4 @@

-

- If your contact accepts the file transfer, you can watch the progress of the - transfer and see the estimated amount of time remaining before it is complete. -

-

- If they do not accept it, the status of the transfer will change to File - transfer cancelled, and the file will not be sent. -

-

- Once a transfer is finished, you can close the File Transfers - window. If you have multiple finished transfers listed in the window, click on - Clear to empty the list. This will only remove the files from the - list and will not delete them from your computer. -

- -- cgit v1.2.3