[help] More info about IRC passwords and file sending

3 files changed, 28 insertions, 66 deletions

diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page
index 67de473bd..2b7e8c358 100644
--- a/help/C/irc-join-pwd.page
+++ b/help/C/irc-join-pwd.page
@@ -5,7 +5,7 @@
   <info>
     <link type="guide" xref="irc-manage#manage"/>
     <link type="seealso" xref="irc-join-room"/>
-    <desc>Join a password protected room.</desc>
+    <desc><app>Empathy</app> does not currently support password-protected IRC chat rooms.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-07" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
@@ -18,10 +18,8 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-  <title>Join a protected room</title>
+  <title>Join a protected IRC chat room</title>
 
-  <p>
-    At the moment it is not possible to join a password protected room.
-  </p>
+  <p>It is not currently possible to join a password-protected IRC chat room.</p>
 
 </page>
diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page
index 8b55bf834..90f9ff3ed 100644
--- a/help/C/irc-nick-password.page
+++ b/help/C/irc-nick-password.page
@@ -6,7 +6,7 @@
     <link type="guide" xref="irc-manage#manage"/>
     <link type="seealso" xref="prob-conn-name"/>
     <link type="seealso" xref="account-irc"/>
-    <desc>How to set the password of a nickname.</desc>
+    <desc>Protect your nickname to prevent other IRC users from using it.</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">
@@ -20,78 +20,44 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-  <title>Set the nickname password</title>
+  <title>Use a nickname password on IRC</title>
 
-  <p>
-    Registering a nickname is useful to preserve your identity on IRC, and to be able
-    to use always the same nickname. In some cirtumstances, some IRC channels may be
-    configured to accept only registered nickname.
-  </p>
+  <p>On some IRC networks, you can register your nickname with a service called
+  NickServ.  By sending special messages to NickServ, you can set your password
+  and identify yourself.  Some IRC chat rooms may not allow you to join without
+  a 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 that nickname.
-  </p>
-  
-  <note>
-    <p>
-      Not all the IRC servers support nickname registration.
-    </p>
-  </note>
+  <p><app>Empathy</app> does not currently support nickname registration.  Some
+  IRC networks, however, will automatically forward a <em>server password</em> to
+  NickServ.  On these networks, you can use the IRC password in <app>Empathy</app>
+  to identify yourself to NickServ.  The popular FreeNode network is known to have
+  this feature.</p>
+
+  <p>To set an IRC server password:</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>
-        Select the IRC account from the box on the left of the dialog.
-      </p>
+      <p>Select the IRC account from the list 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
+	      In the <gui>Password</gui> field, 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>
-      <p>
-        Once connected, you will receive a message from the nickname server that will
-        tell you of the established identification.
-      </p>
+      <p>Click <gui>Apply</gui>.</p>
     </item>
   </steps>
 
+
   <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>
+    <p>These instructions only allow you to use a password-protected nickname
+    on certain IRC networks.  It is not currently possible to register an IRC
+    nickname or change your nickname password using <app>Empathy</app>.</p>
   </note>
-
 </page>
diff --git a/help/C/irc-sending-file.page b/help/C/irc-sending-file.page
index 804efa9fa..242fbeabb 100644
--- a/help/C/irc-sending-file.page
+++ b/help/C/irc-sending-file.page
@@ -5,7 +5,7 @@
   <info>
     <link type="guide" xref="irc-manage#manage"/>
     <link type="seealso" xref="send-file"/>
-    <desc>Send a file from your computer to one of the IRC contacts.</desc>
+    <desc><app>Empathy</app> does not currently support sending files using IRC.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
@@ -18,10 +18,8 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-  <title>Send files</title>
+  <title>Send files over IRC</title>
 
-  <p>
-    At the moment it is not possible to send files using IRC.
-  </p>
+  <p>It is not currently possible to send files using IRC.</p>
 
 </page>