Merge commit 'jtellier/confirm-lose-accounts-settings'

[empathy.git] / help / C / add-account.page

diff --git a/help/C/add-account.page b/help/C/add-account.page
index 4931ff0d7652252e646b32855abc4565ff57bf9e..99a6d35dcfbc38a901f1c344b6833ac22ea07642 100644 (file)
--- a/help/C/add-account.page
+++ b/help/C/add-account.page
@@ -1,6 +1,6 @@
 <page xmlns="http://projectmallard.org/1.0/"
-  type="topic"
-  id="add-account">
+      type="topic" style="task"
+      id="add-account">
 
   <info>
     <link type="guide" xref="index#accounts"/>
@@ -13,6 +13,10 @@
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <credit type="author">
+      <name>Shaun McCance</name>
+      <email>shaunm@gnome.org</email>
+    </credit>
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
@@ -22,69 +26,57 @@
 
   <title>Add a new account</title>
 
+  <p>You can add instant messaging accounts from any supported service to communicate
+  with all of your contacts in <app>Empathy</app>.  For some account providers,
+  these steps will also allow you to register for a new account.  For more details,
+  see <link xref="create-account"/>.</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>
+      <p>From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui>
+      <gui>Accounts</gui></guiseq>, or press <key>F4</key>.</p>
+    </item>
+    <item>
+      <p>Click the <gui style="button">Add</gui> button.</p>
+    </item>
+    <item>
+      <p>From the <gui>Add new</gui> drop-down list, select the type of account you wish
+      to add.</p>
     </item>
     <item>
-      <p>
-        Click on the <gui style="button">Add</gui> button.
-      </p>
+      <p>If you do not already have a registered account, select <gui>Create a new account</gui>.
+      This feature is not available for all account types, and may not work with some account
+      providers.  See <link xref="create-account"/> for more information.</p>
     </item>
     <item>
-      <p>
-        From the <gui>Add new</gui> drop-down list choose
-        the service you wish to add an account for, then click
-        on the <gui style="button">Create</gui> button.
-      </p>
+      <p>Click <gui>Create</gui>.</p>
     </item>
     <item>
-      <p>
-        Fill the required fields with your <em>user name</em> and <em>password</em>.
-      </p>
+      <p>Enter the required information.  For most accounts, you will only need
+      a login ID and a password.  Some accounts may require additional information.
+      See <link xref="accounts-window#details"/> for more information.</p>
     </item>
     <item>
-      <p>
-        Click on <gui style="button">Connect</gui> to enable the new account.
-      </p>
+      <p>Click <gui style="button">Connect</gui> to enable the new account.</p>
 
       <!-- TODO: check if it's a bug or what. In case, this part needs to
       be removed or we must signal it as a bug! -->
 
-      <note id="warning">
-        <p>
-          If you do not click on <gui style="button">Connect</gui>, and you close
-          the dialog, the account will not be created, and it will be necessary to
-          create it again.
-        </p>
-        <p>
-          If you do not click on <gui style="button">Connect</gui>, and you select
-          another account from the dialog, the data you inserted will be lost.
-        </p>
+      <note style="warning">
+        <p>If you close the <gui>Accounts</gui> window without clicking
+        <gui>Connect</gui>, the entire account will be lost, and you will
+        need to create it again.</p>
+        <p>If you select another account without clicking <gui>Connect</gui>,
+        any information you have entered will be lost.</p>
       </note>
     </item>
   </steps>
 
   <note style="tip">
-    <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>
+    <p>To change the name the identifies the account in the <gui>Accounts</gui>
+    window, select the account from the list on the left and either click on the
+    name or press the space bar.  Edit the account name and press <key>Enter</key>
+    when you’re finished.</p>
   </note>
 
 </page>