* New topic: prob-conn-name for handling the "Name in use" IRC error * New topic: irc-nick-password on setting the password for a registered nickname * New topic: irc-join-room on how to enter an IRC channel * Added the new topic in the IRC account page * Reworked the title of the guide page for common problems * Added a small paragraph to the add-account page

7 files changed, 247 insertions, 16 deletions

diff --git a/help/C/add-account.page b/help/C/add-account.page
index 8a31cc12c..9ab2beced 100644
--- a/help/C/add-account.page
+++ b/help/C/add-account.page
@@ -88,4 +88,10 @@
     </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/irc-account.page b/help/C/irc-account.page
index 7a93506b6..aef11767a 100644
--- a/help/C/irc-account.page
+++ b/help/C/irc-account.page
@@ -5,7 +5,8 @@
   <info>
     <link type="guide" xref="irc-manage#manage"/>
     <link type="seealso" xref="prob-conn-neterror"/>
-    <desc>Create a new IRC account.</desc>
+    <link type="seealso" xref="prob-conn-name"/>
+    <desc>Create a new account.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-07-25" status="draft"/>
 
     <credit type="author">
@@ -22,7 +23,7 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
   
-  <title>Create an IRC account</title>
+  <title>Create an account</title>
 
   <steps>
     <item>
@@ -78,9 +79,10 @@
 	    </p>
 	   </item>
 	   <item>
-	   <!-- TODO: think of a simple way to talk about the nickname -->
+	   <!-- TODO: rethink the description of the nickname -->
 	    <p>
-	      In the <gui>Nickname</gui> text box, type the name... 
+	      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>
@@ -95,13 +97,13 @@
 	    </p>
 	    <note>
 	      <p>
-	        It is not necessary to insert also your real name.
+	        It is not necessary to insert your real name.
 	      </p>
 	    </note>
 	   </item>
 	   <item>
 	    <p>
-	      In the <gui>Quit message</gui> text box, type the text message that will be 
+	      In the <gui>Quit message</gui> text box, type a text message that will be 
 	      sent when you close your session.
 	    </p>
 	   </item>
@@ -111,12 +113,18 @@
 	      next to the name of the account in the box on the left of the dialog.
       </p>
     </item>
-	 </steps>
+  </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 of the networks you want to use.
+      account with each one of the networks you want to use.
     </p>
   </note>
 
diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page
new file mode 100644
index 000000000..e6dc99177
--- /dev/null
+++ b/help/C/irc-join-room.page
@@ -0,0 +1,57 @@
+<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>
+
+    <license>Creative Commons Share Alike 3.0</license>
+
+    <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-nick-password.page b/help/C/irc-nick-password.page
new file mode 100644
index 000000000..3240335a8
--- /dev/null
+++ b/help/C/irc-nick-password.page
@@ -0,0 +1,94 @@
+<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"/>
+
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+
+    <license>Creative Commons Share Alike 3.0</license>
+
+    <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 a 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/prob-conn-name.page b/help/C/prob-conn-name.page
new file mode 100644
index 000000000..a6ed9115d
--- /dev/null
+++ b/help/C/prob-conn-name.page
@@ -0,0 +1,60 @@
+<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>
+    <license>Creative Commons Share Alike 3.0</license>
+    <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
index 65a8d1e95..cb7dcb049 100644
--- a/help/C/prob-conn-neterror.page
+++ b/help/C/prob-conn-neterror.page
@@ -7,9 +7,9 @@
     <link type="guide" xref="irc-manage#problems" />
     <desc>
         An error message appears in the main <app>Empathy</app> window which says 
-        <gui>Network error</gui>.
+        "Network error".
     </desc>
-    <revision version="3.0" date="2009-06-17" status="draft"/>
+    <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>
@@ -31,7 +31,7 @@
 
 <p>
 If you try to connect and an error message appears in the main Empathy 
-window which says <gui>Network error</gui>, Empathy cannot communicate with 
+window which says "Network error", Empathy cannot communicate with 
 the instant messaging service for some reason.
 </p>
 
diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page
index 8655d1242..b4397b792 100644
--- a/help/C/prob-conn.page
+++ b/help/C/prob-conn.page
@@ -5,9 +5,10 @@
 <info>
   <link type="guide" xref="index#problems"/>
   <desc>
-    Diagnose common problems with connecting to an instant messaging service.
+    Diagnose common problems connecting to an instant messaging service.
   </desc>
-  <revision version="3.0" date="2009-06-17" status="draft"/>
+  <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>
@@ -22,7 +23,7 @@
   <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
 </info>
 
-<title>I have a problem connecting to an instant messaging service</title>
+<title>Problems connecting to an instant messaging service</title>
 
 <comment>
     <cite date="2009-06-14"><name>Phil Bull</name></cite>
@@ -31,8 +32,13 @@
 </comment>
 
 <comment>
-    <cite date="2009-06-17"><name>Phil Bull</name></cite>
-    <p>Check whether gui tags are allowed in section titles and descs.</p>
+  <cite date="2009-06-17"><name>Phil Bull</name></cite>
+  <p>Check whether gui tags are allowed in section titles and descs.</p>
+  <cite date="2009-07-26"><name>Milo Casagrande</name></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>
 
 </page>