Index: archive/eject.xml
===================================================================
--- archive/eject.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
+++ archive/eject.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -0,0 +1,129 @@
+<?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 eject-download-http "http://www.paldo.org/paldo/sources/eject/eject-&eject-version;.tar.bz2">
+  <!ENTITY eject-download-ftp  "ftp://mirrors.kernel.org/slackware/slackware-13.1/source/a/eject/eject-&eject-version;.tar.bz2">
+  <!ENTITY eject-md5sum        "5a6cab2184ae4ed21128054d931d558f">
+  <!ENTITY eject-size          "105 KB">
+  <!ENTITY eject-buildsize     "1 MB">
+  <!ENTITY eject-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="eject" xreflabel="eject-&eject-version;">
+  <?dbhtml filename="eject.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>eject-&eject-version;</title>
+
+  <indexterm zone="eject">
+    <primary sortas="a-eject">eject</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Eject</title>
+
+    <para>The <application>Eject</application> package is a program for ejecting
+    removable media under software control.</para>
+
+    <note><para>Starting with util-linux-2.22, the <command>eject</command>
+    program has been incorporated into that package.  If you have installed
+    util-linux-2.22 or later, this package is not needed.</para></note>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&eject-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&eject-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &eject-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &eject-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &eject-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &eject-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/eject"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Eject</title>
+
+    <para>Install <application>Eject</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>eject and volname</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="eject-prog">
+        <term><command>eject</command></term>
+        <listitem>
+          <para>ejects removable media.</para>
+          <indexterm zone="eject eject-prog">
+            <primary sortas="b-eject">eject</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="volname">
+        <term><command>volname</command></term>
+        <listitem>
+          <para>returns the volume name.</para>
+          <indexterm zone="eject volname">
+            <primary sortas="b-volname">volname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/esound.xml
===================================================================
--- archive/esound.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
+++ archive/esound.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -0,0 +1,296 @@
+<?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 esound-download-http "&gnome-download-http;/esound/0.2/esound-&esound-version;.tar.bz2">
+  <!ENTITY esound-download-ftp  "&gnome-download-ftp;/esound/0.2/esound-&esound-version;.tar.bz2">
+  <!ENTITY esound-md5sum        "8d9aad3d94d15e0d59ba9dc0ea990c6c">
+  <!ENTITY esound-size          "392 KB">
+  <!ENTITY esound-buildsize     "5.3 MB">
+  <!ENTITY esound-time          "0.3 SBU">
+]>
+
+<sect1 id="esound" xreflabel="EsounD-&esound-version;">
+  <?dbhtml filename="esound.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>EsounD-&esound-version;</title>
+
+  <indexterm zone="esound">
+    <primary sortas="a-EsounD">EsounD</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to EsounD</title>
+
+    <para>The <application>EsounD</application> package contains
+    the Enlightened Sound Daemon. This is useful for mixing together
+    several digitized audio streams for playback by a single device.</para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&esound-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&esound-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &esound-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &esound-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &esound-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &esound-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">EsounD Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="audiofile"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="alsa-lib"/> and
+    <xref linkend="docbook-utils"/> (Required for building the html documentation)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/esound"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of EsounD</title>
+
+    <para>Install <application>EsounD</application> by running the following
+    commands:</para>
+
+<screen><userinput>LIBS=-lm ./configure --prefix=/usr --sysconfdir=/etc &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 docdir=/usr/share/doc/esound-&esound-version;</userinput></screen>
+
+    <para>If you have <application>DocBook-utils</application> installed, still
+    as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>chown -v root:root /usr/share/doc/esound-&esound-version;/*</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>LIBS=-lm</parameter>: Make sure the linker uses the math
+    library.</para>
+
+    <para><parameter>--sysconfdir=/etc</parameter>: This switch puts
+    configuration files in <filename class="directory">/etc</filename> instead
+    of <filename class="directory">/usr/etc</filename>.</para>
+
+    <para><parameter>--disable-static</parameter>: Prevent the static libraries
+    being built.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring EsounD</title>
+
+    <sect3 id="esound-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/esd.conf</filename></para>
+
+      <indexterm zone="esound esound-config">
+        <primary sortas="e-etc-esd.conf">/etc/esd.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>Instructions and information about the configuration file is
+      located in the <filename>TIPS</filename> file in the
+      <application>EsounD</application> source directory.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>esd, esdcat, esd-config, esdctl, esddsp, esdfilt, esdloop, esdmon,
+        esdplay, esdrec, and esdsample</seg>
+        <seg>libesd.{so,a} and libesddsp.{so,a}</seg>
+        <seg>/usr/share/doc/esound</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="esd">
+        <term><command>esd</command></term>
+        <listitem>
+          <para>is the Enlightened Sound Daemon.</para>
+          <indexterm zone="esound esd">
+            <primary sortas="b-esd">esd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="esdcat">
+        <term><command>esdcat</command></term>
+        <listitem>
+          <para>plays a RAW audio stream through the daemon.</para>
+          <indexterm zone="esound esdcat">
+            <primary sortas="b-esdcat">esdcat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="esd-config">
+        <term><command>esd-config</command></term>
+        <listitem>
+          <para>is used by <command>configure</command> to determine the
+          compiler and linker flags that should be used to compile and link programs
+          that use <application>EsounD</application>.</para>
+          <indexterm zone="esound esd-config">
+            <primary sortas="b-esd-config">esd-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="esdctl">
+        <term><command>esdctl</command></term>
+        <listitem>
+          <para> controls certain aspects of the sound daemon.</para>
+          <indexterm zone="esound esdctl">
+            <primary sortas="b-esdctl">esdctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="esddsp">
+        <term><command>esddsp</command></term>
+        <listitem>
+          <para>can allow non-esd applications to be routed through esd.</para>
+          <indexterm zone="esound esddsp">
+            <primary sortas="b-esddsp">esddsp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="esdfilt">
+        <term><command>esdfilt</command></term>
+        <listitem>
+          <para>is an <application>EsoundD</application> filter.</para>
+          <indexterm zone="esound esdfilt">
+            <primary sortas="b-esdfilt">esdfilt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="esdloop">
+        <term><command>esdloop</command></term>
+        <listitem>
+          <para>is test scaffolding for sample cache, loop and free.</para>
+          <indexterm zone="esound esdloop">
+            <primary sortas="b-esdloop">esdloop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="esdmon">
+        <term><command>esdmon</command></term>
+        <listitem>
+          <para>outputs the mixed stream from the daemon.</para>
+          <indexterm zone="esound esdmon">
+            <primary sortas="b-esdmon">esdmon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="esdplay">
+        <term><command>esdplay</command></term>
+        <listitem>
+          <para>plays the named file on
+          <application>EsoundD</application>.</para>
+          <indexterm zone="esound esdplay">
+            <primary sortas="b-esdplay">esdplay</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="esdrec">
+        <term><command>esdrec</command></term>
+        <listitem>
+          <para>outputs from the sound device's current input.</para>
+          <indexterm zone="esound esdrec">
+            <primary sortas="b-esdrec">esdrec</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="esdsample">
+        <term><command>esdsample</command></term>
+        <listitem>
+          <para>is test scaffolding for sample cache, playback, and free.</para>
+          <indexterm zone="esound esdsample">
+            <primary sortas="b-esdsample">esdsample</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libesd">
+        <term><filename class='libraryfile'>libesd.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions used by the <application>EsounD</application>
+          programs to read, write and play various sound format files.</para>
+          <indexterm zone="esound libesd">
+            <primary sortas="c-libesd">libesd.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libesddsp">
+        <term><filename class='libraryfile'>libesddsp.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions used by other programs to read, write and
+          play various sound format files.</para>
+          <indexterm zone="esound libesddsp">
+            <primary sortas="c-libesddsp">libesddsp.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/gnupg.xml
===================================================================
--- archive/gnupg.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
+++ archive/gnupg.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -0,0 +1,192 @@
+<?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 gnupg-download-http " ">
+  <!ENTITY gnupg-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg-version;.tar.bz2">
+  <!ENTITY gnupg-md5sum        "58bb873ecf17d3205a98c545248d7b04">
+  <!ENTITY gnupg-size          "3.5 MB">
+  <!ENTITY gnupg-buildsize     "46 MB">
+  <!ENTITY gnupg-time          "0.4 SBU">
+]>
+
+<sect1 id="gnupg" xreflabel="GnuPG-&gnupg-version;">
+  <?dbhtml filename="gnupg.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>GnuPG-&gnupg-version;</title>
+
+  <indexterm zone="gnupg">
+    <primary sortas="a-GnuPG">GnuPG</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to GnuPG</title>
+
+    <para>The <application>GnuPG</application> package contains a
+    public/private key encryptor. This is useful for signing
+    files or emails as proof of identity and preventing tampering with
+    the contents of the file or email. For a more enhanced version of
+    GnuPG which supports S/MIME, see the <xref linkend="gnupg2"/>
+    package.</para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnupg-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnupg-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnupg-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnupg-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnupg-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnupg-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">GnuPG Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="openldap"/>,
+    <xref linkend="libusb-compat"/>,
+    <xref linkend="curl"/>,
+    an <xref linkend="server-mail"/>, and
+    <ulink url="http://www.oasis-open.org/docbook/tools/dtm/">docbook-to-man</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gnupg"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GnuPG</title>
+
+    <para>Install <application>GnuPG</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib &amp;&amp;
+make</userinput></screen>
+
+    <para>If you have <xref linkend="texlive"/>
+    installed and you wish to create documentation in alternate formats, issue
+    the following command:</para>
+
+<screen><userinput>make -C doc pdf html</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Note that if you have already installed <application>GnuPG
+    2</application>, the instructions below will overwrite
+    <filename>/usr/share/man/man1/gpg-zip.1</filename>. Now, as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+
+install -v -m755 -d /usr/share/doc/gnupg-&gnupg-version; &amp;&amp;
+cp      -v          /usr/share/gnupg/FAQ \
+                    /usr/share/doc/gnupg-&gnupg-version; &amp;&amp;
+install -v -m644    doc/{highlights-1.4.txt,OpenPGP,samplekeys.asc,DETAILS} \
+                    /usr/share/doc/gnupg-&gnupg-version;</userinput></screen>
+
+    <para>If you created alternate formats of the documentation, install it
+    using the following command as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cp -v -R doc/gnupg1.{html,pdf} /usr/share/doc/gnupg-&gnupg-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--libexecdir=/usr/lib</parameter>: This command
+    creates a <filename class="directory">gnupg</filename> directory in
+    <filename class="directory">/usr/lib</filename> instead of
+    <filename class="directory">/usr/libexec</filename>.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>gpg, gpg-zip, gpgsplit, and gpgv</seg>
+        <seg>None</seg>
+        <seg>/usr/lib/gnupg, /usr/share/gnupg and
+        /usr/share/doc/gnupg-&gnupg-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gpg">
+        <term><command>gpg</command></term>
+        <listitem>
+          <para>is the backend (command-line interface) for
+          this OpenPGP implementation.</para>
+          <indexterm zone="gnupg gpg">
+            <primary sortas="b-gpg">gpg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpg-zip">
+        <term><command>gpg-zip</command></term>
+        <listitem>
+          <para>shell script that implements a gpg-ized version of
+          <command>tar</command>.</para>
+          <indexterm zone="gnupg gpg-zip">
+            <primary sortas="b-gpg-zip">gpg-zip</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpgsplit">
+        <term><command>gpgsplit</command></term>
+        <listitem>
+          <para>separates key rings.</para>
+          <indexterm zone="gnupg gpgsplit">
+            <primary sortas="b-gpgsplit">gpgsplit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpgv">
+        <term><command>gpgv</command></term>
+        <listitem>
+          <para>is a verify only version of <command>gpg</command>.</para>
+          <indexterm zone="gnupg gpgv">
+            <primary sortas="b-gpgv">gpgv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/libXp.xml
===================================================================
--- archive/libXp.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
+++ archive/libXp.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -0,0 +1,122 @@
+<?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 libXp-download-http "http://xorg.freedesktop.org/releases/individual/lib/libXp-&libXp-version;.tar.bz2">
+  <!ENTITY libXp-download-ftp  "ftp://ftp.x.org/pub/individual/lib/libXp-&libXp-version;.tar.bz2">
+  <!ENTITY libXp-md5sum        "bb038577c7f4e42a1b675fa6451bc4aa">
+  <!ENTITY libXp-size          "292 KB">
+  <!ENTITY libXp-buildsize     "4.9 MB">
+  <!ENTITY libXp-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libXp" xreflabel="libXp-&libXp-version;">
+  <?dbhtml filename="libXp.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libXp-&libXp-version;</title>
+
+  <indexterm zone="libXp">
+    <primary sortas="a-libXp">libXp</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libXp</title>
+
+    <para>The <application>libXp</application> package contains a library
+    implementing the X Print Protocol.</para>
+
+    &not-katamari;
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libXp-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libXp-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libXp-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libXp-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libXp-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libXp-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libXp Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="printproto"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libXp"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libXp</title>
+
+    <para>Install <application>libXp</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure $XORG_CONFIG &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="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libXp.so</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libXp-lib">
+        <term><filename class='libraryfile'>libXp.so</filename></term>
+        <listitem>
+          <para>is the library of X authority database routines.</para>
+          <indexterm zone="libXp libXp">
+            <primary sortas="c-libXp">libXp.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/libmpeg3.xml
===================================================================
--- archive/libmpeg3.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
+++ archive/libmpeg3.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -0,0 +1,213 @@
+<?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 libmpeg3-download-http "&sourceforge-repo;/heroines/libmpeg3-&libmpeg3-version;-src.tar.bz2">
+  <!ENTITY libmpeg3-download-ftp  " ">
+  <!ENTITY libmpeg3-md5sum        "a9d0d34e8941a4437eb8e7dfe559eca1">
+  <!ENTITY libmpeg3-size          "2.4 MB">
+  <!ENTITY libmpeg3-buildsize     "13 MB">
+  <!ENTITY libmpeg3-time          "0.1 SBU">
+]>
+
+<sect1 id="libmpeg3" xreflabel="libMPEG3-&libmpeg3-version;">
+  <?dbhtml filename="libmpeg3.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libMPEG3-&libmpeg3-version;</title>
+
+  <indexterm zone="libmpeg3">
+    <primary sortas="a-libMPEG3">libMPEG3</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libMPEG3</title>
+
+    <para>
+      <application>libMPEG3</application> supports advanced
+      editing and manipulation of MPEG streams.
+    </para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libmpeg3-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libmpeg3-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libmpeg3-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libmpeg3-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libmpeg3-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libmpeg3-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/libmpeg3-&libmpeg3-version;-makefile_fixes-2.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libMPEG3 Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="liba52"/> and
+      <xref linkend="NASM"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libmpeg3"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libMPEG3</title>
+
+    <para>
+      Install <application>libMPEG3</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../libmpeg3-&libmpeg3-version;-makefile_fixes-2.patch &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="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          mpeg3cat, mpeg3dump, mpeg3peek and mpeg3toc
+        </seg>
+        <seg>
+           libmpeg3.{so,a}
+        </seg>
+        <seg>
+          /usr/include/audio and
+          /usr/include/video
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="mpeg3cat">
+        <term><command>mpeg3cat</command></term>
+        <listitem>
+          <para>
+            concatenates elementary streams or demultiplexes a program
+            stream (separates components of the stream).
+          </para>
+          <indexterm zone="libmpeg3 mpeg3cat">
+            <primary sortas="b-mpeg3cat">mpeg3cat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mpeg3dump">
+        <term><command>mpeg3dump</command></term>
+        <listitem>
+          <para>
+            dumps information or extracts audio to a 24 bit PCM file.
+          </para>
+          <indexterm zone="libmpeg3 mpeg3dump">
+            <primary sortas="b-mpeg3dump">mpeg3dump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mpeg3peek">
+        <term><command>mpeg3peek</command></term>
+        <listitem>
+          <para>
+            prints the byte offset of a given frame. It only works for
+            video and requires a table of contents.
+          </para>
+          <indexterm zone="libmpeg3 mpeg3peek">
+            <primary sortas="b-mpeg3peek">mpeg3peek</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mpeg3toc">
+        <term><command>mpeg3toc</command></term>
+        <listitem>
+          <para>
+            creates a table of contents for a DVD or MPEG stream.
+          </para>
+          <indexterm zone="libmpeg3 mpeg3toc">
+            <primary sortas="b-mpeg3toc">mpeg3toc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libmpeg3-lib">
+        <term><filename class='libraryfile'>libmpeg3.{so,a}</filename></term>
+        <listitem>
+          <para>
+            decodes several MPEG standards into uncompressed data
+            suitable for editing and playback.
+          </para>
+          <indexterm zone="libmpeg3 libmpeg3-lib">
+            <primary sortas="c-libmpeg3">libmpeg3.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/obexd.xml
===================================================================
--- archive/obexd.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
+++ archive/obexd.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -0,0 +1,143 @@
+<?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 obexd-download-http "http://www.kernel.org/pub/linux/bluetooth/obexd-&obexd-version;.tar.xz">
+  <!ENTITY obexd-download-ftp  "ftp://ftp.kernel.org/pub/linux/bluetooth/obexd-&obexd-version;.tar.xz">
+  <!ENTITY obexd-md5sum        "dfb9bdd490a975616afa3a0c2bf53c88">
+  <!ENTITY obexd-size          "344 KB">
+  <!ENTITY obexd-buildsize     "6.5 MB">
+  <!ENTITY obexd-time          "0.2 SBU">
+]>
+
+<sect1 id="obexd" xreflabel="Obexd-&obexd-version;">
+  <?dbhtml filename="obexd.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Obexd-&obexd-version;</title>
+
+  <indexterm zone="obexd">
+    <primary sortas="a-Obexd">Obexd</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Obexd</title>
+
+    <para>
+      The <application>Obexd</application> package contains D-Bus services providing
+      OBEX client and server functionality. OBEX is a communications protocol that
+      facilitates the exchange of binary objects between devices.
+    </para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&obexd-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&obexd-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &obexd-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &obexd-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &obexd-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &obexd-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Obexd Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="bluez"/> and
+      <xref linkend="libical"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/obexd"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Obexd</title>
+
+    <para>
+      Install <application>Obexd</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>sed -i 's/#include &lt;string.h&gt;/&amp;\n#include &lt;stdio.h&gt;/' plugins/mas.c &amp;&amp;
+./configure --prefix=/usr --libexecdir=/usr/lib/obex &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>
+      <command>sed -i 's/#include ...</command>: This sed fixes building against
+      the <application>Glibc</application> 2.17.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          obex-client and obexd
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/lib/obex
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: archive/printproto.xml
===================================================================
--- archive/printproto.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
+++ archive/printproto.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -0,0 +1,99 @@
+<?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 printproto-download-http "http://xorg.freedesktop.org/releases/individual/proto/printproto-&printproto-version;.tar.bz2">
+  <!ENTITY printproto-download-ftp  "ftp://ftp.x.org/pub/individual/proto/printproto-&printproto-version;.tar.bz2">
+  <!ENTITY printproto-md5sum        "99d0e25feea2fead7d8325b7000b41c3">
+  <!ENTITY printproto-size          "224 KB">
+  <!ENTITY printproto-buildsize     "2.6 MB">
+  <!ENTITY printproto-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="printproto" xreflabel="printproto-&printproto-version;">
+  <?dbhtml filename="printproto.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>printproto-&printproto-version;</title>
+
+  <indexterm zone="printproto">
+    <primary sortas="a-printproto">printproto</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to printproto</title>
+
+    <para>The <application>printproto</application> package provides the
+    protocol headers for the <xref linkend="libXp"/> package.</para>
+
+    &not-katamari;
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&printproto-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&printproto-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &printproto-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &printproto-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &printproto-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &printproto-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/printproto"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of printproto</title>
+
+    <para>Install <application>printproto</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure $XORG_CONFIG</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="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: archive/pyrex.xml
===================================================================
--- archive/pyrex.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
+++ archive/pyrex.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -0,0 +1,117 @@
+<?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 pyrex-download-http
+           "http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-&pyrex-version;.tar.gz">
+  <!ENTITY pyrex-download-ftp  " ">
+  <!ENTITY pyrex-md5sum        "515dee67d15d4393841e2d60e8341947">
+  <!ENTITY pyrex-size          "252 KB">
+  <!ENTITY pyrex-buildsize     "4.0 MB">
+  <!ENTITY pyrex-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin Pyrex -->
+  <sect2 id="pyrex" xreflabel="Pyrex-&pyrex-version;">
+
+    <title>Pyrex-&pyrex-version;</title>
+
+    <indexterm zone="pyrex">
+      <primary sortas="a-Pyrex">Pyrex</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Pyrex Module</title>
+
+      <para>
+        <application>Pyrex</application> is language used for writing
+        <application>Python</application> extension modules.
+      </para>
+
+      &lfs74_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+          Download (HTTP): <ulink url="&pyrex-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pyrex-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pyrex-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pyrex-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pyrex-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pyrex-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Pyrex Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="python2"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pyrex"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Pyrex</title>
+
+      <para>
+        Install <application>pyrex</application> by running the following
+        commands as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>python setup.py install</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Program</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directory</segtitle>
+
+        <seglistitem>
+          <seg>
+            pyrexc
+          </seg>
+          <seg>
+            None
+          </seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/Pyrex
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
+  <!-- End Pyrex -->
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ general/genutils/imagemagick.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -130,6 +130,6 @@
       <xref linkend="ffmpeg"/>,
       <ulink url="http://www.fftw.org/">FFTW</ulink>,
-      <ulink url="http://www.gsp.com/support/virtual/email/pgp/">PGP</ulink>
-      or <xref linkend="gnupg"/> or <xref linkend="gnupg2"/>
+      <ulink url="http://www.gsp.com/support/virtual/email/pgp/">PGP</ulink> or
+      <xref linkend="gnupg2"/>
       (you'll have to do some hacking to use <application>GnuPG</application>),
       <xref linkend="sane"/>,
Index: general/graphlib/babl.xml
===================================================================
--- general/graphlib/babl.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ general/graphlib/babl.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -107,6 +107,5 @@
 install -v -m755 -d /usr/share/gtk-doc/html/babl/graphics &amp;&amp;
 install -v -m644 docs/*.{css,html} /usr/share/gtk-doc/html/babl &amp;&amp;
-install -v -m644 docs/graphics/*.{html,png,svg} /usr/share/gtk-doc/html/babl/graphics
-</userinput></screen>
+install -v -m644 docs/graphics/*.{html,png,svg} /usr/share/gtk-doc/html/babl/graphics</userinput></screen>
   </sect2>
 
@@ -140,6 +139,6 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libbabl.so, and libraries in /usr/lib/babl-0.1/</seg>
-        <seg>/usr/include/babl-0.1/</seg>
+        <seg>libbabl.so and libraries in /usr/lib/babl-0.1</seg>
+        <seg>/usr/include/babl-0.1</seg>
       </seglistitem>
     </segmentedlist>
Index: general/graphlib/gegl.xml
===================================================================
--- general/graphlib/gegl.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ general/graphlib/gegl.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -144,6 +144,5 @@
 install -v -m644 docs/*.{css,html} /usr/share/gtk-doc/html/gegl &amp;&amp;
 install -d -v -m755 /usr/share/gtk-doc/html/gegl/images &amp;&amp;
-install -v -m644 docs/images/* /usr/share/gtk-doc/html/gegl/images
-</userinput></screen>
+install -v -m644 docs/images/* /usr/share/gtk-doc/html/gegl/images</userinput></screen>
   </sect2>
 
@@ -178,6 +177,6 @@
       <seglistitem>
         <seg>gegl</seg>
-        <seg>libgegl-0.2.so, and libraries in /usr/lib/gegl-0.2/</seg>
-        <seg>/usr/include/gegl-0.2/</seg>
+        <seg>libgegl-0.2.so and libraries in /usr/lib/gegl-0.2</seg>
+        <seg>/usr/include/gegl-0.2</seg>
       </seglistitem>
     </segmentedlist>
Index: general/graphlib/harfbuzz.xml
===================================================================
--- general/graphlib/harfbuzz.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ general/graphlib/harfbuzz.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -83,5 +83,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="cairo"/> and
+      <xref linkend="cairo"/>,
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk-doc"/>, and
       <ulink url="http://projects.palaso.org/projects/graphitedev/files">Graphite2</ulink>
     </para>
@@ -110,5 +112,5 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --with-gobject &amp;&amp;
 make</userinput></screen>
 
@@ -128,8 +130,17 @@
 
     <para>
+      <parameter>--with-gobject</parameter>: This switch enables building
+      of the <application>Harfbuzz</application> GObject wrapper. Remove
+      it if you did not install <application>GLib</application>.
+    </para>
+
+    <para>
       <option>--with-graphite2</option>: This switch enables
       <application>Graphite2</application> support.
     </para>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
@@ -139,10 +150,10 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          hb-ot-shape-closure, hb-shape and hb-view
+          hb-ot-shape-closure, hb-shape, and hb-view
         </seg>
         <seg>
@@ -150,5 +161,6 @@
         </seg>
         <seg>
-          /usr/include/harfbuzz
+          /usr/include/harfbuzz and
+          /usr/share/gtk-doc/html/harfbuzz
         </seg>
       </seglistitem>
Index: general/prog/cvs.xml
===================================================================
--- general/prog/cvs.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ general/prog/cvs.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -127,8 +127,6 @@
     <para>Now fix some conflicts with newer libraries and programs:</para>
 
-<screen><userinput>
-sed -i -e 's/getline /get_line /' lib/getline.{c,h} &amp;&amp;
-sed -i -e 's/^@sp$/&amp; 1/'          doc/cvs.texinfo 
-</userinput></screen>
+<screen><userinput>sed -i -e 's/getline /get_line /' lib/getline.{c,h} &amp;&amp;
+sed -i -e 's/^@sp$/&amp; 1/'          doc/cvs.texinfo </userinput></screen>
 
     <para>Install <application>CVS</application> by running
Index: general/prog/lua.xml
===================================================================
--- general/prog/lua.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ general/prog/lua.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -112,5 +112,5 @@
     </para>
 
-<screen role="root"><userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.2 liblua.so.5.2.1" \
+<screen role="root"><userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.2 liblua.so.&lua-version;" \
      INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &amp;&amp;
 mkdir -pv /usr/share/doc/lua-&lua-version; &amp;&amp;
@@ -123,5 +123,5 @@
 <screen role="root"><userinput>cat &gt; /usr/lib/pkgconfig/lua.pc &lt;&lt; "EOF"
 <literal>V=5.2
-R=5.2.1
+R=&lua-version;
 
 prefix=/usr
Index: neral/prog/pyrex.xml
===================================================================
--- general/prog/pyrex.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ 	(revision )
@@ -1,117 +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 pyrex-download-http
-           "http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/Pyrex-&pyrex-version;.tar.gz">
-  <!ENTITY pyrex-download-ftp  " ">
-  <!ENTITY pyrex-md5sum        "515dee67d15d4393841e2d60e8341947">
-  <!ENTITY pyrex-size          "252 KB">
-  <!ENTITY pyrex-buildsize     "4.0 MB">
-  <!ENTITY pyrex-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Pyrex -->
-  <sect2 id="pyrex" xreflabel="Pyrex-&pyrex-version;">
-
-    <title>Pyrex-&pyrex-version;</title>
-
-    <indexterm zone="pyrex">
-      <primary sortas="a-Pyrex">Pyrex</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pyrex Module</title>
-
-      <para>
-        <application>Pyrex</application> is language used for writing
-        <application>Python</application> extension modules.
-      </para>
-
-      &lfs74_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-          Download (HTTP): <ulink url="&pyrex-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyrex-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyrex-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyrex-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyrex-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyrex-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Pyrex Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="python2"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pyrex"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pyrex</title>
-
-      <para>
-        Install <application>pyrex</application> by running the following
-        commands as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>python setup.py install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            pyrexc
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/Pyrex
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
-  <!-- End Pyrex -->
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ general/prog/python-modules.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -69,9 +69,4 @@
       <listitem>
         <para>
-          <xref linkend="pyrex"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           <xref linkend="pyxdg"/>
         </para>
@@ -102,7 +97,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pyrex.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="pyxdg.xml"/>
 
Index: neral/sysutils/eject.xml
===================================================================
--- general/sysutils/eject.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ 	(revision )
@@ -1,129 +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 eject-download-http "http://www.paldo.org/paldo/sources/eject/eject-&eject-version;.tar.bz2">
-  <!ENTITY eject-download-ftp  "ftp://mirrors.kernel.org/slackware/slackware-13.1/source/a/eject/eject-&eject-version;.tar.bz2">
-  <!ENTITY eject-md5sum        "5a6cab2184ae4ed21128054d931d558f">
-  <!ENTITY eject-size          "105 KB">
-  <!ENTITY eject-buildsize     "1 MB">
-  <!ENTITY eject-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="eject" xreflabel="eject-&eject-version;">
-  <?dbhtml filename="eject.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>eject-&eject-version;</title>
-
-  <indexterm zone="eject">
-    <primary sortas="a-eject">eject</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Eject</title>
-
-    <para>The <application>Eject</application> package is a program for ejecting
-    removable media under software control.</para>
-
-    <note><para>Starting with util-linux-2.22, the <command>eject</command>
-    program has been incorporated into that package.  If you have installed
-    util-linux-2.22 or later, this package is not needed.</para></note>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&eject-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&eject-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &eject-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &eject-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &eject-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &eject-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/eject"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Eject</title>
-
-    <para>Install <application>Eject</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>eject and volname</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="eject-prog">
-        <term><command>eject</command></term>
-        <listitem>
-          <para>ejects removable media.</para>
-          <indexterm zone="eject eject-prog">
-            <primary sortas="b-eject">eject</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="volname">
-        <term><command>volname</command></term>
-        <listitem>
-          <para>returns the volume name.</para>
-          <indexterm zone="eject volname">
-            <primary sortas="b-volname">volname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/obexd.xml
===================================================================
--- general/sysutils/obexd.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ 	(revision )
@@ -1,143 +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 obexd-download-http "http://www.kernel.org/pub/linux/bluetooth/obexd-&obexd-version;.tar.xz">
-  <!ENTITY obexd-download-ftp  "ftp://ftp.kernel.org/pub/linux/bluetooth/obexd-&obexd-version;.tar.xz">
-  <!ENTITY obexd-md5sum        "dfb9bdd490a975616afa3a0c2bf53c88">
-  <!ENTITY obexd-size          "344 KB">
-  <!ENTITY obexd-buildsize     "6.5 MB">
-  <!ENTITY obexd-time          "0.2 SBU">
-]>
-
-<sect1 id="obexd" xreflabel="Obexd-&obexd-version;">
-  <?dbhtml filename="obexd.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Obexd-&obexd-version;</title>
-
-  <indexterm zone="obexd">
-    <primary sortas="a-Obexd">Obexd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Obexd</title>
-
-    <para>
-      The <application>Obexd</application> package contains D-Bus services providing
-      OBEX client and server functionality. OBEX is a communications protocol that
-      facilitates the exchange of binary objects between devices.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&obexd-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&obexd-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &obexd-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &obexd-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &obexd-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &obexd-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Obexd Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="bluez"/> and
-      <xref linkend="libical"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/obexd"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Obexd</title>
-
-    <para>
-      Install <application>Obexd</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/#include &lt;string.h&gt;/&amp;\n#include &lt;stdio.h&gt;/' plugins/mas.c &amp;&amp;
-./configure --prefix=/usr --libexecdir=/usr/lib/obex &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>
-      <command>sed -i 's/#include ...</command>: This sed fixes building against
-      the <application>Glibc</application> 2.17.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          obex-client and obexd
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/lib/obex
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ general/sysutils/sysutils.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -27,5 +27,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cpio.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eject.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fcron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
@@ -35,5 +34,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="obex-data-server.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="obexd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pciutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pm-utils.xml"/>
Index: gnome/applications/seahorse.xml
===================================================================
--- gnome/applications/seahorse.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ gnome/applications/seahorse.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -80,5 +80,4 @@
       <xref linkend="gcr"/>,
       <xref linkend="gpgme"/>,
-      <xref linkend="gnupg"/> or
       <xref linkend="gnupg2"/>,
       <xref linkend="libsecret"/> and
Index: gnome/platform/accountsservice.xml
===================================================================
--- gnome/platform/accountsservice.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ gnome/platform/accountsservice.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -84,6 +84,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="vala"/>
+      <xref linkend="gobject-introspection"/>
     </para>
 
@@ -107,6 +106,5 @@
     </para>
 
-<screen><userinput>
-./configure --prefix=/usr            \
+<screen><userinput>./configure --prefix=/usr            \
             --sysconfdir=/etc        \
             --localstatedir=/var     \
Index: gnome/platform/gcr.xml
===================================================================
--- gnome/platform/gcr.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ gnome/platform/gcr.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -86,5 +86,4 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gnupg"/> or
       <xref linkend="gnupg2"/>,
       <xref linkend="gobject-introspection"/>, and
Index: gnome/platform/gvfs.xml
===================================================================
--- gnome/platform/gvfs.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ gnome/platform/gvfs.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -113,6 +113,5 @@
     <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
     <para role="optional">
-      <xref linkend="obex-data-server"/> and
-      <xref linkend="obexd"/>
+      <xref linkend="obex-data-server"/>
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ introduction/welcome/changelog.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -48,4 +48,8 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Archive unneeded packages: gnupg,
+          esound, libmpeg3, libXp, printproto, pyrex, eject, and obexd</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Archive unneeded packages: pkgconfig,
           bc, ibus, udev, slib, gamin, and notify-python.</para>
Index: multimedia/audioutils/mpg123.xml
===================================================================
--- multimedia/audioutils/mpg123.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ multimedia/audioutils/mpg123.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -80,5 +80,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="esound"/>,
       <ulink url="http://kcat.strangesoft.net/openal-releases/">OpenAL</ulink>,
       <xref linkend="pulseaudio"/>,
Index: ltimedia/libdriv/esound.xml
===================================================================
--- multimedia/libdriv/esound.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ 	(revision )
@@ -1,296 +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 esound-download-http "&gnome-download-http;/esound/0.2/esound-&esound-version;.tar.bz2">
-  <!ENTITY esound-download-ftp  "&gnome-download-ftp;/esound/0.2/esound-&esound-version;.tar.bz2">
-  <!ENTITY esound-md5sum        "8d9aad3d94d15e0d59ba9dc0ea990c6c">
-  <!ENTITY esound-size          "392 KB">
-  <!ENTITY esound-buildsize     "5.3 MB">
-  <!ENTITY esound-time          "0.3 SBU">
-]>
-
-<sect1 id="esound" xreflabel="EsounD-&esound-version;">
-  <?dbhtml filename="esound.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>EsounD-&esound-version;</title>
-
-  <indexterm zone="esound">
-    <primary sortas="a-EsounD">EsounD</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to EsounD</title>
-
-    <para>The <application>EsounD</application> package contains
-    the Enlightened Sound Daemon. This is useful for mixing together
-    several digitized audio streams for playback by a single device.</para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&esound-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&esound-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &esound-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &esound-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &esound-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &esound-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">EsounD Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="audiofile"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="alsa-lib"/> and
-    <xref linkend="docbook-utils"/> (Required for building the html documentation)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/esound"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of EsounD</title>
-
-    <para>Install <application>EsounD</application> by running the following
-    commands:</para>
-
-<screen><userinput>LIBS=-lm ./configure --prefix=/usr --sysconfdir=/etc &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 docdir=/usr/share/doc/esound-&esound-version;</userinput></screen>
-
-    <para>If you have <application>DocBook-utils</application> installed, still
-    as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>chown -v root:root /usr/share/doc/esound-&esound-version;/*</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>LIBS=-lm</parameter>: Make sure the linker uses the math
-    library.</para>
-
-    <para><parameter>--sysconfdir=/etc</parameter>: This switch puts
-    configuration files in <filename class="directory">/etc</filename> instead
-    of <filename class="directory">/usr/etc</filename>.</para>
-
-    <para><parameter>--disable-static</parameter>: Prevent the static libraries
-    being built.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring EsounD</title>
-
-    <sect3 id="esound-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/esd.conf</filename></para>
-
-      <indexterm zone="esound esound-config">
-        <primary sortas="e-etc-esd.conf">/etc/esd.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>Instructions and information about the configuration file is
-      located in the <filename>TIPS</filename> file in the
-      <application>EsounD</application> source directory.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>esd, esdcat, esd-config, esdctl, esddsp, esdfilt, esdloop, esdmon,
-        esdplay, esdrec, and esdsample</seg>
-        <seg>libesd.{so,a} and libesddsp.{so,a}</seg>
-        <seg>/usr/share/doc/esound</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="esd">
-        <term><command>esd</command></term>
-        <listitem>
-          <para>is the Enlightened Sound Daemon.</para>
-          <indexterm zone="esound esd">
-            <primary sortas="b-esd">esd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdcat">
-        <term><command>esdcat</command></term>
-        <listitem>
-          <para>plays a RAW audio stream through the daemon.</para>
-          <indexterm zone="esound esdcat">
-            <primary sortas="b-esdcat">esdcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esd-config">
-        <term><command>esd-config</command></term>
-        <listitem>
-          <para>is used by <command>configure</command> to determine the
-          compiler and linker flags that should be used to compile and link programs
-          that use <application>EsounD</application>.</para>
-          <indexterm zone="esound esd-config">
-            <primary sortas="b-esd-config">esd-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdctl">
-        <term><command>esdctl</command></term>
-        <listitem>
-          <para> controls certain aspects of the sound daemon.</para>
-          <indexterm zone="esound esdctl">
-            <primary sortas="b-esdctl">esdctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esddsp">
-        <term><command>esddsp</command></term>
-        <listitem>
-          <para>can allow non-esd applications to be routed through esd.</para>
-          <indexterm zone="esound esddsp">
-            <primary sortas="b-esddsp">esddsp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdfilt">
-        <term><command>esdfilt</command></term>
-        <listitem>
-          <para>is an <application>EsoundD</application> filter.</para>
-          <indexterm zone="esound esdfilt">
-            <primary sortas="b-esdfilt">esdfilt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdloop">
-        <term><command>esdloop</command></term>
-        <listitem>
-          <para>is test scaffolding for sample cache, loop and free.</para>
-          <indexterm zone="esound esdloop">
-            <primary sortas="b-esdloop">esdloop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdmon">
-        <term><command>esdmon</command></term>
-        <listitem>
-          <para>outputs the mixed stream from the daemon.</para>
-          <indexterm zone="esound esdmon">
-            <primary sortas="b-esdmon">esdmon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdplay">
-        <term><command>esdplay</command></term>
-        <listitem>
-          <para>plays the named file on
-          <application>EsoundD</application>.</para>
-          <indexterm zone="esound esdplay">
-            <primary sortas="b-esdplay">esdplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdrec">
-        <term><command>esdrec</command></term>
-        <listitem>
-          <para>outputs from the sound device's current input.</para>
-          <indexterm zone="esound esdrec">
-            <primary sortas="b-esdrec">esdrec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="esdsample">
-        <term><command>esdsample</command></term>
-        <listitem>
-          <para>is test scaffolding for sample cache, playback, and free.</para>
-          <indexterm zone="esound esdsample">
-            <primary sortas="b-esdsample">esdsample</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libesd">
-        <term><filename class='libraryfile'>libesd.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions used by the <application>EsounD</application>
-          programs to read, write and play various sound format files.</para>
-          <indexterm zone="esound libesd">
-            <primary sortas="c-libesd">libesd.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libesddsp">
-        <term><filename class='libraryfile'>libesddsp.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions used by other programs to read, write and
-          play various sound format files.</para>
-          <indexterm zone="esound libesddsp">
-            <primary sortas="c-libesddsp">libesddsp.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/grilo.xml
===================================================================
--- multimedia/libdriv/grilo.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ multimedia/libdriv/grilo.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -61,7 +61,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libxml2"/>, and
-      <xref linkend="perl-xml-parser"/>
+      <xref linkend="gtk3"/>
     </para>
 
Index: multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ multimedia/libdriv/gst-plugins-base.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -121,5 +121,5 @@
       <xref linkend="gtk-doc"/> and
       <xref linkend="python2"/> (compiled against an XML parser such as
-      <xref linkend=" expat"/>).
+      <xref linkend="expat"/>).
     </para>
 
Index: multimedia/libdriv/libao.xml
===================================================================
--- multimedia/libdriv/libao.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ multimedia/libdriv/libao.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -67,8 +67,6 @@
     <para role="optional">
       <xref linkend="x-window-system"/>,
-      <xref linkend="esound"/>,
       <xref linkend="alsa"/>, and
-      <xref linkend='pulseaudio'/> (requires <xref linkend='libatomic_ops'/>
-      on x86)
+      <xref linkend='pulseaudio'/>
     </para>
 
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ multimedia/libdriv/libdriv.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -30,5 +30,4 @@
   <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="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"/>
@@ -60,5 +59,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmad.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmpeg2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmpeg3.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmusicbrainz5.xml"/>
Index: multimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ multimedia/libdriv/libdv.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -62,7 +62,9 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="popt"/>,
-    <xref linkend="sdl"/>, and
-    <xref linkend="x-window-system"/></para>
+    <para role="optional">
+      <xref linkend="popt"/>,
+      <xref linkend="sdl"/>, and
+      <xref linkend="x-window-system"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: ltimedia/libdriv/libmpeg3.xml
===================================================================
--- multimedia/libdriv/libmpeg3.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ 	(revision )
@@ -1,213 +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 libmpeg3-download-http "&sourceforge-repo;/heroines/libmpeg3-&libmpeg3-version;-src.tar.bz2">
-  <!ENTITY libmpeg3-download-ftp  " ">
-  <!ENTITY libmpeg3-md5sum        "a9d0d34e8941a4437eb8e7dfe559eca1">
-  <!ENTITY libmpeg3-size          "2.4 MB">
-  <!ENTITY libmpeg3-buildsize     "13 MB">
-  <!ENTITY libmpeg3-time          "0.1 SBU">
-]>
-
-<sect1 id="libmpeg3" xreflabel="libMPEG3-&libmpeg3-version;">
-  <?dbhtml filename="libmpeg3.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libMPEG3-&libmpeg3-version;</title>
-
-  <indexterm zone="libmpeg3">
-    <primary sortas="a-libMPEG3">libMPEG3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libMPEG3</title>
-
-    <para>
-      <application>libMPEG3</application> supports advanced
-      editing and manipulation of MPEG streams.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmpeg3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmpeg3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmpeg3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmpeg3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmpeg3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmpeg3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libmpeg3-&libmpeg3-version;-makefile_fixes-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libMPEG3 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="liba52"/> and
-      <xref linkend="NASM"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libmpeg3"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libMPEG3</title>
-
-    <para>
-      Install <application>libMPEG3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libmpeg3-&libmpeg3-version;-makefile_fixes-2.patch &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mpeg3cat, mpeg3dump, mpeg3peek and mpeg3toc
-        </seg>
-        <seg>
-           libmpeg3.{so,a}
-        </seg>
-        <seg>
-          /usr/include/audio and
-          /usr/include/video
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mpeg3cat">
-        <term><command>mpeg3cat</command></term>
-        <listitem>
-          <para>
-            concatenates elementary streams or demultiplexes a program
-            stream (separates components of the stream).
-          </para>
-          <indexterm zone="libmpeg3 mpeg3cat">
-            <primary sortas="b-mpeg3cat">mpeg3cat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpeg3dump">
-        <term><command>mpeg3dump</command></term>
-        <listitem>
-          <para>
-            dumps information or extracts audio to a 24 bit PCM file.
-          </para>
-          <indexterm zone="libmpeg3 mpeg3dump">
-            <primary sortas="b-mpeg3dump">mpeg3dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpeg3peek">
-        <term><command>mpeg3peek</command></term>
-        <listitem>
-          <para>
-            prints the byte offset of a given frame. It only works for
-            video and requires a table of contents.
-          </para>
-          <indexterm zone="libmpeg3 mpeg3peek">
-            <primary sortas="b-mpeg3peek">mpeg3peek</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpeg3toc">
-        <term><command>mpeg3toc</command></term>
-        <listitem>
-          <para>
-            creates a table of contents for a DVD or MPEG stream.
-          </para>
-          <indexterm zone="libmpeg3 mpeg3toc">
-            <primary sortas="b-mpeg3toc">mpeg3toc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmpeg3-lib">
-        <term><filename class='libraryfile'>libmpeg3.{so,a}</filename></term>
-        <listitem>
-          <para>
-            decodes several MPEG standards into uncompressed data
-            suitable for editing and playback.
-          </para>
-          <indexterm zone="libmpeg3 libmpeg3-lib">
-            <primary sortas="c-libmpeg3">libmpeg3.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ multimedia/libdriv/sdl.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -63,5 +63,4 @@
     <para role="optional">
       <xref linkend="alsa"/>,
-      <xref linkend="esound"/>,
       <xref linkend='pulseaudio'/>
       <xref linkend="NASM"/>,
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ multimedia/videoutils/mplayer.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -170,5 +170,4 @@
     <para role="optional">
       <xref linkend="alsa"/>,
-      <xref linkend="esound"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="sdl"/>,
Index: networking/mailnews/mutt.xml
===================================================================
--- networking/mailnews/mutt.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ networking/mailnews/mutt.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -69,25 +69,29 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gnupg"/> or <xref linkend="gnupg2"/>,
-    <xref linkend="openssl"/> or <xref linkend="gnutls"/>,
-    an <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
-    <xref linkend="aspell"/>,
-    <xref linkend="mitkrb"/>,
-    <xref linkend="cyrus-sasl"/>,
-    <xref linkend="slang"/>,
-    <xref linkend="libidn"/>,
-    <xref linkend="texlive"/>
-    <xref linkend="db"/> or
-    <ulink url="http://qdbm.sourceforge.net/">QDBM</ulink> or
-    <ulink url="http://tokyocabinet.sourceforge.net/index.html">Tokyo Cabinet</ulink>, and
-    <ulink url="http://www.gnu.org/software/gdb/gdb.html">GDB</ulink>
+    <para role="optional">
+      <xref linkend="gnupg2"/>,
+      <xref linkend="openssl"/> or 
+      <xref linkend="gnutls"/>,
+      an <xref linkend="server-mail"/> (that provides a <command>sendmail</command> command),
+      <xref linkend="aspell"/>,
+      <xref linkend="mitkrb"/>,
+      <xref linkend="cyrus-sasl"/>,
+      <xref linkend="slang"/>,
+      <xref linkend="libidn"/>,
+      <xref linkend="texlive"/>
+      <xref linkend="db"/> or
+      <ulink url="http://qdbm.sourceforge.net/">QDBM</ulink> or
+      <ulink url="http://tokyocabinet.sourceforge.net/index.html">Tokyo Cabinet</ulink>, and
+      <ulink url="http://www.gnu.org/software/gdb/gdb.html">GDB</ulink>
     </para>
 
     <bridgehead renderas="sect4">Optional (To Regenerate HTML
     Documentation)</bridgehead>
-    <para role="optional"><xref linkend="libxslt"/> and either
-    <xref linkend="lynx"/>,
-    <xref linkend="w3m"/> or
-    <ulink url="http://elinks.or.cz/">ELinks</ulink></para>
+    <para role="optional">
+      <xref linkend="libxslt"/> and either
+      <xref linkend="lynx"/>,
+      <xref linkend="w3m"/> or
+      <ulink url="http://elinks.or.cz/">ELinks</ulink>
+    </para>
 
     <bridgehead renderas="sect4">Optional (To Generate PDF Manual)</bridgehead>
@@ -250,16 +254,4 @@
 <screen><userinput>cat /usr/share/doc/mutt-&mutt-version;/samples/gpg.rc &gt;&gt; ~/.muttrc</userinput></screen>
 
-      <para><application>Mutt</application> uses <command>gpg</command> in the
-      imported sample. If you have <xref linkend="gnupg2"/> installed and you
-      do not have <xref linkend="gnupg"/> installed you can create a symlink
-      to satisfy this condition:</para>
-
-      <screen role="root"><userinput>ln -v -s gpg2 /usr/bin/gpg</userinput></screen>
-
-      <para>If, however, you have <xref linkend="gnupg"/> installed and you wish
-      to use <xref linkend="gnupg2"/>, then you should edit
-      <filename>~/.muttrc</filename> by hand and change all occurrences of
-      <command>gpg</command> to <command>gpg2</command>.</para>
-
     </sect3>
 
@@ -331,5 +323,5 @@
         <term><command>pgpewrap</command></term>
         <listitem>
-          <para>prepares a command line for the <xref linkend="gnupg"/>
+          <para>prepares a command line for the <xref linkend="gnupg2"/>
           utilities.</para>
           <indexterm zone="mutt pgpewrap">
@@ -344,5 +336,5 @@
           <para>is a key ring dumper for <ulink
           url="http://www.pgp.com/">PGP</ulink>. It is not needed for
-          <xref linkend="gnupg"/>.</para>
+          <xref linkend="gnupg2"/>.</para>
           <indexterm zone="mutt pgpring">
             <primary sortas="b-pgpring">pgpring</primary>
Index: networking/mailnews/re-alpine.xml
===================================================================
--- networking/mailnews/re-alpine.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ networking/mailnews/re-alpine.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -84,6 +84,5 @@
     commands:</para>
 
-<screen><userinput>
-./configure --prefix=/usr       \
+<screen><userinput>./configure --prefix=/usr       \
             --sysconfdir=/etc   \
             --without-ldap      \
Index: networking/netlibs/ldns.xml
===================================================================
--- networking/netlibs/ldns.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ networking/netlibs/ldns.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -102,6 +102,5 @@
     </para>
 
-<screen><userinput>
-./configure --prefix=/usr     \
+<screen><userinput>./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --disable-static  \
Index: networking/netprogs/ntp.xml
===================================================================
--- networking/netprogs/ntp.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ networking/netprogs/ntp.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -59,13 +59,4 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/ntp-&ntp-version;-mod_nano-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
     <bridgehead renderas="sect3">ntp Dependencies</bridgehead>
 
@@ -103,6 +94,5 @@
     the following commands:</para>
 
-<screen><userinput>
-./configure --prefix=/usr         \
+<screen><userinput>./configure --prefix=/usr         \
             --sysconfdir=/etc     \
             --enable-linuxcaps    \
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ postlfs/editors/emacs.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -65,5 +65,4 @@
     <xref linkend="libtiff"/>, and
     <ulink url="http://directory.fsf.org/wiki/Libungif">libungif</ulink></para>
-    <!-- <xref linkend="giflib"/></para> -->
 
     <para condition="html" role="usernotes">User Notes:
@@ -78,6 +77,5 @@
     commands:</para>
 
-<screen><userinput>
-./configure --prefix=/usr         \
+<screen><userinput>./configure --prefix=/usr         \
             --libexecdir=/usr/lib \
             --with-gif=no         \
@@ -213,48 +211,4 @@
       </varlistentry>
 
-<!--
-<sect3><title>cvt-mail</title>
-<para><command>cvt-mail</command> converts old style goslings emacs mail
-directories into gnu-rmail format.</para></sect3>
-
-<sect3><title>digest-doc</title>
-<para><command>digest-doc</command> is a filter to create nroff output for man
-pages.</para></sect3>
-
-<sect3><title>emacsserver</title>
-<para><command>emacserver</command> allows other applications/shells to access
-an already running emacs instance and share buffers with it.</para></sect3>
-
-<sect3><title>fakemail</title>
-<para><command>fakemail</command> is a sendmail-like interface to
-<filename>/bin/mail</filename>.</para></sect3>
-
-<sect3><title>hexl</title>
-<para><command>hexl</command> converts files for editing with emacs hexl-mode
-binary file editing mode.</para></sect3>
-
-<sect3><title>movemail</title>
-<para><command>movemail</command> provides access to
-POP3 mailboxes.</para></sect3>
-
-<sect3><title>profile</title>
-<para><command>profile</command> generates periodic events for profiling of
-Emacs Lisp code.</para></sect3>
-
-<sect3><title>rcs2log</title>
-<para><command>rcs2log</command> generates change log prefixes from
-RCS files.</para></sect3>
-
-<sect3><title>sorted-doc</title>
-<para><command>sorted-doc</command> is a filter to generate texinfo
-files.</para></sect3>
-
-<sect3><title>vcdiff</title>
-<para><command>vcdiff</command> compares SCCS
-files.</para></sect3>
-
-<sect3><title>yow</title>
-<para><command>yow</command> prints a quotation from Zippy the
-Pinhead.</para></sect3>  -->
     </variablelist>
 
Index: postlfs/security/consolekit.xml
===================================================================
--- postlfs/security/consolekit.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ postlfs/security/consolekit.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -115,6 +115,5 @@
     </para>
 
-<screen><userinput>
-./configure --prefix=/usr        \
+<screen><userinput>./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \
Index: stlfs/security/gnupg.xml
===================================================================
--- postlfs/security/gnupg.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ 	(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 gnupg-download-http " ">
-  <!ENTITY gnupg-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg-version;.tar.bz2">
-  <!ENTITY gnupg-md5sum        "58bb873ecf17d3205a98c545248d7b04">
-  <!ENTITY gnupg-size          "3.5 MB">
-  <!ENTITY gnupg-buildsize     "46 MB">
-  <!ENTITY gnupg-time          "0.4 SBU">
-]>
-
-<sect1 id="gnupg" xreflabel="GnuPG-&gnupg-version;">
-  <?dbhtml filename="gnupg.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>GnuPG-&gnupg-version;</title>
-
-  <indexterm zone="gnupg">
-    <primary sortas="a-GnuPG">GnuPG</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GnuPG</title>
-
-    <para>The <application>GnuPG</application> package contains a
-    public/private key encryptor. This is useful for signing
-    files or emails as proof of identity and preventing tampering with
-    the contents of the file or email. For a more enhanced version of
-    GnuPG which supports S/MIME, see the <xref linkend="gnupg2"/>
-    package.</para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gnupg-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gnupg-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gnupg-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gnupg-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gnupg-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gnupg-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GnuPG Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openldap"/>,
-    <xref linkend="libusb-compat"/>,
-    <xref linkend="curl"/>,
-    an <xref linkend="server-mail"/>, and
-    <ulink url="http://www.oasis-open.org/docbook/tools/dtm/">docbook-to-man</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gnupg"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GnuPG</title>
-
-    <para>Install <application>GnuPG</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib &amp;&amp;
-make</userinput></screen>
-
-    <para>If you have <xref linkend="texlive"/>
-    installed and you wish to create documentation in alternate formats, issue
-    the following command:</para>
-
-<screen><userinput>make -C doc pdf html</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Note that if you have already installed <application>GnuPG
-    2</application>, the instructions below will overwrite
-    <filename>/usr/share/man/man1/gpg-zip.1</filename>. Now, as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/gnupg-&gnupg-version; &amp;&amp;
-cp      -v          /usr/share/gnupg/FAQ \
-                    /usr/share/doc/gnupg-&gnupg-version; &amp;&amp;
-install -v -m644    doc/{highlights-1.4.txt,OpenPGP,samplekeys.asc,DETAILS} \
-                    /usr/share/doc/gnupg-&gnupg-version;</userinput></screen>
-
-    <para>If you created alternate formats of the documentation, install it
-    using the following command as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cp -v -R doc/gnupg1.{html,pdf} /usr/share/doc/gnupg-&gnupg-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--libexecdir=/usr/lib</parameter>: This command
-    creates a <filename class="directory">gnupg</filename> directory in
-    <filename class="directory">/usr/lib</filename> instead of
-    <filename class="directory">/usr/libexec</filename>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gpg, gpg-zip, gpgsplit, and gpgv</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/gnupg, /usr/share/gnupg and
-        /usr/share/doc/gnupg-&gnupg-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gpg">
-        <term><command>gpg</command></term>
-        <listitem>
-          <para>is the backend (command-line interface) for
-          this OpenPGP implementation.</para>
-          <indexterm zone="gnupg gpg">
-            <primary sortas="b-gpg">gpg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg-zip">
-        <term><command>gpg-zip</command></term>
-        <listitem>
-          <para>shell script that implements a gpg-ized version of
-          <command>tar</command>.</para>
-          <indexterm zone="gnupg gpg-zip">
-            <primary sortas="b-gpg-zip">gpg-zip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgsplit">
-        <term><command>gpgsplit</command></term>
-        <listitem>
-          <para>separates key rings.</para>
-          <indexterm zone="gnupg gpgsplit">
-            <primary sortas="b-gpgsplit">gpgsplit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpgv">
-        <term><command>gpgv</command></term>
-        <listitem>
-          <para>is a verify only version of <command>gpg</command>.</para>
-          <indexterm zone="gnupg gpgv">
-            <primary sortas="b-gpgv">gpgv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: postlfs/security/gnupg2.xml
===================================================================
--- postlfs/security/gnupg2.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ postlfs/security/gnupg2.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -14,5 +14,5 @@
 
 <sect1 id="gnupg2" xreflabel="GnuPG-&gnupg2-version;">
-  <?dbhtml filename="gnupg2.html"?>
+  <?dbhtml filename="gnupg.html"?>
 
   <sect1info>
@@ -24,11 +24,11 @@
 
   <indexterm zone="gnupg2">
-    <primary sortas="a-GnuPG-2">GnuPG 2</primary>
+    <primary sortas="a-GnuPG">GnuPG</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to GnuPG 2</title>
-
-    <para>The <application>GnuPG 2</application> package is GNU's tool for
+    <title>Introduction to GnuPG</title>
+
+    <para>The <application>GnuPG</application> package is GNU's tool for
     secure communication and data storage. It can be used to encrypt data and
     to create digital signatures. It includes an advanced key management
@@ -36,6 +36,5 @@
     described in RFC2440 and the S/MIME standard as described by several RFCs.
     GnuPG 2 is the stable version of GnuPG integrating support for OpenPGP and
-    S/MIME. It does not conflict with an installed <xref linkend="gnupg"/>
-    OpenPGP-only version.</para>
+    S/MIME.</para>
 
     &lfs74_checked;
@@ -89,7 +88,7 @@
 
   <sect2 role="installation">
-    <title>Installation of GnuPG 2</title>
-
-    <para>Install <application>GnuPG 2</application> by running the following
+    <title>Installation of GnuPG</title>
+
+    <para>Install <application>GnuPG</application> by running the following
     commands:</para>
 
Index: postlfs/security/gpgme.xml
===================================================================
--- postlfs/security/gpgme.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ postlfs/security/gpgme.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -85,5 +85,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gnupg"/> or
       <xref linkend="gnupg2"/> (used during the testsuite)
     </para>
Index: postlfs/security/mitkrb.xml
===================================================================
--- postlfs/security/mitkrb.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ postlfs/security/mitkrb.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -113,5 +113,5 @@
     <para>
       After unpacking the distribution tarball and if you have
-      <xref linkend="gnupg"/> installed, you can
+      <xref linkend="gnupg2"/> installed, you can
       authenticate the package.  First, check the contents of the file
       <filename>krb5-&mitkrb-version;.tar.gz.asc</filename>.
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ postlfs/security/openssl.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -114,6 +114,10 @@
 patch -Np1 -i ../openssl-&openssl-version;-fix_pod_syntax-1.patch &amp;&amp;
 
+<!-- libdir=lib so it doesn't write over /usr/lib64 symlink on 64 bit system.
+     Might break packaging. -->
+
 ./config --prefix=/usr         \
          --openssldir=/etc/ssl \
+         --libdir=lib          \
          shared                \
          zlib-dynamic &amp;&amp;
Index: postlfs/security/polkit.xml
===================================================================
--- postlfs/security/polkit.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ postlfs/security/polkit.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -130,6 +130,5 @@
     </para>
 
-<screen><userinput>
-./configure --prefix=/usr        \
+<screen><userinput>./configure --prefix=/usr        \
             --sysconfdir=/etc    \
             --localstatedir=/var \
Index: postlfs/security/security.xml
===================================================================
--- postlfs/security/security.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ postlfs/security/security.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -48,5 +48,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cracklib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cyrus-sasl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnupg2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnutls.xml"/>
Index: postlfs/virtualization/qemu.xml
===================================================================
--- postlfs/virtualization/qemu.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ postlfs/virtualization/qemu.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -74,5 +74,4 @@
       <xref linkend="check"/>,
       <xref linkend="curl"/>,
-      <xref linkend="esound"/>,
       <xref linkend="mesalib"/>, and
       <xref linkend="cyrus-sasl"/>.
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ x/installing/installing.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -73,6 +73,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xorg-server.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x7driver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="printproto.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libXp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="twm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xterm.xml"/>
Index: installing/libXp.xml
===================================================================
--- x/installing/libXp.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ 	(revision )
@@ -1,122 +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 libXp-download-http "http://xorg.freedesktop.org/releases/individual/lib/libXp-&libXp-version;.tar.bz2">
-  <!ENTITY libXp-download-ftp  "ftp://ftp.x.org/pub/individual/lib/libXp-&libXp-version;.tar.bz2">
-  <!ENTITY libXp-md5sum        "bb038577c7f4e42a1b675fa6451bc4aa">
-  <!ENTITY libXp-size          "292 KB">
-  <!ENTITY libXp-buildsize     "4.9 MB">
-  <!ENTITY libXp-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libXp" xreflabel="libXp-&libXp-version;">
-  <?dbhtml filename="libXp.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libXp-&libXp-version;</title>
-
-  <indexterm zone="libXp">
-    <primary sortas="a-libXp">libXp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libXp</title>
-
-    <para>The <application>libXp</application> package contains a library
-    implementing the X Print Protocol.</para>
-
-    &not-katamari;
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libXp-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libXp-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libXp-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libXp-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libXp-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libXp-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libXp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="printproto"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libXp"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libXp</title>
-
-    <para>Install <application>libXp</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libXp.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libXp-lib">
-        <term><filename class='libraryfile'>libXp.so</filename></term>
-        <listitem>
-          <para>is the library of X authority database routines.</para>
-          <indexterm zone="libXp libXp">
-            <primary sortas="c-libXp">libXp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/printproto.xml
===================================================================
--- x/installing/printproto.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ 	(revision )
@@ -1,99 +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 printproto-download-http "http://xorg.freedesktop.org/releases/individual/proto/printproto-&printproto-version;.tar.bz2">
-  <!ENTITY printproto-download-ftp  "ftp://ftp.x.org/pub/individual/proto/printproto-&printproto-version;.tar.bz2">
-  <!ENTITY printproto-md5sum        "99d0e25feea2fead7d8325b7000b41c3">
-  <!ENTITY printproto-size          "224 KB">
-  <!ENTITY printproto-buildsize     "2.6 MB">
-  <!ENTITY printproto-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="printproto" xreflabel="printproto-&printproto-version;">
-  <?dbhtml filename="printproto.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>printproto-&printproto-version;</title>
-
-  <indexterm zone="printproto">
-    <primary sortas="a-printproto">printproto</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to printproto</title>
-
-    <para>The <application>printproto</application> package provides the
-    protocol headers for the <xref linkend="libXp"/> package.</para>
-
-    &not-katamari;
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&printproto-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&printproto-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &printproto-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &printproto-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &printproto-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &printproto-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/printproto"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of printproto</title>
-
-    <para>Install <application>printproto</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG</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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/agg.xml
===================================================================
--- x/lib/agg.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ x/lib/agg.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -94,6 +94,5 @@
     </para>
 
-<screen><userinput>
-sed -i 's:  -L@x_libraries@::' src/platform/X11/Makefile.am &amp;&amp;
+<screen><userinput>sed -i 's:  -L@x_libraries@::' src/platform/X11/Makefile.am &amp;&amp;
 sed -i '/^AM_C_PROTOTYPES/d'   configure.in                 &amp;&amp;
 
Index: x/lib/clutter.xml
===================================================================
--- x/lib/clutter.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ x/lib/clutter.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -100,4 +100,6 @@
     <para role="optional">
       <xref linkend="gtk-doc"/>,
+      <ulink url="http://www.freedesktop.org/wiki/Software/libevdev/">
+      libevdev</ulink>,
       <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>,
       <ulink url="http://tslib.berlios.de/">Tslib</ulink>,
Index: x/lib/gtk+3.xml
===================================================================
--- x/lib/gtk+3.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ x/lib/gtk+3.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -121,10 +121,9 @@
     </para>
 
-<screen><userinput>
-./configure --prefix=/usr             \
+<screen><userinput>./configure --prefix=/usr             \
             --sysconfdir=/etc         \
-            --disable-wayland-backend \
+            --enable-broadway-backend \
             --enable-x11-backend      \
-            --enable-broadway-backend &amp;&amp;
+            --disable-wayland-backend &amp;&amp;
 make</userinput></screen>
 
@@ -160,14 +159,14 @@
 
     <para>
-      <option>--disable-wayland-backend</option>: switch disables tests for 
-      Wayland which isn't available on BLFS.
-    </para>
-
-    <para>
-      <option>--enable-x11-backend</option>: switch enables the X11 gdk backend.
-    </para>
-
-    <para>
-      <option>--enable-broadway-backend</option>: switch enables the HTML5 gdk backend.
+      <option>--enable-broadway-backend</option>: switch enables the HTML5 GTK backend.
+    </para>
+
+    <para>
+      <option>--enable-x11-backend</option>: switch enables the X11 GDK backend.
+    </para>
+
+    <para>
+      <option>--disable-wayland-backend</option>: switch disables the Wayland GDK backend
+      because Wayland isn't available in BLFS.
     </para>
 
Index: x/wm/icewm.xml
===================================================================
--- x/wm/icewm.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ x/wm/icewm.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -60,9 +60,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/> and
-    <xref linkend="gdk-pixbuf"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="esound"/></para>
+    <para role="required">
+      <xref linkend="x-window-system"/> and
+      <xref linkend="gdk-pixbuf"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: xsoft/other/blueman.xml
===================================================================
--- xsoft/other/blueman.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ xsoft/other/blueman.xml	(revision f82ac3fb40745f38134e058bff1c707c99df61ca)
@@ -80,5 +80,5 @@
       <!-- <xref linkend="notify-python"/>, -->
       <xref linkend="pygtk"/> (with <xref linkend="gtk2"/> support),
-      <xref linkend="pyrex"/>, and
+      <!--<xref linkend="pyrex"/>, --> and
       <xref linkend="startup-notification"/>
     </para>
