[help] Updates to create-account, import-account, and offline-contacts

1 files changed, 41 insertions, 42 deletions

diff --git a/help/C/create-account.page b/help/C/create-account.page
index a81e72b2e..d273287e6 100644
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -1,15 +1,16 @@
 <page xmlns="http://projectmallard.org/1.0/"
-      type="topic"
+      xmlns:e="http://projectmallard.org/experimental/"
+      type="topic" style="task"
       id="create-account">
 
   <info>
     <link type="guide" xref="index#accounts"/>
     <link type="seealso" xref="add-account"/>
-    <desc>
-      Register an account with one of the supported messaging services.
-    </desc>
+    <desc>Register for 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"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review">
+      <e:review by="shaunm@gnome.org" date="2009-09-02" status="done"/>
+    </revision>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -54,57 +55,60 @@
   <section id="salut">
     <title>People Nearby</title>
 
-    <p>You do not need to create an account to use this feature.  This service works
-    whenever you are connected to a local network, such as a wireless hotspot.  It
-    automatically finds all other users on the network who are also using this
-    service.</p>
+    <p>You do not need to create an account with a service provider to use this
+    feature.  This service works whenever you are connected to a local network,
+    such as a wireless hotspot.  It automatically finds all other users on the
+    network who are also using this service.</p>
 
     <p>For more information, see <link xref="salut-protocol" />.</p>
   </section>
 
   <section id ="sip-services">
-    <title>Telephony Services</title>
+    <title>SIP</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>
+    <p>SIP is an open system which allows users to have audio and video
+    conversations over the Internet.  You need to create an account with
+    a SIP provider.  You can communicate with all other SIP users,
+    regardless of which SIP provider they use.</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>
+    <p>There are a number of popular free SIP account providers; one
+    popular provider is <link
+    href="https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">Sipphone</link>.</p>
 
-    <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 style="warning">
+      <p>Due to technical differences, the free <link
+      href="https://www.ekiga.net/index.php?page=register">Ekiga.net</link>
+      service does not currently work with <app>Empathy</app>.</p>
     </note>
+
+    <p>Some SIP providers allow you to call normal phones from your computer.
+    Generally, you will need to subscribe to a paid service for this feature.</p>
   </section>
 
   <section id="irc">
     <title>IRC</title>
 
-    <comment>
-      <p>you don't need an account, but mention and cross-link nick registering
-      and server password stuff</p>
-    </comment>
+    <p>You do not need to register for an account to use IRC.  Although you specify
+    a nickname when you add an IRC account to <app>Empathy</app>, this nickname is
+    only established each time you connect.  If another user is using the nickname,
+    you will need to choose a new nickname.</p>
+
+    <p>Some IRC networks use a service called NickServ to allow users to protect
+    thier nicknames.  See <link xref="irc-nick-password"/> for more information.</p>
+
+    <p>Some IRC servers are password protected.  You will need to know the password
+    to connect to these servers.  Generally, these are private IRC networks.</p>
   </section>
 
   <section id="proprietary-services">
     <title>Proprietary Services</title>
 
+    <p>There are many proprietary instant messaging services that have been
+    developed by different companies or organizations.  <app>Empathy</app>
+    allows you to connect to an existing account for most popular services.
+    To create a new account with one of these services, you will need to
+    visit the service’s web site and agree to its terms of use.</p>
+
     <list>
       <item>
         <p>
@@ -113,11 +117,6 @@
       </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>