From 63ccd06c5f862c1655c83b6f620e015516501439 Mon Sep 17 00:00:00 2001
From: Milo Casagrande <milo@ubuntu.com>
Date: Mon, 19 Dec 2011 22:10:21 +0100
Subject: [help] Reworked the search conversation topic

	* Small work on the previous conversation topic in order
	  to address the new UI. Topic needs to be reviewed.
---
 help/C/prev-conv.page | 43 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

(limited to 'help')

diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page
index a1668dfe1..97718427a 100644
--- a/help/C/prev-conv.page
+++ b/help/C/prev-conv.page
@@ -12,6 +12,7 @@
       <e:review by="shaunm@gnome.org" date="2009-08-31" status="done"/>
       -->
     </revision>
+    <revision pkgversion="3.2" version="0.2" date="2011-12-19" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -22,7 +23,7 @@
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
-    </license>    
+    </license>
 <!--
     <copyright>
       <year>2009</year>
@@ -34,15 +35,6 @@
 
   <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.  You can <link xref="#search">search through all of your
@@ -68,19 +60,18 @@
       <gui>Previous Conversations</gui></guiseq>.  Alternatively, press <key>F3</key>.</p>
     </item>
     <item>
-      <p>Select the <gui>Search</gui> tab.</p>
-    </item>
-    <item>
-      <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>
+      <p>Select an account from the drop-down list in the top.  A list of
+      contacts and chat room for that account will be shown below.</p>
     </item>
     <item>
-      <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>
+      <p>Type the text you want to search for in the <gui>Search</gui> text field.
+      </p>
     </item>
     <item>
-      <p>Click on a conversation to view it.  <app>Empathy</app> will select the text
-      in the conversation that matched your search terms.</p>
+      <p>
+        Any conversations that matched your search terms will be shown. By
+        default, conversations are ordered by date.
+      </p>
     </item>
   </steps>
   </section>
@@ -96,9 +87,6 @@
       <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>Select the <gui>Conversations</gui> tab.</p>
-    </item>
     <item>
       <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>
@@ -114,16 +102,17 @@
     </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>
+  <p>
+    You can search for text in the conversations by typing into the
+    search field at the top. The matching conversations will be showed.
+  </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
-    choose <gui>View Previous Conversations</gui>.  The <gui>Previous
+    choose <gui>Previous Conversations</gui>.  The <gui>Previous
     Conversations</gui> window will open with that contact already selected.</p>
   </note>
-    
-  </section>
 
+  </section>
 </page>
-- 
cgit v1.2.3