Index: archive/celt051.xml
===================================================================
--- archive/celt051.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
+++ archive/celt051.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
@@ -0,0 +1,182 @@
+<?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 celt051-download-http "http://downloads.xiph.org/releases/celt/celt-&celt051-version;.tar.gz">
+  <!ENTITY celt051-download-ftp  " ">
+  <!ENTITY celt051-md5sum        "67e7b5e45db57a6f1f0a6962f5ecb190">
+  <!ENTITY celt051-size          "432 KB">
+  <!ENTITY celt051-buildsize     "5.5 MB">
+  <!ENTITY celt051-time          "0.1 SBU">
+]>
+
+<!-- Try to keep the indentation used in this file-->
+<sect1 id="celt051" xreflabel="Celt-&celt051-version;">
+  <?dbhtml filename="celt051.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Celt-&celt051-version;</title>
+
+  <indexterm zone="celt051">
+    <primary sortas="a-celt051">celt051</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Celt</title>
+
+    <para>
+      CELT is a very low delay audio codec designed for high-quality
+      communications. Its potential uses include video-conferencing and
+      network music performance.
+    </para>
+
+    &lfs70_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&celt051-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&celt051-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &celt051-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &celt051-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &celt051-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &celt051-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Celt Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libogg"/> (For encoder/decoder tools).
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/celt051"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Celt</title>
+
+    <para>
+      Install <application>Celt</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --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 Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          celtdec051 and celtenc051
+        </seg>
+        <seg>
+          libcelt051.so
+        </seg>
+        <seg>
+          /usr/include/celt051
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="celtdec051">
+        <term><command>celtdec051</command></term>
+        <listitem>
+          <para>
+            is CELT decoder.
+          </para>
+          <indexterm zone="celt051 celtdec051">
+            <primary sortas="b-celtdec051">celtdec051</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="celtenc051">
+        <term><command>celtenc051</command></term>
+        <listitem>
+          <para>
+            is CELT encoder.
+          </para>
+          <indexterm zone="celt051 celtenc051">
+            <primary sortas="b-celtenc051">celtenc051</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcelt051">
+        <term><filename class="libraryfile">libcelt051.so</filename></term>
+        <listitem>
+          <para>
+            contains CELT API functions.
+          </para>
+          <indexterm zone="celt051 libcelt051">
+            <primary sortas="c-libcelt051">libcelt051.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/farsight2.xml
===================================================================
--- archive/farsight2.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
+++ archive/farsight2.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
@@ -0,0 +1,154 @@
+<?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 farsight2-download-http "http://farsight.freedesktop.org/releases/farsight2/farsight2-&farsight2-version;.tar.gz">
+  <!ENTITY farsight2-download-ftp  " ">
+  <!ENTITY farsight2-md5sum        "7756d910687dd2abd455fd68e83f125c">
+  <!ENTITY farsight2-size          "1.1 MB">
+  <!ENTITY farsight2-buildsize     "40 MB">
+  <!ENTITY farsight2-time          "0.4 SBU">
+]>
+
+<sect1 id="farsight2" xreflabel="Farsight2-&farsight2-version;">
+  <?dbhtml filename="farsight2.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Farsight2-&farsight2-version;</title>
+
+  <indexterm zone="farsight2">
+    <primary sortas="a-Farsight2">Farsight2</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Farsight2</title>
+
+    <para>The <application>Farsight2</application> package is a collection of
+    GStreamer modules and libraries for videoconferencing.</para>
+
+    &lfs70_built;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&farsight2-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&farsight2-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &farsight2-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &farsight2-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &farsight2-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &farsight2-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Farsight2 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gst-plugins-base"/>,
+    <xref linkend="libnice"/>, and
+    <xref linkend="python2"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><ulink
+    url="http://gstreamer.freedesktop.org/modules/gst-python.html">GStreamer
+    Python Bindings</ulink>,
+    <xref linkend="gtk-doc"/>,
+    <xref linkend="gupnp"/>,
+    <xref linkend="pygobject2"/>, and
+    <ulink url="http://www.valgrind.org/">Valgrind</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/farsight2"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Farsight2</title>
+
+    <para>Install <application>Farsight2</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --disable-python &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-python</parameter>: This parameter disables the
+    <application>Python</application> bindings from being built. Omit it if
+    you have installed the optional python module dependencies.</para>
+
+    <para><option>--enable-static=no</option>: This switch prevents the static
+    libraries being installed.</para>
+
+    <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 Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libfsfunnel.{so,a},libfsmsnconference.{so,a},
+        libfsrawconference.{so,a},libfsrtcpfilter.{so,a},libfsrtpconference.{so,a},
+        libfsvideoanyrate.{so,a},libgstfarsight-0.10.{so,a},
+        libmulticast-transmitter.{so,a},libnice-transmitter.{so,a},
+        librawudp-transmitter.{so,a}, and libshm-transmitter.{so,a}</seg>
+        <seg>/usr/{include/gstreamer-0.10/gst/farsight,lib/farsight2-0.0,
+        share/{farsight2/0.0/fsrtpconference,gtk-doc/html/{farsight2-libs-0.10,
+        farsight2-plugins-0.10}}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgstfarsight-0.10">
+        <term><filename class='libraryfile'>libgstfarsight-0.10.{so,a}</filename></term>
+        <listitem>
+          <para>contains the <application>farsight2</application> API
+          functions.</para>
+          <indexterm zone="farsight2 libgstfarsight-0.10">
+            <primary sortas="c-libgstfarsight-0.10">libgstfarsight-0.10.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/libosinfo.xml
===================================================================
--- archive/libosinfo.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
+++ archive/libosinfo.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
@@ -0,0 +1,224 @@
+<?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 libosinfo-download-http 
+           "https://fedorahosted.org/releases/l/i/libosinfo/libosinfo-&libosinfo-version;.tar.gz">
+  <!ENTITY libosinfo-download-ftp  " ">
+  <!ENTITY libosinfo-md5sum        "2af9ba79b3f202032be45d2e6ed7b6e1">
+  <!ENTITY libosinfo-size          "964 KB">
+  <!ENTITY libosinfo-buildsize     "15 MB">
+  <!ENTITY libosinfo-time          "0.2 SBU">
+]>
+
+<sect1 id="libosinfo" xreflabel="libosinfo-&libosinfo-version;">
+  <?dbhtml filename="libosinfo.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libosinfo-&libosinfo-version;</title>
+
+  <indexterm zone="libosinfo">
+    <primary sortas="a-libosinfo">libosinfo</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libosinfo</title>
+
+    <para>
+      The <application>libosinfo</application> package is a GObject 
+      based library for managing information about operating systems, 
+      hypervisors and the (virtual) hardware devices they can support.
+    </para>
+
+    &lfs70_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libosinfo-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libosinfo-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libosinfo-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libosinfo-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libosinfo-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libosinfo-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libosinfo Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libsoup"/> (built with GNOME components).
+    </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="check"/> (required for the test suite) and
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libosinfo"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libosinfo</title>
+
+    <para>
+      Install <application>libosinfo</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --enable-vala \
+            --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</option>: This option 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>
+          osinfo-db-validate, osinfo-detect and osinfo-query
+        </seg>
+        <seg>
+          libosinfo-1.0.so
+        </seg>
+        <seg>
+          /usr/include/libosinfo-1.0,
+          /usr/share/gtk-doc/html/Libosinfo and
+          /usr/share/libosinfo
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="osinfo-db-validate">
+        <term><command>osinfo-db-validate</command></term>
+        <listitem>
+          <para>
+            is used to check if all XML files comply with 
+            the libosinfo schema.
+          </para>
+          <indexterm zone="libosinfo osinfo-db-validate">
+            <primary sortas="b-osinfo-db-validate">osinfo-db-validate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="osinfo-detect">
+        <term><command>osinfo-detect</command></term>
+        <listitem>
+          <para>
+            is used to examine the "PATH" or "URI" to 
+            determine what (if any) operating system it 
+            is for, and whether it is installable or is 
+            a Live image.
+          </para>
+          <indexterm zone="libosinfo osinfo-detect">
+            <primary sortas="b-osinfo-detect">osinfo-detect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="osinfo-query">
+        <term><command>osinfo-query</command></term>
+        <listitem>
+          <para>
+            is used to extract information from the database.
+          </para>
+          <indexterm zone="libosinfo osinfo-query">
+            <primary sortas="b-osinfo-query">osinfo-query</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libosinfo-1.0">
+        <term><filename class="libraryfile">libosinfo-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains the libosinfo API functions.
+          </para>
+          <indexterm zone="libosinfo libosinfo-1.0">
+            <primary sortas="c-libosinfo-1.0">libosinfo-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/libvirt-glib.xml
===================================================================
--- archive/libvirt-glib.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
+++ archive/libvirt-glib.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
@@ -0,0 +1,180 @@
+<?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 libvirt-glib-download-http 
+           "http://libvirt.org/sources/glib/libvirt-glib-&libvirt-glib-version;.tar.gz">
+  <!ENTITY libvirt-glib-download-ftp  " ">
+  <!ENTITY libvirt-glib-md5sum        "cc0913fdf1011558e81e7de4b00c7d1f">
+  <!ENTITY libvirt-glib-size          "636 KB">
+  <!ENTITY libvirt-glib-buildsize     "16 MB">
+  <!ENTITY libvirt-glib-time          "0.4 SBU">
+]>
+
+<sect1 id="libvirt-glib" xreflabel="libvirt-glib-&libvirt-glib-version;">
+  <?dbhtml filename="libvirt-glib.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libvirt-glib-&libvirt-glib-version;</title>
+
+  <indexterm zone="libvirt-glib">
+    <primary sortas="a-libvirt-glib">libvirt-glib</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libvirt-glib</title>
+
+    <para>
+      The <application>libvirt-glib</application> package wraps libvirt 
+      to provide a high-level object-oriented API better suited for 
+      glib-based applications.
+    </para>
+
+    &lfs71_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libvirt-glib-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libvirt-glib-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libvirt-glib-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libvirt-glib-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libvirt-glib-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libvirt-glib-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libvirt-glib Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libvirt"/>
+    </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;/libvirt-glib"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libvirt-glib</title>
+
+    <para>
+      Install <application>libvirt-glib</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --enable-vala \
+            --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>
+
+    <para>
+      <option>--enable-vala</option>: This option 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 Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          libvirt-gconfig-1.0.so, libvirt-glib-1.0.so, 
+          libvirt-gobject-1.0.so and 
+          libvirtglibmod.so (Python Module)
+        </seg>
+        <seg>
+          /usr/include/{libvirt-gconfig-1.0,libvirt-glib-1.0,libvirt-gobject-1.0} and
+          /usr/share/gtk-doc/html/{Libvirt-gconfig,Libvirt-glib,Libvirt-gobject}
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libvirt-glib-lib">
+        <term><filename class="libraryfile">libvirt-g*.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libvirt-glib</application> API functions.
+          </para>
+          <indexterm zone="libvirt-glib libvirt-glib-lib">
+            <primary sortas="c-libvirt-glib">libvirt-g*.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/libvirt.xml
===================================================================
--- archive/libvirt.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
+++ archive/libvirt.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
@@ -0,0 +1,280 @@
+<?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 libvirt-download-http "http://libvirt.org/sources/libvirt-&libvirt-version;.tar.gz">
+  <!ENTITY libvirt-download-ftp  " ">
+  <!ENTITY libvirt-md5sum        "5e842bc55733ceba60c64767580ff3e4">
+  <!ENTITY libvirt-size          "19 MB">
+  <!ENTITY libvirt-buildsize     "240 MB">
+  <!ENTITY libvirt-time          "1.6 SBU">
+]>
+
+<sect1 id="libvirt" xreflabel="libvirt-&libvirt-version;">
+  <?dbhtml filename="libvirt.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libvirt-&libvirt-version;</title>
+
+  <indexterm zone="libvirt">
+    <primary sortas="a-libvirt">libvirt</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libvirt</title>
+
+    <para>
+      The <application>libvirt</application> is a C toolkit 
+      used to interact with the virtualization capabilities
+      of recent versions of Linux (and other OSes).
+    </para>
+
+    &lfs71_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libvirt-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libvirt-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libvirt-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libvirt-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libvirt-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libvirt-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libvirt Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gnutls"/>,
+      <xref linkend="libgcrypt"/>,
+      <xref linkend="libtirpc"/>,
+      <xref linkend="libxml2"/> and
+      <xref linkend="lvm2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="polkit"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="avahi"/>,
+      <xref linkend="curl"/>,
+      <xref linkend="cyrus-sasl"/>,
+      <ulink url="http://people.redhat.com/sgrubb/libcap-ng/">
+      libcap-ng</ulink>,
+      <xref linkend="libnl"/>,
+      <ulink url="http://oss.sgi.com/projects/libnuma/">
+      libnuma</ulink>,
+      <xref linkend="libpcap"/>,
+      <ulink url="http://www.libssh2.org/">libssh2</ulink>,
+      <ulink url="https://fedorahosted.org/netcf/">NetCF</ulink>,
+      <ulink url="http://www.open-iscsi.org/">Open iSCSI</ulink>,
+      <ulink url="http://www.openswan.org/projects/openswan/">
+      OpenSwan</ulink>,
+      <xref linkend="parted"/>,
+      <xref linkend="qemu-kvm"/>,
+      <ulink url="https://www.virtualbox.org/">VirtualBox</ulink>,
+      <ulink url="http://www.xen.org/">Xen</ulink>,
+      <xref linkend="xorg7-lib"/> and
+      <ulink url="http://lloyd.github.com/yajl/">YAYL</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libvirt"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libvirt</title>
+
+    <para>
+      Install <application>libvirt</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/libvirt \
+            --with-storage-lvm \
+            --without-macvtap \
+            --disable-static \
+            CPPFLAGS="-I/usr/include/tirpc -I/usr/include/libnl3" &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>--with-storage-lvm</option>: This option enables LVM storage backend.
+    </para>
+
+    <para>
+      <option>--without-macvtap</option>: This option disables macvtap device support.
+      Remove if you have installed <xref linkend="libnl"/>.
+    </para>
+
+    <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>
+          libvirtd, virsh, virt-host-validate,
+          virt-pki-validate and virt-xml-validate
+        </seg>
+        <seg>
+          libvirt.so and libvirt-qemu.so
+        </seg>
+        <seg>
+          /etc/libvirt, /usr/include/libvirt, /usr/lib/libvirt,
+          /usr/share/augeas/lenses,
+          /usr/share/doc/{libvirt-0.9.11,libvirt-python-0.9.11}, 
+          /usr/share/gtk-doc/html/libvirt,
+          /usr/share/libvirt, /var/cache/libvirt, /var/lib/libvirt and
+          /var/log/libvirt
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <!-- If the program or library name conflicts (is the same) as the
+      package name, add -prog or -lib to the varlistentry entity id
+      and the 2nd entry of the indexterm zone entity -->
+
+      <varlistentry id="libvirtd">
+        <term><command>libvirtd</command></term>
+        <listitem>
+          <para>
+            is the server side daemon component of the libvirt 
+            virtualization management system.
+          </para>
+          <indexterm zone="libvirt libvirtd">
+            <primary sortas="b-libvirtd">libvirtd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="virsh">
+        <term><command>virsh</command></term>
+        <listitem>
+          <para>
+            is the main interface for managing virsh guest domains.
+          </para>
+          <indexterm zone="libvirt virsh">
+            <primary sortas="b-virsh">virsh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="virt-host-validate">
+        <term><command>virt-host-validate</command></term>
+        <listitem>
+          <para>
+            This tool validates that the host is configured in 
+            a suitable way to run libvirt hypervisor drivers.
+          </para>
+          <indexterm zone="libvirt virt-host-validate">
+            <primary sortas="b-virt-host-validate">virt-host-validate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="virt-pki-validate">
+        <term><command>virt-pki-validate</command></term>
+        <listitem>
+          <para>
+            This tool validates that the necessary PKI files are 
+            configured for a secure libvirt server or client
+            using the TLS encryption protocol.
+          </para>
+          <indexterm zone="libvirt virt-pki-validate">
+            <primary sortas="b-virt-pki-validate">virt-pki-validate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="virt-xml-validate">
+        <term><command>virt-xml-validate</command></term>
+        <listitem>
+          <para>
+            is used to validate a libvirt XML for compliance with the 
+            published schema.
+          </para>
+          <indexterm zone="libvirt virt-xml-validate">
+            <primary sortas="b-virt-xml-validate">virt-xml-validate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libvirt-lib">
+        <term><filename class="libraryfile">libvirt.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libvirt</application> API functions.
+          </para>
+          <indexterm zone="libvirt libvirt-lib">
+            <primary sortas="c-libvirt">libvirt.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/spice-gtk.xml
===================================================================
--- archive/spice-gtk.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
+++ archive/spice-gtk.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
@@ -0,0 +1,244 @@
+<?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 spice-gtk-download-http "http://spice-space.org/download/gtk/spice-gtk-&spice-gtk-version;.tar.bz2">
+  <!ENTITY spice-gtk-download-ftp  " ">
+  <!ENTITY spice-gtk-md5sum        "c8f2c274ab81e0ac273be5c6490b8603">
+  <!ENTITY spice-gtk-size          "852 KB">
+  <!ENTITY spice-gtk-buildsize     "25 MB">
+  <!ENTITY spice-gtk-time          "0.8 SBU">
+]>
+
+<sect1 id="spice-gtk" xreflabel="spice-gtk-&spice-gtk-version;">
+  <?dbhtml filename="spice-gtk.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>spice-gtk-&spice-gtk-version;</title>
+
+  <indexterm zone="spice-gtk">
+    <primary sortas="a-spice-gtk">spice-gtk</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to spice-gtk</title>
+
+    <para>
+      The <application>spice-gtk</application> package contains 
+      a Gtk client and libraries for SPICE remote desktop servers.
+    </para>
+
+    &lfs70_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&spice-gtk-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&spice-gtk-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &spice-gtk-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &spice-gtk-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &spice-gtk-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &spice-gtk-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">spice-gtk Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="celt051"/>,
+      <xref linkend="cyrus-sasl"/>,
+      <xref linkend="gtk3"/>,
+      <xref linkend="polkit"/> and
+      <xref linkend="pulseaudio"/>
+    </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">
+      <ulink url="http://spice-space.org/download/libcacard/">libcacard</ulink> and
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/spice-gtk"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of spice-gtk</title>
+
+    <para>
+      Install <application>spice-gtk</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --enable-vala \
+            --disable-static \
+            --disable-smartcard &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>
+
+    <para>
+      <option>--enable-vala</option>: This option enables
+      building of the Vala bindings. Remove if you don't have
+      <xref linkend="vala"/> installed.
+    </para>
+
+    <para>
+      <option>--disable-smartcard</option>: This option disables use of 
+      libcacard. Remove if you have libcacard 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 Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          snappy, spicy and spicy-stats
+        </seg>
+        <seg>
+          libspice-client-glib-2.0.so, libspice-client-gtk-3.0.so
+          and libspice-controller.so
+        </seg>
+        <seg>
+          /usr/include/{spice-client-glib-2.0,spice-client-gtk-3.0,spice-controller} and
+          /usr/share/gtk-doc/spice-gtk
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="snappy">
+        <term><command>snappy</command></term>
+        <listitem>
+          <para>
+            is program which connects to Spice server 
+            and takes a screenshot.
+          </para>
+          <indexterm zone="spice-gtk snappy">
+            <primary sortas="b-snappy">snappy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="spicy">
+        <term><command>spicy</command></term>
+        <listitem>
+          <para>
+            is Gtk based Spice client application.
+          </para>
+          <indexterm zone="spice-gtk spicy">
+            <primary sortas="b-spicy">spicy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="spicy-stats">
+        <term><command>spicy-stats</command></term>
+        <listitem>
+          <para>
+            is program which connects to Spice server 
+            and writes out a summary of connection details, 
+            amount of bytes transferred, etc.
+          </para>
+          <indexterm zone="spice-gtk spicy-stats">
+            <primary sortas="b-spicy-stats">spicy-stats</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libspice-client-glib-2.0">
+        <term><filename class="libraryfile">libspice-client-glib-2.0.so</filename></term>
+        <listitem>
+          <para>
+            provides GLib objects for Spice protocol decoding and surface rendering.
+          </para>
+          <indexterm zone="spice-gtk libspice-client-glib-2.0">
+            <primary sortas="c-libspice-client-glib-2.0">libspice-client-glib-2.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libspice-client-gtk-3.0">
+        <term><filename class="libraryfile">libspice-client-gtk-3.0.so</filename></term>
+        <listitem>
+          <para>
+            provides Gtk widget to show Spice display and accept user input.
+          </para>
+          <indexterm zone="spice-gtk libspice-client-gtk-3.0">
+            <primary sortas="c-libspice-client-gtk-3.0">libspice-client-gtk-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 3bef2f07669e5c8f7c4f9338afee867839ab90f5)
+++ general.ent	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
@@ -154,5 +154,4 @@
 <!-- Chapter 4 -->
 
-<!ENTITY accountsservice-version      "0.6.22">
 <!ENTITY acl-version                  "2.2.51">
 <!ENTITY attr-version                 "2.4.46">
@@ -216,9 +215,12 @@
 
 <!-- Chapter 8 Virtualization -->
+<!ENTITY qemu-kvm-version             "1.0">
+
+<!-- Removed
 <!ENTITY libosinfo-version            "0.1.1">
 <!ENTITY libvirt-version              "0.9.12">
 <!ENTITY libvirt-glib-version         "0.0.8">
 <!ENTITY spice-gtk-version            "0.11">
-<!ENTITY qemu-kvm-version             "1.0">
+-->
 
 <!-- Part III -->
@@ -387,5 +389,4 @@
 <!ENTITY fcron-version                "3.0.6">
 <!ENTITY gpm-version                  "1.20.6">
-<!ENTITY gvfs-version                 "1.12.3">
 <!ENTITY hdparm-version               "9.39">
 <!ENTITY libarchive-version           "3.0.4">
@@ -540,5 +541,4 @@
 <!ENTITY pyrex-version                "0.9.9">
 <!ENTITY pyxdg-version                "0.22">
-<!ENTITY ipython-version              "0.12">
 
 <!--- Removed
@@ -546,5 +546,7 @@
 <!ENTITY pyorbit-version              "2.24.0">
 <!ENTITY gnome-python-version         "2.28.1">
-<!ENTITY gnome-python-desktop-version "2.30.2">-->
+<!ENTITY gnome-python-desktop-version "2.30.2">
+<!ENTITY ipython-version              "0.12">
+-->
 
 <!-- Part IV -->
@@ -592,7 +594,5 @@
 <!ENTITY curl-version                 "7.27.0">
 <!ENTITY geoclue-version              "0.12.0">
-<!ENTITY geocode-glib-version         "0.99.0">
 <!ENTITY glib-networking-version      "2.32.3">
-<!ENTITY libchamplain-version         "0.12.3">
 <!ENTITY libevent-version             "2.0.19">
 <!ENTITY libgdata-version             "0.12.0">
@@ -607,6 +607,8 @@
 
 <!-- Removed
+<!ENTITY geocode-glib-version         "0.99.0">
+<!ENTITY gnet-version                 "2.0.7">
+<!ENTITY libchamplain-version         "0.12.3">
 <!ENTITY wvstreams-version            "4.2.2">
-<!ENTITY gnet-version                 "2.0.7">
 -->
 
@@ -701,4 +703,6 @@
 <!ENTITY atk-version                  "2.4.0">
 <!ENTITY atkmm-version                "2.22.6">
+<!ENTITY at-spi2-core-version         "2.4.2">
+<!ENTITY at-spi2-atk-version          "2.4.0">
 <!ENTITY cairo-version                "1.12.2">
 <!ENTITY cairomm-version              "1.10.0">
@@ -773,130 +777,102 @@
 
 <!-- Platform -->
-<!ENTITY at-spi2-core-version         "2.4.2">
-<!ENTITY at-spi2-atk-version          "2.4.0">
-<!ENTITY cantarell-fonts-version      "0.0.9">
-<!ENTITY caribou-version              "0.4.2">
+<!ENTITY accountsservice-version      "0.6.22">
+<!ENTITY polkit-gnome-version         "0.105">
+<!ENTITY gnome-doc-utils-version      "0.20.10">
+<!ENTITY yelp-xsl-version             "3.4.2">
+<!ENTITY libgnome-keyring-version     "3.4.1">
+<!-- <!ENTITY libsecret-version            ""> -->
+<!ENTITY gsettings-desktop-schemas-version "3.4.2">
 <!ENTITY dconf-version                "0.12.1">
+<!ENTITY GConf-version                "3.2.5">
+<!ENTITY gcr-version                  "3.4.1">
+<!ENTITY gnome-js-common-version      "0.1.2">
+<!ENTITY gjs-version                  "1.32.0">
+<!ENTITY seed-version                 "3.2.0">
+<!ENTITY libpeas-version              "1.4.0">
+<!ENTITY libgee-version               "0.6.5">
+<!ENTITY libgweather-version          "3.4.1">
+<!ENTITY libwnck-version              "3.4.2">
+<!ENTITY libgnomekbd-version          "3.4.0.2">
+<!ENTITY libgtop-version              "2.28.4">
+<!ENTITY libwacom-version             "0.4">
+<!ENTITY gnome-online-accounts-version "3.4.2">
 <!ENTITY evolution-data-server-version "3.4.3">
 <!ENTITY folks-version                "0.6.9">
-<!ENTITY GConf-version                "3.2.5">
-<!ENTITY gcr-version                  "3.4.1">
-<!ENTITY gjs-version                  "1.32.0">
-<!ENTITY gnome-doc-utils-version      "0.20.10">
-<!ENTITY gnome-js-common-version      "0.1.2">
-<!ENTITY gnome-video-effects-version  "0.4.0">
-<!ENTITY gsettings-desktop-schemas-version "3.4.2">
 <!ENTITY gtksourceview-version        "3.4.2">
-<!ENTITY libgee-version               "0.6.5">
-<!ENTITY libgnome-keyring-version     "3.4.1">
-<!ENTITY libgnomekbd-version          "3.4.0.2">
-<!ENTITY libgtop-version              "2.28.4">
-<!ENTITY libgweather-version          "3.4.1">
-<!ENTITY libpeas-version              "1.4.0">
-<!ENTITY libwacom-version             "0.4">
-<!ENTITY libwnck-version              "3.4.2">
-<!ENTITY polkit-gnome-version         "0.105">
-<!ENTITY seed-version                 "3.2.0">
+<!ENTITY gtkhtml-version              "4.4.3">
 <!ENTITY totem-pl-parser-version      "3.4.2">
 <!ENTITY vte-version                  "0.32.2">
-<!ENTITY yelp-xsl-version             "3.4.2">
-<!ENTITY yelp-tools-version           "3.4.1">
 
 <!-- Desktop -->
 <!ENTITY gnome-backgrounds-version    "3.4.2">
-<!ENTITY gnome-bluetooth-version      "3.4.2">
-<!ENTITY gnome-control-center-version "3.4.2">
-<!ENTITY gnome-desktop-version        "3.4.2">
 <!ENTITY gnome-icon-theme-version     "3.4.0">
 <!ENTITY gnome-icon-theme-extras-version "3.4.0">
 <!ENTITY gnome-icon-theme-symbolic-version "3.4.0">
+<!ENTITY gnome-themes-standard-version "3.4.2">
+<!ENTITY gnome-video-effects-version  "0.4.0">
+<!ENTITY gnome-desktop-version        "3.4.2">
 <!ENTITY gnome-keyring-version        "3.4.1">
 <!ENTITY gnome-menus-version          "3.4.2">
-<!ENTITY gnome-online-accounts-version "3.4.2">
 <!ENTITY gnome-panel-version          "3.4.2.1">
+<!ENTITY nautilus-version             "3.4.2">
+<!ENTITY nautilus-sendto-version      "3.0.2">
+<!ENTITY gvfs-version                 "1.12.3">
+<!ENTITY gnome-screensaver-version    "3.4.4">
+<!ENTITY gnome-power-manager-version  "3.4.0">
+<!ENTITY gnome-bluetooth-version      "3.4.2">
+<!ENTITY gnome-user-share-version     "3.0.2">
+<!ENTITY gnome-settings-daemon-version "3.4.2">
+<!ENTITY gnome-control-center-version "3.4.2">
+<!ENTITY gnome-applets-version        "3.4.1">
+<!ENTITY gnome-terminal-version       "3.4.1.1">
+<!ENTITY zenity-version               "3.4.0">
+<!ENTITY metacity-version             "2.34.5">
+<!ENTITY network-manager-applet-version "0.9.6.2">
+<!ENTITY mutter-version               "3.4.1">
+<!ENTITY caribou-version              "0.4.2">
+<!ENTITY gnome-shell-version          "3.4.2">
 <!ENTITY gnome-session-version        "3.4.2.1">
-<!ENTITY gnome-settings-daemon-version "3.4.2">
-<!ENTITY gnome-shell-version          "3.4.2">
-<!ENTITY gnome-themes-standard-version "3.4.2">
 <!ENTITY gnome-user-docs-version      "3.4.2">
-<!ENTITY metacity-version             "2.34.5">
-<!ENTITY mutter-version               "3.4.1">
-<!ENTITY nautilus-version             "3.4.2">
-<!ENTITY network-manager-applet-version "0.9.6.2">
 <!ENTITY yelp-version                 "3.4.2">
-<!ENTITY zenity-version               "3.4.0">
-
+
+<!-- System Services -->
+<!ENTITY gdm-version                  "3.4.1">
+
+<!-- Chapter 31 -->
 <!-- Applications -->
+<!ENTITY aisleriot-version            "3.4.1">
+<!ENTITY alacarte-version             "0.13.4">
 <!ENTITY baobab-version               "3.4.1">
 <!ENTITY brasero-version              "3.4.1">
+<!ENTITY cheese-version               "3.4.2">
 <!ENTITY empathy-version              "3.4.2.3">
 <!ENTITY eog-version                  "3.4.3">
 <!ENTITY epiphany-version             "3.4.3">
+<!ENTITY epiphany-extensions-version  "3.4.0">
 <!ENTITY evince-version               "3.4.0">
+<!ENTITY evolution-version            "3.4.3">
+<!ENTITY file-roller-version          "3.4.2">
 <!ENTITY gcalctool-version            "6.4.2.1">
+<!ENTITY gedit-version                "3.4.2">
+<!ENTITY gnome-color-manager-version  "3.4.2">
 <!ENTITY gnome-contacts-version       "3.4.1">
 <!ENTITY gnome-dictionary-version     "3.4.0">
 <!ENTITY gnome-disk-utility-version   "3.4.1">
-<!ENTITY gnome-font-viewer-version    "3.4.0">
-<!ENTITY gnome-power-manager-version  "3.4.0">
-<!ENTITY gnome-screensaver-version    "3.4.4">
+<!ENTITY gnome-games-version          "3.4.2">
+<!ENTITY gnome-nettool-version        "3.2.0">
 <!ENTITY gnome-screenshot-version     "3.4.1">
 <!ENTITY gnome-search-tool-version    "3.4.0">
 <!ENTITY gnome-system-log-version     "3.4.1">
 <!ENTITY gnome-system-monitor-version "3.4.1">
-<!ENTITY gnome-terminal-version       "3.4.1.1">
-<!ENTITY gnome-user-share-version     "3.0.2">
+<!ENTITY gnome-tweak-tool-version     "3.4.0">
 <!ENTITY gucharmap-version            "3.4.1">
 <!ENTITY mousetweaks-version          "3.4.2">
-<!ENTITY sushi-version                "0.4.1">
-<!ENTITY vino-version                 "3.4.2">
-
-<!-- System Services -->
-<!ENTITY gdm-version                  "3.4.1">
-
-<!-- Chapter 31 -->
-<!-- Applications -->
-<!ENTITY accerciser-version           "3.4.1">
-<!ENTITY aisleriot-version            "3.4.1">
-<!ENTITY anjuta-version               "3.4.4">
-<!ENTITY cheese-version               "3.4.2">
-<!ENTITY devhelp-version              "3.4.1">
-<!ENTITY evolution-version            "3.4.3">
-<!ENTITY file-roller-version          "3.4.2">
-<!ENTITY gedit-version                "3.4.2">
-<!ENTITY glade-version                "3.12.1">
-<!ENTITY gnome-boxes-version          "3.4.3">
-<!ENTITY gnome-color-manager-version  "3.4.2">
-<!ENTITY gnome-devel-docs-version     "3.4.1">
-<!ENTITY gnome-documents-version      "0.4.2">
-<!ENTITY gnome-games-version          "3.4.2">
-<!ENTITY gnome-nettool-version        "3.2.0">
-<!ENTITY nautilus-sendto-version      "3.0.2">
-<!ENTITY nemiver-version              "0.9.3">
 <!ENTITY orca-version                 "3.4.2">
-<!ENTITY rygel-version                "0.14.3">
 <!ENTITY seahorse-version             "3.4.1">
+<!ENTITY sound-juicer-version         "3.4.0">
 <!ENTITY totem-version                "3.4.3">
 <!ENTITY vinagre-version              "3.4.2">
-
-<!-- Other Packages -->
-<!ENTITY alacarte-version             "0.13.4">
-<!ENTITY epiphany-extensions-version  "3.4.0">
-<!ENTITY gdl-version                  "3.4.2">
-<!ENTITY gdlmm-version                "3.3.2">
-<!ENTITY ghex-version                 "3.4.1">
-<!ENTITY gnome-applets-version        "3.4.1">
-<!ENTITY gnome-tweak-tool-version     "3.4.0">
-<!ENTITY gssdp-version                "0.12.1">
-<!ENTITY gtkhtml-version              "4.4.3">
-<!ENTITY gtksourceviewmm-version      "3.2.0">
-<!ENTITY gupnp-version                "0.18.3">
-<!ENTITY gupnp-av-version             "0.10.2">
-<!ENTITY gupnp-dlna-version           "0.6.6">
-<!ENTITY gupnp-vala-version           "0.10.3">
-<!ENTITY libgda-version               "5.0.3">
-<!ENTITY mobile-broadband-provider-info-version "20120614">
-<!ENTITY sound-juicer-version         "3.4.0">
-<!ENTITY tracker-version              "0.14.2">
+<!ENTITY vino-version                 "3.4.2">
 
 <!-- Chapter 32 -->
@@ -910,4 +886,32 @@
 <!ENTITY libbonoboui-version          "2.24.5">
 <!ENTITY libgnomeui-version           "2.24.5">
+
+<!-- Removed
+<!ENTITY accerciser-version           "3.4.1">
+<!ENTITY anjuta-version               "3.4.4">
+<!ENTITY cantarell-fonts-version      "0.0.9">
+<!ENTITY devhelp-version              "3.4.1">
+<!ENTITY gdl-version                  "3.4.2">
+<!ENTITY gdlmm-version                "3.3.2">
+<!ENTITY ghex-version                 "3.4.1">
+<!ENTITY glade-version                "3.12.1">
+<!ENTITY gnome-boxes-version          "3.4.3">
+<!ENTITY gnome-devel-docs-version     "3.4.1">
+<!ENTITY gnome-documents-version      "0.4.2">
+<!ENTITY gnome-font-viewer-version    "3.4.0">
+<!ENTITY gssdp-version                "0.12.1">
+<!ENTITY gtksourceviewmm-version      "3.2.0">
+<!ENTITY gupnp-version                "0.18.3">
+<!ENTITY gupnp-av-version             "0.10.2">
+<!ENTITY gupnp-dlna-version           "0.6.6">
+<!ENTITY gupnp-vala-version           "0.10.3">
+<!ENTITY libgda-version               "5.0.3">
+<!ENTITY mobile-broadband-provider-info-version "20120614">
+<!ENTITY nemiver-version              "0.9.3">
+<!ENTITY rygel-version                "0.14.3">
+<!ENTITY sushi-version                "0.4.1">
+<!ENTITY tracker-version              "0.14.2">
+<!ENTITY yelp-tools-version           "3.4.1">
+-->
 
 <!-- Obsolete
@@ -986,6 +990,8 @@
 <!ENTITY libreoffice-version          "3.6.0">
 
-<!-- <!ENTITY koffice-version              "1.6.3">
-<!ENTITY openoffice-version           "3.2.1"> -->
+<!-- Removed
+<!ENTITY koffice-version              "1.6.3">
+<!ENTITY openoffice-version           "3.2.1">
+-->
 
 <!-- Chapter 36 -->
@@ -1026,9 +1032,7 @@
 <!ENTITY alsa-oss-version             "1.0.25">
 <!ENTITY audiofile-version            "0.3.4">
-<!ENTITY celt051-version              "0.5.1.3">
 <!ENTITY esound-version               "0.2.41">
 <!ENTITY faac-version                 "1.28">
 <!ENTITY faad2-version                "2.7">
-<!-- <!ENTITY farsight2-version            "0.0.26"> -->
 <!ENTITY farstream-version            "0.1.2">
 <!ENTITY flac-version                 "1.2.1">
@@ -1039,5 +1043,4 @@
 <!ENTITY gst-plugins-ugly-version     "0.10.19">
 <!ENTITY gst-ffmpeg-version           "0.10.13">
-<!-- <!ENTITY id3lib-version               "3.8.3"> -->
 <!ENTITY liba52-version               "0.7.4">
 <!ENTITY libao-version                "1.1.0">
@@ -1048,7 +1051,5 @@
 <!ENTITY libdvdnav-version            "4.2.0">
 <!ENTITY libdv-version                "1.0.0">
-<!-- <!ENTITY libfame-version              "0.9.1"> -->
 <!ENTITY libmad-version               "0.15.1b">
-<!-- <!ENTITY libmikmod-version            "3.1.11"> -->
 <!ENTITY libmpeg2-version             "0.5.1">
 <!ENTITY libmpeg3-version             "1.8">
@@ -1062,5 +1063,4 @@
 <!ENTITY libvorbis-version            "1.3.3">
 <!ENTITY libvpx-version               "1.1.0">
-<!-- <!ENTITY nas-version                  "1.9.1"> -->
 <!ENTITY opal-version                 "3.10.2">
 <!ENTITY pulseaudio-version           "2.1">
@@ -1072,5 +1072,11 @@
 <!ENTITY xvid-version                 "1.3.2">
 
-<!-- Obsolete
+<!-- Removed
+<!ENTITY celt051-version              "0.5.1.3">
+<!ENTITY farsight2-version            "0.0.26">
+<!ENTITY id3lib-version               "3.8.3">
+<!ENTITY libfame-version              "0.9.1">
+<!ENTITY libmikmod-version            "3.1.11">
+<!ENTITY nas-version                  "1.9.1">
 <!ENTITY openquicktime-version        "1.0">
 -->
@@ -1154,5 +1160,4 @@
 <!ENTITY enscript-version             "1.6.4">
 <!ENTITY psutils-version              "p17">
-<!ENTITY libgxps-version              "0.2.2">
 <!ENTITY gsview-version               "4.8">
 <!ENTITY xpdf-version                 "3.02">
@@ -1161,4 +1166,8 @@
 <!ENTITY paps-version                 "0.6.8">
 
+<!-- Removed
+<!ENTITY libgxps-version              "0.2.2">
+-->
+
 <!-- Chapter 47 -->
 <!ENTITY texlive-version              "20110705">
Index: gnome/gnome.xml
===================================================================
--- gnome/gnome.xml	(revision 3bef2f07669e5c8f7c4f9338afee867839ab90f5)
+++ gnome/gnome.xml	(revision f894c6ab68fea55664f4ff41289f49e98530c341)
@@ -18,5 +18,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-intro.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="core/core.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add/add.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="applications/applications.xml"/>
   <!-- transitionally, gnome-2 packages used elsewhere -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="deprecated/deprecated.xml"/>
