]> git.0d.be Git - empathy.git/blobdiff - help/C/empathy.xml
Added stub topic for password protected IRC channels Wrote the audio call topic Some...
[empathy.git] / help / C / empathy.xml
index 83f480f42764170dcb54fb18a1de4c3035ea4769..e6a1a72829bc7465e262d5e91ad612dc2fe51abd 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" 
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 <!ENTITY legal SYSTEM "legal.xml">
-<!ENTITY appversion "2.24">
-<!ENTITY manrevision "2.0">
-<!ENTITY date "April 2008">
+<!ENTITY appversion "2.28">
+<!ENTITY manrevision "2.2">
+<!ENTITY date "May 2009">
 <!ENTITY app "<application>Empathy</application>">
 <!ENTITY appname "Empathy">
 <!ENTITY gtalk "http://www.google.com/talk/">
 <!ENTITY yahoo "https://login.yahoo.com/config/login">
 <!ENTITY fwd
 "http://account2.freeworlddialup.com/index.php?section_id=94">
-<!ENTITY ekiga "http://www.ekiga.net/user/reg/">
-<!ENTITY sipphone "https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">
+<!ENTITY ekiga "https://www.ekiga.net/index.php?page=register">
+<!ENTITY sipphone
+"https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">
+<!ENTITY jabber "http://www.jabber.org/web/Jabber.org">
 ]>
 <?db.chunk.max_depth 2?>
 <article id="index" lang="en">
   <!-- please do not change the id; for translations, change lang to -->
   <!-- appropriate code -->
-  <articleinfo> 
-    <title>&app; Manual V&manrevision;</title>       
+  <articleinfo>
+    <title>&app; Manual V&manrevision;</title>
+
+    <copyright>
+      <year>2008, 2009</year>
+      <holder>Ubuntu Documentation Project</holder>
+    </copyright>
+    <copyright>
+      <year>2009</year>
+      <holder>GNOME Documentation Project</holder>
+    </copyright>
 
-    <copyright> 
-      <year>2008</year> 
-      <holder>Ubuntu Documentation Project</holder> 
-    </copyright> 
     <!-- An address can be added to the publisher information.  If a role is 
     not specified, the publisher/author is the same for all versions of the 
     document.  -->
-    <publisher> 
-      <publishername>Ubuntu Documentation Project</publishername> 
-    </publisher> 
+    <publisher>
+      <publishername>GNOME Documentation Project</publishername>
+    </publisher>
 
     <!-- licence stuff -->
     &legal;
     
-    <authorgroup> 
-      <author role="maintainer"> 
-       <firstname>Milo</firstname> 
-       <surname>Casagrande</surname> 
-       <affiliation> 
-         <orgname>Ubuntu Documentation Project</orgname> 
-         <address><email>milo_casagrande@yahoo.it</email></address> 
-       </affiliation> 
-      </author> 
-      <author> 
-       <firstname>Seth</firstname> 
-       <surname>Dudenhofer</surname> 
-       <affiliation> 
-         <orgname>Ubuntu Documentation Project</orgname> 
-         <address><email>sdudenhofer@gmail.com</email></address> 
-       </affiliation> 
-      </author> 
+    <authorgroup>
+      <author role="maintainer">
+       <firstname>Milo</firstname>
+       <surname>Casagrande</surname>
+       <affiliation>
+         <orgname>GNOME Documentation Project</orgname>
+         <address><email>milo@ubuntu.com</email></address>
+       </affiliation>
+       <affiliation>
+         <orgname>Ubuntu Documentation Project</orgname>
+         <address><email>milo@ubuntu.com</email></address>
+       </affiliation>
+      </author>
+      <author>
+       <firstname>Seth</firstname>
+       <surname>Dudenhofer</surname>
+       <affiliation>
+         <orgname>Ubuntu Documentation Project</orgname>
+         <address><email>sdudenhofer@gmail.com</email></address>
+       </affiliation>
+      </author>
     </authorgroup>
 
+    <releaseinfo revision="2.28" role="incomplete">
+      <ulink type="bug" url="http://bugzilla.gnome.org/show_bug.cgi?id=561033" />
+      <ulink type="planning" url="http://live.gnome.org/Empathy/Documentation" />
+    </releaseinfo>
+
 <!-- According to GNU FDL, revision history is mandatory if you are -->
 <!-- modifying/reusing someone else's document.  If not, you can omit it. -->
 <!-- Remember to remove the &manrevision; entity from the revision -->
 <!-- When the desktop release version changes to V3.x, the revision number of the manual changes -->
 <!-- to V3.0, and so on. -->
     <revhistory>
+      <revision>
+       <revnumber>Empathy Manual V&manrevision;</revnumber>
+       <date>&date;</date>
+       <revdescription>
+         <para role="author">Milo Casagrande
+           <email>milo@ubuntu.com</email>
+         </para>
+         <para role="publisher">GNOME Documentation Project</para>
+       </revdescription>
+      </revision>
+
+      <revision>
+       <revnumber>Empathy Manual V2.1</revnumber>
+       <date>January 2009</date>
+       <revdescription>
+         <para role="author">Milo Casagrande
+           <email>milo@ubuntu.com</email>
+         </para>
+         <para role="publisher">Ubuntu Documentation Project</para>
+       </revdescription>
+      </revision>
+
       <revision> 
-       <revnumber>Empathy Manual V&manrevision;</revnumber> 
-       <date>&date;</date> 
-       <revdescription> 
+       <revnumber>Empathy Manual V2.0</revnumber>
+       <date>April 2008</date>
+       <revdescription>
          <para role="author">Milo Casagrande
-           <email>milo_casagrande@yahoo.it</email>
+           <email>milo@ubuntu.com</email>
          </para>
          <para role="author">Seth Dudenhofer
            <email>sdudenhofer@gmail.com</email>
          </para>
          <para role="publisher">Ubuntu Documentation Project</para>
-       </revdescription> 
-      </revision> 
+       </revdescription>
+      </revision>
     </revhistory> 
     
     <releaseinfo>
       <title>Feedback</title> 
       <para>
        To report a bug or make a suggestion regarding the &app; application or
-       this manual, follow the directions in the <ulink url="ghelp:gnome-feedback"
-         type="help">GNOME Feedback Page</ulink>. 
+       this manual, follow the directions in the <ulink url="ghelp:user-guide?feedback" type="help">GNOME Feedback Page</ulink>. 
       </para>
     </legalnotice>
 
   </articleinfo>
 
   <indexterm zone="index"> 
-    <primary>Empathy</primary> 
-  </indexterm> 
-  <indexterm zone="index"> 
-    <primary>empathy</primary> 
+    <primary>Empathy</primary>
+  </indexterm>
+  <indexterm zone="index">
+    <primary>empathy</primary>
     <secondary>istant messaging</secondary>
   </indexterm>
 
        </listitem>
        <listitem>
          <para>
-           Jabber
+           Jabber (or <acronym>XMPP</acronym>)
          </para>
        </listitem>
        <listitem>
            Yahoo
          </para>
        </listitem>
+       <listitem>
+         <para>
+           And many others...
+         </para>
+       </listitem>
       </itemizedlist>
     </para>
   </sect1>
            <para>Choose 
              <menuchoice>
                <guisubmenu>Internet</guisubmenu>
-               <guimenuitem>Empathy Instant Messenger</guimenuitem>
+               <guimenuitem>Empathy IM Client</guimenuitem>
              </menuchoice>.
            </para>
          </listitem>
                </entry>
                <entry valign="top">
                  <para>
-                   Allows to update the user's status.
+                   Allows to update the status.
                  </para>
                </entry>
              </row>
        </table>
       </para>
     </sect2>
-
-    <sect2 id="empathy-when-start-new">
-      <title>When You Start &appname; for the First Time</title>
-      <para>
-       When you start &app; for the first time and you don't have
-       configured any account yet, the following dialog is shown.
-       <!-- Figure 2 -->
-       <figure id="empathy-FIG-newaccount"> 
-         <title>&app; Accounts Dialog</title> 
-         <screenshot> 
-           <mediaobject> 
-             <imageobject>
-               <imagedata fileref="figures/empathy-new-account.png" format="PNG"/> 
-             </imageobject>
-             <textobject> 
-               <phrase>
-                 Shows &app; account creation dialog.
-               </phrase> 
-             </textobject> 
-           </mediaobject> 
-         </screenshot> 
-       </figure>
-       <!-- End of Figure -->
-      </para>
-      <para>
-       From here, you can configure and create your accounts. See
-       <xref linkend="empathy-accounts" /> for more information.
-      </para>
-    </sect2>
-
   </sect1>
 
   <sect1 id="empathy-accounts">
        register a new account (see <xref linkend="empathy-register-account" />).
     </para>
     <para>
-      In order to talk with other users (called
-      <emphasis>contatcs</emphasis>), you need to use the same service
+      In order to talk with other users, also called
+      <emphasis>contacts</emphasis>, you need to use the same service
       they are using. If, for example, one contact is using the <emphasis
       role="strong">Jabber</emphasis> service, you need to have an
-      account registerd with that service.
+      account registered with that service.
     </para>
     <para>
       &app; can handle as many accounts on any supported services as you want and
        </itemizedlist>
       </para>
       <para>
-       You can use one of the following services if you already have
-       a <emphasis role="strong">Jabber</emphasis> account:
+       For registering a <emphasis role="strong">Jabber</emphasis>
+       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 <ulink
+       type="http" url="&jabber;">jabber.org</ulink>.
+      </para>
+      <para>
+       If you already have a <emphasis
+       role="strong">Jabber</emphasis> account, you can use one of
+       the following services:
       </para>
       <para>
        <itemizedlist>
     </sect2>
 
     <sect2 id="empathy-create-account">
-      <title>Creating an Account</title>
+      <title>Adding your Account to &app;</title>
       <para>
-       To create an account, proceed as follow:
+       To add your account to &app;, proceed as follows:
        <orderedlist>
          <listitem>
            <para>
              From the <link linkend="empathy-FIG-mainwindow">main window
              </link> (<guilabel>Contact List</guilabel>)
-             click on the account button to open the
+             click on the account button or press <keycap>F4</keycap> to open the
              <guilabel>Accounts</guilabel> dialog.
            </para>
          </listitem>
          <listitem>
            <para>
-             Click on the <guibutton>Add</guibutton> button.
+             If it is the first time you launch &app;:
+             <orderedlist>
+               <listitem>
+                 <para>
+                   From the <guilabel>Type</guilabel> drop-down list choose
+                   the service you wish to add an account for, then click
+                   on the <guibutton>Create</guibutton> button.
+                 </para>
+               </listitem>
+             </orderedlist>
            </para>
-         </listitem>
-         <listitem>
            <para>
-             From the <guilabel>Type</guilabel> drop-down list choose
-             the service you wish to create an account for, then click
-             on the <guibutton>Create</guibutton> button.
+             Otherwise:
+             <orderedlist>
+               <listitem>
+                 <para>
+                   Click on the <guilabel>Add</guilabel> button.
+                 </para>
+               </listitem>
+               <listitem>
+                 <para>
+                   From the <guilabel>Type</guilabel> drop-down list choose
+                   the service you wish to add an account for, then click
+                   on the <guibutton>Create</guibutton> button.
+                 </para>
+               </listitem>
+             </orderedlist>
            </para>
          </listitem>
          <listitem>
            <para>
              Fill the required fields with your <emphasis>user
-               name</emphasis> and <emphasis>password</emphasis>.
+               name</emphasis> and
+               <emphasis>password</emphasis>. Optionally, you can
+               modify some advanced options. For more information,
+             see <xref linkend="empathy-advanced-options"/>.
            </para>
          </listitem>
          <listitem>
            <para>
              To enable the new account, select the
              <guilabel>Enabled</guilabel> check-box next to
-             the name of the account.
-             <!-- in the box on the left of the
-             <guilabel>Accounts</guilabel> dialog. -->
+             the name of the account in the box on the left.
+           </para>
+         </listitem>
+       </orderedlist>
+      </para>
+      
+      <sect3 id="empathy-importing-accounts">
+       <title>Importing Accounts</title>
+       <para>
+         If you use another instant messaging program, you can import
+         the accounts from that program into &app;
+       </para>
+       <para>
+         <note>
+           <para>
+             At the moment &app; can import the accounts only from
+             the instant messaging program
+             <application>Pidgin</application>. For more information
+             about <application>Pidgin</application>, see the <ulink
+             type="http" url="http://www.pidgin.im/">Pidgin website</ulink>.
+           </para>
+         </note>
+       </para>
+       <para>
+         To import the accounts into &app;, proceed as follows:
+         <orderedlist>
+           <listitem>
+             <para>
+               From the <link linkend="empathy-FIG-mainwindow">main window
+               </link> (<guilabel>Contact List</guilabel>)
+               click on the account button or press <keycap>F4</keycap> to open the
+               <guilabel>Accounts</guilabel> dialog.
+             </para>
+           </listitem>
+           <listitem>
+             <para>
+               Click on the <guibutton>Import Accounts...</guibutton>
+               button to open the <guilabel>Import
+               Accounts</guilabel> dialog.
+             </para>
+           </listitem>
+           <listitem>
+             <para>
+               Select the accounts you would like to import by
+               clicking on the <guilabel>Import</guilabel> check-box.
+             </para>
+           </listitem>
+           <listitem>
+             <para>
+               When you have selected all the desired accounts, click
+               <guibutton>OK</guibutton> to import them. If you don't
+               want to import the accounts, click
+               <guibutton>Cancel</guibutton>.
+             </para>
+           </listitem>
+           <listitem>
+             <para>
+               When you import a new account into &app;, it will not be
+               enabled by default.
+             </para>
+             <para>
+               To enable the new account, select the
+               <guilabel>Enabled</guilabel> check-box next to
+               the name of the account in the box on the left.
+             </para>
+           </listitem>
+         </orderedlist>
+       </para>
+      </sect3>
+    </sect2>
+
+    <sect2 id="empathy-edit-account">
+      <title>Editing an Account</title>
+      <para>
+       To edit one of your accounts, i.e. to change the
+       <emphasis>password</emphasis> or your <emphasis>user
+       name</emphasis>, proceed as follows:
+       <orderedlist>
+         <listitem>
+           <para>
+             From the <link linkend="empathy-FIG-mainwindow">main window
+             </link> (<guilabel>Contact List</guilabel>)
+             click on the account button or press <keycap>F4</keycap> to open the
+             <guilabel>Accounts</guilabel> dialog.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             Select the account you wish to edit in the box on the
+             left.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             Modify the desired data.
+           </para>
+         </listitem>
+       </orderedlist>
+      </para>
+      <para>
+       <note>
+         <para>
+           Based on the type of the account, it is possibile to edit
+           different settings.
+         </para>
+       </note>
+      </para>
+      <para>
+       To modify the identifier of an account, how &app; identifies
+       an account, proceed as follows:
+       <orderedlist>
+         <listitem>
+           <para>
+             From the <link linkend="empathy-FIG-mainwindow">main window
+             </link> (<guilabel>Contact List</guilabel>)
+             click on the account button or press <keycap>F4</keycap> to open the
+             <guilabel>Accounts</guilabel> dialog.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             Select the account you wish to edit in the box on the
+             left and double-click on its name.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             Change the name of the account as you desire.
            </para>
          </listitem>
        </orderedlist>
     <sect2 id="empathy-disabling-removing-account">
       <title>Disabling and Removing an Account</title>
       <para>
-       To disable an account, proceed as follow:
+       To disable an account, proceed as follows:
       </para>
       <para>
        <orderedlist>
            <para>
              From the <link linkend="empathy-FIG-mainwindow">main window
              </link> (<guilabel>Contact List</guilabel>)
-             click on the account button to open the
+             click on the account button or press <keycap>F4</keycap>
+             to open the
              <guilabel>Accounts</guilabel> dialog.
            </para>
          </listitem>
        </orderedlist>
       </para>
       <para>
-       To remove an account, proceed as follow:
+       To remove an account, proceed as follows:
       </para>
       <para>
        <orderedlist>
            <para>
              From the <link linkend="empathy-FIG-mainwindow">main window
              </link> (<guilabel>Contact List</guilabel>)
-             click on the account button to open the
+             click on the account button or press <keycap>F4</keycap>
+             to open the
              <guilabel>Accounts</guilabel> dialog.
            </para>
          </listitem>
        </orderedlist>
       </para>
     </sect2>
+    
+    <sect2 id="empathy-edit-personal-information">
+      <title>Editing Personal Information</title>
+      <para>
+       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:
+      </para>
+      <para>
+       <orderedlist>
+         <listitem>
+           <para>
+             From the <link linkend="empathy-FIG-mainwindow">main
+               window</link>, select <menuchoice>
+               <guimenu>Edit</guimenu>
+               <guimenuitem>Personal Information</guimenuitem>
+             </menuchoice>.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             From the <guilabel>Account</guilabel> drop-down list, choose
+             the account you want to edit.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             In the <guilabel>Alias</guilabel> text box, write your new
+             alias.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             To change your icon, click on the person-looking button and
+             choose an image file.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             When done, click <guibutton>Close</guibutton>.
+           </para>
+         </listitem>
+       </orderedlist>
+      </para>
+      <para>
+       <note>
+         <para>
+           An <emphasis>alias</emphasis> is an alternative way you
+           can identify yourself. You can use your real
+           name or a nickname.
+         </para>
+       </note>
+      </para>
+    </sect2>
+    
+    <sect2 id="empathy-advanced-options">
+      <title>Advanced Options</title> 
+      <para>
+       Based on the service you are using, it is possible to
+       configure more advanced options to modify the normal behavior of
+       &app;.
+      </para>
+      <para>
+       To configure these options, when you are <link
+       linkend="empathy-create-account">adding a new
+       account</link>, click on the drop-down section
+       <guilabel>Advanced</guilabel>.
+      </para>
+
+      <sect3 id="empathy-xmpp-advanced">
+       <title>
+         Jabber (or <acronym>XMPP</acronym>) and Google Talk
+       </title>
+       <para>
+         <variablelist>
+           <varlistentry>
+             <term>
+               <guilabel>Encryption required (TLS/SSL)</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Select this option in order to use some sort of
+                 encryption during your conversations.
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Ignore SSL certificate errors</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 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.
+               </para>
+               <para>
+                 <note>
+                   <para>
+                     Select this option only if you are sure the
+                     certificate is secure and you can trust it.
+                   </para>
+                 </note>
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Resource</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 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
+                 <guilabel>Priority</guilabel> one, you can
+                 use your account simultaneously in two different
+                 devices. For example, if you set one device to
+                 <replaceable>desktop</replaceable> and the other
+                 one to <replaceable>mobile</replaceable>, you can
+                 connect with both of them and based on the
+                 <guilabel>Priority</guilabel> value you will receive
+                 messages on one of the two devices or both.
+               </para>
+               <para>
+                 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.
+               </para>
+               <para>
+                 <note>
+                   <para>
+                     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
+                     <guilabel>Priority</guilabel> spin box.
+                   </para>
+                 </note>
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Priority</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this spin box to indicate wich device, set in
+                 the <guilabel>Resource</guilabel> 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.
+               </para>
+               <para>
+                 You can set values in the range from
+                 <literal>-128</literal> to <literal>127</literal>.
+               </para>
+               <para>
+                 <note>
+                   <para>
+                     If you set the same value of this spin box in
+                     both the devices, you will receive messages on
+                     both of them.
+                   </para>
+                 </note>
+               </para>
+             </listitem>
+           </varlistentry>
+         </variablelist>
+       </para>
+       <para>
+         In the <guilabel>Override server settings</guilabel> section
+         you can set options that take precedence over the default settings.
+         <variablelist>
+           <varlistentry>
+             <term>
+               <guilabel>Server</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this text box to write the name of the
+                 server you want to use for this service.
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Port</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this spin box to set the number of the port of
+                 the server to use.
+               </para>
+               <para>
+                 You can set values in the range from
+                 <literal>0</literal> to <literal>65,555</literal>.
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Use old SSL</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Select this option to use the old version of the
+                 secure protocol for encrypting your connection.
+               </para>
+             </listitem>
+           </varlistentry>
+         </variablelist>
+       </para>
+      </sect3>
+
+      <sect3 id="empathy-yahoo-advanced">
+       <title>Yahoo</title>
+       <para>
+         <variablelist>
+           <varlistentry>
+             <term>
+               <guilabel>Ignore conference and chatrooms
+               invitations</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Select this option to ignore the invitations that
+                 other people may send you.
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Room List locale</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 The value of this text box identifies the language
+                 used to retrieve the room list when connecting to
+                 the Yahoo service.
+               </para>
+               <para>
+                 If you need to change this value, use the two letter
+                 code of your language.
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Charset</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 The value of this text box identifies the set of the
+                 characters used by &app;.
+               </para>
+               <para>
+                 <note>
+                   <para>
+                     It is advise to leave this value to
+                     <literal>UTF-8</literal>. Change it only
+                     if that charset does not cover your language.
+                   </para>
+                 </note>
+               </para>
+             </listitem>
+           </varlistentry>               
+           <varlistentry>
+             <term>
+               <guilabel>Server</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this text box to write the name of the
+                 server you want to use for this service.
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Port</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this spin box to set the number of the port of
+                 the server to use.
+               </para>
+               <para>
+                 You can set values in the range from
+                 <literal>0</literal> to <literal>65,555</literal>.
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Use Yahoo Japan</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 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. 
+               </para>
+             </listitem>
+           </varlistentry>
+         </variablelist>
+       </para>
+      </sect3>
+
+      <sect3 id="empathy-msn-advanced">
+       <title><acronym>AIM</acronym>, GroupWise and <acronym>MSN</acronym></title>
+       <para>
+         <variablelist>
+           <varlistentry>
+             <term>
+               <guilabel>Server</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this text box to write the name of the
+                 server you want to use for this service.
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Port</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this spin box to set the number of the port of
+                 the server to use.
+               </para>
+               <para>
+                 You can set values in the range from
+                 <literal>0</literal> to <literal>65,555</literal>.
+               </para>
+             </listitem>
+           </varlistentry>
+         </variablelist>           
+       </para>
+      </sect3>
+
+      <sect3 id="empathy-salut-advanced">
+       <title>Salut</title>
+       <para>
+         <variablelist>
+           <varlistentry>
+             <term>
+               <guilabel>Published Name</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this text box to write the name that will be
+                 visible to the other users of the network. 
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Email</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this text box to write your email.
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Jabber ID</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this text box to write your Jabber ID, if you
+                 have one.
+               </para>
+             </listitem>
+           </varlistentry>
+         </variablelist>
+       </para>
+      </sect3>
+
+      <sect3 id="empathy-icq-advanced">
+       <title>ICQ</title>
+       <para>
+         <variablelist>
+           <varlistentry>
+             <term>
+               <guilabel>Charset</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 The value of this text box identifies the set of the
+                 characters used by &app;.
+               </para>
+               <para>
+                 <note>
+                   <para>
+                     It is advise to leave this value to
+                     <literal>UTF-8</literal>. Change it only
+                     if that charset does not cover your language.
+                   </para>
+                 </note>
+               </para>
+             </listitem>
+           </varlistentry>               
+           <varlistentry>
+             <term>
+               <guilabel>Server</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this text box to write the name of the
+                 server you want to use for this service.
+               </para>
+             </listitem>
+           </varlistentry>
+           <varlistentry>
+             <term>
+               <guilabel>Port</guilabel>
+             </term>
+             <listitem>
+               <para>
+                 Use this spin box to set the number of the port of
+                 the server to use.
+               </para>
+               <para>
+                 You can set values in the range from
+                 <literal>0</literal> to <literal>65,555</literal>.
+               </para>
+             </listitem>
+           </varlistentry>
+         </variablelist>
+       </para>
+      </sect3>
+
+      <sect3 id="empathy-gadugadu-advanced">
+       <title>Gadu Gadu</title>
+       <para>
+         <variablelist>
+           <varlistentry>
+             <term><guilabel>Nick</guilabel></term>
+             <listitem>
+               <para>
+                 Use this text box to write an alternative name to
+                 use with this service.
+               </para>
+             </listitem>
+           </varlistentry>
+         </variablelist>
+       </para>
+      </sect3>
+
+    </sect2>
+    
   </sect1>
 
-  <sect1 id="empathy-contacts">
-    <title>Contacts</title>
+  <sect1 id="empathy-contacts-groups">
+    <title>Contacts and Groups</title>
     <para>
       All the contacts are handled within &app;'s <link
       linkend="empathy-FIG-mainwindow">main window</link>.
     </para>
-    <sect2 id="empathy-add-contact">
-      <title>Adding a Contact</title>
+    <para>
+      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.
+    </para>
+     <sect2 id="empathy-add-contact">
+      <title>Adding and Removing a Contact</title>
       <para>
-       To add a new contact, proceed as follow:
+       To add a new contact, proceed as follows:
       </para>
       <para>
        <orderedlist>
          </listitem>
          <listitem>
            <para>
-             In the <guilabel>Identifier</guilabel> text-box type the
+             In the <guilabel>Identifier</guilabel> text box type the
              <emphasis>address</emphasis> of the contact in the form
              of
              <userinput><replaceable>user name</replaceable>@<replaceable>service
          </listitem>
          <listitem>
            <para>
-             In the <guilabel>Alias</guilabel> text-box type the name
+             In the <guilabel>Alias</guilabel> text box type the name
              you want to give at the the new contact.
            </para>
          </listitem>
          </listitem>
        </orderedlist>
       </para>
-    </sect2>
-    <sect2 id="empathy-remove-contact">
-      <title>Removing a Contact</title>
       <para>
-       To remove a contact, proceed as follow:
+       To remove a contact, proceed as follows:
       </para>
       <para>
        <orderedlist>
          </listitem>
        </orderedlist>
       </para>
+      <para>
+       <note>
+         <para>
+           An <emphasis>alias</emphasis> is an alternative way you
+           can identify that particular contact. You can use the real
+           name or the nickname of that person.
+         </para>
+       </note>
+      </para>
+    </sect2>
+    <sect2 id="empathy-edit-contact">
+      <title>Editing a Contact</title>
+      <para>
+       To edit a contact, proceed as follows:
+      </para>
+      <para>
+       <orderedlist>
+         <listitem>
+           <para>
+             From the <link linkend="empathy-FIG-mainwindow">main
+               window</link>, select the contact you would like
+             to modify and choose <menuchoice>
+               <guimenu>Edit</guimenu>
+               <guisubmenu>Contact</guisubmenu>
+               <guimenuitem>Edit</guimenuitem>
+             </menuchoice>, or right-click on it
+             and choose <guilabel>Edit</guilabel>.
+           </para>
+         </listitem>
+       </orderedlist>
+      </para>
+      <para>
+       From the <guilabel>Edit Contact Information</guilabel> dialog,
+       you can modify the <emphasis>alias</emphasis>
+       and the <emphasis>group</emphasis> of the contact.
+      </para>
+      <para>
+       <note>
+         <para>
+           An <emphasis>alias</emphasis> is an alternative way you
+           can identify that particular contact. You can use the real
+           name or the nickname of that person.
+         </para>
+       </note>
+      </para>
+      <para>
+       For more information about groups, see <xref
+         linkend="empathy-add-contact-group"/> and <xref
+         linkend="empathy-add-group"/>.
+      </para>
+    </sect2>
+    
+    <sect2 id="empathy-add-contact-group">
+      <title>Adding a Contact to a Group</title>
+      <para>
+       To add a contact to one or more groups, proceed as follows:
+      </para>
+      <para>
+       <orderedlist>
+         <listitem>
+           <para>
+             From the <link linkend="empathy-FIG-mainwindow">main
+               window</link>, select the contact you would like
+             to modify and choose <menuchoice>
+               <guimenu>Edit</guimenu>
+               <guisubmenu>Contact</guisubmenu>
+               <guimenuitem>Edit</guimenuitem>
+             </menuchoice>, or right-click on it
+             and choose <guilabel>Edit</guilabel>.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             From the <guilabel>Groups</guilabel> section, select the
+             group, or groups, you want to add the contact to.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             When done, click <guibutton>Close</guibutton>.
+           </para>
+         </listitem>
+       </orderedlist>
+      </para>
     </sect2>
-    <sect2>
-      <title>Modifying a Contact</title>
+
+    <sect2 id="empathy-add-group">
+      <title>Adding a New Group</title>
       <para>
+       To add a new group, proceed as follows:
       </para>
+      <para>
+       <orderedlist>
+         <listitem>
+           <para>
+             From the <link linkend="empathy-FIG-mainwindow">main
+               window</link>, select one contact and choose <menuchoice>
+               <guimenu>Edit</guimenu>
+               <guisubmenu>Contact</guisubmenu>
+               <guimenuitem>Edit</guimenuitem>
+             </menuchoice>, or right-click on it
+             and choose <guilabel>Edit</guilabel>.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             In the <guilabel>Groups</guilabel> section, write the
+             name of the group you want to add and then click on
+             <guibutton>Add Group</guibutton>.
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+             When done, click <guibutton>Close</guibutton>.
+           </para>
+         </listitem>
+       </orderedlist>
+      </para>  
     </sect2>
   </sect1>
 
+<!--
+  <sect1 id="empathy-send-receive-message">
+    <title>Sending and Receiving Messages</title>
+    <para>
+    </para>
+  </sect1>
 
+  <sect1 id="empathy-preferences">
+    <title>Preferences</title>
+    <para>
+    </para>
+  </sect1>
+-->
+  
 </article>