From 32dcb071cac5ba5d9bb9a66445d43d2047f450f4 Mon Sep 17 00:00:00 2001
From: Milo Casagrande <milo@ubuntu.com>
Date: Fri, 28 Aug 2009 00:00:31 +0200
Subject: [help] 	Fixed some topics against the new UI 	Topics fixed:
 add-account, disable-account, remove-account, irc-account 	Added
 irc-account to irc-manage 	Used 2column for irc-manage

---
 help/C/add-account.page     | 54 ++++++++++++++++++++-------------------------
 help/C/disable-account.page | 10 +++++++--
 help/C/irc-account.page     |  1 +
 help/C/irc-manage.page      |  2 ++
 help/C/remove-account.page  |  7 +++---
 5 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/help/C/add-account.page b/help/C/add-account.page
index 5821a856c..4931ff0d7 100644
--- a/help/C/add-account.page
+++ b/help/C/add-account.page
@@ -8,6 +8,7 @@
     <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"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-27" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -41,47 +42,40 @@
     </item>
     <item>
       <p>
-	      If it is the first time you launch <app>Empathy</app>:
+        Click on the <gui style="button">Add</gui> button.
       </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>
+    </item>
+    <item>
       <p>
-        Otherwise:
+        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>
-      <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>.
+        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.
+        Click on <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>
     </item>
   </steps>
 
diff --git a/help/C/disable-account.page b/help/C/disable-account.page
index 2ded8067a..f24c0f48f 100644
--- a/help/C/disable-account.page
+++ b/help/C/disable-account.page
@@ -11,6 +11,7 @@
     </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"/>
+    <revision pkgversion="2.28" version="0.3" date="2009-08-27" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -53,12 +54,17 @@
     <item>
       <p>
         Select the account you wish to disable from the box on the
-         left of the dialog.
+        left of the dialog.
       </p>
     </item>
     <item>
       <p>
-        Deselect the <gui>Enabled</gui> check-box.
+        Deselect the <gui style="checkbox">Enabled</gui> check-box.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on <gui style="button">Apply</gui>.
       </p>
     </item>
   </steps>
diff --git a/help/C/irc-account.page b/help/C/irc-account.page
index dd43fbb97..e6761f32a 100644
--- a/help/C/irc-account.page
+++ b/help/C/irc-account.page
@@ -4,6 +4,7 @@
 
   <info>
     <link type="guide" xref="index#accounts"/>
+    <link type="guide" xref="irc-manage"/>
     <link type="seealso" xref="prob-conn-neterror"/>
     <link type="seealso" xref="prob-conn-name"/>
     <desc>Create an IRC account.</desc>
diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page
index 07b6163f0..f1fc0a138 100644
--- a/help/C/irc-manage.page
+++ b/help/C/irc-manage.page
@@ -1,5 +1,6 @@
 <page xmlns="http://projectmallard.org/1.0/"
   type="guide"
+  style="2column"
   id="irc-manage">
 
   <info>
@@ -8,6 +9,7 @@
     <desc>How to use IRC with <app>Empathy</app>.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-07-25" status="draft"/>
     <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-27" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
diff --git a/help/C/remove-account.page b/help/C/remove-account.page
index 5728b40d0..dda83517c 100644
--- a/help/C/remove-account.page
+++ b/help/C/remove-account.page
@@ -7,6 +7,7 @@
     <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"/>
+    <revision pkgversion="2.28" version="0.3" date="2009-08-27" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -55,14 +56,14 @@
     </item>
     <item>
       <p>
-        Click on the <gui>Remove</gui> button.
+        Click on the trash icon to remove the account.
       </p>
     </item>
     <item>
       <p>
         A dialog will be shown asking for confirmation. Click on
-         the <gui>Remove</gui> button to permanently remove the
-         account.
+        the <gui>Remove</gui> button to permanently remove the
+        account.
       </p>
     </item>
   </steps>
-- 
cgit v1.2.3