[help] Reworked two topics, added a new one

 * introduction: some wordings
 * group-conversations: moved from advanced to text conversations section
   reworked the topic
 * prev-conv: added stub topic for searching previous conversations

3 files changed, 86 insertions, 9 deletions

diff --git a/help/C/group-conversations.page b/help/C/group-conversations.page
index dff7eb478..fcc0b4365 100644
--- a/help/C/group-conversations.page
+++ b/help/C/group-conversations.page
@@ -3,12 +3,13 @@
   id="group-conversations">
 
   <info>
-    <link type="guide" xref="index#advanced"/>
+    <link type="guide" xref="index#text-conv"/>
     <desc>
-      Start a group conversation with your contacts.
+      Start or join a group conversation with your contacts.
     </desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/>
     <revision pkgversion="2.28" version="0.2" date="2009-08-17" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-17" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -30,12 +31,18 @@
     To have a group conversation you need to have a registered account with either
     Jabber or Google Talk, or a Salut account.
   </p>
+
   <note>
     <p>
-      You can have a group conversation with contacts that are using the same service
-      as yours.
+      You can have a group conversation only with the contacts that are using the
+      same service as yours.
     </p>
   </note>
+
+  <section id="start-group-conv">
+
+  <title>Start a group conversation</title>
+
   <steps>
     <item>
       <p>
@@ -50,6 +57,15 @@
     </item>
     <item>
       <p>
+        In the <gui>Server</gui> text box, type the name of server in which the conversation
+        will be hosted.
+      </p>
+      <p>
+        Leave it empty if it will be on the current server.
+      </p>
+    </item>
+    <item>
+      <p>
         In the <gui>Room</gui> text box, type the name you want to give to the conversation.
       </p>
       <note>
@@ -74,7 +90,7 @@
         </item>
         <item>
           <p>
-            Choose <guiseq><gui>Edit<gui><gui>Contact</gui><gui>Invite to chatroom</gui></guiseq>.
+            Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</gui></guiseq>.
           </p>
         </item>
       </list> 
@@ -84,5 +100,41 @@
       </p>
     </item>
   </steps>
+  
+  </section>
+
+  <section id="join-group-conv">
+
+  <title>Join a group conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, choose
+        <guiseq><gui>Room</gui><gui>Join</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        Expand the <gui>Room List</gui> section to see all the existing rooms.
+      </p>
+    </item>
+    <item>
+      <p>
+        Double-click on the name of a room to join it.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    It is not possible to join all existing rooms. Some of the rooms might require a
+    password, or might be invitation only. <app>Empathy</app> does not support these
+    kind of rooms.
+  </p>
+
+  <!-- TODO: find out where the password protected or invitation only icons are
+  and create a table. -->
+
+  </section>
 
 </page>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 8305fab29..58311b17b 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -5,6 +5,7 @@
   <info>
     <link type="guide" xref="index"/>
     <revision pkgversion="2.28" version="0.1" date="2009-08-16" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-17" status="review"/>
     <desc>
       Introduction to the <app>Empathy</app> instant messenger.
     </desc>
@@ -23,22 +24,22 @@
 
   <p>
     <app>Empathy</app> is an instant messaging application for the GNOME Desktop.
-    It supports text messaging, voice &amp; video call even using SIP, 
-    file transfers and all the most used messaging systems such as MSN and Google Talk.
+    It supports text messaging, voice &amp; video call, file transfers and all the
+    most used messaging systems such as MSN and Google Talk.
   </p>
   <p>
     <app>Empathy</app> includes features that help you better collaborate while at work,
     and that let you easily keep in touch with your friends.  
   </p>
   <p>
-    You can group all the conversations on a single window, or have multiple windows for
+    You can group all the conversations in a single window, or have multiple windows for
     different kind of conversations; easily search through your previous conversations, and
     share your desktop in just two clicks.
   </p>
 
   <p>
     <media type="image" src="figures/empathy-main-window.png" mime="image/png">
-      <app>Empathy</app> main window
+      <app>Empathy</app> main window.
     </media>
   </p>
 
diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page
new file mode 100644
index 000000000..ed59892be
--- /dev/null
+++ b/help/C/prev-conv.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prev-conv">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <desc>
+      Search your previous conversations.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-17" status="stub"/>
+    <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>Previous conversations</title>
+
+</page>