Merge branch 'mallard-to-merge'

38 files changed, 2033 insertions, 1474 deletions

diff --git a/help/.gitignore b/help/.gitignore
index 2f8d8eb55..597bd8fcf 100644
--- a/help/.gitignore
+++ b/help/.gitignore
@@ -13,3 +13,14 @@ it/*.xml
 ru/*.xml
 sv/*.xml
 
+ca/*.page
+cs/*.page
+de/*.page
+el/*.page
+en_GB/*.page
+es/*.page
+fi/*.page
+fr/*.page
+it/*.page
+ru/*.page
+sv/*.page
diff --git a/help/C/add-account.page b/help/C/add-account.page
new file mode 100644
index 000000000..2fa344cfb
--- /dev/null
+++ b/help/C/add-account.page
@@ -0,0 +1,94 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="add-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="remove-account"/>
+    <desc>Add a new account to <app>Empathy</app>.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-24" status="draft"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Add a new account</title>
+
+  <steps>
+    <item>
+      <p>
+	      From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          Press <key>F4</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+	      If it is the first time you launch <app>Empathy</app>:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          From the <gui>Type</gui> drop-down list choose
+	          the service you wish to add an account for, then click
+	          on the <gui>Create</gui> button.
+	       </p>
+        </item>
+      </list>
+      <p>
+        Otherwise:
+      </p>
+      <steps>
+        <item>
+          <p>
+            Click on the <gui>Add</gui> button.
+          </p>
+        </item>
+        <item>
+          <p>
+            From the <gui>Type</gui> drop-down list choose
+             the service you wish to add an account for, then click
+             on the <gui>Create</gui> button.
+	        </p>
+	      </item>
+      </steps>
+    </item>
+    <item>
+      <p>
+        Fill the required fields with your <em>user
+         name</em> and	<em>password</em>.
+      </p>
+    </item>
+    <item>
+      <p>
+        To enable the new account, select the
+         <gui>Enabled</gui> check-box next to
+         the name of the account in the box on the left of the dialog.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    If you want to change the name that identifies the account in the <gui>Accounts</gui>
+    dialog, double-click on the name of the account in the box on the left of the dialog
+    and type the new name.
+  </p>
+
+</page>
diff --git a/help/C/add-contact.page b/help/C/add-contact.page
new file mode 100644
index 000000000..fbde28774
--- /dev/null
+++ b/help/C/add-contact.page
@@ -0,0 +1,69 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="add-contact">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="offline-contacts"/>
+    <desc>Add someone to the contact list.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-15" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Add someone to your list of contacts</title>
+
+  <comment>
+    <cite date="2009-06-15">Phil Bull</cite>
+    <p>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.</p>
+  </comment>
+
+  <steps>
+    <item>
+      <p>
+        Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the type of
+         service the person you want to add to your contacts is using.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Identifier</gui> text box, type the email address
+         or the username of the person you want to add to your
+         contacts list.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Alias</gui> text box, type their name.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click <gui>Add</gui> to add the person to your list of
+         contacts.
+      </p>
+    </item>
+  </steps>
+
+  <note>
+    <p>
+      To add a new person to your list of contacts, you need to be
+       connected to the Internet and to your account.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/audio-call.page b/help/C/audio-call.page
new file mode 100644
index 000000000..116f4a8f8
--- /dev/null
+++ b/help/C/audio-call.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="audio-call">
+
+  <info>
+    <link type="guide" xref="index#audio-video"/>
+    <link type="seealso" xref="audio-video"/>
+    <desc>
+      Start an audio conversation with one of your contacts.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review"/>
+
+  </info>
+
+  <title>Start an audio conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Select the contact you want to have a conversation with, and click
+            on the audio call icon next to their name.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to have a conversation with, and
+            select <gui>Audio Call</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        A new window will open. When the connection is established, you will
+        see written, at the bottom of the window, <gui>Connected</gui> and the total
+        conversation time.
+      </p>
+    </item>
+    <item>
+      <p>
+        To close the conversation, click on <gui>Hang up</gui>.
+      </p>
+    </item>
+  </steps>
+  <note>
+    <p>
+      To turn an audio conversation into a video one, from the call window select
+      <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>,
+      or click on the video call icon.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/audio-video.page b/help/C/audio-video.page
new file mode 100644
index 000000000..cc118dd56
--- /dev/null
+++ b/help/C/audio-video.page
@@ -0,0 +1,69 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="audio-video">
+
+  <info>
+    <link type="guide" xref="index#audio-video"/>
+    <desc>
+      When it is possible to have an audio or video conversation.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="draft"/>
+
+  </info>
+
+  <title>Audio and video conversations</title>
+
+  <p>
+    When your contacts support audio or video conversations, you will see, next to
+    the contacts name in the <gui>Contact List</gui> window, one or two small icons that
+    represent the different conversations you can have.
+  </p>
+
+  <table frame="all" rules="cols" shade="rows">
+    <thead>
+      <tr>
+        <td>
+          <p>
+            Icon
+          </p>
+        </td>
+        <td>
+          <p>
+            Description
+          </p>
+        </td>
+      </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>
+        <p>
+          <media type="image" mime="image/png" src="figures/audio-input-microphone.png">
+            Icon for audio conversation
+          </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the icon that represents the possibility to have an audio conversation.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p>
+          <media type="image" mime="image/png" src="figures/camera-web.png">
+            Icon for video conversation
+          </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the icon that represents the possibility to have a video conversation.
+        </p>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+
+</page>
diff --git a/help/C/change-status.page b/help/C/change-status.page
new file mode 100644
index 000000000..a2e687ffc
--- /dev/null
+++ b/help/C/change-status.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="change-status">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="status-icons"/>
+    <desc>
+      Change your status, if you are going away from your computer for example.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Change your status</title>
+
+  <steps>
+    <item>
+      <p>
+        Click on the drop-down list at the top of the <gui>Contact List</gui> window.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select a status from the list.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    For example, if you are busy and do not want to
+    be disturbed, select <gui>Busy</gui>.
+  </p>
+
+  <note>
+    <p>
+      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 <gui>Away</gui>.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/create-account.page b/help/C/create-account.page
new file mode 100644
index 000000000..203818c7f
--- /dev/null
+++ b/help/C/create-account.page
@@ -0,0 +1,137 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="create-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="add-account"/>
+    <link type="seealso" xref="irc-account"/>
+    <desc>
+      Register an account with one of the supported messaging services.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-21" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Register for a new account</title>
+
+  <p>
+    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.
+  </p>
+  <p>
+    At the end of the registration process you should have a <em>user
+      name</em> (or an <em>account ID</em>) and a <em>password</em>
+      that you will use to add the account to <app>Empathy</app>.
+  </p>
+  <p>
+    Click on the name of the service to visit its website.
+  </p>
+
+  <section id="im-services">
+    <title>Instant Messaging Services</title>
+
+    <list>
+      <item>
+        <p>
+          <link href="http://dashboard.aim.com/aim">AIM</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="http://www.google.com/talk/">Google Talk</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="https://www.icq.com/register/">ICQ</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="http://register.jabber.org/">Jabber</link>
+        </p>
+        <note>
+          <p>
+            It is possible to use the automatic creation of accounts
+            with this service. Not all the service providers support it.
+             One service provider known to work is <em>jabber.org</em>,
+             the default one of the application.
+          </p>
+        </note>
+      </item>
+      <item>
+        <p>
+          <link href="https://accountservices.passport.net">MSN</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="https://login.yahoo.com/config/login">Yahoo!</link>
+        </p>
+      </item>
+    </list>
+  </section>
+
+  <section id="local-service">
+    <title>Local Instant Messaging Services</title>
+    <p>
+      This service works when you are connected to a local network,
+      you do not need an Internet connection in order to use it.
+    </p>
+    <list>
+      <item>
+        <p>
+          <em>Salut</em>
+        </p>
+      </item>
+    </list>
+
+    <p>
+      For more information, see <link xref="salut-protocol" />.
+    </p>
+
+  </section>
+
+  <section id ="sip-services">
+    <title>Telephony Services</title>
+
+    <p>
+      These services will let you do voice call over the Internet with
+      other people using the same service or even to normal phones.
+    </p>
+
+    <list>
+      <item>
+        <p>
+          <link href="https://www.ekiga.net/index.php?page=register">Ekiga</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">Sipphone</link>
+        </p>
+      </item>
+    </list>
+
+    <note>
+      <p>
+        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.
+      </p>
+    </note>
+
+  </section>
+</page>
diff --git a/help/C/disable-account.page b/help/C/disable-account.page
new file mode 100644
index 000000000..2ded8067a
--- /dev/null
+++ b/help/C/disable-account.page
@@ -0,0 +1,66 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="disable-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="remove-account"/>
+    <desc>
+      Prevent an account from logging-in automatically when you start
+      <app>Empathy</app>.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Disable an account</title>
+
+  <p>
+    Disabling an account means to deactivate it, temporarily or
+     permanently. All the conversations you had will be kept in your computer.
+  </p>
+  <p>
+    After disabling an account, it is possible to enable it again.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          Press <key>F4</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the account you wish to disable from the box on the
+         left of the dialog.
+      </p>
+    </item>
+    <item>
+      <p>
+        Deselect the <gui>Enabled</gui> check-box.
+      </p>
+    </item>
+  </steps>
+
+</page>
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 @@
-<?xml version="1.0"?>
-<!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.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 icq "https://www.icq.com/register/">
-<!ENTITY aim "http://dashboard.aim.com/aim">
-<!ENTITY msn "https://accountservices.passport.net">
-<!ENTITY yahoo "https://login.yahoo.com/config/login">
-<!ENTITY fwd
-"http://account2.freeworlddialup.com/index.php?section_id=94">
-<!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>
-
-    <copyright>
-      <year>2008, 2009</year>
-      <holder>Ubuntu Documentation Project</holder>
-    </copyright>
-    <copyright>
-      <year>2009</year>
-      <holder>GNOME 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>GNOME Documentation Project</publishername>
-    </publisher>
-
-    <!-- licence stuff -->
-    &legal;
-    
-    <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 -->
-<!-- entries other than the current revision. -->
-<!-- The revision numbering system for GNOME manuals is as follows: -->
-<!-- * the revision number consists of two components -->
-<!-- * the first component of the revision number reflects the release version of the GNOME desktop. -->
-<!-- * the second component of the revision number is a decimal unit that is incremented with each revision of the manual. -->
-<!-- For example, if the GNOME desktop release is V2.x, the first version of the manual that -->
-<!-- is written in that desktop timeframe is V2.0, the second version of the manual is V2.1, etc. -->
-<!-- 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 V2.0</revnumber>
-	<date>April 2008</date>
-	<revdescription>
-	  <para role="author">Milo Casagrande
-	    <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>
-    </revhistory> 
-    
-    <releaseinfo>
-      This manual describes version &appversion; of &appname;.
-    </releaseinfo> 
-    <legalnotice> 
-      <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:user-guide?feedback" type="help">GNOME Feedback Page</ulink>. 
-      </para>
-    </legalnotice>
-
-    <abstract role="description">
-      <para>
-	&appname; is an application for instant messaging.
-      </para>
-    </abstract>
-
-  </articleinfo>
-
-  <indexterm zone="index"> 
-    <primary>Empathy</primary>
-  </indexterm>
-  <indexterm zone="index">
-    <primary>empathy</primary>
-    <secondary>istant messaging</secondary>
-  </indexterm>
-
-  <sect1 id="empathy-intro">
-    <title>Introduction</title>
-    <para>
-      &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.
-    </para>
-    <para>
-      &app; supports the following services:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    <acronym>AIM</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Google Talk
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    ICQ
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <acronym>IRC</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Jabber (or <acronym>XMPP</acronym>)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <acronym>MSN</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Salut
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <acronym>SIP</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Yahoo
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    And many others...
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-  </sect1>
-
-  <sect1 id="empathy-getting-started">
-    <title>Getting Started</title>
-
-    <sect2 id="empathy-starting">
-      <title>Starting &appname;</title>
-      <para>You can start &app; in the following ways:
-      </para> 
-      <variablelist>
-    	<varlistentry>
-	  <term><guimenu>Applications</guimenu> menu</term>
-	  <listitem>
-	    <para>Choose 
-	      <menuchoice>
-		<guisubmenu>Internet</guisubmenu>
-		<guimenuitem>Empathy IM Client</guimenuitem>
-	      </menuchoice>.
-	    </para>
-	  </listitem>
-    	</varlistentry>
-    	<varlistentry>
-	  <term>Command line</term>
-	  <listitem>
-	    <para>Type <command>empathy</command> and then press
-	      <keycap>Enter</keycap>.
-	    </para>
-	  </listitem>
-    	</varlistentry>
-      </variablelist>
-    </sect2>
-
-    <sect2 id="emphaty-when-start">
-      <title>When You Start &appname;</title>
-      <para>
-	When you start &app; the following window is shown.
-	<!-- Figure 1 -->
-	<figure id="empathy-FIG-mainwindow"> 
-	  <title>&app; Main Window</title> 
-	  <screenshot> 
-	    <mediaobject> 
-	      <imageobject>
-		<imagedata fileref="figures/empathy-main-window.png" format="PNG"/> 
-	      </imageobject>
-	      <textobject> 
-		<phrase>
-		  Shows &app; main window. Contains the	titlebar, the
-		  menubar, contact list, status icon and status arrow
-		  button list.
-		</phrase> 
-	      </textobject> 
-	    </mediaobject> 
-	  </screenshot> 
-	</figure>
-	<!-- End of Figure -->
-      </para>
-      <para>
-	<xref linkend="empathy-TBL-1"/> describes the components of
-	&app;'s main window.
-	<table frame="topbot" id="empathy-TBL-1">
-	  <title>&app; Main Components</title>
-	  <tgroup cols="2" colsep="0" rowsep="0">
-	    <colspec colname="colspec0" colwidth="29.39*"/>
-	    <colspec colname="colspec1" colwidth="70.61*"/>
-	    <thead>
-	      <row rowsep="1">
-		<entry valign="top">
-		  <para>Component</para>
-		</entry>
-		<entry valign="top">
-		  <para>Description</para>
-		</entry>
-	      </row>
-	    </thead>
-	    <tbody>
-	      <row>
-		<entry valign="top">
-		  <para>Menubar</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Contains menus used to perform actions in &app;.
-		  </para>
-		</entry>
-	      </row>
-	      <row>
-		<entry valign="top">
-		  <para>Status Drop-Down List</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Allows to update the status.
-		  </para>
-		</entry>
-	      </row>
-	      <row>
-		<entry valign="top">
-		  <para>Account Button</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Opens the <guilabel>Accounts</guilabel> dialog.
-		  </para>
-		</entry>
-	      </row>
-	      <row>
-		<entry valign="top">
-		  <para>Contact List</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Shows all the available contacts and their
-		    associated status.
-		  </para>
-		</entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</table>
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="empathy-accounts">
-    <title>Accounts</title>
-    <para>
-      To use &app; you need at least one account of the supported services.
-    </para>
-    <para>
-      If you don't already have an account and you don't have your <emphasis>user
-	name</emphasis> and <emphasis>password</emphasis>, you need to
-	register a new account (see <xref linkend="empathy-register-account" />).
-    </para>
-    <para>
-      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 registered with that service.
-    </para>
-    <para>
-      &app; can handle as many accounts on any supported services as you want and
-      you can have them all open at the same time.
-    </para>
-
-    <sect2 id="empathy-register-account">
-      <title>Registering an Account</title>
-      <para>
-	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 <emphasis>user
-	  name</emphasis> (or an <emphasis>account ID</emphasis>) and
-	a <emphasis>password</emphasis> that you will use to
-	create the account in &app;.
-      </para>
-      <para>
-	Click on the name of the service to visit its website:
-	<!-- Need to do like that, if using only
-	<ulink>SERVICE</ulink> it wouldn't be possibile to
-	localize the links -->
-	<itemizedlist>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&aim;">AIM</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&gtalk;">Google
-	      Talk</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	   <para>
-	      The <ulink type="http" url="&icq;">ICQ</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&msn;">MSN</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&yahoo;">Yahoo</ulink> service.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-	For registering a <acronym>SIP</acronym> account, you can use one of the
-	following service:
-      </para>
-      <para>
-	<itemizedlist>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&ekiga;">Ekiga</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&fwd;"><acronym>FWD</acronym></ulink> (Free
-	      World Dialup) service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&sipphone;">Sipphone</ulink> service.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-	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>
-	  <listitem>
-	    <para>
-	      Salut
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="empathy-create-account">
-      <title>Adding your Account to &app;</title>
-      <para>
-	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 or press <keycap>F4</keycap> to open the
-	      <guilabel>Accounts</guilabel> dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      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>
-	    <para>
-	      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>. 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.
-	    </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>
-      </para>
-    </sect2>
-
-    <sect2 id="empathy-disabling-removing-account">
-      <title>Disabling and Removing an Account</title>
-      <para>
-	To disable an account, proceed as follows:
-      </para>
-      <para>
-	<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 disable in the box on the
-	      left of the dialog and deselect the
-	      <guilabel>Enabled</guilabel> check-box.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	To remove an account, proceed as follows:
-      </para>
-      <para>
-	<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 disable in the box on the
-	      left of the dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click on the <guibutton>Remove</guibutton> button.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      A dialog will be shown asking for confirmation. Click on
-	      the <guibutton>Remove</guibutton> button to remove the account.
-	    </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-groups">
-    <title>Contacts and Groups</title>
-    <para>
-      All the contacts are handled within &app;'s <link
-      linkend="empathy-FIG-mainwindow">main window</link>.
-    </para>
-    <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 follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-		window</link> choose <menuchoice>
-		<guimenu>Chat</guimenu>
-		<guimenuitem>Add Contact...</guimenuitem>
-	      </menuchoice>. The <guilabel>New Contact</guilabel>
-		dialog will be shown.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      From the <guilabel>Account</guilabel> drop-down list,
-	      choose the service used by the contact you are adding.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      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
-	      domain</replaceable></userinput>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      In the <guilabel>Alias</guilabel> text box type the name
-	      you want to give at the the new contact.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click on <guibutton>Add</guibutton> to add the new contact.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	To remove 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 remove and right-click on it.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      From the popup menu, choose <guilabel>Remove</guilabel> to
-	      remove the contact.
-	    </para>
-	  </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 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>
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
--- /dev/null
+++ b/help/C/figures/audio-input-microphone.png
diff --git a/help/C/figures/available.png b/help/C/figures/available.png
new file mode 100644
index 000000000..66b24967a
--- /dev/null
+++ b/help/C/figures/available.png
diff --git a/help/C/figures/away.png b/help/C/figures/away.png
new file mode 100644
index 000000000..ff59e309d
--- /dev/null
+++ b/help/C/figures/away.png
diff --git a/help/C/figures/busy.png b/help/C/figures/busy.png
new file mode 100644
index 000000000..fec554d89
--- /dev/null
+++ b/help/C/figures/busy.png
diff --git a/help/C/figures/camera-web.png b/help/C/figures/camera-web.png
new file mode 100644
index 000000000..e5406c5b9
--- /dev/null
+++ b/help/C/figures/camera-web.png
diff --git a/help/C/figures/extended-away.png b/help/C/figures/extended-away.png
new file mode 100644
index 000000000..ca26ae5d8
--- /dev/null
+++ b/help/C/figures/extended-away.png
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 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="group-conversations">
+
+  <info>
+    <link type="guide" xref="index#advanced"/>
+    <desc>
+      Start a group conversation with your contacts.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/>
+
+  </info>
+  <title>Group conversations</title>
+
+</page>
diff --git a/help/C/index.page b/help/C/index.page
new file mode 100644
index 000000000..729271b3e
--- /dev/null
+++ b/help/C/index.page
@@ -0,0 +1,43 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="index">
+
+  <info>
+
+    <revision version="3.0" date="2009-06-14" status="incomplete"/>
+
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Empathy Instant Messenger</title>
+
+  <section id="audio-video" style="2column">
+    <title>Audio and video conversations</title>
+  </section>
+
+  <section id="text-conv" style="2column">
+    <title>Text conversations</title>
+  </section>
+
+  <section id="accounts" style="2column">
+    <title>Manage accounts</title>
+  </section>
+
+  <section id="advanced" style="2column">
+    <title>Advanced actions</title>
+  </section>
+
+  <section id="problems" style="2column">
+    <title>Fix common problems</title>
+  </section>
+
+</page>
diff --git a/help/C/irc-account.page b/help/C/irc-account.page
new file mode 100644
index 000000000..1f81eb593
--- /dev/null
+++ b/help/C/irc-account.page
@@ -0,0 +1,128 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="prob-conn-neterror"/>
+    <link type="seealso" xref="prob-conn-name"/>
+    <desc>Create an IRC account.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-25" status="draft"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Create an IRC account</title>
+
+  <steps>
+    <item>
+      <p>
+	      From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+	        <p>
+	          Press <key>F4</key>.
+	        </p>
+	      </item>
+	      <item>
+	        <p>
+	          Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+	        </p>
+      	</item>
+      </list>
+    </item>
+    <item>
+      <p>
+	      If it is the first time you launch <app>Empathy</app>:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          From the <gui>Type</gui> drop-down list choose
+	          <gui>IRC</gui>, then click on the <gui>Create</gui> button.
+	        </p>
+	      </item>
+      </list>
+      <p>
+	      Otherwise:
+      </p>
+      <steps>
+	      <item>
+	        <p>
+	          Click on the <gui>Add</gui> button.
+	        </p>
+	      </item>
+	      <item>
+	        <p>
+	          From the <gui>Type</gui> drop-down list choose
+	          <gui>IRC</gui>, then click on the <gui>Create</gui> button.
+	        </p>
+	      </item>
+	     </steps>
+	   </item>
+	   <item>
+	    <p>
+	      From the <gui>Network</gui> drop-down list, select the name of the network
+	      you are creating the account for.
+	    </p>
+	   </item>
+	   <item>
+	   <!-- TODO: rethink the description of the nickname -->
+	    <p>
+	      In the <gui>Nickname</gui> text box, type the name that will identify yourself
+	      in the network you are creating the account.
+	    </p>
+	   </item>
+	   <item>
+	    <p>
+	      In the <gui>Password</gui> text box, type the password you used to register
+	      your nikcname. If you do not have one, leave this field blank.
+	    </p>
+	   </item>
+	   <item>
+	    <p>
+	      In the <gui>Real name</gui> text box, type your real name.
+	    </p>
+	    <note>
+	      <p>
+	        It is not necessary to insert your real name.
+	      </p>
+	    </note>
+	   </item>
+	   <item>
+	    <p>
+	      In the <gui>Quit message</gui> text box, type a text message that will be
+	      sent when you close your session.
+	    </p>
+	   </item>
+	   <item>
+	    <p>
+	      To enable the new account, select the <gui>Enabled</gui> check-box
+	      next to the name of the account in the box on the left of the dialog.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    If you want to change the name that identifies the account in the <gui>Accounts</gui>
+    dialog, double-click on the name of the account in the box on the left of the dialog
+    and type the new name.
+  </p>
+
+  <note>
+    <p>
+      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.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page
new file mode 100644
index 000000000..e672bbe68
--- /dev/null
+++ b/help/C/irc-join-pwd.page
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-join-pwd">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <link type="seealso" xref="irc-join-room"/>
+    <desc>Join a password protected room.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-07" status="review"/>
+
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Join a protected room</title>
+
+  <p>
+    At the moment it is not possible to join a password protected room.
+  </p>
+
+</page>
diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page
new file mode 100644
index 000000000..379399267
--- /dev/null
+++ b/help/C/irc-join-room.page
@@ -0,0 +1,55 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-join-room">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <desc>Entering an IRC channel.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
+
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Join a room</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, choose
+        <guiseq><gui>Room</gui><gui>Join</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the IRC account that
+        corresponds to the network you want to use.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Room</gui> text box, type the name of the channel you want to
+        join. Prefix the name with the hash character (<sys>#</sys>).
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on <gui>Join</gui> to enter the room.
+      </p>
+    </item>
+  </steps>
+
+  <note>
+    <p>
+      To join multiple rooms, you need to repeat the steps above for each room.
+    </p>
+  </note>
+</page>
diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page
new file mode 100644
index 000000000..bb285f248
--- /dev/null
+++ b/help/C/irc-manage.page
@@ -0,0 +1,43 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="guide"
+  id="irc-manage">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <desc>Manage IRC accounts with <app>Empathy</app>.</desc>
+    <revision pkgversion="2.28" version="3.0" date="2009-07-25" status="draft"/>
+
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Use IRC</title>
+
+  <comment>
+    <cite date="2009-07-25">Milo Casagrande</cite>
+    <p>
+      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.
+    </p>
+  </comment>
+
+  <section id="manage" style="2column">
+    <title>Manage IRC accounts</title>
+  </section>
+
+  <section id="problems" style="2column">
+    <!-- TODO: see prob-conn-neterror.page -->
+    <title>Fix common problems</title>
+  </section>
+
+
+</page>
diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page
new file mode 100644
index 000000000..1a73a2c4f
--- /dev/null
+++ b/help/C/irc-nick-password.page
@@ -0,0 +1,92 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-nick-password">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <link type="seealso" xref="prob-conn-name"/>
+    <desc>How to set the password of a nickname.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Set the nickname password</title>
+
+  <p>
+    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.
+  </p>
+
+  <p>
+    If you have registered your nickname with a password on a network that supports nickname
+    registration, you can use that password with <app>Empathy</app> to identify yourself as
+    the owner of the nickname.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+	      From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+	        <p>
+	          Press <key>F4</key>.
+	        </p>
+	      </item>
+	      <item>
+	        <p>
+	          Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+	        </p>
+      	</item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the IRC account from the box on the left of the dialog.
+      </p>
+    </item>
+    <item>
+      <p>
+        If the account is enabled, disable it by deselecting the <gui>Enable</gui>
+        check-box next to the name of the account.
+      </p>
+    </item>
+    <item>
+      <p>
+	      In the <gui>Password</gui> text box, type the password you used to register
+	      your nikcname.
+      </p>
+    </item>
+    <item>
+      <p>
+	      Enable the account by selecting the <gui>Enabled</gui> check-box
+	      next to the name of the account.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    Once you are connected, you will receive a message from the nickname server that will
+    tell you of the established identification.
+  </p>
+
+  <note>
+    <p>
+      At the moment it is not possible to register an IRC nickname with <app>Empathy</app>, it is
+      only possible to use the password of an already registered nickname.
+    </p>
+  </note>
+
+</page>
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 @@
-  <legalnotice id="legalnotice">
-	<para>
-	  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 <ulink type="help"
-	  url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
-	  distributed with this manual.
-         </para>
-         <para> 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.
-	</para>
-
-	<para>
-	  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.
-	</para>
-
-	<para>
-	  DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
-	  UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
-	  WITH THE FURTHER UNDERSTANDING THAT:
-
-	  <orderedlist>
-		<listitem>
-		  <para>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
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>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.
-		  </para>
-		</listitem>
-	  </orderedlist>
-	</para>
-  </legalnotice>
-
+<license xmlns="http://projectmallard.org/1.0/"
+         href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+<p>This work is licensed under a
+<link href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons
+Attribution-Share Alike 3.0 United States License</link>.</p>
+<p>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.</p>
+</license>
diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page
new file mode 100644
index 000000000..6fa8c51ee
--- /dev/null
+++ b/help/C/offline-contacts.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="offline-contacts">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <desc>
+      How to see the contacts that are not online.
+    </desc>
+    <revision version="3.0" date="2009-06-24" status="draft"/>
+    <revision pkgversion="2.28" version="3.1" date="2009-07-21" status="review"/>
+
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+    	<year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Display offline contacts</title>
+
+  <comment>
+    <cite date="2009-06-24">Milo Casagrande</cite>
+    <p>
+      Need to rework on the terminology used.
+    </p>
+  </comment>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Choose <guiseq><gui>View</gui><gui>Offline Contacts</gui></guiseq>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Press <keyseq><key>Ctrl</key><key>H</key></keyseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        To hide the offline contacts again, repeat the same procedure above.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page
new file mode 100644
index 000000000..71caf567e
--- /dev/null
+++ b/help/C/prob-conn-acctdisabled.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-acctdisabled">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <desc>
+        The instant messaging account that you want to use is not enabled in
+        the list of accounts.
+    </desc>
+    <revision version="3.0" date="2009-06-17" status="draft"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+<title>My account is not enabled</title>
+
+<p>
+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.
+</p>
+
+<list>
+<item>
+    <p>
+    Click <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and make sure
+    that the <gui>Enabled</gui> checkbox is checked.
+    </p>
+</item>
+<item>
+    <p>
+    Make sure that your username and password are correct.
+    </p>
+</item>
+<item>
+    <p>
+    Expand the <gui>Advanced</gui> section of the <app>Accounts</app>
+    window and make sure that all of the server settings are correct.
+    </p>
+</item>
+</list>
+
+</page>
diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page
new file mode 100644
index 000000000..e49167299
--- /dev/null
+++ b/help/C/prob-conn-auth.page
@@ -0,0 +1,62 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-auth">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <link type="seealso" xref="create-account"/>
+    <desc>
+        An error message appears in the main window saying that
+        "<gui>Authentication failed</gui>".
+    </desc>
+
+    <revision version="3.0" date="2009-06-17" status="draft"/>
+    <revision pkgversion="2.28" version="3.1" date="2009-07-23" status="draft"/>
+
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>I get a message that says "Authentication failed"</title>
+
+  <comment>
+    <cite date="2009-07-23">Milo Casagrande</cite>
+    <p>
+      Could be useful to link here how to change your password or how to
+      recover it. Need to write that section.
+    </p>
+  </comment>
+
+  <p>
+    If you try to connect and you get a message saying <gui>Authentication failed</gui>,
+    your instant messaging service is not allowing you to connect because it does not
+    recognize your username or password for some reason.
+  </p>
+
+  <list>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click the <gui>Edit Account</gui> button in the error message. Type
+        your username and password again to make sure that they are correct.
+        Deselect the <gui>Enabled</gui> box next to the name of your account and
+        then select it to try to connect to the service again.
+      </p>
+    </item>
+  </list>
+</page>
diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page
new file mode 100644
index 000000000..98e17c36c
--- /dev/null
+++ b/help/C/prob-conn-name.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-name">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <link type="guide" xref="irc-manage#problems"/>
+    <desc>
+      An error message appears in the main <app>Empathy</app> window which says
+      "Name in use".
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <!--
+    TODO: work on this page. This error appears with the IRC account
+    when you set a nickname that is already in use on that network. We need
+    to write topics for changing your nickname and to set the password of your
+    nickname.
+   -->
+
+  <title>I get a message that says "Name in use"</title>
+
+  <p>
+    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.
+  </p>
+
+  <p>
+    To resolve this problem, click on the <gui>Edit Account</gui> button and
+    perform one of the following:
+  </p>
+
+  <list>
+    <item>
+      <p>
+        Change your nickname.
+      </p>
+    </item>
+    <item>
+      <p>
+        Set the password for that nickname, if you have registered that nickname
+        within the network you are using. For more information,
+        see <link xref="irc-nick-password"/>.
+      </p>
+    </item>
+  </list>
+
+</page>
diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page
new file mode 100644
index 000000000..f15a4c86c
--- /dev/null
+++ b/help/C/prob-conn-neterror.page
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-neterror">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <link type="guide" xref="irc-manage#problems" />
+    <desc>
+        An error message appears in the main <app>Empathy</app> window which says
+        "Network error".
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-17" status="draft"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+<!--
+  TODO: rework this page in order to talk about the IRC problem: if you
+  don't set your nickname, this is the kind of error that will be shown.
+ -->
+
+<title>I get a message that says "Network error"</title>
+
+<p>
+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.
+</p>
+
+<list>
+<item>
+    <p>
+    Check that you are connected to the Internet or network.
+    </p>
+</item>
+<item>
+    <steps>
+        <item>
+        <p>
+        Click the <gui>Edit Account</gui> button in the error message.
+        </p>
+        </item>
+        <item>
+        <p>
+        Expand the <gui>Advanced</gui> 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.
+        </p>
+        </item>
+        <item>
+        <p>
+        Uncheck the <gui>Enabled</gui> box next to the name of your account and
+        then check it again to try to connect to the service again.
+        </p>
+        </item>
+    </steps>
+</item>
+</list>
+
+</page>
diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page
new file mode 100644
index 000000000..137a58770
--- /dev/null
+++ b/help/C/prob-conn.page
@@ -0,0 +1,44 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="guide"
+  id="prob-conn">
+
+<info>
+  <link type="guide" xref="index#problems"/>
+  <desc>
+    Diagnose common problems connecting to an instant messaging service.
+  </desc>
+  <revision version="0.1" date="2009-06-17" status="draft"/>
+  <revision version="0.2" date="2009-07-26" status="draft"/>
+  <credit type="author">
+    <name>Phil Bull</name>
+    <email>philbull@gmail.com</email>
+  </credit>
+  <copyright>
+    <year>2009</year>
+    <name>GNOME Documentation Project</name>
+  </copyright>
+
+  <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+</info>
+
+<title>Problems connecting to an instant messaging service</title>
+
+<comment>
+    <cite date="2009-06-14">Phil Bull</cite>
+    <p>This is a stub. We should identify the most common causes for a user not
+    being able to connect and document those.</p>
+</comment>
+
+<comment>
+  <cite date="2009-06-17">Phil Bull</cite>
+  <p>Check whether gui tags are allowed in section titles and descs.</p>
+  <comment>
+    <cite date="2009-07-26">Milo Casagrande</cite>
+    <p>
+      You can... but the end result is not very good: the title is in blue and the
+      gui element in grey.
+    </p>
+  </comment>
+</comment>
+
+</page>
diff --git a/help/C/remove-account.page b/help/C/remove-account.page
new file mode 100644
index 000000000..5728b40d0
--- /dev/null
+++ b/help/C/remove-account.page
@@ -0,0 +1,70 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="remove-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <desc>Completely remove an account from <app>Empathy</app>.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Remove an account</title>
+
+  <p>
+    Removing an account means to delete it from your computer with all
+    the conversations you had with other people.
+  </p>
+  <p>
+    After removing an account you will not be able to recover it or to recover
+     the conversations you had.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Press <key>F4</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the account you wish to remove from the box on the
+         left of the dialog.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on the <gui>Remove</gui> button.
+      </p>
+    </item>
+    <item>
+      <p>
+        A dialog will be shown asking for confirmation. Click on
+         the <gui>Remove</gui> button to permanently remove the
+         account.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page
new file mode 100644
index 000000000..8b23acac6
--- /dev/null
+++ b/help/C/salut-protocol.page
@@ -0,0 +1,52 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="salut-protocol">
+
+  <info>
+    <link type="seealso" xref="create-account"/>
+    <desc>
+      Undesrtanding the <em>Salut</em> protocol.
+    </desc>
+    <revision version="0.1" date="2009-08-12" status="draft"/>
+
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>What is the <em>Salut</em> service?</title>
+
+  <comment>
+    <cite date="2009-06-21">Milo Casagrande</cite>
+    <p>
+      Need to work on this section, explaining people in clear words
+      what the hell is this service!
+    </p>
+  </comment>
+
+  <p>
+    The <em>Salut</em> service is a serverless communication service:
+    you do not need to connect and authenticate to a central server in
+    order to use it.
+  </p>
+  <p>
+    This kind of serverless messaging system is restricted to a local area
+    network and an active Internet connection is not necessary.
+  </p>
+  <p>
+    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.
+  </p>
+  <p>
+    All the modern local area networks should be able to support this kind
+    of service.
+  </p>
+</page>
diff --git a/help/C/send-file.page b/help/C/send-file.page
new file mode 100644
index 000000000..7d7b2ab7d
--- /dev/null
+++ b/help/C/send-file.page
@@ -0,0 +1,90 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="send-file">
+
+  <info>
+    <link type="guide" xref="index#advanced"/>
+    <desc>Send a file from your computer to one of your contacts.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="draft"/>
+
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Send files</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Right-click on the contact you want to send a file, and select <gui>Send file</gui>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Click on the contact you want to send a file, and choose <guiseq><gui>Edit</gui>
+            <gui>Contact</gui><gui>Send file</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the file to send, and click on <gui>Send</gui>.
+      </p>
+    </item>
+    <item>
+      <p>
+        The <gui>File Transfers</gui> window will appear. Wait for your contact to accept the
+        file transfer, or click <gui>Stop</gui> to halt the transfer.
+      </p>
+    </item>
+  </steps>
+
+  <note>
+    <p>
+      It is possible to send files only using the following services: <em>Jabber</em>,
+       <em>Google Talk</em> and <em>Salut</em>.
+    </p>
+  </note>
+
+  <p>
+    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.
+  </p>
+  <p>
+    If they do not accept it, the status of the transfer will change to <gui>File
+    transfer cancelled</gui>, and the file will not be sent.
+  </p>
+  <p>
+    Once a transfer is finished, you can close the <gui>File Transfers</gui>
+    window. If you have multiple finished transfers listed in the window, click on
+    <gui>Clear</gui> to empty the list. This will only remove the files from the
+    list and will not delete them from your computer.
+  </p>
+
+  <note>
+    <p>
+      In order to send a file to someone, you need to be connected to the Internet, or to
+      a local area network.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/send-message.page b/help/C/send-message.page
new file mode 100644
index 000000000..bdf1c7341
--- /dev/null
+++ b/help/C/send-message.page
@@ -0,0 +1,52 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="send-message">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <desc>Send a message to one of your contacts.</desc>
+    <revision version="3.0" date="2009-06-14" status="draft"/>
+
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Send a message to someone</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Double-click the name of the contact that you want to have a conversation
+            with.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to have a conversation with, and
+            select <gui>Chat</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        A new window will open. Type a message into the box at the
+        bottom of the window and press <key>Enter</key> to send it.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page
new file mode 100644
index 000000000..36656a16f
--- /dev/null
+++ b/help/C/set-custom-status.page
@@ -0,0 +1,163 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="set-custom-status">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="change-status"/>
+	  <link type="seealso" xref="status-icons"/>
+    <desc>
+      Set a personal message for your status.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-30" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Jim Campbell</name>
+      <email>jwcampbell@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Set a custom message</title>
+
+  <p>
+    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.
+  </p>
+  <p>
+    It is possible to set a custom message based on the different statuses available.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, click on the drop-down list at
+         the top.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select the status you want to add a custom message to. You have to select the one
+         identified with the label <gui>Custom Message</gui>.
+      </p>
+    </item>
+    <item>
+      <p>
+        Enter your custom message in the text box at the top of the window, and
+         press <key>Enter</key> to set the message.
+      </p>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+      <p>
+        If you do not do it, the custom message will not be available the next time you
+         use <app>Empathy</app>. It will be saved only for the current session.
+      </p>
+    </item>
+  </steps>
+
+  <section id="edit-custom">
+
+  <title>Edit, remove and add a custom message</title>
+
+  <steps>
+    <item>
+     <p>
+        From the <gui>Contact List</gui> window, click on the drop-down list at
+         the top.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select <gui>Edit Custom Message</gui>.
+      </p>
+    </item>
+	  <item>
+	    <list>
+	      <item>
+	        <p>
+	          To edit a custom message:
+	        </p>
+	        <steps>
+	          <item>
+	            <p>
+	              From the <gui>Saved Presets</gui> box, select the status message
+	               you want to edit and double-click on it.
+              </p>
+            </item>
+            <item>
+              <p>
+                Type the new custom message and press <key>Enter</key> to modify it.
+              </p>
+            </item>
+          </steps>
+        </item>
+        <item>
+          <p>
+            To remove a custom message:
+          </p>
+          <steps>
+            <item>
+              <p>
+                From the <gui>Saved Presets</gui> box, select the status message you want
+                 to remove.
+              </p>
+            </item>
+            <item>
+              <p>
+                Click on the <gui>Remove</gui> button.
+              </p>
+            </item>
+          </steps>
+        </item>
+        <item>
+          <p>
+            To add a new custom message, from the <gui>Add New Preset</gui> section:
+          </p>
+          <steps>
+            <item>
+              <p>
+                Click on the drop-down list to select the status you want to set a custom
+                 message to.
+              </p>
+            </item>
+            <item>
+              <p>
+                Click on the text box, and type the new custom message.
+              </p>
+            </item>
+            <item>
+              <p>
+                Click on <gui>Add</gui> to add the new message to the presets ones.
+              </p>
+            </item>
+          </steps>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        When finished, click on <gui>Close</gui>.
+      </p>
+    </item>
+  </steps>
+
+  <note>
+    <p>
+      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 <gui>Contact List</gui> window.
+    </p>
+  </note>
+
+  </section>
+
+</page>
diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page
new file mode 100644
index 000000000..de7957791
--- /dev/null
+++ b/help/C/share-desktop.page
@@ -0,0 +1,86 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="share-desktop">
+
+  <info>
+    <link type="guide" xref="index#advanced"/>
+    <desc>
+      Share the desktop with your contacts.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Share your desktop</title>
+
+  <p>
+    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.
+  </p>
+
+  <note>
+    <p>
+      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.
+    </p>
+  </note>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Select the contact you want to share your desktop with, and choose
+             <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></guiseq>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to share your desktop with,
+             and select <gui>Share my desktop</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+      <p>
+        For more information about how to use the remote desktop viewer application,
+         refer to its help.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    When you share your desktop with someone else, it is possible to experience
+     system performance slowdown and low Internet speed.
+  </p>
+
+  <note>
+    <p>
+      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 <app>Empathy</app> and a remote desktop
+       viewer application installed in their system.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/status-icons.page b/help/C/status-icons.page
new file mode 100644
index 000000000..cc561cb89
--- /dev/null
+++ b/help/C/status-icons.page
@@ -0,0 +1,108 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="status-icons">
+
+  <info>
+    <desc>
+      Understanding the various status icons.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-18" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="draft"/>
+
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Status icons</title>
+
+  <comment>
+    <cite date="2009-07-21">Milo Casagrande</cite>
+    <p>
+      Need to understand when the extended away icon is used: how many minuts/hours should pass?
+    </p>
+    <p>
+      Need also to check for images to work!
+    </p>
+  </comment>
+
+  <table frame="all" rules="cols" shade="rows">
+    <thead>
+      <tr>
+        <td>
+          <p>
+            Icon
+          </p>
+        </td>
+        <td>
+          <p>
+            Description
+          </p>
+        </td>
+      </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>
+        <p>
+        <media type="image" mime="image/png" src="figures/available.png">
+          Available icon
+        </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the default icon for the <em>Available</em> status.
+        </p>
+        <p>
+          Use this icon when you are availble to have conversations with other
+          people.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p>
+        <media type="image" mime="image/png" src="figures/busy.png">
+          Busy icon
+        </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the default icon for the <em>Busy</em> status.
+        </p>
+        <p>
+          Use this icon when you do not want to be disturbed.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p>
+        <media type="image" mime="image/png" src="figures/away.png">
+          Away icon
+        </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the default icon for the <em>Away</em> status.
+        </p>
+        <p>
+          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.
+        </p>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+
+</page>
diff --git a/help/C/video-call.page b/help/C/video-call.page
new file mode 100644
index 000000000..1f65c6085
--- /dev/null
+++ b/help/C/video-call.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="video-call">
+
+  <info>
+    <link type="guide" xref="index#audio-video"/>
+    <link type="seealso" xref="audio-video"/>
+    <desc>
+      Start a video conversation with one of your contacts.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/>
+
+  </info>
+  <title>Start a video conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Select the contact you want to have a conversation with, and click
+            on the video call icon next to their name.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to have a conversation with, and
+            select <gui>Video Call</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        A new window will open. When the connection is established, you will
+        see written, at the bottom of the window, <gui>Connected</gui> and the total
+        conversation time.
+      </p>
+    </item>
+    <item>
+      <p>
+        To close the conversation, click on <gui>Hang up</gui>.
+      </p>
+    </item>
+  </steps>
+  <note>
+    <p>
+      To turn a video conversation into an audio one, from the call window deselect
+      <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>,
+      or click on the video call icon.
+    </p>
+  </note>
+
+
+
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index f51965b59..2ba171df1 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,8 +1,46 @@
 include $(top_srcdir)/gnome-doc-utils.make
 
-DOC_MODULE = empathy
-DOC_ENTITIES = legal.xml
+DOC_ID = empathy
+DOC_INCLUDES = legal.xml
 DOC_FIGURES = \
-	figures/empathy-main-window.png
+	figures/audio-input-microphone.png \
+	figures/available.png \
+	figures/away.png \
+	figures/busy.png \
+	figures/camera-web.png \
+	figures/empathy-main-window.png \
+	figures/extended-away.png
+
+DOC_PAGES = \
+	add-account.page \
+	add-contact.page \
+	audio-call.page \
+	audio-video.page \
+	change-status.page \
+	create-account.page \
+	disable-account.page \
+	group-conversations.page \
+	index.page \
+	irc-account.page \
+	irc-join-pwd.page \
+	irc-join-room.page \
+	irc-manage.page \
+	irc-nick-password.page \
+	offline-contacts.page \
+	prob-conn-acctdisabled.page \
+	prob-conn-auth.page \
+	prob-conn-name.page \
+	prob-conn-neterror.page \
+	prob-conn.page \
+	remove-account.page \
+	salut-protocol.page \
+	send-file.page \
+	send-message.page \
+	set-custom-status.page \
+	share-desktop.page \
+	status-icons.page \
+	video-call.page
+
+
 DOC_LINGUAS = ca cs de el en_GB es fi fr it ru sv
 dist-hook: doc-dist-hook