From: Milo Casagrande Date: Fri, 14 Aug 2009 19:09:26 +0000 (+0200) Subject: [help] X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=7a91c985c8e9b96764e29948de83fb016da9beda [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 --- diff --git a/help/C/audio-video.page b/help/C/audio-video.page index cc118dd5..244ed2c4 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 37939926..c196f205 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 bb285f24..081c7e2c 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 1a73a2c4..c0e9328a 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 00000000..804efa9f --- /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 00000000..0f73bdad --- /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 71caf567..1daf6140 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 e4916729..3188b261 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 98e17c36..3e4edd40 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 f15a4c86..8001ed49 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 7d7b2ab7..bbe4302c 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 00000000..d7123c4e --- /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. +

+ + + + diff --git a/help/Makefile.am b/help/Makefile.am index 2ba171df..91747b93 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -26,6 +26,8 @@ DOC_PAGES = \ irc-join-room.page \ irc-manage.page \ irc-nick-password.page \ + irc-sending-file.page \ + irc-start-conversation.page \ offline-contacts.page \ prob-conn-acctdisabled.page \ prob-conn-auth.page \ @@ -38,6 +40,7 @@ DOC_PAGES = \ send-message.page \ set-custom-status.page \ share-desktop.page \ + start-conversation.page \ status-icons.page \ video-call.page