[help] More reviews and updates for account management topics

1 files changed, 65 insertions, 94 deletions

diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page
index b521ada59..11c73c785 100644
--- a/help/C/prev-conv.page
+++ b/help/C/prev-conv.page
@@ -1,6 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/"
-  type="topic"
-  id="prev-conv">
+      xmlns:e="http://projectmallard.org/experimental/"
+      type="topic" style="tasks"
+      id="prev-conv">
 
   <info>
     <link type="guide" xref="index#text-conv"/>
@@ -8,11 +9,17 @@
       Search your previous conversations.
     </desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-17" status="stub"/>
-    <revision pkgversion="2.28" version="0.2" date="2009-08-19" status="review"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-31" status="review">
+      <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
+    </revision>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <credit type="author">
+      <name>Shaun McCance</name>
+      <email>shaunm@gnome.org</email>
+    </credit>
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
@@ -20,134 +27,98 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-  <title>Previous conversations</title>
+  <title>View previous conversations</title>
+
+  <comment>
+    <cite date="2009-08-31">Shaun McCance</cite>
+    <p>Highlighting text is quirky:
+    <link href="http://bugzilla.gnome.org/show_bug.cgi?id=593733">#593733</link>.
+    If there's an actual highlighting going on, independent of the selection
+    (like in yellow or something), we can use the term "highlight".  Otherwise
+    we need to use the term "select".  Watch that bug.</p>
+  </comment>
 
   <p>
     <app>Empathy</app> automatically saves all your text conversations you have
-    with your contacts, and lets you perform two different kinds of search: a
-    normal text search, or a per-conversation search.
-  </p>
-  <p>
-    The normal search is a <em>full text</em> search: it will search the exact text in
-    all your previous conversations.
-  </p>
-  <p>
-    The per-conversation search permits you to limit the text search to a particular
-    contact and conversation, and permits you to look at all the previous
-    conversations you had with your contacts.
+    with your contacts.  You can <link xref="#search">search through all of your
+    previous conversations</link> or <link xref="#browse">browse previous
+    conversations</link> by contact and date.
   </p>
 
   <note>
     <p>
-      You do not need to be connected to the Internet to search your previous
+      You do not need to be connected to the Internet to view and search your previous
       conversations.
     </p>
   </note>
 
+  <section id="search" style="task">
+  <title>Search previous conversations</title>
+
+  <p>You can perform a full-text search through all of your previous conversations.</p>
+
   <steps>
     <item>
-      <p>
-        To start searching your previous conversations, from the <gui>Contact List</gui>
-        window, perform one of the following:
-      </p>
-      <list>
-        <item>
-          <p>
-            Press <key>F3</key>.
-          </p>
-        </item>
-        <item>
-          <p>
-            Choose <guiseq><gui>View</gui><gui>Previous Conversations</gui></guiseq>.
-          </p>
-        </item>
-      </list>
+      <p>From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui>
+      <gui>Previous Conversations</gui></guiseq>.  Alternatively, press <key>F3</key>.</p>
     </item>
     <item>
-      <p>
-        Based on the kind of search you want to perform, see
-        <link xref="prev-conv#normal-search"/> or <link xref="prev-conv#contact-search"/>
-        for more information.
-      </p>
+      <p>Select the <gui>Search</gui> tab.</p>
     </item>
-  </steps>
-
-  <section id="normal-search">
-  <title>Normal search</title>
-  <steps>
     <item>
-      <p>
-        Select the <gui>Search</gui> tab.
-      </p>
+      <p>In the <gui>For</gui> field, type the text you want to search for.
+      Click <gui>Find</gui> or press <key>Enter</key>.</p>
     </item>
     <item>
-      <p>
-        In the <gui>For</gui> text box, type the text you want to search, and click on
-        <gui>Find</gui>.
-      </p>
+      <p>Any conversations that matched your search terms will be shown in the list below
+      the search field.  By default, conversations are ordered by date.</p>
     </item>
     <item>
-      <p>
-        If there are results, they will be shown in the first pane, ordered by date.
-      </p>
-    </item>
-    <item>
-      <p>
-        Click on the result to see the exact text you were searching for on the
-        bottom pane.
-      </p>
-      <p>  
-        The search results will be highlighted.
-      </p>
+      <p>Click on a conversation to view it.  <app>Empathy</app> will select the text
+      in the conversation that matched your search terms.</p>
     </item>
   </steps>
   </section>
 
-  <section id="contact-search">
-  <title>Conversation search</title>
+  <section id="browse" style="task">
+  <title>Browse previous conversations</title>
+
+  <p>You can browse your previous conversations with your contacts or in
+  chat rooms by date.</p>
+
   <steps>
     <item>
-      <p>
-        Select the <gui>Conversations</gui> tab.
-      </p>
+      <p>From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui>
+      <gui>Previous Conversations</gui></guiseq>.  Alternatively, press <key>F3</key>.</p>
     </item>
     <item>
-      <p>
-        From the drop-down list at the top of the window, select your account.
-      </p>
+      <p>Select the <gui>Conversations</gui> tab.</p>
     </item>
     <item>
-      <p>
-        From the left top pane, select the contact you want to look the previous
-        conversations of. The previous conversations will be shown on the right pane.
-      </p>
-      <p>
-        By default, the last conversation you had will be shown.
-      </p>
-      <note>
-        <p>
-          Based on your account selected and the service of that account, it will
-          be possible to select contacts, IRC rooms or group conversations. 
-        </p>
-      </note>
+      <p>Select an account from the drop-down list in the top left.  A list of
+      contacts and chat room for that account will be shown below.</p>
     </item>
     <item>
-      <p>
-        From the left bottom pane, you can browse your conversations by date. Based
-        on the contact selected, the date in which you had a conversation will
-        be highlighted in bold text.
-      </p>
+      <p>Select a contact or chat room to view your previous conversations from.
+      By default the most recent conversation will be shown.</p>
     </item>
     <item>
-      <p>
-        To perform a text search, type the text you want to search in the text box
-        at the top of the window.
-      </p>
-      <p>
-        The search results will be highlighted.
-      </p>
+      <p>You can browse your conversations by date.  Days on which you had a conversation
+      with the selected contact will be shown in bold text.  Click a date to select it.
+      Click the arrows next to the month and year to browse earlier dates.</p>
     </item>
   </steps>
+
+  <p>You can search for text in the displayed conversation by typing into the
+  search field at the top.  The matching text will be highlighted.</p>
+
+  <note style="tip">
+    <p>You can quickly view the previous conversations with one of your contacts
+    from the <gui>Contact List</gui> window.  Simply right click the contact and
+    select <gui>View Previous Conversations</gui>.  The <gui>Previous
+    Conversations</gui> window will open with that contact already selected.</p>
+  </note>
+    
   </section>
 
 </page>