Index: ltimedia/libdriv/celt051.xml
===================================================================
--- multimedia/libdriv/celt051.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ 	(revision )
@@ -1,182 +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 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: ltimedia/libdriv/farsight2.xml
===================================================================
--- multimedia/libdriv/farsight2.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ 	(revision )
@@ -1,154 +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 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: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ multimedia/libdriv/libdriv.xml	(revision 3533001e01ff01fbdabe4f918c3083dd40b47401)
@@ -30,9 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="alsa-oss.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="audiofile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="celt051.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="esound.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faac.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faad2.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="farsight2.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="flac.xml"/>
Index: tworking/netlibs/geocode-glib.xml
===================================================================
--- networking/netlibs/geocode-glib.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ 	(revision )
@@ -1,169 +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 geocode-glib-download-http 
-           "&gnome-download-http;/geocode-glib/0.99/geocode-glib-&geocode-glib-version;.tar.bz2">
-  <!ENTITY geocode-glib-download-ftp  
-           "&gnome-download-ftp;/geocode-glib/0.99/geocode-glib-&geocode-glib-version;.tar.bz2">
-  <!ENTITY geocode-glib-md5sum        "73ac778225f35ad996ea0345c5abe4b9">
-  <!ENTITY geocode-glib-size          "300 KB">
-  <!ENTITY geocode-glib-buildsize     "3.0 MB">
-  <!ENTITY geocode-glib-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="geocode-glib" xreflabel="geocode-glib-&geocode-glib-version;">
-  <?dbhtml filename="geocode-glib.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>geocode-glib-&geocode-glib-version;</title>
-
-  <indexterm zone="geocode-glib">
-    <primary sortas="a-geocode-glib">geocode-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Geocode GLib</title>
-
-    <para>
-      The <application>Geocode GLib</application> is a convenience library 
-      for the Yahoo! Place Finder APIs. The Place Finder web service allows 
-      to do geocoding (finding longitude and latitude from an address), and 
-      reverse geocoding (finding an address from coordinates).
-    </para>
-
-    &lfs70_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&geocode-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&geocode-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &geocode-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &geocode-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &geocode-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &geocode-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Geocode GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="json-glib"/> and
-      <xref linkend="libsoup"/>
-    </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;/geocode-glib"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Geocode GLib</title>
-
-    <para>
-      Install <application>Geocode GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &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/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libgeocode-glib.so
-        </seg>
-        <seg>
-          /usr/include/geocode-glib and
-          /usr/share/gtk-doc/html/geocode-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgeocode-glib">
-        <term><filename class="libraryfile">libgeocode-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Geocode GLib</application> API functions.
-          </para>
-          <indexterm zone="geocode-glib libgeocode-glib">
-            <primary sortas="c-libgeocode-glib">libgeocode-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: tworking/netlibs/libchamplain.xml
===================================================================
--- networking/netlibs/libchamplain.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ 	(revision )
@@ -1,192 +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 libchamplain-download-http 
-           "&gnome-download-http;/libchamplain/0.12/libchamplain-&libchamplain-version;.tar.xz">
-  <!ENTITY libchamplain-download-ftp  
-           "&gnome-download-ftp;/libchamplain/0.12/libchamplain-&libchamplain-version;.tar.xz">
-  <!ENTITY libchamplain-md5sum        "f0d63225c2efa8b367ebf205fa40862a">
-  <!ENTITY libchamplain-size          "572 KB">
-  <!ENTITY libchamplain-buildsize     "19 MB">
-  <!ENTITY libchamplain-time          "0.4 SBU">
-]>
-
-<sect1 id="libchamplain" xreflabel="libchamplain-&libchamplain-version;">
-  <?dbhtml filename="libchamplain.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libchamplain-&libchamplain-version;</title>
-
-  <indexterm zone="libchamplain">
-    <primary sortas="a-libchamplain">libchamplain</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libchamplain</title>
-
-    <para>
-      The <application>libchamplain</application> is a Clutter based widget
-      used to display rich, eye-candy and interactive maps.
-    </para>
-
-    &lfs71_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libchamplain-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libchamplain-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libchamplain-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libchamplain-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libchamplain-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libchamplain-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libchamplain Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="clutter-gtk"/>,
-      <xref linkend="libsoup"/> and
-      <xref linkend="sqlite"/>
-    </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;/libchamplain"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libchamplain</title>
-
-    <para>
-      Install <application>libchamplain</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>
-          libchamplain-0.12.so and libchamplain-gtk-0.12.so
-        </seg>
-        <seg>
-          /usr/include/{libchamplain-0.12,libchamplain-gtk-0.12} and
-          /usr/share/gtk-doc/html/{libchamplain,libchamplain-gtk}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libchamplain-0">
-        <term><filename class="libraryfile">libchamplain-0.12.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libchamplain</application> API functions.
-          </para>
-          <indexterm zone="libchamplain libchamplain-0">
-            <primary sortas="c-libchamplain-">libchamplain-0.12.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libchamplain-gtk-0">
-        <term><filename class="libraryfile">libchamplain-gtk-0.12.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libchamplain</application> GTK+ bindings.
-          </para>
-          <indexterm zone="libchamplain libchamplain-gtk-0">
-            <primary sortas="c-libchamplain-gtk-0">libchamplain-gtk-0.12.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: networking/netlibs/netlibs.xml
===================================================================
--- networking/netlibs/netlibs.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ networking/netlibs/netlibs.xml	(revision 3533001e01ff01fbdabe4f918c3083dd40b47401)
@@ -24,7 +24,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="curl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="geoclue.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="glib-networking.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libchamplain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libevent.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgdata.xml"/>
Index: stlfs/security/accountsservice.xml
===================================================================
--- postlfs/security/accountsservice.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ 	(revision )
@@ -1,197 +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 accountsservice-download-http 
-           "http://www.freedesktop.org/software/accountsservice/accountsservice-&accountsservice-version;.tar.xz">
-  <!ENTITY accountsservice-download-ftp  " ">
-  <!ENTITY accountsservice-md5sum        "73ec0e689a83a2970313cf7204f88622">
-  <!ENTITY accountsservice-size          "324 KB">
-  <!ENTITY accountsservice-buildsize     "10 MB">
-  <!ENTITY accountsservice-time          "0.3 SBU">
-]>
-
-<sect1 id="accountsservice" xreflabel="AccountsService-&accountsservice-version;">
-  <?dbhtml filename="accountsservice.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>AccountsService-&accountsservice-version;</title>
-
-  <indexterm zone="accountsservice">
-    <primary sortas="a-AccountsService">AccountsService</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AccountsService</title>
-
-    <para>
-      The <application>AccountsService</application> package provides a set
-      of <application>D-Bus</application> interfaces for querying and manipulating
-      user account information and an implementation of these interfaces based on
-      the usermod(8), useradd(8) and userdel(8) commands.
-    </para>
-
-    &lfs71_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&accountsservice-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&accountsservice-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &accountsservice-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &accountsservice-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &accountsservice-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &accountsservice-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AccountsService Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxslt"/> and
-      <xref linkend="polkit"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="xmlto"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/accountsservice"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AccountsService</title>
-
-    <para>
-      Install <application>AccountsService</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --libexecdir=/usr/lib/accountsservice \
-            --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>
-      <parameter>--libexecdir=/usr/lib/accountsservice</parameter>: This
-      parameter causes the libexec files to be installed in the preferred location
-      of <filename class="directory">/usr/lib/accountsservice</filename> instead
-      of <filename class="directory">/usr/libexec</filename>.
-    </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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          accounts-daemon
-        </seg>
-        <seg>
-          libaccountsservice.so
-        </seg>
-        <seg>
-          /usr/include/accountsservice-1.0,
-          /usr/lib/accountsservice and
-          /var/lib/AccountsService
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="accounts-daemon">
-        <term><command>accounts-daemon</command></term>
-        <listitem>
-          <para>
-            is the <application>AccountsService</application> daemon.
-          </para>
-          <indexterm zone="accountsservice accounts-daemon">
-            <primary sortas="b-accounts-daemon">accounts-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaccountsservice">
-        <term><filename class='libraryfile'>libaccountsservice.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>AccountsService</application> API functions.
-          </para>
-          <indexterm zone="accountsservice libaccountsservice">
-            <primary sortas="c-libaccountsservice">libaccountsservice.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ postlfs/security/security.xml	(revision 3533001e01ff01fbdabe4f918c3083dd40b47401)
@@ -42,5 +42,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulnerabilities.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="accountsservice.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
Index: stlfs/virtualization/libosinfo.xml
===================================================================
--- postlfs/virtualization/libosinfo.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ 	(revision )
@@ -1,224 +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 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: stlfs/virtualization/libvirt-glib.xml
===================================================================
--- postlfs/virtualization/libvirt-glib.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ 	(revision )
@@ -1,180 +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 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: stlfs/virtualization/libvirt.xml
===================================================================
--- postlfs/virtualization/libvirt.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ 	(revision )
@@ -1,280 +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 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: stlfs/virtualization/spice-gtk.xml
===================================================================
--- postlfs/virtualization/spice-gtk.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ 	(revision )
@@ -1,244 +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 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: postlfs/virtualization/virtualization.xml
===================================================================
--- postlfs/virtualization/virtualization.xml	(revision 99b3ac418c130a7666a47df8d47c6246957e1519)
+++ postlfs/virtualization/virtualization.xml	(revision 3533001e01ff01fbdabe4f918c3083dd40b47401)
@@ -22,8 +22,4 @@
   processor.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libosinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvirt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libvirt-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spice-gtk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qemu-kvm.xml"/>
 
