Index: gnome-systemd/telepathy/telepathy-farstream.xml
===================================================================
--- gnome-systemd/telepathy/telepathy-farstream.xml	(revision dffd177abac2855b3c85d5a136beb616c157900d)
+++ gnome-systemd/telepathy/telepathy-farstream.xml	(revision 46c3ba903d47ba8b110a796d1cc5ef224e3c331d)
@@ -130,5 +130,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/telepathy/telepathy-gabble.xml
===================================================================
--- gnome-systemd/telepathy/telepathy-gabble.xml	(revision 46c3ba903d47ba8b110a796d1cc5ef224e3c331d)
+++ gnome-systemd/telepathy/telepathy-gabble.xml	(revision 46c3ba903d47ba8b110a796d1cc5ef224e3c331d)
@@ -0,0 +1,185 @@
+<?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-gabble-download-http
+           "http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-&telepathy-gabble-version;.tar.gz">
+  <!ENTITY telepathy-gabble-download-ftp  " ">
+  <!ENTITY telepathy-gabble-md5sum        "40f2fbabc4e6e147258c83ed697f2fcf">
+  <!ENTITY telepathy-gabble-size          "2.7 MB">
+  <!ENTITY telepathy-gabble-buildsize     "57 MB">
+  <!ENTITY telepathy-gabble-time          "1.0 SBU">
+]>
+
+<sect1 id="telepathy-gabble" xreflabel="telepathy-gabble-&telepathy-gabble-version;">
+  <?dbhtml filename="telepathy-gabble.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>telepathy-gabble-&telepathy-gabble-version;</title>
+
+  <indexterm zone="telepathy-gabble">
+    <primary sortas="a-telepathy-gabble">telepathy-gabble</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Telepathy Gabble</title>
+
+    <para>
+      <application>Telepathy Gabble</application> is a Jabber/XMPP connection
+      manager for the <application>Telepathy</application> framework.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&telepathy-gabble-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&telepathy-gabble-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &telepathy-gabble-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &telepathy-gabble-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &telepathy-gabble-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &telepathy-gabble-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Telepathy Gabble Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cacerts"/>,
+      <xref linkend="gnutls"/> or
+      <xref linkend="openssl"/>,
+      <xref linkend="sqlite"/>, and
+      <xref linkend="telepathy-glib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libnice"/> and
+      <xref linkend="libsoup"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="cyrus-sasl"/> and
+      <ulink url="https://twistedmatrix.com/trac/">Twisted</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/telepathy-gabble"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Telepathy Gabble</title>
+
+    <para>
+      Install <application>Telepathy Gabble</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --docdir=/usr/share/doc/telepathy-gabble-&telepathy-gabble-version; &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"/>
+
+    <para>
+      <option>--with-ssl=openssl</option>: Use this switch if you
+      would like to use <xref linkend="openssl"/> instead of
+      <xref linkend="gnutls"/> in case both are installed.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          telepathy-gabble and telepathy-gabble-xmpp-console
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/lib/telepathy/gabble-0 and
+          /usr/share/doc/telepathy-gabble-&telepathy-gabble-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="telepathy-gabble-prog">
+        <term><command>telepathy-gabble</command></term>
+        <listitem>
+          <para>
+            is the <application>Telepathy</application> connection manager
+            for XMPP (Jabber).
+          </para>
+          <indexterm zone="telepathy-gabble telepathy-gabble-prog">
+            <primary sortas="b-telepathy-gabble">telepathy-gabble</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome-systemd/telepathy/telepathy-glib.xml
===================================================================
--- gnome-systemd/telepathy/telepathy-glib.xml	(revision dffd177abac2855b3c85d5a136beb616c157900d)
+++ gnome-systemd/telepathy/telepathy-glib.xml	(revision 46c3ba903d47ba8b110a796d1cc5ef224e3c331d)
@@ -148,5 +148,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/telepathy/telepathy-haze.xml
===================================================================
--- gnome-systemd/telepathy/telepathy-haze.xml	(revision 46c3ba903d47ba8b110a796d1cc5ef224e3c331d)
+++ gnome-systemd/telepathy/telepathy-haze.xml	(revision 46c3ba903d47ba8b110a796d1cc5ef224e3c331d)
@@ -0,0 +1,167 @@
+<?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-haze-download-http
+           "http://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-&telepathy-haze-version;.tar.gz">
+  <!ENTITY telepathy-haze-download-ftp  " ">
+  <!ENTITY telepathy-haze-md5sum        "b9ee3638833fb50db6276d1b771820b0">
+  <!ENTITY telepathy-haze-size          "568 KB">
+  <!ENTITY telepathy-haze-buildsize     "5.3 MB">
+  <!ENTITY telepathy-haze-time          "0.1 SBU">
+]>
+
+<sect1 id="telepathy-haze" xreflabel="telepathy-haze-&telepathy-haze-version;">
+  <?dbhtml filename="telepathy-haze.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>telepathy-haze-&telepathy-haze-version;</title>
+
+  <indexterm zone="telepathy-haze">
+    <primary sortas="a-telepathy-haze">telepathy-haze</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Telepathy Haze</title>
+
+    <para>
+      <application>Telepathy Haze</application> is a connection 
+      manager for the <application>Telepathy</application>  
+      framework using libpurple (Pidgin) protocols.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&telepathy-haze-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&telepathy-haze-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &telepathy-haze-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &telepathy-haze-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &telepathy-haze-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &telepathy-haze-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Telepathy Haze Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="pidgin"/> and
+      <xref linkend="telepathy-glib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="https://twistedmatrix.com/trac/">Twisted</ulink>
+    </para>
+
+    <note>
+      <para>
+        The protocols supported by this package depend on
+        the dependencies that were present when building
+        <xref linkend="pidgin"/>.
+      </para>
+    </note>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/telepathy-haze"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Telepathy Haze</title>
+
+    <para>
+      Install <application>Telepathy Haze</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &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="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          telepathy-haze
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="telepathy-haze-prog">
+        <term><command>telepathy-haze</command></term>
+        <listitem>
+          <para>
+            is the <application>Telepathy</application> connection manager
+            for libpurple (Pidgin).
+          </para>
+          <indexterm zone="telepathy-haze telepathy-haze-prog">
+            <primary sortas="b-telepathy-haze">telepathy-haze</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome-systemd/telepathy/telepathy-logger.xml
===================================================================
--- gnome-systemd/telepathy/telepathy-logger.xml	(revision dffd177abac2855b3c85d5a136beb616c157900d)
+++ gnome-systemd/telepathy/telepathy-logger.xml	(revision 46c3ba903d47ba8b110a796d1cc5ef224e3c331d)
@@ -135,6 +135,6 @@
 
     <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/telepathy/telepathy-mission-control.xml
===================================================================
--- gnome-systemd/telepathy/telepathy-mission-control.xml	(revision dffd177abac2855b3c85d5a136beb616c157900d)
+++ gnome-systemd/telepathy/telepathy-mission-control.xml	(revision 46c3ba903d47ba8b110a796d1cc5ef224e3c331d)
@@ -144,5 +144,5 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
Index: gnome-systemd/telepathy/telepathy-salut.xml
===================================================================
--- gnome-systemd/telepathy/telepathy-salut.xml	(revision 46c3ba903d47ba8b110a796d1cc5ef224e3c331d)
+++ gnome-systemd/telepathy/telepathy-salut.xml	(revision 46c3ba903d47ba8b110a796d1cc5ef224e3c331d)
@@ -0,0 +1,187 @@
+<?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-salut-download-http
+           "http://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-&telepathy-salut-version;.tar.gz">
+  <!ENTITY telepathy-salut-download-ftp  " ">
+  <!ENTITY telepathy-salut-md5sum        "7516e6f6fa56a61054413a03642b938d">
+  <!ENTITY telepathy-salut-size          "1.8 MB">
+  <!ENTITY telepathy-salut-buildsize     "59 MB">
+  <!ENTITY telepathy-salut-time          "0.5 SBU">
+]>
+
+<sect1 id="telepathy-salut" xreflabel="telepathy-salut-&telepathy-salut-version;">
+  <?dbhtml filename="telepathy-salut.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>telepathy-salut-&telepathy-salut-version;</title>
+
+  <indexterm zone="telepathy-salut">
+    <primary sortas="a-telepathy-salut">telepathy-salut</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Telepathy Salut</title>
+
+    <para>
+      <application>Telepathy Salut</application> is a link-local XMPP (XEP-0174) connection
+      manager for the <application>Telepathy</application> framework.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&telepathy-salut-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&telepathy-salut-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &telepathy-salut-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &telepathy-salut-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &telepathy-salut-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &telepathy-salut-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Telepathy Salut Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="avahi"/>,
+      <xref linkend="gnutls"/> or
+      <xref linkend="openssl"/>,
+      <xref linkend="libsoup"/>, and
+      <xref linkend="telepathy-glib"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="cyrus-sasl"/> and
+      <ulink url="https://twistedmatrix.com/trac/">Twisted</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/telepathy-salut"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Telepathy Salut</title>
+
+    <para>
+      Install <application>Telepathy Salut</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr         \
+            --disable-avahi-tests \
+            --disable-static      \
+            --docdir=/usr/share/doc/telepathy-salut-&telepathy-salut-version; &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>
+      <parameter>--disable-avahi-tests</parameter>: This switch is used
+      to disable <application>Avahi</application> tests. Remove it if
+      you have installed <application>Twisted</application> and wish
+      to run them.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <para>
+      <option>--with-ssl=openssl</option>: Use this switch if you
+      would like to use <xref linkend="openssl"/> instead of
+      <xref linkend="gnutls"/> in case both are installed.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          telepathy-salut
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/lib/telepathy/salut-0 and
+          /usr/share/doc/telepathy-salut-&telepathy-salut-version; 
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="telepathy-salut-prog">
+        <term><command>telepathy-salut</command></term>
+        <listitem>
+          <para>
+            is the <application>Telepathy</application> connection manager
+            for link-local XMPP.
+          </para>
+          <indexterm zone="telepathy-salut telepathy-salut-prog">
+            <primary sortas="b-telepathy-salut">telepathy-salut</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome-systemd/telepathy/telepathy.xml
===================================================================
--- gnome-systemd/telepathy/telepathy.xml	(revision dffd177abac2855b3c85d5a136beb616c157900d)
+++ gnome-systemd/telepathy/telepathy.xml	(revision 46c3ba903d47ba8b110a796d1cc5ef224e3c331d)
@@ -20,4 +20,7 @@
   <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-mission-control.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-gabble.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-haze.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-salut.xml"/>
 
 </chapter>
