[help] Updates to instructions for audio and video conversations

1 files changed, 96 insertions, 36 deletions

diff --git a/help/C/audio-video.page b/help/C/audio-video.page
index cef06e126..31f512836 100644
--- a/help/C/audio-video.page
+++ b/help/C/audio-video.page
@@ -1,14 +1,15 @@
 <page xmlns="http://projectmallard.org/1.0/"
-  type="topic"
-  id="audio-video">
+      xmlns:e="http://projectmallard.org/experimental/"
+      type="topic"
+      id="audio-video">
 
   <info>
     <link type="guide" xref="index#audio-video"/>
-    <desc>
-      When it is possible to have an audio or video conversation.
-    </desc>
+    <desc>Information on when it is possible to have an audio or video conversation.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="draft"/>
-    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review">
+      <e:review by="shaunm@gnome.org" date="2009-09-04" status="done"/>
+    </revision>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -20,15 +21,14 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-  <title>Audio and video conversations</title>
+  <title>Audio and Video Support</title>
 
-  <p>
-    When your contacts support audio or video conversations, you will see, next to
-    the contacts name in the <gui>Contact List</gui> window, one or two small icons that
-    represent the different conversations you can have.
-  </p>
+  <p>You can only have audio and video conversation with contacts who are using
+  an application which also supports this feature.  When your contacts support
+  audio or video conversations, you will see the following icons next to their
+  names in the contact list:</p>
 
-  <table frame="all" rules="cols" shade="rows">
+  <table frame="all" rules="cols rowgroups" shade="rows">
     <thead>
       <tr>
         <td>
@@ -53,9 +53,7 @@
         </p>
       </td>
       <td>
-        <p>
-          This is the icon that represents the possibility to have an audio conversation.
-        </p>
+        <p>The contact is able to have an audio conversation.</p>
       </td>
     </tr>
     <tr>
@@ -67,9 +65,7 @@
         </p>
       </td>
       <td>
-        <p>
-          This is the icon that represents the possibility to have a video conversation.
-        </p>
+        <p>The contact is able to have a video conversation.</p>
       </td>
     </tr>
     </tbody>
@@ -77,31 +73,45 @@
   
   <note>
     <p>
-      In order to have a video conversation, you need to have a web-cam that is
-      supported by your operating system, and a working microphone.
+      In order to have an audio conversation, you need to have a sound card that is
+      supported by your operating system, and a working microphone. 
     </p>
     <p>
-      In order to have an audio conversation, you need to have a sound-card that is
-      supported by your operating system, and a working microphone. 
+      In order to have a video conversation, you need to have a webcam that is
+      supported by your operating system, and a working microphone.
     </p>
   </note>
+
+  <section id="services">
   
-  <section id="supported-services">
-  
-  <title>Supported services</title>
+  <title>Supported Account Types</title>
+
+  <p>You can only have audio and video conversations using accounts on
+  certain supported services.  The following table lists whether audio
+  and video is supported for each type of account.</p>
+
+  <note>
+    <p>Account types are provided by plugins.  Your system may not have
+    all of the following types available, or it may have types not listed
+    here.  Updated plugins may make audio or video conversations possible
+    on account types that are listed as unsupported here.</p>
+  </note>
+
+  <comment>
+    <cite date="2009-09-04">Shaun McCance</cite>
+    <p>I'd like to do tables like this using nothing for No and ✔ for Yes, but
+    we need to look at the accessibility impact.  I've
+    <link href="http://mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html">asked
+    the accessibility team</link> for input.</p>
+  </comment>
   
-  <table frame="all" rules="cols" shade="rows">
+  <table frame="all" rules="rowgroups colgroups" shade="rows">
+    <col/><colgroup><col/><col/></colgroup>
     <thead>
       <tr>
-        <td><p>
-          Protocol / Service
-        </p></td>
-        <td><p>
-          Video conversations
-        </p></td>
-        <td><p>
-          Audio conversations
-        </p></td>
+        <td><p>Service</p></td>
+        <td><p>Audio</p></td>
+        <td><p>Video</p></td>
       </tr>
     </thead>
     <tbody>
@@ -111,16 +121,31 @@
         <td><p>No</p></td>
       </tr>
       <tr>
+        <td><p>gadugadu</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
         <td><p>Google Talk</p></td>
         <td><p>Yes</p></td>
         <td><p>Yes</p></td>
       </tr>
       <tr>
+        <td><p>Groupwise</p></td>
+        <td><p>Yes</p></td>
+        <td><p>Yes</p></td>
+      </tr>
+      <tr>
         <td><p>ICQ</p></td>
         <td><p>No</p></td>
         <td><p>No</p></td>
       </tr>
       <tr>
+        <td><p>IRC</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
         <td><p>Jabber</p></td>
         <td><p>Yes</p></td>
         <td><p>Yes</p></td>
@@ -131,15 +156,50 @@
         <td><p>No</p></td>
       </tr>
       <tr>
+        <td><p>myspace</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>qq</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>People Nearby</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
         <td><p>Salut</p></td>
         <td><p>No</p></td>
         <td><p>No</p></td>
       </tr>
       <tr>
+        <td><p>sametime</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>silc</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>SIP</p></td>
+        <td><p>Yes</p></td>
+        <td><p>Yes</p></td>
+      </tr>
+      <tr>
         <td><p>Yahoo!</p></td>
         <td><p>No</p></td>
         <td><p>No</p></td>
       </tr>
+      <tr>
+        <td><p>zephyr</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
     </tbody>
   </table>