[help] Updating IRC instructions, removing irc-account.page

diff --git a/help/C/create-account.page b/help/C/create-account.page
index f1a0c428127efdca0b90b255e2d07186e2c391b9..a81e72b2ec8a64d31a13d69a65f5368f52755530 100644 (file)
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -5,7 +5,6 @@
   <info>
     <link type="guide" xref="index#accounts"/>
     <link type="seealso" xref="add-account"/>
-    <link type="seealso" xref="irc-account"/>
     <desc>
       Register an account with one of the supported messaging services.
     </desc>

diff --git a/help/C/irc-account.page b/help/C/irc-account.page
deleted file mode 100644 (file)
index e6761f3..0000000
--- a/help/C/irc-account.page
+++ /dev/null
@@ -1,129 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-  type="topic"
-  id="irc-account">
-
-  <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>
-    <revision pkgversion="2.28" version="0.1" date="2009-07-25" status="draft"/>
-    <revision pkgversion="2.28" version="0.1" date="2009-08-10" status="review"/>
-    <credit type="author">
-      <name>Milo Casagrande</name>
-      <email>milo@ubuntu.com</email>
-    </credit>
-    <copyright>
-      <year>2009</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-  </info>
-
-  <title>Create an IRC account</title>
-
-  <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>
-             If it is the first time you launch <app>Empathy</app>:
-      </p>
-      <list>
-             <item>
-               <p>
-                 From the <gui>Type</gui> drop-down list choose
-                 <gui>IRC</gui>, then click on the <gui>Create</gui> button.
-               </p>
-             </item>
-      </list>
-      <p>
-             Otherwise:
-      </p>
-      <steps>
-             <item>
-               <p>
-                 Click on the <gui>Add</gui> button.
-               </p>
-             </item>
-             <item>
-               <p>
-                 From the <gui>Type</gui> drop-down list choose
-                 <gui>IRC</gui>, then click on the <gui>Create</gui> button.
-               </p>
-             </item>
-            </steps>
-          </item>
-          <item>
-           <p>
-             From the <gui>Network</gui> drop-down list, select the name of the network
-             you are creating the account for.
-           </p>
-          </item>
-          <item>
-          <!-- TODO: rethink the description of the nickname -->
-           <p>
-             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>
-           <p>
-             In the <gui>Password</gui> text box, type the password you used to register
-             your nikcname. If you do not have one, leave this field blank.
-           </p>
-          </item>
-          <item>
-           <p>
-             In the <gui>Real name</gui> text box, type your real name.
-           </p>
-           <note>
-             <p>
-               It is not necessary to insert your real name.
-             </p>
-           </note>
-          </item>
-          <item>
-           <p>
-             In the <gui>Quit message</gui> text box, type a text message that will be
-             sent when you close your session.
-           </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.
-      </p>
-    </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>
-
-  <note style="tip">
-    <p>
-      If you want to use different networks at the same time, you need to create an
-      account with each one of the networks you want to use.
-    </p>
-  </note>
-
-</page>

diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page
index 8461b1de1d2b0aaa887241207071ee58d829e90f..53fe3bd749043623d5522172116dad0fcf700fb9 100644 (file)
--- a/help/C/irc-join-room.page
+++ b/help/C/irc-join-room.page
@@ -1,6 +1,6 @@
 <page xmlns="http://projectmallard.org/1.0/"
-  type="topic"
-  id="irc-join-room">
+      type="topic" style="task"
+      id="irc-join-room">
 
   <info>
     <link type="guide" xref="irc-manage#manage"/>
@@ -18,7 +18,11 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-  <title>Join a room</title>
+  <title>Join an IRC chat room</title>
+
+  <p>You can join IRC chat rooms (also known as IRC channels) on any IRC network you’re
+  connected to.  To connect to an IRC network, see <link xref="add-account"/> and
+  <link xref="account-irc"/>.</p>
 
   <steps>
     <item>
@@ -36,12 +40,12 @@
     <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>).
+        join. IRC channel names start with the hash character (<sys>#</sys>).
       </p>
     </item>
     <item>
       <p>
-        Click on <gui>Join</gui> to enter the room.
+        Click <gui>Join</gui> to enter the room.
       </p>
     </item>
   </steps>

diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page
index f1fc0a138177fc97514a39e11f693220402c3d98..b35f12d39e3be06d3332201f0743c9a444fea44f 100644 (file)
--- a/help/C/irc-manage.page
+++ b/help/C/irc-manage.page
@@ -5,7 +5,6 @@
 
   <info>
     <link type="guide" xref="index#text-conv"/>
-    <link type="seealso" xref="irc-account"/>
     <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"/>