Index: gnome/applications/applications.xml
===================================================================
--- gnome/applications/applications.xml	(revision 72ea7aaee607939898d41c8d1a73cbe2b2baf4ce)
+++ gnome/applications/applications.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
@@ -71,5 +71,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nautilus-sendto.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="evolution-data-server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="geocode-glib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uhttpmock.xml"/>
Index: ome/applications/telepathy-glib.xml
===================================================================
--- gnome/applications/telepathy-glib.xml	(revision 72ea7aaee607939898d41c8d1a73cbe2b2baf4ce)
+++ 	(revision )
@@ -1,190 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY telepathy-glib-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
-  <!ENTITY telepathy-glib-download-ftp  " ">
-  <!ENTITY telepathy-glib-md5sum        "93c429e37750b25dcf8de86bb514664f">
-  <!ENTITY telepathy-glib-size          "3.8 MB">
-  <!ENTITY telepathy-glib-buildsize     "240 MB">
-  <!ENTITY telepathy-glib-time          "1.2 SBU">
-]>
-
-<sect1 id="telepathy-glib" xreflabel="telepathy-glib-&telepathy-glib-version;">
-  <?dbhtml filename="telepathy-glib.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>telepathy-glib-&telepathy-glib-version;</title>
-
-  <indexterm zone="telepathy-glib">
-    <primary sortas="a-telepathy-glib">telepathy-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy GLib</title>
-
-    <para>
-      The <application>Telepathy GLib</application> contains a library used by
-      <application>GLib</application> based <application>Telepathy</application>
-      components. Telepathy is a <application>D-Bus</application> framework for
-      unifying real time communication, including instant messaging, voice calls
-      and video calls. It abstracts differences between protocols to provide a
-      unified interface for applications.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="dbus-glib"/>, and
-      <xref linkend="libxslt"/>
-    </para>
-
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/telepathy-glib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy GLlib</title>
-
-    <para>
-      Install <application>Telepathy GLib</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-vala-bindings \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-vala-bindings</option>: This switch enables
-      building of the Vala bindings. Remove if you don't have
-      <xref linkend="vala"/> installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libtelepathy-glib.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-1.0 and
-          /usr/share/gtk-doc/html/telepathy-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtelepathy-glib">
-        <term><filename class="libraryfile">libtelepathy-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Telepathy GLib</application> API functions.
-          </para>
-          <indexterm zone="telepathy-glib libtelepathy-glib">
-            <primary sortas="c-libtelepathy-glib">libtelepathy-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/gnome.xml
===================================================================
--- gnome/gnome.xml	(revision 72ea7aaee607939898d41c8d1a73cbe2b2baf4ce)
+++ gnome/gnome.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
@@ -18,4 +18,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="platform/platform.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy/telepathy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="applications/applications.xml"/>
   <!-- transitionally, gnome-2 packages used elsewhere -->
Index: gnome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision 72ea7aaee607939898d41c8d1a73cbe2b2baf4ce)
+++ gnome/platform/platform.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
@@ -43,8 +43,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="folks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vte.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-logger.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-mission-control.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-farstream.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="farstream.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zeitgeist.xml"/>
Index: ome/platform/telepathy-farstream.xml
===================================================================
--- gnome/platform/telepathy-farstream.xml	(revision 72ea7aaee607939898d41c8d1a73cbe2b2baf4ce)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY telepathy-farstream-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-farstream/telepathy-farstream-&telepathy-farstream-version;.tar.gz">
-  <!ENTITY telepathy-farstream-download-ftp  " ">
-  <!ENTITY telepathy-farstream-md5sum        "53e3a69bdee7b301e2fdd2f2d254e385">
-  <!ENTITY telepathy-farstream-size          "588 KB">
-  <!ENTITY telepathy-farstream-buildsize     "6.0 MB">
-  <!ENTITY telepathy-farstream-time          "0.1 SBU">
-]>
-
-<sect1 id="telepathy-farstream" xreflabel="telepathy-farstream-&telepathy-farstream-version;">
-  <?dbhtml filename="telepathy-farstream.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>telepathy-farstream-&telepathy-farstream-version;</title>
-
-  <indexterm zone="telepathy-farstream">
-    <primary sortas="a-telepathy-farstream">telepathy-farstream</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy Farstream</title>
-
-    <para>
-      The <application>Telepathy Farstream</application> is a
-      <application>Telepathy</application> client library that
-      uses <application>Farstream</application> to handle Call
-      channels.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-farstream-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-farstream-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-farstream-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-farstream-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-farstream-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-farstream-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy Farstream Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="farstream"/>, and
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/telepathy-farstream"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Farstream</title>
-
-    <para>
-      Install <application>Telepathy Farstream</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libtelepathy-farstream.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-1.0/telepathy-farstream and
-          /usr/share/gtk-doc/html/telepathy-farstream
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtelepathy-farstream">
-        <term><filename class="libraryfile">libtelepathy-farstream.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>Telepathy Farstream</application> API functions.
-          </para>
-          <indexterm zone="telepathy-farstream libtelepathy-farstream">
-            <primary sortas="c-libtelepathy-farstream">libtelepathy-farstream.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/telepathy-glib.xml
===================================================================
--- gnome/platform/telepathy-glib.xml	(revision 72ea7aaee607939898d41c8d1a73cbe2b2baf4ce)
+++ 	(revision )
@@ -1,190 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY telepathy-glib-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
-  <!ENTITY telepathy-glib-download-ftp  " ">
-  <!ENTITY telepathy-glib-md5sum        "93c429e37750b25dcf8de86bb514664f">
-  <!ENTITY telepathy-glib-size          "3.8 MB">
-  <!ENTITY telepathy-glib-buildsize     "240 MB">
-  <!ENTITY telepathy-glib-time          "1.2 SBU">
-]>
-
-<sect1 id="telepathy-glib-1" xreflabel="telepathy-glib-&telepathy-glib-version;">
-  <?dbhtml filename="telepathy-glib.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>telepathy-glib-&telepathy-glib-version;</title>
-
-  <indexterm zone="telepathy-glib">
-    <primary sortas="a-telepathy-glib">telepathy-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy GLib</title>
-
-    <para>
-      The <application>Telepathy GLib</application> contains a library used by
-      <application>GLib</application> based <application>Telepathy</application>
-      components. Telepathy is a <application>D-Bus</application> framework for
-      unifying real time communication, including instant messaging, voice calls
-      and video calls. It abstracts differences between protocols to provide a
-      unified interface for applications.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="dbus-glib"/>, and
-      <xref linkend="libxslt"/>
-    </para>
-
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/telepathy-glib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy GLlib</title>
-
-    <para>
-      Install <application>Telepathy GLib</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --enable-vala-bindings \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--enable-vala-bindings</option>: This switch enables
-      building of the Vala bindings. Remove if you don't have
-      <xref linkend="vala"/> installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libtelepathy-glib.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-1.0 and
-          /usr/share/gtk-doc/html/telepathy-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtelepathy-glib-1">
-        <term><filename class="libraryfile">libtelepathy-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Telepathy GLib</application> API functions.
-          </para>
-          <indexterm zone="telepathy-glib libtelepathy-glib-1">
-            <primary sortas="c-libtelepathy-glib">libtelepathy-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/telepathy-logger.xml
===================================================================
--- gnome/platform/telepathy-logger.xml	(revision 72ea7aaee607939898d41c8d1a73cbe2b2baf4ce)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY telepathy-logger-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-&telepathy-logger-version;.tar.bz2">
-  <!ENTITY telepathy-logger-download-ftp  " ">
-  <!ENTITY telepathy-logger-md5sum        "e513eaa767344821073a0b7bb8b45217">
-  <!ENTITY telepathy-logger-size          "528 KB">
-  <!ENTITY telepathy-logger-buildsize     "16 MB">
-  <!ENTITY telepathy-logger-time          "0.2 SBU">
-]>
-
-<sect1 id="telepathy-logger" xreflabel="telepathy-logger-&telepathy-logger-version;">
-  <?dbhtml filename="telepathy-logger.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>telepathy-logger-&telepathy-logger-version;</title>
-
-  <indexterm zone="telepathy-logger">
-    <primary sortas="a-telepathy-logger">telepathy-logger</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy Logger</title>
-
-    <para>
-      The <application>Telepathy Logger</application> package is a headless
-      observer client that logs information received by the
-      <application>Telepathy</application> framework. It features pluggable
-      backends to log different sorts of messages in different formats.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-logger-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-logger-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-logger-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-logger-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-logger-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-logger-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy Logger Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="sqlite"/>, and
-      <xref linkend="telepathy-glib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/telepathy-logger"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Logger</title>
-
-    <para>
-      Install <application>Telepathy Logger</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/telepathy \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          telepathy-logger
-        </seg>
-        <seg>
-          libtelepathy-logger.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-logger-0.2,
-          /usr/lib/telepathy,
-          /usr/share/gtk-doc/html/telepathy-logger and
-          /usr/share/telepathy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="telepathy-logger-prog">
-        <term><command>telepathy-logger</command></term>
-        <listitem>
-          <para>
-            is the <application>Telepathy Logger</application> D-Bus service.
-          </para>
-          <indexterm zone="telepathy-logger telepathy-logger-prog">
-            <primary sortas="b-telepathy-logger">telepathy-logger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtelepathy-logger">
-        <term><filename class="libraryfile">libtelepathy-logger.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Telepathy Logger</application> API functions.
-          </para>
-          <indexterm zone="telepathy-logger libtelepathy-logger">
-            <primary sortas="c-libtelepathy-logger">libtelepathy-logger.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: ome/platform/telepathy-mission-control.xml
===================================================================
--- gnome/platform/telepathy-mission-control.xml	(revision 72ea7aaee607939898d41c8d1a73cbe2b2baf4ce)
+++ 	(revision )
@@ -1,222 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY telepathy-mission-control-download-http
-           "http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-&telepathy-mission-control-version;.tar.gz">
-  <!ENTITY telepathy-mission-control-download-ftp  " ">
-  <!ENTITY telepathy-mission-control-md5sum        "8dc751da77a84abef3f9153bc422a17b">
-  <!ENTITY telepathy-mission-control-size          "1.1 MB">
-  <!ENTITY telepathy-mission-control-buildsize     "25 MB">
-  <!ENTITY telepathy-mission-control-time          "0.2 SBU">
-]>
-
-<sect1 id="telepathy-mission-control" xreflabel="telepathy-mission-control-&telepathy-mission-control-version;">
-  <?dbhtml filename="telepathy-mission-control.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>telepathy-mission-control-&telepathy-mission-control-version;</title>
-
-  <indexterm zone="telepathy-mission-control">
-    <primary sortas="a-telepathy-mission-control">telepathy-mission-control</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy Mission Control</title>
-
-    <para>
-      <application>Telepathy Mission Control</application> is an account manager
-      and channel dispatcher for the <application>Telepathy</application>
-      framework, allowing user interfaces  and other clients to share connections
-      to real-time communication services without conflicting.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-mission-control-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-mission-control-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-mission-control-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-mission-control-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-mission-control-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-mission-control-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Telepathy Mission Control Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="telepathy-glib"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="dbus-glib"/>, and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="NetworkManager"/>, and
-      <xref linkend="upower"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/telepathy-mission-control"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Mission Control</title>
-
-    <para>
-      Install <application>Telepathy Mission Control</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib/telepathy \
-            --enable-gnome-keyring \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a testsuite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mc-tool, mc-wait-for-name and mission-control-5
-        </seg>
-        <seg>
-          libmission-control-plugins.so
-        </seg>
-        <seg>
-          /usr/include/mission-control-5.5,
-          /usr/lib/telepathy and
-          /usr/share/gtk-doc/html/mission-control-plugins
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mc-tool">
-        <term><command>mc-tool</command></term>
-        <listitem>
-          <para>
-            is a command line tool used to manipulate Mission Control accounts.
-          </para>
-          <indexterm zone="telepathy-mission-control mc-tool">
-            <primary sortas="b-mc-tool">mc-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mc-wait-for-name">
-        <term><command>mc-wait-for-name</command></term>
-        <listitem>
-          <para>
-            waits for a (D-Bus) bus name that will (after a while) be provided
-            automatically by the desktop session.
-          </para>
-          <indexterm zone="telepathy-mission-control mc-wait-for-name">
-            <primary sortas="b-mc-wait-for-name">mc-wait-for-name</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mission-control-5">
-        <term><command>mission-control-5</command></term>
-        <listitem>
-          <para>
-            is a <application>D-Bus</application> service which runs on the session
-            bus to implement AccountManager and ChannelDispatcher services described
-            in the <application>Telepathy</application> D-Bus specification.
-          </para>
-          <indexterm zone="telepathy-mission-control mission-control-5">
-            <primary sortas="b-mission-control-5">mission-control-5</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmission-control-plugins">
-        <term><filename class="libraryfile">libmission-control-plugins.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>Telepathy Mission Control</application> plugin API functions.
-          </para>
-          <indexterm zone="telepathy-mission-control libmission-control-plugins">
-            <primary sortas="c-libmission-control-plugins">libmission-control-plugins.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: gnome/telepathy/telepathy-farstream.xml
===================================================================
--- gnome/telepathy/telepathy-farstream.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
+++ gnome/telepathy/telepathy-farstream.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY telepathy-farstream-download-http
+           "http://telepathy.freedesktop.org/releases/telepathy-farstream/telepathy-farstream-&telepathy-farstream-version;.tar.gz">
+  <!ENTITY telepathy-farstream-download-ftp  " ">
+  <!ENTITY telepathy-farstream-md5sum        "53e3a69bdee7b301e2fdd2f2d254e385">
+  <!ENTITY telepathy-farstream-size          "588 KB">
+  <!ENTITY telepathy-farstream-buildsize     "6.0 MB">
+  <!ENTITY telepathy-farstream-time          "0.1 SBU">
+]>
+
+<sect1 id="telepathy-farstream" xreflabel="telepathy-farstream-&telepathy-farstream-version;">
+  <?dbhtml filename="telepathy-farstream.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>telepathy-farstream-&telepathy-farstream-version;</title>
+
+  <indexterm zone="telepathy-farstream">
+    <primary sortas="a-telepathy-farstream">telepathy-farstream</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Telepathy Farstream</title>
+
+    <para>
+      The <application>Telepathy Farstream</application> is a
+      <application>Telepathy</application> client library that
+      uses <application>Farstream</application> to handle Call
+      channels.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&telepathy-farstream-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&telepathy-farstream-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &telepathy-farstream-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &telepathy-farstream-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &telepathy-farstream-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &telepathy-farstream-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Telepathy Farstream Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="farstream"/>, and
+      <xref linkend="telepathy-glib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/telepathy-farstream"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Telepathy Farstream</title>
+
+    <para>
+      Install <application>Telepathy Farstream</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libtelepathy-farstream.so
+        </seg>
+        <seg>
+          /usr/include/telepathy-1.0/telepathy-farstream and
+          /usr/share/gtk-doc/html/telepathy-farstream
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libtelepathy-farstream">
+        <term><filename class="libraryfile">libtelepathy-farstream.so</filename></term>
+        <listitem>
+          <para>
+            contains <application>Telepathy Farstream</application> API functions.
+          </para>
+          <indexterm zone="telepathy-farstream libtelepathy-farstream">
+            <primary sortas="c-libtelepathy-farstream">libtelepathy-farstream.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/telepathy/telepathy-glib.xml
===================================================================
--- gnome/telepathy/telepathy-glib.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
+++ gnome/telepathy/telepathy-glib.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY telepathy-glib-download-http
+           "http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
+  <!ENTITY telepathy-glib-download-ftp  " ">
+  <!ENTITY telepathy-glib-md5sum        "93c429e37750b25dcf8de86bb514664f">
+  <!ENTITY telepathy-glib-size          "3.8 MB">
+  <!ENTITY telepathy-glib-buildsize     "240 MB">
+  <!ENTITY telepathy-glib-time          "1.2 SBU">
+]>
+
+<sect1 id="telepathy-glib" xreflabel="telepathy-glib-&telepathy-glib-version;">
+  <?dbhtml filename="telepathy-glib.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>telepathy-glib-&telepathy-glib-version;</title>
+
+  <indexterm zone="telepathy-glib">
+    <primary sortas="a-telepathy-glib">telepathy-glib</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Telepathy GLib</title>
+
+    <para>
+      The <application>Telepathy GLib</application> contains a library used by
+      <application>GLib</application> based <application>Telepathy</application>
+      components. Telepathy is a <application>D-Bus</application> framework for
+      unifying real time communication, including instant messaging, voice calls
+      and video calls. It abstracts differences between protocols to provide a
+      unified interface for applications.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&telepathy-glib-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&telepathy-glib-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &telepathy-glib-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &telepathy-glib-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &telepathy-glib-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &telepathy-glib-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Telepathy GLib Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>,
+      <xref linkend="dbus"/>,
+      <xref linkend="dbus-glib"/>, and
+      <xref linkend="libxslt"/>
+    </para>
+
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>, and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/telepathy-glib"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Telepathy GLlib</title>
+
+    <para>
+      Install <application>Telepathy GLib</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --enable-vala-bindings \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>--enable-vala-bindings</option>: This switch enables
+      building of the Vala bindings. Remove if you don't have
+      <xref linkend="vala"/> installed.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libtelepathy-glib.so
+        </seg>
+        <seg>
+          /usr/include/telepathy-1.0 and
+          /usr/share/gtk-doc/html/telepathy-glib
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libtelepathy-glib">
+        <term><filename class="libraryfile">libtelepathy-glib.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Telepathy GLib</application> API functions.
+          </para>
+          <indexterm zone="telepathy-glib libtelepathy-glib">
+            <primary sortas="c-libtelepathy-glib">libtelepathy-glib.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/telepathy/telepathy-logger.xml
===================================================================
--- gnome/telepathy/telepathy-logger.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
+++ gnome/telepathy/telepathy-logger.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY telepathy-logger-download-http
+           "http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-&telepathy-logger-version;.tar.bz2">
+  <!ENTITY telepathy-logger-download-ftp  " ">
+  <!ENTITY telepathy-logger-md5sum        "e513eaa767344821073a0b7bb8b45217">
+  <!ENTITY telepathy-logger-size          "528 KB">
+  <!ENTITY telepathy-logger-buildsize     "16 MB">
+  <!ENTITY telepathy-logger-time          "0.2 SBU">
+]>
+
+<sect1 id="telepathy-logger" xreflabel="telepathy-logger-&telepathy-logger-version;">
+  <?dbhtml filename="telepathy-logger.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>telepathy-logger-&telepathy-logger-version;</title>
+
+  <indexterm zone="telepathy-logger">
+    <primary sortas="a-telepathy-logger">telepathy-logger</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Telepathy Logger</title>
+
+    <para>
+      The <application>Telepathy Logger</application> package is a headless
+      observer client that logs information received by the
+      <application>Telepathy</application> framework. It features pluggable
+      backends to log different sorts of messages in different formats.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&telepathy-logger-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&telepathy-logger-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &telepathy-logger-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &telepathy-logger-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &telepathy-logger-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &telepathy-logger-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Telepathy Logger Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="libxml2"/>,
+      <xref linkend="sqlite"/>, and
+      <xref linkend="telepathy-glib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/telepathy-logger"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Telepathy Logger</title>
+
+    <para>
+      Install <application>Telepathy Logger</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/telepathy \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          telepathy-logger
+        </seg>
+        <seg>
+          libtelepathy-logger.so
+        </seg>
+        <seg>
+          /usr/include/telepathy-logger-0.2,
+          /usr/lib/telepathy,
+          /usr/share/gtk-doc/html/telepathy-logger and
+          /usr/share/telepathy
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="telepathy-logger-prog">
+        <term><command>telepathy-logger</command></term>
+        <listitem>
+          <para>
+            is the <application>Telepathy Logger</application> D-Bus service.
+          </para>
+          <indexterm zone="telepathy-logger telepathy-logger-prog">
+            <primary sortas="b-telepathy-logger">telepathy-logger</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtelepathy-logger">
+        <term><filename class="libraryfile">libtelepathy-logger.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>Telepathy Logger</application> API functions.
+          </para>
+          <indexterm zone="telepathy-logger libtelepathy-logger">
+            <primary sortas="c-libtelepathy-logger">libtelepathy-logger.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/telepathy/telepathy-mission-control.xml
===================================================================
--- gnome/telepathy/telepathy-mission-control.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
+++ gnome/telepathy/telepathy-mission-control.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY telepathy-mission-control-download-http
+           "http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-&telepathy-mission-control-version;.tar.gz">
+  <!ENTITY telepathy-mission-control-download-ftp  " ">
+  <!ENTITY telepathy-mission-control-md5sum        "8dc751da77a84abef3f9153bc422a17b">
+  <!ENTITY telepathy-mission-control-size          "1.1 MB">
+  <!ENTITY telepathy-mission-control-buildsize     "25 MB">
+  <!ENTITY telepathy-mission-control-time          "0.2 SBU">
+]>
+
+<sect1 id="telepathy-mission-control" xreflabel="telepathy-mission-control-&telepathy-mission-control-version;">
+  <?dbhtml filename="telepathy-mission-control.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>telepathy-mission-control-&telepathy-mission-control-version;</title>
+
+  <indexterm zone="telepathy-mission-control">
+    <primary sortas="a-telepathy-mission-control">telepathy-mission-control</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Telepathy Mission Control</title>
+
+    <para>
+      <application>Telepathy Mission Control</application> is an account manager
+      and channel dispatcher for the <application>Telepathy</application>
+      framework, allowing user interfaces  and other clients to share connections
+      to real-time communication services without conflicting.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&telepathy-mission-control-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&telepathy-mission-control-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &telepathy-mission-control-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &telepathy-mission-control-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &telepathy-mission-control-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &telepathy-mission-control-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Telepathy Mission Control Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="telepathy-glib"/>,
+      <xref linkend="dbus"/>,
+      <xref linkend="dbus-glib"/>, and
+      <xref linkend="libxslt"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="NetworkManager"/>, and
+      <xref linkend="upower"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/telepathy-mission-control"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Telepathy Mission Control</title>
+
+    <para>
+      Install <application>Telepathy Mission Control</application> by
+      running the following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/telepathy \
+            --enable-gnome-keyring \
+            --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          mc-tool, mc-wait-for-name and mission-control-5
+        </seg>
+        <seg>
+          libmission-control-plugins.so
+        </seg>
+        <seg>
+          /usr/include/mission-control-5.5,
+          /usr/lib/telepathy and
+          /usr/share/gtk-doc/html/mission-control-plugins
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="mc-tool">
+        <term><command>mc-tool</command></term>
+        <listitem>
+          <para>
+            is a command line tool used to manipulate Mission Control accounts.
+          </para>
+          <indexterm zone="telepathy-mission-control mc-tool">
+            <primary sortas="b-mc-tool">mc-tool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mc-wait-for-name">
+        <term><command>mc-wait-for-name</command></term>
+        <listitem>
+          <para>
+            waits for a (D-Bus) bus name that will (after a while) be provided
+            automatically by the desktop session.
+          </para>
+          <indexterm zone="telepathy-mission-control mc-wait-for-name">
+            <primary sortas="b-mc-wait-for-name">mc-wait-for-name</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mission-control-5">
+        <term><command>mission-control-5</command></term>
+        <listitem>
+          <para>
+            is a <application>D-Bus</application> service which runs on the session
+            bus to implement AccountManager and ChannelDispatcher services described
+            in the <application>Telepathy</application> D-Bus specification.
+          </para>
+          <indexterm zone="telepathy-mission-control mission-control-5">
+            <primary sortas="b-mission-control-5">mission-control-5</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libmission-control-plugins">
+        <term><filename class="libraryfile">libmission-control-plugins.so</filename></term>
+        <listitem>
+          <para>
+            contains <application>Telepathy Mission Control</application> plugin API functions.
+          </para>
+          <indexterm zone="telepathy-mission-control libmission-control-plugins">
+            <primary sortas="c-libmission-control-plugins">libmission-control-plugins.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/telepathy/telepathy.xml
===================================================================
--- gnome/telepathy/telepathy.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
+++ gnome/telepathy/telepathy.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<!--
+$LastChangedBy$
+$Date$
+-->
+
+<chapter id="gnome-telepathy">
+  <?dbhtml filename="telepathy.html"?>
+
+  <title>Telepathy Framework</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-logger.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-mission-control.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-farstream.xml"/>
+
+</chapter>
Index: multimedia/libdriv/sound-theme-freedesktop.xml
===================================================================
--- multimedia/libdriv/sound-theme-freedesktop.xml	(revision 72ea7aaee607939898d41c8d1a73cbe2b2baf4ce)
+++ multimedia/libdriv/sound-theme-freedesktop.xml	(revision 18400441df70ec627fcb2e7ba9adfc366745e2dc)
@@ -33,5 +33,5 @@
     contains sound themes for the desktop.</para>
 
-    &lfs70_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
