From c1f6327303dfa50e97a02bfad8161553aa549575 Mon Sep 17 00:00:00 2001
From: Shobha Tyagi <tyagishobha@gmail.com>
Date: Sat, 27 Apr 2013 01:10:26 +0530
Subject: Updated link-contacts.page, bug 677549

---
 help/C/link-contacts.page | 73 +++++++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 25 deletions(-)

(limited to 'help/C/link-contacts.page')

diff --git a/help/C/link-contacts.page b/help/C/link-contacts.page
index 06184ac66..6a23cd142 100644
--- a/help/C/link-contacts.page
+++ b/help/C/link-contacts.page
@@ -15,6 +15,10 @@
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <credit type="editor">
+      <name>Shobha Tyagi</name>
+      <email>tyagishobha@gmail.com</email>
+    </credit>
     <license>
       <p>
         Creative Commons Share Alike 3.0
@@ -22,18 +26,18 @@
     </license>
   </info>
 
-  <title>Combine and separate contacts</title>
+  <title>Link and unlink contacts</title>
   <p>
-    If one, or more, of your contacts has multiple accounts with different
-    messaging services, you can combine these contacts into a single one.
+    If one or more of your contacts has multiple accounts with different
+    messaging services, you can combine these accounts into a single contact.
   </p>
   <p>
     The resulting contact is called a <em>meta-contact</em>: a contact composed
     from different single contacts.
   </p>
   <p>
-    If you have a Jane Smith contact that is using three different messaging
-    services like:
+    Suppose you have a contact called Jane Smith who is using three different
+    messaging services like:
   </p>
   <list>
     <item>
@@ -55,52 +59,71 @@
   <p>
     You can combine these contacts into a single Jane Smith one.
   </p>
-  
   <section id="linking">
-    <title>Combining contacts</title>
+  <title>Link contacts</title>
+  <p>
+    The way you can link your contacts is as follows:
+  </p>
     <steps>
       <item>
         <p>
-          From the <gui>Contact List</gui> window, right-click one of the contact
-          that has different accounts, and select
-          <gui style="menuitem">Link Contacts...</gui>.
+          Press the tick button to select entries you want to link. This will enable
+          <em>selection mode</em> and you can see a checkbox for each entry.
         </p>
       </item>
       <item>
         <p>
-          From the left pane in the <gui>Link Contacts</gui> window,
-          select the contacts you want to combine.
+	  Tick the checkboxes that correspond to the <app>Contacts</app> entries which
+	  belong to the same contact.
         </p>
       </item>
       <item>
         <p>
-          Click <gui style="button">Link</gui>.
+          Press <gui style="button">Link</gui>.
         </p>
       </item>
     </steps>
-    <note>
-      <p>
-        When a meta-contact has been created, the default contact that will be used
-        to have a conversation with when you double-click on it, is the contact with
-        the highest presence on-line.
-      </p>
-    </note>
+    <p>
+      Repeat steps 3 and 4 in order to link other contacts.
+    </p>
   </section>
   
-  <section id="unlinkg">
-    <title>Separating contacts</title>
+  <section id="unlinking">
+  <title>Unlink contacts</title>
+  <p>
+    To unlink a linked contact:
+  </p>
     <steps>
       <item>
         <p>
-          From the <gui>Contact List</gui>, right-click the contact
-          to separate, and select <gui style="menuitem">Link Contacts...</gui>.
+          Select the contact from your list.
+        </p>
+      </item>
+      <item>
+        <p>
+          Press <gui style="button">Edit</gui> in the top-right corner of <app>Contacts</app>.
+	</p>
+      </item>
+      <item>
+	<p>
+	  Press <gui style="button">Linked Contacts</gui>.
+        </p>
+      </item>
+      <item>
+	<p>
+	  Press <gui style="button">Remove</gui> to unlink an entry from the linked contact.
         </p>
       </item>
       <item>
         <p>
-          Click <gui style="button">Unlink</gui>.
+          Press <gui style="button">Close</gui> if you do not want to unlink any more contacts.
         </p>
       </item>
+      <item>
+        <p>
+	  Finally, press <gui style="button">Done</gui> to finish editing.
+	</p>
+      </item>
     </steps>
   </section>
 </page>
-- 
cgit v1.2.3