[help] Fixed contacts linking/unlinking topic, fixed the audio and video topics

3 files changed, 16 insertions, 32 deletions

diff --git a/help/C/audio-call.page b/help/C/audio-call.page
index 3f0fe06f3..024b46377 100644
--- a/help/C/audio-call.page
+++ b/help/C/audio-call.page
@@ -22,13 +22,6 @@
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>
-<!--
-    <copyright>
-      <year>2009</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
--->
   </info>
 
   <title>Start an audio conversation</title>
@@ -38,10 +31,11 @@
   the other person to have an application that supports audio calls.</p>
   <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>.
+      <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">Audio Call</gui>.
       </p>
     </item>
     <item>
@@ -61,9 +55,7 @@
     <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.
+      <gui style="menuitem">Video On</gui></guiseq>.
     </p>
   </note>
   
diff --git a/help/C/link-contacts.page b/help/C/link-contacts.page
index 48d683322..06184ac66 100644
--- a/help/C/link-contacts.page
+++ b/help/C/link-contacts.page
@@ -56,7 +56,7 @@
     You can combine these contacts into a single Jane Smith one.
   </p>
   
-  <section id="linking" style="2column">
+  <section id="linking">
     <title>Combining contacts</title>
     <steps>
       <item>
@@ -81,24 +81,24 @@
     <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.
+        to have a conversation with when you double-click on it, is the contact with
+        the highest presence on-line.
       </p>
     </note>
   </section>
   
-  <section id="unlinkg" style="2column">
+  <section id="unlinkg">
     <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>.
+          to separate, and select <gui style="menuitem">Link Contacts...</gui>.
         </p>
       </item>
       <item>
         <p>
-          Click on <gui style="button">Unlink</gui>.
+          Click <gui style="button">Unlink</gui>.
         </p>
       </item>
     </steps>
diff --git a/help/C/video-call.page b/help/C/video-call.page
index e0c8ef06d..144db1ed0 100644
--- a/help/C/video-call.page
+++ b/help/C/video-call.page
@@ -24,13 +24,6 @@
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
-<!--
-    <copyright>
-      <year>2009</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/> 
--->
   </info>
   <title>Start a video conversation</title>
 
@@ -58,12 +51,11 @@
     </item>
   </steps>
   <note style="tip">
-    <p>To turn a video conversation into an audio conversation, choose
-    <guiseq><gui style="menu">Video</gui><gui style="menuitem">Video Off</gui></guiseq>, or click the
-    <media type="image" mime="image/png" src="figures/camera-web.png">video call</media>
-    toolbar button to deselect it.</p>
+    <p>
+      To turn a video conversation into an audio conversation, choose
+      <guiseq><gui style="menu">Video</gui><gui style="menuitem">Video Off</gui></guiseq>.
+    </p>
   </note>
-  
   <section id="video-meta-contact">
     <title>Start a video conversation with a meta-contact</title>
     <steps>