From e2c824ec9024704e22e55e4388912425f9b9ec84 Mon Sep 17 00:00:00 2001
From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Fri, 17 Sep 2010 17:01:02 +1000
Subject: Update channel types list

---
 docs/book/C/channel.xml   | 72 ++++++++++++++++++++++++++++-------------------
 docs/book/C/telepathy.xml |  2 +-
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/docs/book/C/channel.xml b/docs/book/C/channel.xml
index f811e76..694631e 100644
--- a/docs/book/C/channel.xml
+++ b/docs/book/C/channel.xml
@@ -44,76 +44,90 @@
 	 </para>
        </listitem>
      </varlistentry>
-     
+
      <varlistentry>
        <term>
-         <indexterm><primary>RoomList</primary></indexterm>
-         <interfacename>RoomList</interfacename>
+         <indexterm><primary>Text</primary></indexterm>
+         <interfacename>Text</interfacename>
        </term>
        <listitem>
          <para>
-	  A channel type for listing named channels (e.g. chatrooms)
-	  available on the server.
+	  This channel sends and receives text messages, such as instant
+	  messages.
 	 </para>
 	 <para>
-	  See <xref linkend="sect.channel.roomlist"/>.
+	  See <xref linkend="sect.channel.text"/> and then
+	  <xref linkend="chapter.messaging"/>.
 	 </para>
        </listitem>
      </varlistentry>
 
      <varlistentry>
        <term>
-         <indexterm><primary>Text</primary></indexterm>
-         <interfacename>Text</interfacename>
+         <indexterm><primary>Call</primary></indexterm>
+         <interfacename>Call</interfacename>
        </term>
        <listitem>
          <para>
-	  This channel sends and receives text messages, such as instant
-	  messages.
+	  This channel is for voice and video calls.
+	 </para>
+       </listitem>
+     </varlistentry>
+     <varlistentry>
+       <term>
+         <indexterm><primary>FileTransfer</primary></indexterm>
+         <interfacename>FileTransfer</interfacename>
+       </term>
+       <listitem>
+         <para>
+	  A channel type for transferring files.
 	 </para>
 	 <para>
-	  See <xref linkend="sect.channel.text"/> and then
-	  <xref linkend="chapter.messaging"/>.
+	  File transfers are covered in-depth in
+	  <xref linkend="chapter.filetransfer"/>.
 	 </para>
        </listitem>
      </varlistentry>
 
      <varlistentry>
        <term>
-         <indexterm><primary>StreamedMedia</primary></indexterm>
-         <interfacename>StreamedMedia</interfacename>
+         <indexterm><primary>DBusTube</primary></indexterm>
+         <interfacename>DBusTube</interfacename>,
+         <indexterm><primary>StreamTube</primary></indexterm>
+         <interfacename>StreamTube</interfacename>
        </term>
        <listitem>
          <para>
-	  This channel sends and receives streamed audio or video,
-	  such as a video call.
+	  Tubes are channels that enable contact-to-contact networking.
+	  See <xref linkend="chapter.tubes"/>.
 	 </para>
        </listitem>
      </varlistentry>
-     
-     <!--varlistentry>
+
+     <varlistentry>
        <term>
-         <indexterm><primary>Tubes</primary></indexterm>
-         <interfacename>Tubes</interfacename>
+         <indexterm><primary>RoomList</primary></indexterm>
+         <interfacename>RoomList</interfacename>
        </term>
        <listitem>
          <para>
+	  A channel type for listing named channels (e.g. chatrooms)
+	  available on the server.
+	 </para>
+	 <para>
+	  See <xref linkend="sect.channel.roomlist"/>.
 	 </para>
        </listitem>
-     </varlistentry-->
-     
+     </varlistentry>
+
      <varlistentry>
        <term>
-         <indexterm><primary>FileTransfer</primary></indexterm>
-         <interfacename>FileTransfer</interfacename>
+         <indexterm><primary>ContactSearch</primary></indexterm>
+         <interfacename>ContactSearch</interfacename>
        </term>
        <listitem>
          <para>
-	  A channel type for transferring files.
-	 </para>
-	 <para>
-	  File transfers are covered in-depth in
-	  <xref linkend="chapter.filetransfer"/>.
+	  A channel type for searching for contacts on the server.
 	 </para>
        </listitem>
      </varlistentry>
diff --git a/docs/book/C/telepathy.xml b/docs/book/C/telepathy.xml
index 5af87b1..ab14685 100644
--- a/docs/book/C/telepathy.xml
+++ b/docs/book/C/telepathy.xml
@@ -84,7 +84,7 @@
 <xi:include href="filetransfer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <chapter id="chapter.streamedmedia">
- <title>Streamed Media (VoIP)</title>
+ <title>Calls (VoIP)</title>
 </chapter>
 
 <xi:include href="tubes.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-- 
cgit v1.2.3