[help] Added topic about linking contacts, fixed other topics to reflect the new feature

5 files changed, 208 insertions, 35 deletions

diff --git a/help/C/audio-call.page b/help/C/audio-call.page
index 9ed99c3e7..3f0fe06f3 100644
--- a/help/C/audio-call.page
+++ b/help/C/audio-call.page
@@ -13,7 +13,8 @@
       <e:review by="shaunm@gnome.org" date="2009-09-04" status="done"/>
       -->
     </revision>
-    <revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/>    
+    <revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/>
+    <revision pkgversion="2.32" version="0.4" date="2010-09-09" status="review"/>   
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -35,23 +36,19 @@
   <p>You can call your contacts and have an audio conversation with them.
   This features only works with certain types of accounts, and it requires
   the other person to have an application that supports audio calls.</p>
-<!--
-  <comment>
-    <cite date="2009-09-02">Shaun McCance</cite>
-    <p>Link to A/V support matrix</p>
-  </comment>
--->
   <steps>
     <item>
       <p>From the <gui>Contact List</gui> window, click the
       <media type="image" mime="image/png" src="figures/audio-input-microphone.png">audio call</media>
-      icon next to the name of the contact you wish to call and choose <gui style="menuitem">Audio Call</gui>.
-       Alternatively, right click the contact and choose <gui style="menuitem">Audio Call</gui>.</p>
+      icon next to the name of the contact you wish to call and
+      choose <gui style="menuitem">Audio Call</gui>.
+      </p>
     </item>
     <item>
-      <p>A new window will open. When the connection is established, you will
-      see <gui>Connected</gui> at the bottom of the window, along with the
-      total conversation time.</p>
+      <p>
+        A new window will open. When the connection is established, you will
+        see <gui>Connected</gui> at the bottom of the window, along with the
+        total conversation time.</p>
     </item>
     <item>
       <p>
@@ -59,11 +56,40 @@
       </p>
     </item>
   </steps>
+  
   <note style="tip">
-    <p>To turn an audio conversation into a video conversation, choose
-    <guiseq><gui style="menu">Video</gui><gui style="menuitem">Video On</gui></guiseq>, or click the
-    <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
-    toolbar button to select it.</p>
+    <p>
+      To turn an audio conversation into a video conversation, choose
+      <guiseq><gui style="menu">Video</gui>
+      <gui style="menuitem">Video On</gui></guiseq>, or click the
+      <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
+      toolbar button to select it.
+    </p>
   </note>
+  
+  <section id="audio-meta-contact">
+    <title>Start an audio conversation with a meta-contact</title>
+    <steps>
+      <item>
+        <p>
+          From the <gui>Contact List</gui> window, right-click on the meta-contact.   
+        </p>
+      </item>
+      <item>
+        <p>
+          Select the contact you want to have the conversation, and from the menu
+          select <gui style="menuitem">Audio Call</gui>.
+        </p>
+      </item>
+    </steps>
+    <note style="tip">
+      <p>
+        To recognize if a contact is a <em>meta-contact</em>, move your mouse on
+        a contact in the <gui>Contact List</gui> window, and stop over it for a
+        second: a small pop-up message will appear showing the number of the
+        contacts that form the meta-contact.
+      </p>
+    </note>
+  </section>
 
 </page>
diff --git a/help/C/link-contacts.page b/help/C/link-contacts.page
new file mode 100644
index 000000000..48d683322
--- /dev/null
+++ b/help/C/link-contacts.page
@@ -0,0 +1,106 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  style="task"
+  id="link-contacts">
+      
+  <info>
+    <link type="guide" xref="index#contacts" />
+    <link type="seealso" xref="send-message" />
+    <link type="seealso" xref="audio-call" />
+    <link type="seealso" xref="video-call" />
+    <desc>Merge and separate different contacts into a single one.</desc>
+    <revision pkgversion="2.32" version="0.1" date="2010-09-06" status="draft"/>
+    <revision pkgversion="2.32" version="0.2" date="2010-09-09" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <license>
+      <p>
+        Creative Commons Share Alike 3.0
+      </p>
+    </license>
+  </info>
+
+  <title>Combine and separate 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.
+  </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:
+  </p>
+  <list>
+    <item>
+      <p>
+        janes@facebook
+      </p>
+    </item>
+    <item>
+      <p>
+        jane.smith@gmail
+      </p>
+    </item>
+    <item>
+      <p>
+        jane_smith@hotmail
+      </p>
+    </item>
+  </list>
+  <p>
+    You can combine these contacts into a single Jane Smith one.
+  </p>
+  
+  <section id="linking" style="2column">
+    <title>Combining contacts</title>
+    <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>.
+        </p>
+      </item>
+      <item>
+        <p>
+          From the left pane in the <gui>Link Contacts</gui> window,
+          select the contacts you want to combine.
+        </p>
+      </item>
+      <item>
+        <p>
+          Click <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 last contact
+        you select to link from the <gui>Link Contacts</gui> window.
+      </p>
+    </note>
+  </section>
+  
+  <section id="unlinkg" style="2column">
+    <title>Separating contacts</title>
+    <steps>
+      <item>
+        <p>
+          From the <gui>Contact List</gui>, right-click the contact
+          to separate, and select <gui style="menuitem">Unlink...</gui>.
+        </p>
+      </item>
+      <item>
+        <p>
+          Click on <gui style="button">Unlink</gui>.
+        </p>
+      </item>
+    </steps>
+  </section>
+</page>
diff --git a/help/C/send-message.page b/help/C/send-message.page
index fed39f56d..8751f23ef 100644
--- a/help/C/send-message.page
+++ b/help/C/send-message.page
@@ -12,6 +12,7 @@
       <e:review by="shaunm@gnome.org" date="2009-09-09" status="deferred"/>
       -->
     </revision>
+    <revision pkgversion="2.32" version="0.3" date="2010-09-09" status="review"/>
     <credit type="author">
       <name>Phil Bull</name>
       <email>philbull@gmail.com</email>
@@ -33,22 +34,9 @@
   <steps>
     <item>
       <p>
-        From the <gui>Contact List</gui> window, perform one of the following:
+        From the <gui>Contact List</gui> window, double-click the name of the
+        contact that you want to have a conversation with.
       </p>
-      <list>
-        <item>
-          <p>
-            Double click the name of the contact that you want to have a conversation
-            with.
-          </p>
-        </item>
-        <item>
-          <p>
-            Right-click on the name of the contact you want to have a conversation with, and
-            choose <gui>Chat</gui>.
-          </p>
-        </item>
-      </list>
     </item>
     <item>
       <p>
@@ -57,5 +45,30 @@
       </p>
     </item>
   </steps>
+  
+  <section id="send-meta-contact" style="2column">
+    <title>Send a message to a meta-contact</title>
+    <steps>
+      <item>
+        <p>
+          From the <gui>Contact List</gui> window, right-click on the meta-contact.   
+        </p>
+      </item>
+      <item>
+        <p>
+          Select the contact you want to have the conversation, and from the menu
+          select <gui style="menuitem">Chat</gui>.
+        </p>
+      </item>
+    </steps>
+    <note style="tip">
+      <p>
+        To recognize if a contact is a <em>meta-contact</em>, move your mouse on
+        a contact in the <gui>Contact List</gui> window, and stop over it for a
+        second: a small pop-up message will appear showing the number of the
+        contacts that form the meta-contact.
+      </p>
+    </note>
+  </section>
 
 </page>
diff --git a/help/C/video-call.page b/help/C/video-call.page
index 114346b2c..e0c8ef06d 100644
--- a/help/C/video-call.page
+++ b/help/C/video-call.page
@@ -34,8 +34,8 @@
   </info>
   <title>Start a video conversation</title>
 
-  <p>If you have a webcam, you can call your contacts and have an video
-  conversation with them.  This features only works with certain types of
+  <p>If you have a webcam, you can call your contacts and have a video
+  conversation with them. This features only works with certain types of
   accounts, and it requires the other person to have an application that
   supports video calls.</p>
 
@@ -43,8 +43,8 @@
     <item>
       <p>From the <gui>Contact List</gui> window, click the
       <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
-      icon next to the name of the contact you wish to call and choose <gui style="menuitem">Video Call</gui>.  
-      Alternatively, right click the contact and choose <gui style="menuitem">Video Call</gui>.</p>
+      icon next to the name of the contact you wish to call and choose <gui style="menuitem">Video Call</gui>.
+      </p>
     </item>
     <item>
       <p>A new window will open. When the connection is established, you will
@@ -63,4 +63,31 @@
     <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
     toolbar button to deselect it.</p>
   </note>
+  
+  <section id="video-meta-contact">
+    <title>Start a video conversation with a meta-contact</title>
+    <steps>
+      <item>
+        <p>
+          From the <gui>Contact List</gui> window, right-click on the meta-contact.   
+        </p>
+      </item>
+      <item>
+        <p>
+          Select the contact you want to have the conversation, and from the menu
+          select <gui style="menuitem">Video Call</gui>.
+        </p>
+      </item>
+    </steps>
+    <note style="tip">
+      <p>
+        To recognize if a contact is a <em>meta-contact</em>, move your mouse on
+        a contact in the <gui>Contact List</gui> window, and stop over it for a
+        second: a small pop-up message will appear showing the number of the
+        contacts that form the meta-contact.
+      </p>
+    </note>
+  </section>
+
+  
 </page>
diff --git a/help/Makefile.am b/help/Makefile.am
index ae09c3894..009d9c994 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -45,6 +45,7 @@ DOC_PAGES = \
 	irc-send-file.page \
 	irc-start-conversation.page \
 	license.page \
+	link-contacts \
 	prev-conv.page \
 	prob-conn-acctdisabled.page \
 	prob-conn-auth.page \