Index: gnome/platform/empathy.xml
===================================================================
--- gnome/platform/empathy.xml	(revision b85316a2cf4b4c287e0996850e4f2565991be112)
+++ gnome/platform/empathy.xml	(revision b85316a2cf4b4c287e0996850e4f2565991be112)
@@ -0,0 +1,223 @@
+<?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 empathy-download-http
+           "&gnome-download-http;/empathy/3.12/empathy-&empathy-version;.tar.xz">
+  <!ENTITY empathy-download-ftp
+           "&gnome-download-ftp;/empathy/3.12/empathy-&empathy-version;.tar.xz">
+  <!ENTITY empathy-md5sum        "3675eb918ffad622b11a846d46bf58d5">
+  <!ENTITY empathy-size          "4.9 MB">
+  <!ENTITY empathy-buildsize     "120 MB">
+  <!ENTITY empathy-time          "1.1 SBU">
+]>
+
+<sect1 id="empathy" xreflabel="Empathy-&empathy-version;">
+  <?dbhtml filename="empathy.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Empathy-&empathy-version;</title>
+
+  <indexterm zone="empathy">
+    <primary sortas="a-Empathy">Empathy</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Empathy</title>
+
+    <para>
+      <application>Empathy</application> is an instant messaging program
+      which supports text, voice, and video chat and file transfers over many
+      different protocols.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&empathy-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&empathy-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &empathy-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &empathy-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &empathy-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &empathy-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Empathy Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="clutter"/>,
+      <xref linkend="clutter-gst2"/>,
+      <xref linkend="clutter-gtk"/>,
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="farstream"/>,
+      <xref linkend="folks"/>,
+      <xref linkend="gcr"/>,
+      <xref linkend="glib2"/>,
+      <xref linkend="libgee"/>,
+      <xref linkend="libsecret"/>,
+      <xref linkend="gnome-online-accounts"/>,
+      <xref linkend="gnutls"/>,
+      <xref linkend="gsettings-desktop-schemas"/>,
+      <xref linkend="gstreamer10"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="libcanberra"/>,
+      <xref linkend="libsoup"/>,
+      <xref linkend="libxml2"/>,
+      <xref linkend="cogl"/>,
+      <xref linkend="libnotify"/>, and
+      <xref linkend="webkitgtk2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="telepathy-farstream"/>,
+      <xref linkend="telepathy-glib"/>,
+      <xref linkend="telepathy-logger"/>,
+      <xref linkend="telepathy-mission-control"/>, and
+      <xref linkend="systemd"/> (for GUdev)
+    </para>
+
+<bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+       <xref linkend="enchant"/>,
+       <xref linkend="geoclue"/>,
+       <xref linkend="geocode-glib"/>,
+       <xref linkend="iso-codes"/>,
+       <xref linkend="cheese"/>,
+       <xref linkend="nautilus-sendto"/>, and
+       <xref linkend="libchamplain"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/empathy"/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Empathy</title>
+
+    <para>
+      Install <application>Empathy</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --disable-Werror \
+            --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"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          empathy, empathy-accounts and empathy-debugger
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/lib/empathy,
+          /usr/lib/mission-control-plugins.0,
+          /usr/share/adium,
+          /usr/share/empathy and
+          /usr/share/help/*/empathy
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="empathy-prog">
+        <term><command>empathy</command></term>
+        <listitem>
+          <para>
+            is a <application>GNOME</application> instant messaging client
+            using <application>Telepathy</application>.
+          </para>
+          <indexterm zone="empathy empathy-prog">
+            <primary sortas="b-empathy">empathy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="empathy-accounts">
+        <term><command>empathy-accounts</command></term>
+        <listitem>
+          <para>
+            is an accounts configuration dialog for
+            <application>Empathy</application>.
+          </para>
+          <indexterm zone="empathy empathy-accounts">
+            <primary sortas="b-empathy-accounts">empathy-accounts</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: gnome/platform/folks.xml
===================================================================
--- gnome/platform/folks.xml	(revision 0c7a7693da9fabed8b46945b1e82cb810b033c77)
+++ gnome/platform/folks.xml	(revision b85316a2cf4b4c287e0996850e4f2565991be112)
@@ -92,10 +92,4 @@
       <xref linkend="shared-mime-info"/>, and
       <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valadoc"/>
-      (Required for generating the documentation)
     </para>
 
Index: gnome/platform/platform.xml
===================================================================
--- gnome/platform/platform.xml	(revision 0c7a7693da9fabed8b46945b1e82cb810b033c77)
+++ gnome/platform/platform.xml	(revision b85316a2cf4b4c287e0996850e4f2565991be112)
@@ -63,5 +63,4 @@
   <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="valadoc.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"/>
@@ -71,4 +70,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mutter.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zenity.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="empathy.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dummy-runtime.xml"/>
Index: gnome/platform/valadoc.xml
===================================================================
--- gnome/platform/valadoc.xml	(revision 0c7a7693da9fabed8b46945b1e82cb810b033c77)
+++ 	(revision )
@@ -1,137 +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 valadoc-download-http
-           "https://github.com/GNOME/valadoc/archive/master.zip">
-  <!ENTITY valadoc-download-ftp " ">
-  <!ENTITY valadoc-md5sum        "589b9ed644dee3c0aaaf847eaac0f50d">
-  <!ENTITY valadoc-size          "408 KB">
-  <!ENTITY valadoc-buildsize     "52 MB">
-  <!ENTITY valadoc-time          "1.8 SBU">
-]>
-
-<sect1 id="valadoc" xreflabel="valadoc-&valadoc-version;">
-  <?dbhtml filename="valadoc.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>valadoc-&valadoc-version;</title>
-
-  <indexterm zone="valadoc">
-    <primary sortas="a-valadoc">valadoc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ValaDoc </title>
-
-    <para>
-      The <application>Vala Docs</application> is a documentation generator for generating API documentation 
-      from Vala source code based on libvala. 
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&valadoc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&valadoc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &valadoc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &valadoc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &valadoc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &valadoc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vala Docs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgee"/>,
-      <xref linkend="unzip"/>,  (to extract source)
-      <xref linkend="gdk-pixbuf"/>, and
-      <xref linkend ="graphviz"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/valadoc"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vala Docs</title>
-
-    <para>
-      Install <application>Vala Docs</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 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/without-scrollkeeper.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          /usr/share/gnome/help/{accessibility-devel-guide,gnome-devel-demos},
-          /usr/share/gnome/help/{hig-book,integration-guide} and
-          /usr/share/gnome/help/{optimization-guide,platform-overview}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
