Index: archive/DeviceKit.xml
===================================================================
--- archive/DeviceKit.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/DeviceKit.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,152 @@
+<?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 DeviceKit-download-http "http://hal.freedesktop.org/releases/DeviceKit-&DeviceKit-version;.tar.gz">
+  <!ENTITY DeviceKit-download-ftp  " ">
+  <!ENTITY DeviceKit-md5sum        "8b311547f4a2c8c6b6598e3318d66cd7">
+  <!ENTITY DeviceKit-size          "375 KB">
+  <!ENTITY DeviceKit-buildsize     "3 MB">
+  <!ENTITY DeviceKit-time          "0.1 SBU">
+]>
+
+<sect1 id="DeviceKit" xreflabel="DeviceKit-&DeviceKit-version;">
+  <?dbhtml filename="DeviceKit.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>DeviceKit-&DeviceKit-version;</title>
+
+  <indexterm zone="DeviceKit">
+    <primary sortas="a-DeviceKit">DeviceKit</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to DeviceKit</title>
+
+    <para>The <application>DeviceKit</application> is a modular HAL designed for
+    use in Linux systems that is designed to simplify device management and
+    replace the current monolithic Linux <application>HAL</application>.
+    DeviceKit includes the ability to enumerate system devices and send
+    notifications when hardware is added or removed from the computer
+    system.</para>
+
+    &lfs65_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&DeviceKit-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&DeviceKit-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &DeviceKit-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &DeviceKit-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &DeviceKit-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &DeviceKit-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">DeviceKit Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="dbus-glib"/> and
+    <xref linkend="docbook-xsl"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/DeviceKit"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of DeviceKit</title>
+
+    <para>Install <application>DeviceKit</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/DeviceKit &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>devkit and devkit-daemon</seg>
+        <seg>libdevkit-gobject.{so,a}</seg>
+        <seg>/usr/{include/DeviceKit/devkit-gobject,lib/DeviceKit},
+        /var/run/devkit</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="devkit">
+        <term><command>devkit</command></term>
+        <listitem>
+          <para>is a simple command line client for the
+          <application>DeviceKit</application> daemon.</para>
+          <indexterm zone="DeviceKit devkit">
+            <primary sortas="b-devkit">devkit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="devkit-daemon">
+        <term><command>devkit-daemon</command></term>
+        <listitem>
+          <para>provides the org.freedesktop.DeviceKit service on the system
+          message bus.</para>
+          <indexterm zone="DeviceKit devkit-daemon">
+            <primary sortas="b-devkit-daemon">devkit-daemon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdevkit-gobject">
+        <term><filename class='libraryfile'>libdevkit-gobject.{so,a}</filename></term>
+        <listitem>
+          <para>contains the <application>DeviceKit</application> API
+          functions.</para>
+          <indexterm zone="DeviceKit libdevkit-gobject">
+            <primary sortas="c-libdevkit-gobject">libdevkit-gobject.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/clucene.xml
===================================================================
--- archive/clucene.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/clucene.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,137 @@
+<?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 clucene-download-http "&sourceforge-repo;/clucene/clucene-core-&clucene-version;.tar.bz2">
+  <!ENTITY clucene-download-ftp  " ">
+  <!ENTITY clucene-md5sum        "ba1a8f764a2ca19c66ad907dddd88352">
+  <!ENTITY clucene-size          "1.5 MB">
+  <!ENTITY clucene-buildsize     "45 MB">
+  <!ENTITY clucene-time          "1 SBU">
+]>
+
+<sect1 id="clucene" xreflabel="clucene-&clucene-version;">
+  <?dbhtml filename="clucene.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>CLucene-&clucene-version;</title>
+
+  <indexterm zone="clucene">
+    <primary sortas="l-clucene">clucene</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to CLucene</title>
+
+    <para><application>CLucene</application> is a C++ version of Lucene, a 
+    high performance text search engine.</para>
+
+    &lfs67_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&clucene-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&clucene-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &clucene-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &clucene-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &clucene-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &clucene-time;</para>
+      </listitem>
+    </itemizedlist>
+
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/clucene-&clucene-version;-fixes-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">clucene Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+    <xref linkend="net-tools"/>
+    </para>
+-->
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/clucene"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of CLucene</title>
+
+    <para>Install <application>clucene</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+<!--
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><option>- -xyz</option>: This option is set for ...</para>
+
+  </sect2>
+-->
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libclucene.{so,a}</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+<!--
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="a-automoc4">
+        <term><command>automoc4</command></term>
+        <listitem>
+          <para>is a testing utility for clucene-generated build trees.</para>
+          <indexterm zone="a-automoc4 automoc4">
+            <primary sortas="b-automoc4">automoc4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+-->
+  </sect2>
+
+</sect1>
Index: archive/ggz-client-libs.xml
===================================================================
--- archive/ggz-client-libs.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/ggz-client-libs.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,174 @@
+<?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 ggz-client-libs-download-http "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/&ggz-client-libs-version;/ggz-client-libs-&ggz-client-libs-version;.tar.gz">
+  <!ENTITY ggz-client-libs-download-ftp  "ftp://ftp.belnet.be/packages/ggzgamingzone/ggz/&ggz-client-libs-version;/ggz-client-libs-&ggz-client-libs-version;.tar.gz">
+  <!ENTITY ggz-client-libs-md5sum        "299eaa93721b1d867b5bf7dc6ac764b0">
+  <!ENTITY ggz-client-libs-size          "600 KB">
+  <!ENTITY ggz-client-libs-buildsize     "8 MB">
+  <!ENTITY ggz-client-libs-time          "0.2 SBU">
+]>
+
+<sect1 id="ggz-client-libs" xreflabel="ggz-client-libs-&ggz-client-libs-version;">
+  <?dbhtml filename="ggz-client-libs.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>ggz-client-libs-&ggz-client-libs-version;</title>
+
+  <indexterm zone="ggz-client-libs">
+    <primary sortas="a-ggz-client-libs">ggz-client-libs</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to ggz-client-libs</title>
+
+    <para>The <application>ggz-client-libs</application> package provides the
+    common procedures and utilities required to run the GGZ client and games.
+    The routines are shared by other modules in order to ease coding and promote
+    compatibility and stability.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&ggz-client-libs-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&ggz-client-libs-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &ggz-client-libs-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &ggz-client-libs-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &ggz-client-libs-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &ggz-client-libs-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">ggz-client-libs Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="expat"/> and
+    <xref linkend="libggz"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/ggz-client-libs"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of ggz-client-libs</title>
+
+    <para>Install <application>ggz-client-libs</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc &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="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>ggz, ggz-config, ggz-wrapper, and ggzwrap</seg>
+        <seg>libggzcore.{so,a} and libggzmod.{so,a}</seg>
+        <seg>/usr/lib/ggz</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ggz">
+        <term><command>ggz</command></term>
+        <listitem>
+          <para>is the GGZ Gaming Zone core client selector.</para>
+          <indexterm zone="ggz-client-libs ggz">
+            <primary sortas="b-ggz">ggz</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ggz-config">
+        <term><command>ggz-config</command></term>
+        <listitem>
+          <para>is the GGZ Gaming Zone configuration manager.</para>
+          <indexterm zone="ggz-client-libs ggz-config">
+            <primary sortas="b-ggz-config">ggz-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ggz-wrapper">
+        <term><command>ggz-wrapper</command></term>
+        <listitem>
+          <para>is the GGZ Gaming Zone command line core client.</para>
+          <indexterm zone="ggz-client-libs ggz-wrapper">
+            <primary sortas="b-ggz-wrapper">ggz-wrapper</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ggzwrap">
+        <term><command>ggzwrap</command></term>
+        <listitem>
+          <para>is the GGZ Gaming Zone game client wrapper.</para>
+          <indexterm zone="ggz-client-libs ggzwrap">
+            <primary sortas="b-ggzwrap">ggzwrap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libggzcore">
+        <term><filename class='libraryfile'>libggzcore.{so,a}</filename></term>
+        <listitem>
+          <para>handles the connection of a client application to the GGZ
+          server.</para>
+          <indexterm zone="ggz-client-libs libggzcore">
+            <primary sortas="c-libggzcore">libggzcore.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libggzmod">
+        <term><filename class='libraryfile'>libggzmod.{so,a}</filename></term>
+        <listitem>
+          <para>facilitates the messaging from and to a GGZ core client in a
+          game client.</para>
+          <indexterm zone="ggz-client-libs libggzmod">
+            <primary sortas="c-libggzmod">libggzmod.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/gwrap.xml
===================================================================
--- archive/gwrap.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/gwrap.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gwrap-download-http "http://www.gnucash.org/pub/g-wrap/source/g-wrap-&gwrap-version;.tar.gz">
+  <!ENTITY gwrap-download-ftp  "&gentoo-ftp-repo;/g-wrap-&gwrap-version;.tar.gz">
+  <!ENTITY gwrap-md5sum        "bf29b8b563cc27d9f7fd90a6243653aa">
+  <!ENTITY gwrap-size          "403 KB">
+  <!ENTITY gwrap-buildsize     "6.0 MB">
+  <!ENTITY gwrap-time          "0.2 SBU">
+]>
+
+<sect1 id="gwrap" xreflabel="G-Wrap-&gwrap-version;">
+  <?dbhtml filename="gwrap.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>G-Wrap-&gwrap-version;</title>
+
+  <indexterm zone="gwrap">
+    <primary sortas="a-G-Wrap">G-Wrap</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to G-Wrap</title>
+
+    <para>The <application>G-Wrap</application> package contains tools for
+    exporting <application>C</application> libraries into
+    <application>Scheme</application> interpreters.</para>
+
+    <!-- The version used here is
+    considered a development version, however it has been confirmed to be a
+    reliable replacement for the 'stable' version. The 'stable' version of
+    <application>G-Wrap</application> will not build against the recent
+    versions of <application>Guile</application> and
+    <application>SLIB</application> and there will be no further development
+    in the 'stable' series. For further information, please visit the
+    <application>G-Wrap</application> homepage at
+    <ulink url="http://www.nongnu.org/g-wrap/"/>.</para> -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gwrap-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gwrap-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gwrap-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gwrap-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gwrap-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gwrap-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">G-Wrap Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="slib"/> and
+    <xref linkend="GLib"/></para>
+
+    <!-- <para>If you are building <application>G-Wrap</application> as a dependency
+    for <application>GnuCash</application>, ensure you have
+    <application>GLib</application>-1 installed and you pass the
+    <envar>GLIB_XXX</envar> environment variables to the
+    <command>configure</command> script as shown below.</para> -->
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><ulink
+    url="http://www.gnu.org/software/guile-gtk/">guile-gtk</ulink> and
+    <xref linkend="libffi"/> or <xref linkend="gcc"/> (build Java so that
+    <filename class='libraryfile'>libffi</filename> is built)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/gwrap"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of G-Wrap</title>
+
+    <para>Install <application>G-Wrap</application> by running the following
+    commands:</para>
+
+<!-- <screen><userinput>GLIB_CFLAGS=$(glib-config -\-cflags) \
+GLIB_LIBS=$(glib-config -\-libs) \ -->
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>If you have <xref linkend="texlive"/> installed and wish to create
+    alternate formats of the documentation, issue the following
+    commands:</para>
+
+<screen><userinput>cd doc &amp;&amp;
+texi2pdf g-wrap.texi &amp;&amp;
+texi2html g-wrap.texi &amp;&amp;
+makeinfo --plaintext -o g-wrap.txt g-wrap.texi &amp;&amp;
+mv texinfo.tex texinfo.tex.SAVE &amp;&amp;
+texi2dvi g-wrap.texi &amp;&amp;
+dvips -o g-wrap.ps g-wrap.dvi &amp;&amp;
+cd ..</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>
+
+    <para>If you created the alternate formats of the documentation, install
+    it using the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/g-wrap-&gwrap-version; &amp;&amp;
+install -v -m644 doc/g-wrap.{pdf,html,txt,dvi,ps} \
+                 /usr/share/doc/g-wrap-&gwrap-version;</userinput></screen>
+  </sect2>
+
+  <!--
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>GLIB_CFLAGS=$(glib-config ...) GLIB_LIBS=$(glib-config ...)
+    ./configure ...</command>: The <command>configure</command> script does
+    not pull in the proper <application>GLib</application>-1
+    <envar>CFLAGS</envar> and <envar>LIBS</envar> parameters so
+    <command>glib-config</command> is used to set them. Omit setting them like
+    this if you are not building <application>G-Wrap</application> as a
+    dependency for <application>GnuCash</application> and only issue the
+    <command>./configure</command> command instead.</para>
+
+  </sect2>
+  -->
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>g-wrap-config</seg>
+        <seg>libgw-glib.{so,a}, libgw-gtk.{so,a}, libgw-standard.{so,a},
+        libgw-wct.{so,a}, libgwrap-glib.{so,a} and libgwrap-wct.{so,a}</seg>
+        <!-- <seg>/usr/lib/libffi.{so,a}, /usr/lib/libgw-guile-*.{so,a} and
+        /usr/lib/libgwrap-*.{so,a}</seg> -->
+        <seg>/usr/include/g-wrap, /usr/share/doc/g-wrap-&gwrap-version; and
+        /usr/share/guile/site</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="g-wrap-config">
+        <term><command>g-wrap-config</command></term>
+        <listitem>
+          <para>is a tool to generate <envar>CFLAGS</envar> for linking
+          <application>C</application> code to the
+          <application>Scheme</application> runtime libraries.</para>
+          <indexterm zone="gwrap g-wrap-config">
+            <primary sortas="b-g-wrap-config">g-wrap-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/hal.xml
===================================================================
--- archive/hal.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/hal.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,606 @@
+<?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 hal-download-http      "http://hal.freedesktop.org/releases/hal-&hal-version;.tar.bz2">
+  <!ENTITY hal-download-ftp       " ">
+  <!ENTITY hal-md5sum             "c627d8fb0f9afff94f3c687b5216bc06">
+  <!ENTITY hal-size               "924 KB">
+  <!ENTITY hal-buildsize          "25 MB">
+  <!ENTITY hal-time               "0.5 SBU">
+
+  <!ENTITY hal-info-version       "20091130">
+  <!ENTITY hal-info-download-http "http://hal.freedesktop.org/releases/hal-info-&hal-info-version;.tar.bz2">
+  <!ENTITY hal-info-download-ftp  " ">
+  <!ENTITY hal-info-md5sum        "995b8d2dbfb0646b07c92bb8d23cbcf1">
+  <!ENTITY hal-info-size          "108 KB">
+]>
+
+<sect1 id="hal" xreflabel="HAL-&hal-version;">
+  <?dbhtml filename="hal.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>HAL-&hal-version;</title>
+
+  <indexterm zone="hal">
+    <primary sortas="a-HAL">HAL</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to HAL</title>
+
+    <para><application>HAL</application> is a hardware abstraction layer, which
+    is a piece of software that provides a view of the various hardware
+    attached to a system. In addition to this, <application>HAL</application>
+    keeps detailed metadata for each piece of hardware and provides hooks such
+    that system and desktop-level software can react to changes in the hardware
+    configuration in order to maintain system policy.</para>
+
+    <para>The most important goal of <application>HAL</application> is to
+    provide plug-and-play facilities for UNIX-like desktops with focus on
+    providing a rich and extensible description of device characteristics and
+    features. One example of the functionality provided by
+    <application>HAL</application> is when you plug in a USB storage device.
+    <application>HAL</application> can automatically create a mount point in
+    <filename class="directory">/media</filename> and mount the device.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&hal-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&hal-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &hal-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &hal-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &hal-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &hal-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Package Download</bridgehead>
+    <itemizedlist spacing='compact'>
+      <title>Required Hardware Data</title>
+      <listitem>
+        <para>Download (HTTP): <ulink url="&hal-info-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&hal-info-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &hal-info-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &hal-info-size;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">HAL Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="dbus-glib"/></para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="pciutils"/>
+    (with a current <filename>pci.ids</filename> file) and
+    <xref linkend="usbutils"/>
+    (with a current <filename>usb.ids</filename> file)</para>
+
+    <bridgehead renderas="sect4">Optional (to Create Documentation)</bridgehead>
+    <para role="optional"><xref linkend="xmlto"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gtk-doc"/>,
+    <xref linkend="acl"/>,
+    <xref linkend="gperf"/>,
+    <ulink url="http://www.freedesktop.org/wiki/Software/PolicyKit">PolicyKit</ulink>,
+    <xref linkend="consolekit"/>,
+    <xref linkend="intltool"/>,
+    <xref linkend="parted"/>, and
+    <ulink url="https://fedorahosted.org/libsmbios/">libsmbios</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/hal"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of HAL</title>
+
+    <para>You must create a dedicated user and group before installing the
+    package. Though the default BLFS instructions run the
+    <application>HAL</application> daemon as the
+    <systemitem class="username">root</systemitem> user, a configuration file
+    is installed which has the dedicated user's name hard-coded in it. This
+    causes a confusing message to be generated when starting the
+    <application>D-BUS</application> daemon. Issue the following commands as
+    the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>groupadd -fg 19 haldaemon &amp;&amp;
+useradd -c "HAL Daemon User" -d /dev/null -u 19 \
+        -g haldaemon -s /bin/false haldaemon || [ $? == 9 ]</userinput></screen>
+
+    <para>Install <application>HAL</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/hal \
+            --localstatedir=/var \
+            --docdir=/usr/share/doc/hal-&hal-version; \
+            --enable-policy-kit=no &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>
+
+    <para>Install the <application>HAL</application> hardware data with the
+    following commands:</para>
+
+<screen><userinput>tar -xf ../hal-info-&hal-info-version;.tar.bz2 &amp;&amp;
+cd hal-info-&hal-info-version; &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--libexecdir=/usr/lib/hal</parameter>: This parameter
+    forces the installation of libexec files to
+    <filename class='directory'>/usr/lib/hal</filename> instead of
+    <filename class='directory'>/usr/libexec</filename>.</para>
+
+    <para><parameter>--localstatedir=/var</parameter>: This parameter forces
+    the creation of the <filename>pid</filename> file to
+    <filename class='directory'>/var/run/hald</filename> instead of
+    <filename class='directory'>/usr/var/run/hald</filename>.</para>
+
+    <para><parameter>--enable-policy-kit=no</parameter>: This parameter is
+    required if PolicyKit is not installed. Remove it if PolicyKit is
+    installed.</para>
+
+    <para><parameter>--enable-docbook-docs
+    --docdir=/usr/share/doc/hal-&hal-version;</parameter>: If <xref
+    linkend="xmlto"/> is available, these parameters enable the
+    <application>HAL</application> specification documentation to be
+    built.</para>
+
+  </sect2>
+
+  <sect2>
+    <title>Run-Time Dependencies</title>
+
+    <para>A few more packages enable more functionality in
+    <application>HAL</application> at run-time.
+    These include <xref linkend="eject"/>, <ulink
+    url="http://www.nongnu.org/dmidecode/">dmidecode</ulink>,
+    <xref linkend="lvm2"/> (device-mapper),
+    <ulink url="http://luks.endorphin.org/dm-crypt">Cryptsetup-LUKS</ulink>, and
+    <ulink url="http://pm-utils.freedesktop.org/wiki/">pm-utils</ulink>.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring HAL</title>
+
+    <sect3 id="hal-config">
+      <title>Config Files</title>
+      <para><filename>/etc/dbus-1/system.d/hal.conf</filename>,
+      <filename>/etc/dbus-1/system.d/halusers.conf</filename> and
+      <filename>/etc/hal/*</filename></para>
+
+      <indexterm zone="hal hal-config">
+        <primary sortas="e-etc-dbus-1-system.d-hal.conf">/etc/dbus-1/system.d/hal.conf</primary>
+      </indexterm>
+
+      <indexterm zone="hal hal-config">
+        <primary sortas="e-etc-dbus-1-system.d-halusers.conf">/etc/dbus-1/system.d/halusers.conf</primary>
+      </indexterm>
+
+      <indexterm zone="hal hal-config">
+        <primary sortas="e-etc-hal-star">/etc/hal/*</primary>
+      </indexterm>
+    </sect3>
+
+    <sect3><title>Configuration Information</title>
+    <sect4><title>Allowing users to invoke HAL methods</title>
+
+      <para>The default setup for <application>HAL</application> is to allow
+      only certain users to invoke methods such as Mount(). These are
+      the <systemitem class="username">root</systemitem> user and the user
+      determined to be at the active console using <ulink
+      url="&blfs-wiki;/linux-pam">pam_console</ulink>. If you are not set
+      up to use <xref linkend="linux-pam"/> and <ulink
+      url="&blfs-wiki;/linux-pam">pam_console</ulink>, create a group that
+      is allowed to invoke <application>HAL</application> methods with the
+      following commands:</para>
+
+<screen role="root"><userinput>groupadd -fg 61 halusers &amp;&amp;
+cat &gt; /etc/dbus-1/system.d/halusers.conf &lt;&lt; "EOF"
+<literal>&lt;!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"&gt;
+&lt;busconfig&gt;
+
+ &lt;!-- Allow users in the halusers group invoke HAL methods --&gt;
+ &lt;policy group="halusers"&gt;
+  &lt;allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/&gt;
+  &lt;allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/&gt;
+  &lt;allow send_interface="org.freedesktop.Hal.Device.Volume"/&gt;
+  &lt;allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/&gt;
+ &lt;/policy&gt;
+
+&lt;/busconfig&gt;</literal>
+EOF</userinput></screen>
+
+      <para>Now add the users you would like to the <systemitem
+      class="groupname">halusers</systemitem> group to use
+      <application>HAL</application>.</para>
+
+<screen role="root"><userinput>usermod -a -G halusers <replaceable>&lt;username&gt;</replaceable></userinput></screen>
+
+      <para>Note that these users still need
+      to have appropriate permissions to access the devices that
+      <application>HAL</application> will invoke its methods on.</para>
+
+      <para>With the above configuration in place, authorized users now
+      have the ability to unmount disk partitions mounted at non-standard
+      locations such as <filename class='directory'>/pub</filename>. If
+      you'd like to restrict this policy to only drives which are considered
+      removable or hotpluggable, add the following configuration file as
+      the <systemitem class='username'>root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat &gt; /etc/hal/fdi/policy/no-fixed-drives.fdi &lt;&lt; "EOF"
+<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;!-- -*- SGML -*- --&gt;
+
+&lt;!-- Don't allow HAL methods on disks that are not
+     removable or hotpluggable --&gt;
+
+&lt;deviceinfo version="0.2"&gt;
+&lt;device&gt;
+  &lt;match key="@block.storage_device:storage.hotpluggable" bool="false"&gt;
+    &lt;match key="@block.storage_device:storage.removable" bool="false"&gt;
+      &lt;merge key="volume.ignore" type="bool"&gt;true&lt;/merge&gt;
+    &lt;/match&gt;
+  &lt;/match&gt;
+&lt;/device&gt;
+&lt;/deviceinfo&gt;</literal>
+EOF</userinput></screen>
+      </sect4>
+
+      <sect4><title>Installing mount helpers</title>
+      <para><application>HAL</application> only provides the methods such
+      as Mount() to act on hardware. In order to take advantage of these,
+      a <application>HAL</application> event handler such as <ulink
+      url="http://ivman.sourceforge.net/">Ivman</ulink> should be
+      installed.</para>
+      <!-- FIXME: is Ivman still alive? -->
+      <!-- FIXME: explicitly name the mount helpers
+           from KDE (???) and Xfce (exo-mount) -->
+      </sect4>
+
+      <sect4><title>Changing default mount options</title>
+      <para>In some cases, it is necessary to specify some default mount
+      options for filesystems. E.g., in non-English environments, the
+      <option>iocharset</option> and <option>codepage</option> options
+      are needed for filesystems of Windows origin in order to show
+      national characters correctly. Also, due to a
+      <ulink url="https://launchpad.net/bugs/133567">bug</ulink> in the
+      Linux kernel version in LFS (2.6.22.x), you may want to pass the
+      <option>usefree</option> option to vfat filesystems in order to reduce
+      the time needed to determine the amount of free space on the
+      filesystem.</para>
+
+      <para>Google search results for <quote>hal default mount options</quote>
+      are still full of recommendations to create <filename>*.fdi</filename>
+      files mentioning either
+      <option>volume.policy</option> or <option>storage.policy</option> keys.
+      Such recommendations worked for HAL-0.4.x only and are invalid now.
+      For HAL-&hal-version;, mount options are expected to be handled
+      as follows:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>An event handler from the desktop environment receives an
+          event describing the newly-added storage device.</para>
+        </listitem>
+        <listitem>
+          <para>If the storage device is not already mentioned in
+          <filename>/etc/fstab</filename>, mount options are fetched from
+          a database of user preferences, which is specific to the desktop
+          environment, and passed back to HAL.
+          This process can be influenced by the filesystem type
+          and possibly other volume properties available from HAL.</para>
+        </listitem>
+        <listitem>
+          <para>If the options are in the list of permitted ones, HAL
+          mounts the volume.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The important point above is that the configuration procedure is
+      desktop-specific. However, as of December, 2007, only GNOME allows the
+      user to set default mount options on a per-filesystem basis,
+      as described in the next paragraph.
+      KDE allows the mount options to be set only on a per-volume basis,
+      not per-filesystem, which is a
+      <ulink url="http://bugs.kde.org/show_bug.cgi?id=133456">bug</ulink>,
+      because, as mentioned in the report, <quote>for every new device (let's
+      say your friend's USB stick) you have to first not mount it, then change
+      options and then mount</quote>. Xfce, if compiled with HAL support,
+      <ulink url="http://bugzilla.xfce.org/show_bug.cgi?id=2891">hard-codes</ulink>
+      the mount options without any means to override them,
+      which is even worse.
+      <!-- (for BLFS editors only: they mention policy-kit as a future
+           solution, but, from the description, policy-kit looks like
+           an XML-ized sudo-like configuration parser, which has nothing
+           common with the "default mount options" problem. -->
+      In KDE and Xfce, if the built-in default mount options are not suitable,
+      it is needed to mention every possible removable storage device in
+      <filename>/etc/fstab</filename> with the correct options, thus mostly
+      defeating the point of installing HAL.</para>
+
+      <para>In order to adjust the default mount options, GNOME users should
+      change the
+      <systemitem>/system/storage/default_options/[fs_type]/mount_options</systemitem>
+      GConf key <!--either using <xref linkend="gconf-editor"/>, or -->from the
+      command line, as demonstrated in the following example:</para>
+
+<screen><userinput>gconftool-2 --type list --list-type=string \
+    --set /system/storage/default_options/vfat/mount_options \
+    "[shortname=mixed,uid=,usefree,iocharset=koi8-r,codepage=866]"</userinput></screen>
+
+      <para>See more details in the gnome-mount(1) manual page.</para>
+      </sect4>
+
+      <sect4><title>Adding allowed mount options</title>
+      <para>The list of mount options permitted in the default HAL
+      configuration resides in the
+      <filename>/usr/share/hal/fdi/policy/10osvendor/20-storage-methods.fdi</filename>
+      file. GNOME and KDE users may want to use options not in this
+      list (in the above example, this applies to the <option>usefree</option>
+      option). In this case, as <systemitem class="username">root</systemitem>
+      user, create a custom policy file that mentions unknown mount
+      options:</para>
+
+<screen role="root"><userinput>cat &gt; /etc/hal/fdi/policy/user-options.fdi &lt;&lt; "EOF"
+<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;!-- -*- SGML -*- --&gt;
+
+&lt;!--
+This file is used to set custom options to the HAL policy settings.
+The default policy settings are defined in files contained in the
+/usr/share/hal/fdi/policy subdirectories. User defined customizations
+should be in files contained in the /etc/hal/fdi/policy directory.
+--&gt;
+
+&lt;deviceinfo version="0.2"&gt;
+  &lt;device&gt;
+
+    &lt;!-- this is to be able to mount media in drives we cannot poll,
+         e.g. IDE Zip Drives and PC style floppy drives --&gt;
+    &lt;match key="storage.media_check_enabled" bool="false"&gt;
+      &lt;match key="storage.no_partitions_hint" bool="true"&gt;
+        &lt;append key="volume.mount.valid_options" type="strlist"&gt;usefree&lt;/append&gt;
+        &lt;!-- Insert other options here --&gt;
+      &lt;/match&gt;
+    &lt;/match&gt;
+
+    &lt;match key="volume.fsusage" string="filesystem"&gt;
+
+      &lt;!-- allow these mount options for vfat --&gt;
+      &lt;match key="volume.fstype" string="vfat"&gt;
+        &lt;append key="volume.mount.valid_options" type="strlist"&gt;usefree&lt;/append&gt;
+        &lt;!-- Insert other options here --&gt;
+      &lt;/match&gt;
+    &lt;/match&gt;
+
+  &lt;/device&gt;
+&lt;/deviceinfo&gt;</literal>
+EOF</userinput></screen>
+
+    </sect4>
+    </sect3>
+
+    <sect3  id="hal-init">
+      <title>Boot Script</title>
+
+      <para>To automatically start the <command>hald</command> daemon
+      when the system is rebooted, install the
+      <filename>/etc/rc.d/init.d/haldaemon</filename>
+      bootscript from the
+      <xref linkend="bootscripts"/> package.</para>
+
+      <indexterm zone="hal hal-init">
+        <primary sortas="f-haldaemon">haldaemon</primary>
+      </indexterm>
+
+      <important>
+        <para>If the system-wide <application>D-BUS</application> daemon was
+        running during the installation of <application>HAL</application>,
+        ensure you stop and restart the <application>D-BUS</application>
+        daemon before attempting to start the <command>hald</command>
+        daemon.</para>
+      </important>
+
+<screen role="root"><userinput>make install-haldaemon</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>hal-device, hal-disable-polling,
+        hal-find-by-capability, hal-find-by-property, hal-get-property,
+        hal-is-caller-locked-out, hal-lock, hal-set-property, hald and
+        lshal</seg>
+        <seg>libhal.{so,a} and libhal-storage,{so,a}</seg>
+        <seg>/etc/hal, /usr/include/hal, /usr/lib/hal,
+        /usr/share/doc/hal-&hal-version;, /usr/share/hal, /var/cache/hald,
+        /var/lib/hal, and /var/run/hald</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="hal-device">
+        <term><command>hal-device</command></term>
+        <listitem>
+          <para>is used to create, remove or show a
+          <application>HAL</application> device.</para>
+          <indexterm zone="hal hal-device">
+            <primary sortas="b-hal-device">hal-device</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hal-disable-polling">
+        <term><command>hal-disable-polling</command></term>
+        <listitem>
+          <para>can be used to to disable and enable media detection on
+          drives with removable storage.</para>
+          <indexterm zone="hal hal-disable-polling">
+            <primary sortas="b-hal-disable-polling">hal-disable-polling</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hal-find-by-capability">
+        <term><command>hal-find-by-capability</command></term>
+        <listitem>
+          <para>prints the Unique Device Identifiers for
+          <application>HAL</application> device objects of a given
+          capability.</para>
+          <indexterm zone="hal hal-find-by-capability">
+            <primary sortas="b-hal-find-by-capability">hal-find-by-capability</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hal-find-by-property">
+        <term><command>hal-find-by-property</command></term>
+        <listitem>
+          <para>prints the Unique Device Identifiers for
+          <application>HAL</application> device objects where a given property
+          assumes a given value.</para>
+          <indexterm zone="hal hal-find-by-property">
+            <primary sortas="b-hal-find-by-property">hal-find-by-property</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hal-get-property">
+        <term><command>hal-get-property</command></term>
+        <listitem>
+          <para>retrieves a property from a device.</para>
+          <indexterm zone="hal hal-get-property">
+            <primary sortas="b-hal-get-property">hal-get-property</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hal-set-property">
+        <term><command>hal-set-property</command></term>
+        <listitem>
+          <para>attempts to set property for a device. Note that, due to
+          security considerations, it may not be possible to set a
+          property.</para>
+          <indexterm zone="hal hal-set-property">
+            <primary sortas="b-hal-set-property">hal-set-property</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hal-is-caller-locked-out">
+        <term><command>hal-is-caller-locked-out</command></term>
+        <listitem>
+          <para>determines if a specific caller is locked out of a specific
+          <application>D-Bus</application> interface on a specific device.</para>
+          <indexterm zone="hal hal-is-caller-locked-out">
+            <primary sortas="b-hal-is-caller-locked-out">hal-is-caller-locked-out</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hald">
+        <term><command>hald</command></term>
+        <listitem>
+          <para>is the <application>HAL</application> daemon program.</para>
+          <indexterm zone="hal hald">
+            <primary sortas="b-hald">hald</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lshal">
+        <term><command>lshal</command></term>
+        <listitem>
+          <para>shows all devices and their properties. If the --monitor option
+          is given then the device list and all devices are monitored for
+          changes.</para>
+          <indexterm zone="hal lshal">
+            <primary sortas="b-lshal">lshal</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libhal">
+        <term><filename class='libraryfile'>libhal.{so,a}</filename></term>
+        <listitem>
+          <para>contains the API functions required by the
+          <application>HAL</application> programs.</para>
+          <indexterm zone="hal libhal">
+            <primary sortas="c-libhal">libhal.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libhal-storage">
+        <term><filename class='libraryfile'>libhal-storage.{so,a}</filename></term>
+        <listitem>
+          <para>contains the API functions required by the
+          <application>HAL</application> storage and volume utility
+          programs.</para>
+          <indexterm zone="hal libhal-storage">
+            <primary sortas="c-libhal-storage">libhal-storage.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/ispell.xml
===================================================================
--- archive/ispell.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/ispell.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -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;
+
+    <!-- Inserted as a reminder to do this. The mention of a test suite
+         is usually right before the root user installation commands. Please
+         delete these 12 (including one blank) lines after you are done.-->
+
+    <!-- Use one of the two mentions below about a test suite,
+         delete the line that is not applicable. Of course, if the
+         test suite uses syntax other than "make check", revise the
+         line to reflect the actual syntax to run the test suite -->
+
+    <!-- <para>This package does not come with a test suite.</para> -->
+    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
+
+  <!ENTITY ispell-download-http "http://membled.com/work/patches/ispell/ispell-&ispell-version;.tar.bz2">
+  <!ENTITY ispell-download-ftp " ">
+  <!ENTITY ispell-md5sum "d5d867e62776524f60b3b5dcc3d8014f">
+  <!ENTITY ispell-size "1.2 MB">
+  <!ENTITY ispell-buildsize "11 MB">
+  <!ENTITY ispell-time "less than 0.1 SBU">
+]>
+
+<sect1 id="ispell" xreflabel="ispell-&ispell-version;">
+  <?dbhtml filename="ispell.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Ispell-&ispell-version;</title>
+
+  <indexterm zone="ispell">
+    <primary sortas="a-Ispell">Ispell</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Ispell</title>
+
+    <para>The <application>ispell</application> package contains a spell
+    checker that can handle international languages.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&ispell-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&ispell-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &ispell-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &ispell-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &ispell-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &ispell-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/ispell"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Ispell</title>
+
+    <para>The first step is to create <filename>local.h</filename>.</para>
+
+<screen><userinput>sed -e "s:/usr/local:/usr:g" -e "s:/lib:/share/ispell:" \
+    local.h.linux > local.h</userinput></screen>
+
+    <para>By default, <application>ispell</application> only installs an American
+    English dictionary. To set up other languages, check out the
+    <filename>config.X</filename> file for the #define entry to append to
+    <filename>local.h</filename>.</para>
+
+    <para>Build <application>ispell</application> using the
+    following commands:</para>
+
+<screen><userinput>make</userinput></screen>
+
+    <para>To test the build, issue: <command>make test</command>.</para>
+
+    <para>Now, as the <systemitem class='username'>root</systemitem> user:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -e "s:/usr/local:/usr:g" -e "s:/lib:/share/ispell:"
+    local.h.linux > local.h</command>: This command corrects the
+    installation directories of the package.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>ispell</seg>
+        <seg>None</seg>
+        <seg>/usr/share/ispell</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ispell-prog">
+        <term><command>ispell</command></term>
+        <listitem>
+          <para>is used for spell checking.</para>
+          <indexterm zone="ispell ispell-prog">
+            <primary sortas="b-ispell">ispell</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/jdk.SAVE
===================================================================
--- archive/jdk.SAVE	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/jdk.SAVE	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,966 @@
+<?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 jdk-download-binary       "http://java.sun.com/javase/downloads/index.jsp">
+  <!ENTITY jdk-bin-md5sum            "f7528500c17c09546566e05988beda86">
+  <!ENTITY jdk-bin-size              "67 MB">
+  <!ENTITY jdk-bin-buildsize         "207 MB">
+  <!ENTITY jdk-bin-version           "6u5">
+
+  <!ENTITY jdk-source-jrl-md5sum     "83390379fb9f3193e93a9d5eed5b31d9">
+  <!ENTITY jdk-source-bin-md5sum     "8b6f1b8d8dec051c18385539111141ec">
+  <!ENTITY jdk-source-moz-md5sum     "6dcaf7af16211617adff5d672a8b79f4">
+
+  <!ENTITY jdk-source-jrl-size       "111 MB">
+  <!ENTITY jdk-source-bin-size       "2 MB">
+  <!ENTITY jdk-source-moz-size       "8.2 MB">
+
+  <!ENTITY jdk-src-buildsize         "1.5 GB">
+  <!ENTITY jdk-time                  "12.5 SBU (for both installations)">
+  <!ENTITY jdk-version-string        "6u3">
+  <!ENTITY jdk-bin-version-string    "1.6.0_05">
+
+  <!ENTITY jdk-download-source-jrl "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-src-b05-jrl-24_sep_2007.jar">
+  <!ENTITY jdk-download-source-bin "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-bin-b05-jrl-24_sep_2007.jar">
+  <!ENTITY jdk-download-source-moz "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-mozilla_headers-b05-unix-24_sep_2007.jar">
+
+]>
+
+<sect1 id="jdk" xreflabel="JDK-&jdk-version;">
+  <?dbhtml filename="jdk.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy: randy $</othername>
+    <date>$Date: 2008-05-10 13:50:47 -0500 (Sat, 10 May 2008) $</date>
+  </sect1info>
+
+  <title>JDK-&jdk-version;</title>
+
+  <indexterm zone="jdk">
+    <primary sortas="a-JDK">JDK</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to JDK</title>
+
+    <para>The <application>JDK</application> package contains
+    Sun's <application>Java</application> development environment. This is
+    useful for developing <application>Java</application> programs and provides
+    the runtime environment necessary to run <application>Java</application>
+    programs.  It also includes a plug-in for browsers so that they can be
+    <application>Java</application> aware.</para>
+
+    <!-- Previously, the plugin included
+    in the <application>JDK</application> binary package was unusable on LFS
+    owing to incompatibilities with <application>GCC</application>-3 compiled
+    browsers.  This is not the case anymore.</para> -->
+
+    <para>The <application>JDK</application> comes in two flavors, a
+    precompiled binary and a source package. You will first need to download
+    and install the binary version of the <application>JDK</application>
+    (you'll need to click and agree to the <quote>Sun Microsystems, Inc.
+    Binary Code License Agreement</quote>). To build from the source, you
+    will need to read, and agree to the Sun
+    <!--<ulink url="&patch-root;/jdk-Readme.txt">-->Java Research License<!--</ulink>-->.
+    You will also need to download the additional files and patches to
+    complete the source build as detailed below. Note that in some countries
+    you cannot download the source code.</para>
+
+    <warning><para>Sun has recently decided not to provide JRL sources for
+    the latest update versions of the JDK.  The source build instructions and
+    patches are here for reference only, and contain known security
+    vulnerabilities.  For more information, please see Sun Alerts
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-231246-1">231246</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233321-1">233321</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233322-1">233322</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233323-1">233323</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233324-1">233324</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233325-1">233325</ulink>,
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233326-1">233326</ulink>, and
+    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233327-1">233327</ulink>.</para>
+    <para>  Sun is actively working on a GPL'd version of the JDK, titled
+    <ulink url="http://openjdk.java.net/projects/jdk6/">OpenJDK</ulink>.
+    This new JDK will be licensed under the
+    <ulink url="http://openjdk.java.net/legal/gplv2+ce.html">GNU General
+    Public License, version 2, with the Classpath Exception</ulink>.
+    A stable OpenJDK was not available at the time of writing.</para></warning>
+
+
+    <bridgehead renderas="sect3">Binary Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Binary download (jdk-&jdk-bin-version;-linux-i586.bin):
+        <ulink url="&jdk-download-binary;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &jdk-bin-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size (binary): &jdk-bin-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &jdk-bin-buildsize;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Source Package Information</bridgehead>
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>JRL Source
+          <simplelist>
+            <member><ulink url="&jdk-download-source-jrl;"/></member>
+            <member>&jdk-source-jrl-md5sum;</member>
+            <member>&jdk-source-jrl-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>Source Binaries
+          <simplelist>
+            <member><ulink url="&jdk-download-source-bin;"/></member>
+            <member>&jdk-source-bin-md5sum;</member>
+            <member>&jdk-source-bin-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>Mozilla Headers
+          <simplelist>
+            <member><ulink url="&jdk-download-source-moz;"/></member>
+            <member>&jdk-source-moz-md5sum;</member>
+            <member>&jdk-source-moz-size;</member>
+          </simplelist>
+        </para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &jdk-src-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &jdk-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+
+    <bridgehead renderas="sect4">Required Patches</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="&patch-root;/jdk-&jdk-version-string;-gcc4-1.patch"/></para>
+      </listitem>
+      <listitem>
+        <para><ulink
+        url="&patch-root;/jdk-&jdk-version-string;-motif_fixes-1.patch"/></para>
+      </listitem>
+      <listitem>
+        <para><ulink
+        url="&patch-root;/jdk-&jdk-version-string;-remove_fixed_paths-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">JDK Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional Runtime Dependencies (for binary
+    installation)</bridgehead>
+    <para role="optional">
+    <xref linkend="alsa-lib"/>,
+    <xref linkend="cups"/>, and
+    <xref linkend="gtk2"/></para>
+
+    <bridgehead renderas="sect4">Additional Requirements
+    (for source build, including optional requirements)</bridgehead>
+    <para role="required">
+    <xref linkend="cpio"/>,
+    <xref linkend="ksh"/>,
+    <xref linkend="unzip"/>,
+    <xref linkend="which"/>, and
+    <xref linkend="zip"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/jdk"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of JDK</title>
+
+    <para>The instructions below install both the binary and source versions.
+    You may stop after installing the binary version or continue on installing
+    the source version. You can choose to keep either or both.</para>
+
+    <tip>
+      <para>The <command>./jdk-&jdk-bin-version;-linux-i586.bin</command>
+      command below unpacks the distribution into a
+      <filename class='directory'>jdk&jdk-bin-version-string;</filename>
+      directory.  You will be required to view, and then accept (by entering a
+      <keycap>y</keycap> keypress), a license agreement before any files are
+      unpacked. If you are scripting (automating) the build, you'll need to
+      account for this. There is information about automating build commands
+      in the <xref linkend="automating-builds"/> section of Chapter 2. Towards
+      the end of this section, specific information for automating this type of
+      installation is discussed.</para>
+    </tip>
+
+    <para>Normally in BLFS, the files are unpacked into a subdirectory
+    and the starting point for the installation procedures is that
+    location.  For this application only, start in the directory where all
+    the downloaded files are located.</para>
+
+    <para>Install the binary <application>JDK</application> with the
+    following commands:</para>
+
+<screen><userinput>chmod 755 jdk-&jdk-bin-version;-linux-i586.bin &amp;&amp;
+./jdk-&jdk-bin-version;-linux-i586.bin</userinput></screen>
+
+    <note><para>The installation will end with a message
+    "./jdk-&jdk-bin-version;-linux-i586.bin: line 43: 20283 Aborted" as
+    javaprefix is unset in the environment.  This is by design as
+    <application>GTK+</application> may not be installed during the
+    installation, however, the installation will still exit with a zero error
+    value if scripting the build.</para></note>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cd jdk&jdk-bin-version-string; &amp;&amp;
+install -v -m755 -d /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
+mv -v * /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
+chown -v -R root:root /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
+ln -v -sf xawt/libmawt.so \
+    /opt/jdk-bin-&jdk-bin-version;/jre/lib/i386/ &amp;&amp;
+cd ..</userinput></screen>
+
+    <para>Recent versions of libX11 break libmawt
+    when used with the Xinerama extension.  While still the
+    <systemitem class="username">root</systemitem> user, apply the
+    following sed to the installed binary to work around this
+    problem:</para>
+
+<screen role="root"><userinput>sed -i 's@XINERAMA@FAKEEXTN@g' \
+    /opt/jdk-bin-&jdk-bin-version;/jre/lib/i386/xawt/libmawt.so</userinput></screen>
+
+    <para>The binary version is now installed.</para>
+
+    <para>If you don't want to compile the source or are not in a position to
+    download the source owing to license restrictions, skip ahead to the
+    configuration section.</para>
+
+    <para>Save the existing path, and append the recently installed
+    <application>JDK</application>.</para>
+
+<screen><userinput>export JAVA_HOME=/opt/jdk-bin-&jdk-bin-version; &amp;&amp;
+export PATH_HOLD=${PATH} &amp;&amp;
+export PATH=${PATH}:${JAVA_HOME}/bin</userinput></screen>
+
+    <para>The source code is contained in self-extracting
+    <filename class='extension'>jar</filename> files.  You
+    will need to be in a windowed environment to extract the sources.
+    Create a directory to store the extracted sources.  Choose the newly
+    created <filename class="directory">jdk-build</filename> directory
+    when prompted for the target directory.</para>
+
+<screen><userinput>mkdir jdk-build &amp;&amp;
+cd jdk-build &amp;&amp;
+for JAR in ../jdk-&jdk-version-string;*.jar
+    do java -jar ${JAR}
+done</userinput></screen>
+
+    <para>Apply all the patches downloaded above:</para>
+
+<screen><userinput>for PATCH in ../jdk-&jdk-version-string;*.patch
+    do patch -Np1 -i ${PATCH}
+done</userinput></screen>
+
+    <para>Use the following commands to apply some minor changes that
+    are a little more specific to BLFS, such as lack of a gcc-2.9
+    compiler, removing a broken demo, and forcing to link to shared
+    libraries.  See the 'Command Explanations' section for more detail:</para>
+
+<screen><userinput>sed -i '/^.*linux)/ { N; /.*/ { N; /.*/d }}' \
+    deploy/make/plugin/{adapter,nscore}/Makefile &amp;&amp;
+sed -i '/.*mtrace.*/ { N; /.*/ s/.*mtrace.*\n.*/\t  mtrace/ }' \
+    j2se/make/mkdemo/jvmti/Makefile &amp;&amp;
+sed -i 's/= true/= false/' \
+    j2se/make/common/shared/Compiler-gcc.gmk</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/X11R6_symlink.xml"/>
+
+    <!-- <para>If your <application>X Window System</application> is installed into
+    any prefix other than <filename class="directory">/usr/X11R6</filename>,
+    execute the following commands, replacing
+    <replaceable>&lt;PREFIX&gt;</replaceable> with the installation prefix of
+    the <application>X Window System</application>:</para>
+
+<screen><userinput>for file in `find . -name Makefile \
+    -or -name Imakefile -or -name *.gmk`
+do sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' $file
+done &amp;&amp;
+sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' \
+    j2se/src/solaris/native/sun/awt/fontpath.c \
+    j2se/src/solaris/classes/sun/awt/motif/linux.fontconfig.Sun.properties \
+    j2se/src/solaris/classes/sun/awt/motif/linux.fontconfig.RedHat.3.properties</userinput></screen> -->
+
+    <para>Set/unset some variables which affect the build:</para>
+
+<screen><userinput>export ALT_BOOTDIR=${JAVA_HOME} &amp;&amp;
+export CLASSPATH_HOLD=${CLASSPATH} &amp;&amp;
+export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts &amp;&amp;
+export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin &amp;&amp;
+export MILESTONE="03-BLFS" &amp;&amp;
+export BUILD_NUMBER="b05" &amp;&amp;
+export INSANE=true &amp;&amp;
+export DEV_ONLY=true &amp;&amp;
+export SKIP_FASTDEBUG_BUILD=true &amp;&amp;
+unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS</userinput></screen>
+
+      <warning><para>Setting CFLAGS/CXXFLAGS/LDFLAGS is guaranteed to make
+      the build fail. If you are interested in optimizing the build, set
+      OTHER_CFLAGS/OTHER_CXXFLAGS/OTHER_LDFLAGS instead.  -O3, even in
+      OTHER_C{,XX}FLAGS, is known to cause a build failure.</para></warning>
+
+
+    <para>Additionally, if you would like to <command>make</command> in
+    parallel, add the following:</para>
+
+<screen><userinput>export HOTSPOT_BUILD_JOBS=<replaceable>&lt;3&gt;</replaceable></userinput></screen>
+
+    <para>Build the <application>JDK</application> with the following
+    commands. There will be a few messages about missing files that look like
+    errors. These are caused by not meeting the expected build environment
+    (Red Hat).  As long as the build doesn't stop, the messages
+    are harmless.</para>
+
+<screen><userinput>pushd control/make &amp;&amp;
+make &amp;&amp;
+popd</userinput></screen>
+
+    <para>To test the results, you can run one of the provided demo programs
+    using the newly created <command>java</command> binary. Issue the
+    following commands:</para>
+
+<screen><userinput>pushd control/build/linux-i586/j2sdk-image/demo/jfc/Java2D &amp;&amp;
+../../../bin/java -jar Java2Demo.jar &amp;&amp;
+popd</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user,
+    install the <application>JDK</application>:</para>
+
+<screen role="root"><userinput>pushd control/build/linux-i586 &amp;&amp;
+cp -v -a j2sdk-image /opt/jdk-&jdk-version-string; &amp;&amp;
+chown -v -R root:root /opt/jdk-&jdk-version-string; &amp;&amp;
+ln -v -sf xawt/libmawt.so  /opt/jdk-&jdk-version-string;/jre/lib/i386/ &amp;&amp;
+popd</userinput></screen>
+
+    <para>Restore the unprivileged user's environment using the following
+    commands:</para>
+
+<screen><userinput>export JAVA_HOME=${ALT_BOOTDIR} &amp;&amp;
+export CLASSPATH=${CLASSPATH_HOLD} &amp;&amp;
+export PATH=${PATH_HOLD} &amp;&amp;
+unset PATH_HOLD ALT_BOOTDIR CLASSPATH_HOLD \
+    ALT_CACERTS_FILE ALT_MOZILLA_HEADERS_PATH \
+    BUILD_NUMBER MILESTONE INSANE DEV_ONLY \
+    SKIP_FASTDEBUG_BUILD</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i '/^.*linux)/...</command>: This command disables
+    the build of a gcc-2.9 compatible browser plugin.  LFS does not contain
+    gcc-2.9, and hasn't in quite a few years.</para>
+
+    <para><command>sed -i '/.*mtrace.*/...</command>: This command disables
+    building of the broken 'waiters' demo.</para>
+
+    <para><command>sed -i 's/= true/= false/'...</command>: This command
+    forces the compiler to link against the standard C libraries
+    dynamically.</para>
+
+    <para><command>export ALT_BOOTDIR=${JAVA_HOME}</command>: This variable sets
+    the location of the bootstrap <application>JDK</application>.</para>
+
+    <para><command>export ALT_CACERTS_FILE...</command>: Specifies the
+    certificate file to use (from the installed binary
+    <application>JDK</application>).</para>
+
+    <para><command>export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin/</command>:
+    This tells the build exactly where to find the
+    <application>Mozilla</application> headers.  This has changed since the
+    previous version and is not mentioned in the installation documentation
+    included with the package source.</para>
+
+    <para><command>export MILESTONE="03-BLFS"</command>: This appends
+    the string '03-BLFS' to the buld number.  'internal' is
+    unconditionally added if MILESTONE is unset.  This is similar
+    to the format used by Sun for the official release.</para>
+
+    <para><command>export BUILD_NUMBER="b05"</command>:
+    This will help you identify the compiled version of the runtime
+    environment and virtual machine by appending this information to
+    the version string. This is the same build number used by Sun to
+    identify the official release.</para>
+
+    <para><command>export INSANE=true</command>: The certified platform for the
+    build is Redhat Enterprise Advanced Server 2.1. This variable ensures that
+    all the errors related to compiling on a non-certified platform will be
+    displayed as warnings instead of errors.</para>
+
+    <para><command>export DEV_ONLY=true</command>: This command
+    skips compiling the comparison build.</para>
+
+    <para><command>export SKIP_FASTDEBUG_BUILD=true</command>: This command
+    skips building of the debug version.  Omit this command if you need
+    to build the fastdebug target.</para>
+
+    <para><command>unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS</command>:
+    These variables cause miscompilation of the build. Never set them.</para>
+
+    <para><command>ln -sf xawt/libmawt.so
+    /opt/jdk-&jdk-version-string;/jre/lib/i386/</command>: This fixes
+    linking issues with other applications that expect to find the
+    <application>motif</application> libraries with the other
+    <application>JDK</application> libraries.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring JDK</title>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>There are now two Java 2 SDKs installed in
+      <filename>/opt</filename>. You should decide on which one you
+      would like to use as the default. For example if you decide to use the
+      precompiled <application>JDK</application>, do the following as the
+      <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>ln -v -nsf jdk-bin-&jdk-bin-version; /opt/jdk</userinput></screen>
+
+    <para>The information below assumes your system is set up using the
+    instructions found in
+    <quote><xref linkend="postlfs-config-profile"/></quote>. You may need to
+    extract the relevant information below and incorporate it into your
+    system's startup files if your system is set up differently.</para>
+
+    <para>Add the following <filename>jdk.sh</filename> shell startup file to
+    the <filename>/etc/profile.d</filename> directory with the following
+    commands as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/jdk.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/jdk.sh
+
+# Set JAVA_HOME directory
+JAVA_HOME=/opt/jdk
+
+# Adjust PATH
+pathappend ${JAVA_HOME}/bin PATH
+
+# Auto Java CLASSPATH
+# Copy jar files to, or create symlinks in this directory
+AUTO_CLASSPATH_DIR=/usr/lib/classpath
+pathprepend . CLASSPATH
+for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
+    pathappend $dir CLASSPATH
+done
+
+export JAVA_HOME CLASSPATH
+unset AUTO_CLASSPATH_DIR
+unset dir
+
+# End /etc/profile.d/jdk.sh</literal>
+EOF</userinput></screen>
+
+    <para>The <application>Java</application> plugin is located in
+    <filename class="directory">$JAVA_HOME/jre/plugin/i?86/ns7/</filename>.
+    Make a symbolic link to the file in that directory from your browser(s)
+    plugins directory.</para>
+
+    <important>
+      <para>The plugin must be a symlink for it to work. If not, the browsers
+      will crash when you attempt to load a <application>Java</application>
+      application.</para>
+    </important>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>appletviewer, apt, extcheck, idlj, HtmlConverter, jar,
+        jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi,
+        javaws, jconsole, jdb, jhat, jinfo, jmap, jps,
+        jrunscript, jsadebugd, jstack, jstat, jstatd, keytool,
+        native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry,
+        schemagen, serialver, servertool, tnameserv, unpack200,
+        wsgen, wsimport, and xjc</seg>
+        <seg><envar>$JAVA_HOME</envar>/lib/*,
+        <envar>$JAVA_HOME</envar>/jre/lib/*,
+        and libjavaplugin_oji.so</seg>
+        <seg>/opt/jdk-&jdk-version-string;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="appletviewer">
+        <term><command>appletviewer</command></term>
+        <listitem>
+          <para>runs Java applets outside of the context of a browser.</para>
+          <indexterm zone="jdk appletviewer">
+            <primary sortas="b-appletviewer">appletviewer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="apt">
+        <term><command>apt</command></term>
+        <listitem>
+          <para>is an annotation processing tool.</para>
+          <indexterm zone="jdk apt">
+            <primary sortas="b-apt">apt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="extcheck">
+        <term><command>extcheck</command></term>
+        <listitem>
+          <para>checks a specified jar file for title and version conflicts
+          with any extensions installed in the <application>JDK</application>
+          software.</para>
+          <indexterm zone="jdk extcheck">
+            <primary sortas="b-extcheck">extcheck</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="HtmlConverter">
+        <term><command>HtmlConverter</command></term>
+        <listitem>
+          <para>adds Java auto download to html and asp pages. </para>
+          <indexterm zone="jdk HtmlConverter">
+            <primary sortas="b-HtmlConverter">HtmlConverter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="idlj">
+        <term><command>idlj</command></term>
+        <listitem>
+          <para>generates Java bindings from a given IDL file.</para>
+          <indexterm zone="jdk idlj">
+            <primary sortas="b-idlj">idlj</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jar">
+        <term><command>jar</command></term>
+        <listitem>
+          <para>combines multiple files into a single jar archive.</para>
+          <indexterm zone="jdk jar">
+            <primary sortas="b-jar">jar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jarsigner">
+        <term><command>jarsigner</command></term>
+        <listitem>
+          <para>signs jar files and verifies the signatures and integrity
+          of a signed jar file.</para>
+          <indexterm zone="jdk jarsigner">
+            <primary sortas="b-jarsigner">jarsigner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="java">
+        <term><command>java</command></term>
+        <listitem>
+          <para>launches a Java application by starting a Java runtime
+          environment, loading a specified class and invoking its main
+          method.</para>
+          <indexterm zone="jdk java">
+            <primary sortas="b-java">java</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javac">
+        <term><command>javac</command></term>
+        <listitem>
+          <para>reads class and interface definitions, written in the
+          Java programming language, and compiles them into bytecode
+          class files.</para>
+          <indexterm zone="jdk javac">
+            <primary sortas="b-javac">javac</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javadoc">
+        <term><command>javadoc</command></term>
+        <listitem>
+          <para>parses the declarations and documentation comments in a
+          set of Java source files and produces a corresponding set of
+          HTML pages describing the classes, interfaces,constructors,
+          methods, and fields.</para>
+          <indexterm zone="jdk javadoc">
+            <primary sortas="b-javadoc">javadoc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javah">
+        <term><command>javah</command></term>
+        <listitem>
+          <para>generates C header and source files
+          that are needed to implement native methods.</para>
+          <indexterm zone="jdk javah">
+            <primary sortas="b-javah">javah</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javap">
+        <term><command>javap</command></term>
+        <listitem>
+          <para>disassembles a Java class file.</para>
+          <indexterm zone="jdk javap">
+            <primary sortas="b-javap">javap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="java-rmi.cgi">
+        <term><command>java-rmi.cgi</command></term>
+        <listitem>
+          <para>is the Java RMI client.</para>
+          <indexterm zone="jdk java-rmi.cgi">
+            <primary sortas="b-java-rmi.cgi">java-rmi.cgi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javaws">
+        <term><command>javaws</command></term>
+        <listitem>
+          <para>launches Java application/applets hosted on a network.</para>
+          <indexterm zone="jdk javaws">
+            <primary sortas="b-javaws">javaws</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jconsole">
+        <term><command>jconsole</command></term>
+        <listitem>
+          <para>is a graphical console tool to monitor and manage both
+          local and remote Java applications and virtual machines.</para>
+          <indexterm zone="jdk jconsole">
+            <primary sortas="b-jconsole">jconsole</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jdb">
+        <term><command>jdb</command></term>
+        <listitem>
+          <para>is a simple command-line debugger for Java classes.</para>
+          <indexterm zone="jdk jdb">
+            <primary sortas="b-jdb">jdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jhat">
+        <term><command>jhat</command></term>
+        <listitem>
+          <para>parses a java heap dump file and allows viewing
+          in a webbrowser.</para>
+          <indexterm zone="jdk jhat">
+            <primary sortas="b-jhat">jhat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jinfo">
+        <term><command>jinfo</command></term>
+        <listitem>
+          <para>prints Java configuration information for a given Java
+          process, core file, or a remote debug server.</para>
+          <indexterm zone="jdk jinfo">
+            <primary sortas="b-jinfo">jinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jmap">
+        <term><command>jmap</command></term>
+        <listitem>
+          <para>prints shared object memory maps or heap memory details
+          of a given process, core file, or a remote debug server.</para>
+          <indexterm zone="jdk jmap">
+            <primary sortas="b-jmap">jmap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jps">
+        <term><command>jps</command></term>
+        <listitem>
+          <para>lists the instrumented JVMs on the target system.</para>
+          <indexterm zone="jdk jps">
+            <primary sortas="b-jps">jps</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jrunscript">
+        <term><command>jrunscript</command></term>
+        <listitem>
+          <para>is a command line script shell.</para>
+          <indexterm zone="jdk jrunscript">
+            <primary sortas="b-jrunscript">jrunscript</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jsadebugd">
+        <term><command>jsadebugd</command></term>
+        <listitem>
+          <para>attaches to a Java process or core file and acts as a
+          debug server.</para>
+          <indexterm zone="jdk jsadebugd">
+            <primary sortas="b-jsadebugd">jsadebugd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstack">
+        <term><command>jstack</command></term>
+        <listitem>
+          <para>prints Java stack traces of Java threads for a given
+          Java process, core file, or a remote debug server.</para>
+          <indexterm zone="jdk jstack">
+            <primary sortas="b-jstack">jstack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstat">
+        <term><command>jstat</command></term>
+        <listitem>
+          <para>displays performance statistics for an instrumented JVM.</para>
+          <indexterm zone="jdk jstat">
+            <primary sortas="b-jstat">jstat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstatd">
+        <term><command>jstatd</command></term>
+        <listitem>
+          <para>is an RMI server application that monitors for the creation
+          and termination of instrumented JVMs.</para>
+          <indexterm zone="jdk jstatd">
+            <primary sortas="b-jstatd">jstatd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="keytool">
+        <term><command>keytool</command></term>
+        <listitem>
+          <para>is a key and certificate management utility.</para>
+          <indexterm zone="jdk keytool">
+            <primary sortas="b-keytool">keytool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="native2ascii">
+        <term><command>native2ascii</command></term>
+        <listitem>
+          <para> converts files that contain non-supported character encoding
+          into files containing Latin-1 or Unicode-encoded characters.</para>
+          <indexterm zone="jdk native2ascii">
+            <primary sortas="b-native2ascii">native2ascii</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="orbd">
+        <term><command>orbd</command></term>
+        <listitem>
+          <para>is used to enable clients to transparently locate and invoke
+          persistent objects on servers in the CORBA environment.</para>
+          <indexterm zone="jdk orbd">
+            <primary sortas="b-orbd">orbd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pack200">
+        <term><command>pack200</command></term>
+        <listitem>
+          <para>is a Java application that transforms a jar file into a
+          compressed pack200 file using the Java gzip compressor.</para>
+          <indexterm zone="jdk pack200">
+            <primary sortas="b-pack200">pack200</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="policytool">
+        <term><command>policytool</command></term>
+        <listitem>
+          <para>creates and manages a policy file graphically.</para>
+          <indexterm zone="jdk policytool">
+            <primary sortas="b-policytool">policytool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rmic">
+        <term><command>rmic</command></term>
+        <listitem>
+          <para>generates stub and skeleton class files for remote objects
+          from the names of compiled Java classes that contain remote
+          object implementations.</para>
+          <indexterm zone="jdk rmic">
+            <primary sortas="b-rmic">rmic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rmid">
+        <term><command>rmid</command></term>
+        <listitem>
+          <para>starts the activation system daemon.</para>
+          <indexterm zone="jdk rmid">
+            <primary sortas="b-rmid">rmid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rmiregistry">
+        <term><command>rmiregistry</command></term>
+        <listitem>
+          <para>creates and starts a remote object registry on the specified
+          port on the current host.</para>
+          <indexterm zone="jdk rmiregistry">
+            <primary sortas="b-rmiregistry">rmiregistry</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="schemagen">
+        <term><command>schemagen</command></term>
+        <listitem>
+          <para>is a Java XML binding schema generator.</para>
+          <indexterm zone="jdk schemagen">
+            <primary sortas="b-schemagen">schemagen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="serialver">
+        <term><command>serialver</command></term>
+        <listitem>
+          <para>returns the serialVersionUID for one or more classes in a
+          form suitable for copying into an evolving class.</para>
+          <indexterm zone="jdk serialver">
+            <primary sortas="b-serialver">serialver</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="servertool">
+        <term><command>servertool</command></term>
+        <listitem>
+          <para>provides an ease-of-use interface for application programmers
+          to register, unregister, startup and shutdown a server.</para>
+          <indexterm zone="jdk servertool">
+            <primary sortas="b-servertool">servertool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tnameserv">
+        <term><command>tnameserv</command></term>
+        <listitem>
+          <para>starts the Java IDL name server.</para>
+          <indexterm zone="jdk tnameserv">
+            <primary sortas="b-tnameserv">tnameserv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unpack200">
+        <term><command>unpack200</command></term>
+        <listitem>
+          <para>is a native implementation that transforms a packed file
+          produced by <application>pack200</application> into a jar
+          file.</para>
+          <indexterm zone="jdk unpack200">
+            <primary sortas="b-unpack200">unpack200</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wsgen">
+        <term><command>wsgen</command></term>
+        <listitem>
+          <para>generates JAX-WS portable artifacts used in JAX-WS
+          web services.</para>
+          <indexterm zone="jdk wsgen">
+            <primary sortas="b-wsgen">wsgen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wsimport">
+        <term><command>wsimport</command></term>
+        <listitem>
+          <para>generates JAX-WS portable artifacts.</para>
+          <indexterm zone="jdk wsimport">
+            <primary sortas="b-wsimport">wsimport</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xjc">
+        <term><command>xjc</command></term>
+        <listitem>
+          <para>is a Java XML binding compiler.</para>
+          <indexterm zone="jdk xjc">
+            <primary sortas="b-xjc">xjc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/jdk.xml
===================================================================
--- archive/jdk.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/jdk.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,703 @@
+<?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 jdk-download-http   "http://java.sun.com/javase/downloads/index.jsp">
+  <!ENTITY jdk-md5sum          "ad5ee976522bf5767100a8b4b981c690">
+  <!ENTITY jdk-size            "85 MB">
+  <!ENTITY jdk-buildsize       "250 MB">
+  <!ENTITY jdk-bin-version     "6u18">
+  <!ENTITY jdk-build-time      "0.1 SBU">
+  <!ENTITY jdk-version-string  "1.6.0_18">
+
+]>
+
+<sect1 id="jdk" xreflabel="JDK-&jdk-version;">
+  <?dbhtml filename="jdk.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>JDK-&jdk-version;</title>
+
+  <indexterm zone="jdk">
+    <primary sortas="a-JDK">JDK</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to JDK</title>
+
+    <para>The <application>JDK</application> package contains
+    Sun's <application>Java</application> development environment. This is
+    useful for developing <application>Java</application> programs and provides
+    the runtime environment necessary to run <application>Java</application>
+    programs.  It also includes a plug-in for browsers so that they can be
+    <application>Java</application> aware.</para>
+
+
+<!--
+    <note><para>Sun has recently decided not to provide JRL sources for
+    the latest update versions of the JDK. Sun is actively working on a GPL'd
+    version of the JDK, titled
+    <ulink url="http://openjdk.java.net/projects/jdk6/">OpenJDK</ulink>.
+    This new JDK will be licensed under the
+    <ulink url="http://openjdk.java.net/legal/gplv2+ce.html">GNU General
+    Public License, version 2, with the Classpath Exception</ulink>.
+    A stable OpenJDK was not available at the time of writing.</para></note>
+-->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (jdk-&jdk-bin-version;-linux-i586.bin):
+        <ulink url="&jdk-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &jdk-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size (binary): &jdk-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &jdk-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &jdk-build-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">JDK Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
+    <para role="optional">
+    <xref linkend="alsa-lib"/>,
+    <xref linkend="cups"/>, and
+    <xref linkend="gtk2"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/jdk"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of JDK</title>
+
+    <tip>
+      <para>The <command>./jdk-&jdk-bin-version;-linux-i586.bin</command>
+      command below unpacks the distribution into a
+      <filename class='directory'>jdk&jdk-version-string;</filename>
+      directory.  You will be required to view, and then accept (by entering a
+      <keycap>y</keycap> keypress), a license agreement before any files are
+      unpacked. If you are scripting (automating) the build, you'll need to
+      account for this. There is information about automating build commands
+      in the <xref linkend="automating-builds"/> section of Chapter 2. Towards
+      the end of this section, specific information for automating this type of
+      installation is discussed.</para>
+    </tip>
+
+    <para>Normally in BLFS, the files are unpacked into a subdirectory
+    and the starting point for the installation procedures is that
+    location.  For this application only, start in the directory where all
+    the downloaded files are located.</para>
+
+    <para>Install the <application>JDK</application> with the
+    following commands:</para>
+
+<screen><userinput>chmod 755 jdk-&jdk-bin-version;-linux-i586.bin &amp;&amp;
+./jdk-&jdk-bin-version;-linux-i586.bin</userinput></screen>
+
+    <note><para>The installation will end with a message
+    "./jdk-&jdk-bin-version;-linux-i586.bin: line 43: 20283 Aborted" as
+    javaprefix is unset in the environment.  This is by design as
+    <application>GTK+</application> may not be installed during the
+    installation, however, the installation will still exit with a zero error
+    value if scripting the build.</para></note>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cd jdk&jdk-version-string; &amp;&amp;
+install -v -m755 -d /opt/jdk-&jdk-bin-version; &amp;&amp;
+mv -v * /opt/jdk-&jdk-bin-version; &amp;&amp;
+chown -v -R root:root /opt/jdk-&jdk-bin-version; &amp;&amp;
+ln -v -sf xawt/libmawt.so \
+    /opt/jdk-&jdk-bin-version;/jre/lib/i386/ &amp;&amp;
+cd ..</userinput></screen>
+
+    <para>Recent versions of libX11 break libmawt
+    when used with the Xinerama extension.  While still the
+    <systemitem class="username">root</systemitem> user, apply the
+    following sed to work around this problem:</para>
+
+<screen role="root"><userinput>sed -i 's@XINERAMA@FAKEEXTN@g' \
+    /opt/jdk-&jdk-bin-version;/jre/lib/i386/xawt/libmawt.so</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>ln -sf xawt/libmawt.so
+    /opt/jdk-&jdk-bin-version;/jre/lib/i386/</command>: This fixes
+    linking issues with other applications that expect to find the
+    <application>motif</application> libraries with the other
+    <application>JDK</application> libraries.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring JDK</title>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+    <para>As the <systemitem class="username">root</systemitem> user, create
+    a symlink to the installation directory:</para>
+
+<screen role="root"><userinput>ln -v -nsf jdk-&jdk-bin-version; /opt/jdk</userinput></screen>
+
+    <para>The information below assumes your system is set up using the
+    instructions found in
+    <quote><xref linkend="postlfs-config-profile"/></quote>. You may need to
+    extract the relevant information below and incorporate it into your
+    system's startup files if your system is set up differently.</para>
+
+    <para>Add the following <filename>jdk.sh</filename> shell startup file to
+    the <filename>/etc/profile.d</filename> directory with the following
+    commands as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/jdk.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/jdk.sh
+
+# Set JAVA_HOME directory
+JAVA_HOME=/opt/jdk
+
+# Adjust PATH
+pathappend ${JAVA_HOME}/bin PATH
+
+# Auto Java CLASSPATH
+# Copy jar files to, or create symlinks in this directory
+AUTO_CLASSPATH_DIR=/usr/lib/classpath
+pathprepend . CLASSPATH
+for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
+    pathappend $dir CLASSPATH
+done
+
+export JAVA_HOME CLASSPATH
+unset AUTO_CLASSPATH_DIR
+unset dir
+
+# End /etc/profile.d/jdk.sh</literal>
+EOF</userinput></screen>
+
+    <para>The <application>Java</application> plugin is located at
+    <filename class="directory">$JAVA_HOME/jre/lib/i386/libnpjp2.so</filename>.
+    Make a symbolic link to the file from your browser(s) plugins
+    directory.</para>
+
+    <important>
+      <para>The plugin must be a symlink for it to work. If not, the browsers
+      will crash when you attempt to load a <application>Java</application>
+      application.</para>
+    </important>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>appletviewer, apt, extcheck, idlj, HtmlConverter, jar,
+        jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi,
+        javaws, jconsole, jcontrol, jdb, jhat, jinfo, jmap, jps,
+        jrunscript, jsadebugd, jstack, jstat, jstatd, jvisualvm, keytool,
+        native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry,
+        schemagen, serialver, servertool, tnameserv, unpack200,
+        wsgen, wsimport, and xjc</seg>
+        <seg><envar>$JAVA_HOME</envar>/lib/*,
+        <envar>$JAVA_HOME</envar>/jre/lib/*</seg>
+        <seg>/opt/jdk-&jdk-bin-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="appletviewer">
+        <term><command>appletviewer</command></term>
+        <listitem>
+          <para>runs Java applets outside of the context of a browser.</para>
+          <indexterm zone="jdk appletviewer">
+            <primary sortas="b-appletviewer">appletviewer</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="apt">
+        <term><command>apt</command></term>
+        <listitem>
+          <para>is an annotation processing tool.</para>
+          <indexterm zone="jdk apt">
+            <primary sortas="b-apt">apt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="extcheck">
+        <term><command>extcheck</command></term>
+        <listitem>
+          <para>checks a specified jar file for title and version conflicts
+          with any extensions installed in the <application>JDK</application>
+          software.</para>
+          <indexterm zone="jdk extcheck">
+            <primary sortas="b-extcheck">extcheck</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="HtmlConverter">
+        <term><command>HtmlConverter</command></term>
+        <listitem>
+          <para>adds Java auto download to html and asp pages. </para>
+          <indexterm zone="jdk HtmlConverter">
+            <primary sortas="b-HtmlConverter">HtmlConverter</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="idlj">
+        <term><command>idlj</command></term>
+        <listitem>
+          <para>generates Java bindings from a given IDL file.</para>
+          <indexterm zone="jdk idlj">
+            <primary sortas="b-idlj">idlj</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jar">
+        <term><command>jar</command></term>
+        <listitem>
+          <para>combines multiple files into a single jar archive.</para>
+          <indexterm zone="jdk jar">
+            <primary sortas="b-jar">jar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jarsigner">
+        <term><command>jarsigner</command></term>
+        <listitem>
+          <para>signs jar files and verifies the signatures and integrity
+          of a signed jar file.</para>
+          <indexterm zone="jdk jarsigner">
+            <primary sortas="b-jarsigner">jarsigner</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="java">
+        <term><command>java</command></term>
+        <listitem>
+          <para>launches a Java application by starting a Java runtime
+          environment, loading a specified class and invoking its main
+          method.</para>
+          <indexterm zone="jdk java">
+            <primary sortas="b-java">java</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javac">
+        <term><command>javac</command></term>
+        <listitem>
+          <para>reads class and interface definitions, written in the
+          Java programming language, and compiles them into bytecode
+          class files.</para>
+          <indexterm zone="jdk javac">
+            <primary sortas="b-javac">javac</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javadoc">
+        <term><command>javadoc</command></term>
+        <listitem>
+          <para>parses the declarations and documentation comments in a
+          set of Java source files and produces a corresponding set of
+          HTML pages describing the classes, interfaces,constructors,
+          methods, and fields.</para>
+          <indexterm zone="jdk javadoc">
+            <primary sortas="b-javadoc">javadoc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javah">
+        <term><command>javah</command></term>
+        <listitem>
+          <para>generates C header and source files
+          that are needed to implement native methods.</para>
+          <indexterm zone="jdk javah">
+            <primary sortas="b-javah">javah</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javap">
+        <term><command>javap</command></term>
+        <listitem>
+          <para>disassembles a Java class file.</para>
+          <indexterm zone="jdk javap">
+            <primary sortas="b-javap">javap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="java-rmi.cgi">
+        <term><command>java-rmi.cgi</command></term>
+        <listitem>
+          <para>is the Java RMI client.</para>
+          <indexterm zone="jdk java-rmi.cgi">
+            <primary sortas="b-java-rmi.cgi">java-rmi.cgi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="javaws">
+        <term><command>javaws</command></term>
+        <listitem>
+          <para>launches Java application/applets hosted on a network.</para>
+          <indexterm zone="jdk javaws">
+            <primary sortas="b-javaws">javaws</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jconsole">
+        <term><command>jconsole</command></term>
+        <listitem>
+          <para>is a graphical console tool to monitor and manage both
+          local and remote Java applications and virtual machines.</para>
+          <indexterm zone="jdk jconsole">
+            <primary sortas="b-jconsole">jconsole</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jcontrol">
+        <term><command>jcontrol</command></term>
+        <listitem>
+          <para>is a graphical control panel for Java.</para>
+          <indexterm zone="jdk jcontrol">
+            <primary sortas="b-jcontrol">jcontrol</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jdb">
+        <term><command>jdb</command></term>
+        <listitem>
+          <para>is a simple command-line debugger for Java classes.</para>
+          <indexterm zone="jdk jdb">
+            <primary sortas="b-jdb">jdb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jhat">
+        <term><command>jhat</command></term>
+        <listitem>
+          <para>parses a java heap dump file and allows viewing
+          in a webbrowser.</para>
+          <indexterm zone="jdk jhat">
+            <primary sortas="b-jhat">jhat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jinfo">
+        <term><command>jinfo</command></term>
+        <listitem>
+          <para>prints Java configuration information for a given Java
+          process, core file, or a remote debug server.</para>
+          <indexterm zone="jdk jinfo">
+            <primary sortas="b-jinfo">jinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jmap">
+        <term><command>jmap</command></term>
+        <listitem>
+          <para>prints shared object memory maps or heap memory details
+          of a given process, core file, or a remote debug server.</para>
+          <indexterm zone="jdk jmap">
+            <primary sortas="b-jmap">jmap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jps">
+        <term><command>jps</command></term>
+        <listitem>
+          <para>lists the instrumented JVMs on the target system.</para>
+          <indexterm zone="jdk jps">
+            <primary sortas="b-jps">jps</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jrunscript">
+        <term><command>jrunscript</command></term>
+        <listitem>
+          <para>is a command line script shell.</para>
+          <indexterm zone="jdk jrunscript">
+            <primary sortas="b-jrunscript">jrunscript</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jsadebugd">
+        <term><command>jsadebugd</command></term>
+        <listitem>
+          <para>attaches to a Java process or core file and acts as a
+          debug server.</para>
+          <indexterm zone="jdk jsadebugd">
+            <primary sortas="b-jsadebugd">jsadebugd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstack">
+        <term><command>jstack</command></term>
+        <listitem>
+          <para>prints Java stack traces of Java threads for a given
+          Java process, core file, or a remote debug server.</para>
+          <indexterm zone="jdk jstack">
+            <primary sortas="b-jstack">jstack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstat">
+        <term><command>jstat</command></term>
+        <listitem>
+          <para>displays performance statistics for an instrumented JVM.</para>
+          <indexterm zone="jdk jstat">
+            <primary sortas="b-jstat">jstat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jstatd">
+        <term><command>jstatd</command></term>
+        <listitem>
+          <para>is an RMI server application that monitors for the creation
+          and termination of instrumented JVMs.</para>
+          <indexterm zone="jdk jstatd">
+            <primary sortas="b-jstatd">jstatd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="jvisualvm">
+        <term><command>jvisualvm</command></term>
+        <listitem>
+          <para>is an intuitive graphical user interface that provides detailed
+          information about Java applications while they are running on a given
+          JVM.</para>
+          <indexterm zone="jdk jvisualvm">
+            <primary sortas="b-jvisualvm">jvisualvm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="keytool">
+        <term><command>keytool</command></term>
+        <listitem>
+          <para>is a key and certificate management utility.</para>
+          <indexterm zone="jdk keytool">
+            <primary sortas="b-keytool">keytool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="native2ascii">
+        <term><command>native2ascii</command></term>
+        <listitem>
+          <para> converts files that contain non-supported character encoding
+          into files containing Latin-1 or Unicode-encoded characters.</para>
+          <indexterm zone="jdk native2ascii">
+            <primary sortas="b-native2ascii">native2ascii</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="orbd">
+        <term><command>orbd</command></term>
+        <listitem>
+          <para>is used to enable clients to transparently locate and invoke
+          persistent objects on servers in the CORBA environment.</para>
+          <indexterm zone="jdk orbd">
+            <primary sortas="b-orbd">orbd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pack200">
+        <term><command>pack200</command></term>
+        <listitem>
+          <para>is a Java application that transforms a jar file into a
+          compressed pack200 file using the Java gzip compressor.</para>
+          <indexterm zone="jdk pack200">
+            <primary sortas="b-pack200">pack200</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="policytool">
+        <term><command>policytool</command></term>
+        <listitem>
+          <para>creates and manages a policy file graphically.</para>
+          <indexterm zone="jdk policytool">
+            <primary sortas="b-policytool">policytool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rmic">
+        <term><command>rmic</command></term>
+        <listitem>
+          <para>generates stub and skeleton class files for remote objects
+          from the names of compiled Java classes that contain remote
+          object implementations.</para>
+          <indexterm zone="jdk rmic">
+            <primary sortas="b-rmic">rmic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rmid">
+        <term><command>rmid</command></term>
+        <listitem>
+          <para>starts the activation system daemon.</para>
+          <indexterm zone="jdk rmid">
+            <primary sortas="b-rmid">rmid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rmiregistry">
+        <term><command>rmiregistry</command></term>
+        <listitem>
+          <para>creates and starts a remote object registry on the specified
+          port on the current host.</para>
+          <indexterm zone="jdk rmiregistry">
+            <primary sortas="b-rmiregistry">rmiregistry</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="schemagen">
+        <term><command>schemagen</command></term>
+        <listitem>
+          <para>is a Java XML binding schema generator.</para>
+          <indexterm zone="jdk schemagen">
+            <primary sortas="b-schemagen">schemagen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="serialver">
+        <term><command>serialver</command></term>
+        <listitem>
+          <para>returns the serialVersionUID for one or more classes in a
+          form suitable for copying into an evolving class.</para>
+          <indexterm zone="jdk serialver">
+            <primary sortas="b-serialver">serialver</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="servertool">
+        <term><command>servertool</command></term>
+        <listitem>
+          <para>provides an ease-of-use interface for application programmers
+          to register, unregister, startup and shutdown a server.</para>
+          <indexterm zone="jdk servertool">
+            <primary sortas="b-servertool">servertool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tnameserv">
+        <term><command>tnameserv</command></term>
+        <listitem>
+          <para>starts the Java IDL name server.</para>
+          <indexterm zone="jdk tnameserv">
+            <primary sortas="b-tnameserv">tnameserv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unpack200">
+        <term><command>unpack200</command></term>
+        <listitem>
+          <para>is a native implementation that transforms a packed file
+          produced by <application>pack200</application> into a jar
+          file.</para>
+          <indexterm zone="jdk unpack200">
+            <primary sortas="b-unpack200">unpack200</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wsgen">
+        <term><command>wsgen</command></term>
+        <listitem>
+          <para>generates JAX-WS portable artifacts used in JAX-WS
+          web services.</para>
+          <indexterm zone="jdk wsgen">
+            <primary sortas="b-wsgen">wsgen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wsimport">
+        <term><command>wsimport</command></term>
+        <listitem>
+          <para>generates JAX-WS portable artifacts.</para>
+          <indexterm zone="jdk wsimport">
+            <primary sortas="b-wsimport">wsimport</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xjc">
+        <term><command>xjc</command></term>
+        <listitem>
+          <para>is a Java XML binding compiler.</para>
+          <indexterm zone="jdk xjc">
+            <primary sortas="b-xjc">xjc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/libelf.xml
===================================================================
--- archive/libelf.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/libelf.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,115 @@
+<?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 libelf-download-http "http://www.mr511.de/software/libelf-&libelf-version;.tar.gz">
+  <!ENTITY libelf-download-ftp  " ">
+  <!ENTITY libelf-md5sum        "4136d7b4c04df68b686570afa26988ac">
+  <!ENTITY libelf-size          "145 KB">
+  <!ENTITY libelf-buildsize     "3 MB">
+  <!ENTITY libelf-time          "0.1 SBU">
+]>
+
+<sect1 id="libelf" xreflabel="libelf-&libelf-version;">
+  <?dbhtml filename="libelf.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libelf-&libelf-version;</title>
+
+  <indexterm zone="libelf">
+    <primary sortas="a-libelf">libelf</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libelf</title>
+
+    <para>The <application>libelf</application> package is a object file access
+    library. It lets you read, modify or create ELF files in an
+    architecture-independent way.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libelf-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libelf-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libelf-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libelf-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libelf-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libelf-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libelf"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libelf</title>
+
+    <para>Install <application>libelf</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 Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libelf.{so,a}</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libelf-lib">
+        <term><filename class='libraryfile'>libelf.{so,a}</filename></term>
+        <listitem>
+          <para>contains the <application>libelf</application> API
+          functions.</para>
+          <indexterm zone="libelf libelf-lib">
+            <primary sortas="c-libelf">libelf.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/libggz.xml
===================================================================
--- archive/libggz.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/libggz.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,130 @@
+<?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 libggz-download-http "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/&libggz-version;/libggz-&libggz-version;.tar.gz">
+  <!ENTITY libggz-download-ftp  "ftp://ftp.belnet.be/packages/ggzgamingzone/ggz/&libggz-version;/libggz-&libggz-version;.tar.gz">
+  <!ENTITY libggz-md5sum        "603739504648833779aa13b0327a1c3d">
+  <!ENTITY libggz-size          "466 KB">
+  <!ENTITY libggz-buildsize     "5 MB">
+  <!ENTITY libggz-time          "0.1 SBU">
+]>
+
+<sect1 id="libggz" xreflabel="libggz-&libggz-version;">
+  <?dbhtml filename="libggz.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libggz-&libggz-version;</title>
+
+  <indexterm zone="libggz">
+    <primary sortas="a-libggz">libggz</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libggz</title>
+
+    <para>The <application>libggz</application> package is the GGZ base library,
+    used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other
+    components.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libggz-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libggz-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libggz-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libggz-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libggz-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libggz-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libggz Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gnutls"/>,
+    <xref linkend="libgcrypt"/>, and
+    <xref linkend="openssl"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libggz"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libggz</title>
+
+    <para>Install <application>libggz</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --with-tls &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--with-tls</parameter>: This parameter will automatically
+    select the use of either GnuTLS or OpenSSL if available.</para>
+
+  </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>libggz.{so,a}</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libggz-lib">
+        <term><filename class='libraryfile'>libggz.{so,a}</filename></term>
+        <listitem>
+          <para>contains the libggz API functions.</para>
+          <indexterm zone="libggz libggz-lib">
+            <primary sortas="c-libggz">libggz.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/libgtkhtml.xml
===================================================================
--- archive/libgtkhtml.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/libgtkhtml.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,128 @@
+<?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 libgtkhtml-download-http "&gnome-download-http;/libgtkhtml/2.11/libgtkhtml-&libgtkhtml-version;.tar.bz2">
+  <!ENTITY libgtkhtml-download-ftp  "&gnome-download-ftp;/libgtkhtml/2.11/libgtkhtml-&libgtkhtml-version;.tar.bz2">
+  <!ENTITY libgtkhtml-md5sum        "a1d1a197dcff8c4571659deef5495e24">
+  <!ENTITY libgtkhtml-size          "597 KB">
+  <!ENTITY libgtkhtml-buildsize     "36 MB">
+  <!ENTITY libgtkhtml-time          "0.8 SBU">
+]>
+
+<sect1 id="libgtkhtml" xreflabel="libgtkhtml-&libgtkhtml-version;">
+  <?dbhtml filename="libgtkhtml.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libgtkhtml-&libgtkhtml-version;</title>
+
+  <indexterm zone="libgtkhtml">
+    <primary sortas="a-Libgtkhtml">Libgtkhtml</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libgtkhtml</title>
+
+    <para>The <application>libgtkhtml</application> package contains the
+    <filename class="libraryfile">libgtkhtml-2</filename> library. This
+    library provides an API for rendering HTML.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libgtkhtml-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libgtkhtml-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libgtkhtml-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libgtkhtml-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libgtkhtml-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libgtkhtml-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libgtkhtml Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="gtk2"/> and
+    <xref linkend="libxml2"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><!--<xref linkend="gail"/> and
+      Gail no longer required since libgailutil is now part of GTK+.-->
+    <xref linkend="gnome-vfs"/> (only used in the test suite)</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libgtkhtml"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libgtkhtml</title>
+
+    <para>Install <application>libgtkhtml</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. You can run a test
+    program which includes many test cases; if desired, issue:
+    <command>( cd tests; ./testgtkhtml )</command></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 Directory</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libgtkhtml-2.{so,a}</seg>
+        <seg>/usr/include/gtkhtml-2.0</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgtkhtml-2">
+        <term><filename class='libraryfile'>libgtkhtml-2.{so,a}</filename></term>
+        <listitem>
+          <para>provides the functions necessary to render and/or
+          edit HTML.</para>
+          <indexterm zone="libgtkhtml libgtkhtml-2">
+            <primary sortas="c-libgtkhtml-2">libgtkhtml-2.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/liboil.xml
===================================================================
--- archive/liboil.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/liboil.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,140 @@
+<?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 liboil-download-http "http://liboil.freedesktop.org/download/liboil-&liboil-version;.tar.gz">
+  <!ENTITY liboil-download-ftp  " ">
+  <!ENTITY liboil-md5sum        "47dc734f82faeb2964d97771cfd2e701">
+  <!ENTITY liboil-size          "912 KB">
+  <!ENTITY liboil-buildsize     "34 MB">
+  <!ENTITY liboil-time          "0.5 SBU">
+]>
+
+<sect1 id="liboil" xreflabel="liboil-&liboil-version;">
+  <?dbhtml filename="liboil.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>liboil-&liboil-version;</title>
+
+  <indexterm zone="liboil">
+    <primary sortas="a-liboil">liboil</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to liboil</title>
+
+    <para><application>Liboil</application> is a library of simple
+    functions that are optimized for various CPUs.</para>
+
+    &lfs67_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&liboil-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&liboil-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &liboil-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &liboil-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &liboil-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &liboil-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">liboil Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="pkgconfig"/> and
+    <xref linkend="gtk-doc"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/liboil"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of liboil</title>
+
+    <para>Install <application>liboil</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>oil-bugreport</seg>
+        <seg>liboil-0.3{so,a}</seg>
+        <seg>/usr/include/liboil-0.3 and
+        /usr/share/gtk-doc/html/liboil</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="oil-bugreport">
+        <term><command>oil-bugreport</command></term>
+        <listitem>
+          <para>prints out API function stats.</para>
+          <indexterm zone="liboil oil-bugreport">
+            <primary sortas="b-oil-bugreport">oil-bugreport</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="liboil-0.3">
+        <term><filename class='libraryfile'>liboil-0.3.{so,a}</filename></term>
+        <listitem>
+          <para>contains the liboil API functions.</para>
+          <indexterm zone="liboil liboil-0.3">
+            <primary sortas="c-liboil-0.3">liboil-0.3.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/pdl.xml
===================================================================
--- archive/pdl.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/pdl.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,648 @@
+<?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;
+
+    <!-- Inserted as a reminder to do this. The mention of a test suite
+         is usually right before the root user installation commands. Please
+         delete these 12 (including one blank) lines after you are done.-->
+
+    <!-- Use one of the two mentions below about a test suite,
+         delete the line that is not applicable. Of course, if the
+         test suite uses syntax other than "make check", revise the
+         line to reflect the actual syntax to run the test suite -->
+
+    <!-- <para>This package does not come with a test suite.</para> -->
+    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
+
+  <!ENTITY pdl-download-http "&sourceforge-repo;/pdl/PDL-&pdl-version;.tar.gz">
+  <!ENTITY pdl-download-ftp  "&gentoo-ftp-repo;/PDL-&pdl-version;.tar.gz">
+  <!ENTITY pdl-md5sum        "edd056a006eae8b46e8ef804b9774a93">
+  <!ENTITY pdl-size          "2.1 MB">
+  <!ENTITY pdl-buildsize     "74 MB">
+  <!ENTITY pdl-time          "2.56 SBU">
+]>
+
+<sect1 id="pdl" xreflabel="PDL-&pdl-version;">
+  <?dbhtml filename="pdl.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>PDL-&pdl-version;</title>
+
+  <indexterm zone="pdl">
+    <primary sortas="a-PDL">PDL</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to PDL</title>
+
+    <para><application>PDL</application> (Perl Data Language) gives
+    standard <application>Perl</application> the ability to compactly store
+    and quickly manipulate the large N-dimensional data arrays common to
+    scientific computing. <application>PDL</application> turns
+    <application>Perl</application> into an array-oriented, numerical language
+    similar to such commercial packages as <application>IDL</application>
+    and <application>MatLab</application>. One can write simple
+    <application>Perl</application> expressions to manipulate entire numerical
+    arrays all at once.</para>
+
+    <para><application>PDL</application> provides extensive numerical and
+    semi-numerical functionality with support for two- and three-dimensional
+    visualisation as well as a variety of I/O formats. The goal is to allow
+    <application>PDL</application> to interact with a variety of external
+    numerical packages, graphics and visualisation systems. Easy interfacing
+    to such systems is one of the core design features of
+    <application>PDL</application>.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&pdl-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&pdl-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &pdl-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &pdl-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &pdl-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &pdl-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">PDL Dependencies</bridgehead>
+
+    <para><application>PDL</application> is a collection of over 90
+    <application>Perl</application> modules. Some of these modules require
+    additional libraries, packages and/or <application>Perl</application>
+    modules for full functionality. Listed below are the modules which require
+    additional software or configuration. If you don't need a particular
+    module's functionality, you don't need to install its dependencies. The
+    dependency tree for each module is listed downward, meaning you'll need to
+    start at the bottom of a module's tree and work up. The dependencies are
+    listed in the same order as they are in the
+    <filename>DEPENDENCIES</filename> file, found in the package source
+    tree.</para>
+
+    <para>This package (and many of the dependency packages) requires a Fortran
+    compiler for full functionality of all the different modules. The
+    <command>gfortran</command> compiler installed with the current BLFS
+    version of <application>GCC</application> (&gcc-version;) will not work. If
+    you want to compile the parts of this package that require a Fortran
+    compiler, you'll need to install a
+    <application>GCC</application>-3.x.x version of Fortran. The
+    <application>GCC</application> developers recommend using Fortran from
+    <application>GCC</application>-3.4.6. You can find specific instructions
+    to install a <application>GCC</application>-3.4.6 compiler on the
+    <ulink url="&blfs-wiki;/gcc3">BLFS
+    Wiki</ulink>. <!-- Alternatively, if you have a need to install
+    <xref linkend="gcc3"/>, you can add the Fortran compiler to the list of
+    compilers installed in those instructions. Don't forget to put the
+    directory containing the <command>{g,f}77</command> commands at the
+    beginning of your <envar>PATH</envar> environment variable before
+    beginning the compilation.--> </para>
+
+    <bridgehead renderas="sect4">PDL::NiceSlice</bridgehead>
+
+    <para>The <application>PDL</application>::NiceSlice module is used to
+    enhance <application>PDL</application>'s slice syntax.
+    <quote>Slicing</quote> is a term used in the process of creating a
+    cross-section, or slice, of a <application>PDL</application> object
+    (piddle).</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="http://www.cpan.org/authors/id/P/PM/PMQS/Filter-&Filter-version;.tar.gz">
+        Filter-&Filter-version;</ulink></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">Inline::Pdlpp</bridgehead>
+
+    <para>The Inline::Pdlpp module allows you to define fast PP
+    code inline in your scripts.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="http://www.cpan.org/authors/id/I/IN/INGY/Inline-&Inline-version;.tar.gz">
+        Inline-&Inline-version;</ulink></para>
+        <itemizedlist>
+          <listitem>
+            <para><ulink
+            url="http://www.cpan.org/authors/id/D/DC/DCONWAY/Parse-RecDescent-&Parse-RecDescent-version;.tar.gz">
+            Parse-RecDescent-&Parse-RecDescent-version;</ulink></para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">Perldl</bridgehead>
+
+    <para><command>perldl</command> is a simple shell (written in
+    <application>Perl</application>) which allows interactive
+    use of <application>PDL</application>.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-&Term-ReadLine-Gnu-version;.tar.gz">
+        Term-ReadLine-Gnu-&Term-ReadLine-Gnu-version;</ulink></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">PDL::Graphics::TriD</bridgehead>
+
+    <para>The <application>PDL</application>::Graphics::TriD module implements
+    a generic 3D plotting interface for <application>PDL</application>. Points,
+    lines and surfaces (among other objects) are supported.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>OpenGL (<xref linkend="x-window-system"/>)</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">PDL::Graphics::PGPLOT</bridgehead>
+
+    <para>The <application>PDL</application>::Graphics::PGPLOT module is a
+    convenience interface to the <application>PGPLOT</application> commands,
+    implemented using the object oriented <application>PGPLOT</application>
+    plotting package in the PDL::Graphics::PGPLOT::Window module.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="http://www.cpan.org/authors/id/K/KG/KGB/PGPLOT-&PGPLOT-perl-version;.tar.gz">
+        PGPLOT-&PGPLOT-perl-version;</ulink></para>
+        <itemizedlist>
+          <listitem>
+            <para><ulink
+            url="http://www.cpan.org/authors/id/K/KG/KGB/ExtUtils-F77-&ExtUtils-F77-version;.tar.gz">
+            ExtUtils-F77-&ExtUtils-F77-version;</ulink></para>
+            <itemizedlist>
+              <listitem>
+                <para><ulink
+                url="&blfs-wiki;/gcc3">a Fortran
+                compiler</ulink></para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+          <listitem>
+            <para><ulink
+            url="http://astro.caltech.edu/~tjp/pgplot/">PGPLOT</ulink></para>
+            <itemizedlist>
+              <listitem>
+                <para><xref linkend="x-window-system"/>,
+                <!-- <xref linkend="lesstif"/>, -->
+                <ulink url="http://sourceforge.net/projects/lesstif/">LessTif</ulink>,
+                <xref linkend="tk"/>, and <ulink
+                url="&blfs-wiki;/gcc3">a Fortran
+                compiler</ulink></para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">PDL::Graphics::PLPLOT</bridgehead>
+
+    <para>The <application>PDL</application>::Graphics::PLPLOT module is a
+    simple interface to the <application>PLplot</application> plotting library.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink url="http://plplot.sourceforge.net/">PLplot</ulink></para>
+        <itemizedlist>
+          <listitem>
+            <para><!-- <xref linkend="pkgconfig"/>, -->
+            <xref linkend="x-window-system"/>,
+            <xref linkend="freetype2"/>,
+            <ulink url="http://www.boutell.com/gd/">GD</ulink>,
+            <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
+            <!-- <xref linkend="gnome-libs"/>, -->
+            <ulink url="&gnome-download-http;/gnome-libs/1.4/">GNOME
+            Libraries-1.4</ulink>,
+            <xref linkend="icedtea6"/>, <!-- or <xref linkend="jdk"/>, -->
+            <xref linkend="tk"/>,
+            <xref linkend="python2"/> (with
+            <ulink url="http://www.numpy.org/">Numeric Python</ulink>),
+            <ulink url="&blfs-wiki;/gcc3">a
+            Fortran compiler</ulink>,
+            <ulink url="http://www.swig.org/">SWIG</ulink>, and
+            <ulink url="http://sourceforge.net/projects/incrtcl/">iTcl</ulink></para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">PDL::Graphics::IIS</bridgehead>
+
+    <para>The <application>PDL</application>::Graphics::IIS
+    module provides an interface to any image display <quote>device</quote>
+    which supports the <quote>IIS protocol</quote>.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="http://tdc-www.harvard.edu/software/saoimage.html">SAOimage</ulink></para>
+        <itemizedlist>
+          <listitem>
+            <para><xref linkend="x-window-system"/></para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
+        <para><ulink
+        url="http://iraf.noao.edu/iraf/web/projects/x11iraf/x11iraf.html">X11
+        IRAF</ulink></para>
+        <itemizedlist>
+          <listitem>
+            <para><xref linkend="x-window-system"/> and
+            <xref linkend="tk"/></para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">PDL::Graphics::Karma</bridgehead>
+
+    <para>The <application>PDL</application>::Graphics::Karma
+    module is an interface to <application>Karma</application> visualisation
+    applications.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="http://www.atnf.csiro.au/computing/software/karma/">Karma</ulink></para>
+        <itemizedlist>
+          <listitem>
+            <para><xref linkend="x-window-system"/></para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
+
+    <para><emphasis>Note:</emphasis> You may need to modify the
+    <option>WHERE_KARMA =&gt; undef</option> line in the source tree
+    <filename>perldl.conf</filename> file to point to your installation
+    of <application>Karma</application></para>
+
+    <bridgehead renderas="sect4">PDL::IO::Pic</bridgehead>
+
+    <para> The <application>PDL</application>::IO::Pic module implements I/O
+    for a number of popular image formats by exploiting the
+    <command>xxxtopnm</command> and <command>pnmtoxxx</command>
+    converters from the <application>Netpbm</application> package and the
+    <command>cjpeg</command> and <command>djpeg</command> converters.
+    It also  contains the routine wmpeg to write MPEG movies from piddles
+    representing image stacks.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>,
+        <xref linkend="libjpeg"/> and
+        <ulink url="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/">
+        mpeg_encode</ulink></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">PDL::Slatec</bridgehead>
+
+    <para> The <application>PDL</application>::Slatec module serves the dual
+    purpose of providing an interface to parts of the slatec library and showing
+    how to interface <application>PDL</application> to an external library.
+    The module provides routines to manipulate matrices, calculate FFTs, fit
+    data using polynomials, and interpolate/integrate data using piecewise
+    cubic Hermite interpolation.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="http://www.cpan.org/authors/id/K/KG/KGB/ExtUtils-F77-&ExtUtils-F77-version;.tar.gz">
+        ExtUtils-F77-&ExtUtils-F77-version;</ulink></para>
+        <itemizedlist>
+          <listitem>
+            <para><ulink
+            url="&blfs-wiki;/gcc3">a Fortran
+            compiler</ulink></para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">PDL::GSL</bridgehead>
+
+    <para> The <application>PDL</application>::<application>GSL</application>
+    module is an interface to the functions provided by the Gnu Scientific Library.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><xref linkend="gsl"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">PDL::FFTW</bridgehead>
+
+    <para> The <application>PDL</application>::<application>FFTW</application>
+    module is a means to interface <application>PDL</application> with the
+    <application>FFTW</application> library. It's similar to the standard FFT
+    routine but it's usually faster and has support for real transforms. It works
+    well for the types of piddles for which the library was compiled (otherwise it
+    must do conversions).</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink url="http://www.fftw.org/">FFTW-2.x</ulink></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">PDL::IO::Browser</bridgehead>
+
+    <para>The <application>PDL</application>::IO::Browser module
+    is a 2D cursor terminal data browser for piddles.</para>
+
+    <para>There is no additional software required to use the module. However,
+    the default is to not install the module because some platforms don't provide
+    a curses compatible library. To enable the module, issue the following
+    command:</para>
+
+<screen><userinput>sed -i -e "s/WITH_IO_BROWSER =&gt; 0/WITH_IO_BROWSER =&gt; 1/" \
+    perldl.conf</userinput></screen>
+
+    <bridgehead renderas="sect4">PDL::IO::NDF</bridgehead>
+
+    <para>The <application>PDL</application>::IO::NDF module adds the ability to
+    read and write Starlink N-dimensional data files as N-dimensional piddles.</para>
+
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para><ulink
+        url="http://www.cpan.org/authors/id/A/AA/AALLAN/Astro-FITS-Header-&Astro-FITS-Header-version;.tar.gz">
+        Astro-FITS-Header-&Astro-FITS-Header-version;</ulink></para>
+        <itemizedlist>
+          <listitem>
+            <para><ulink
+            url="http://www.cpan.org/authors/id/P/PR/PRATZLAFF/Astro-FITS-CFITSIO-&Astro-FITS-CFITSIO-version;.tar.gz">
+            Astro-FITS-CFITSIO-&Astro-FITS-CFITSIO-version;</ulink></para>
+            <itemizedlist>
+              <listitem>
+                <para><ulink
+                url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/">CFITSIO</ulink></para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+          <listitem>
+            <para><ulink
+            url="&files-anduin;/sources/NDF-&NDF-version;.tar.gz">
+            NDF-&NDF-version;</ulink></para>
+            <itemizedlist>
+              <listitem>
+                <para><ulink
+                url="&files-anduin;/sources/Starlink-Config-&Starlink-Config-version;.tar.gz">
+                Starlink-Config-&Starlink-Config-version;</ulink></para>
+                <itemizedlist>
+                  <listitem>
+                    <para><ulink
+                    url="&files-anduin;/sources/Starlink_IMG.tar.gz">
+                    Starlink IMG</ulink></para>
+                    <itemizedlist>
+                      <listitem>
+                        <para><ulink
+                        url="&files-anduin;/sources/Starlink_NDF.tar.gz">
+                        Starlink NDF</ulink> (requires the following Starlink
+                        modules installed in this order, some will already be
+                        installed if you installed Starlink GSD):
+                        <ulink url="&files-anduin;/sources/Starlink_HTX.tar.gz">
+                        HTX</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_SAE.tar.gz">
+                        SAE</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_HLP.tar.gz">
+                        HLP</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_CNF.tar.gz">
+                        CNF</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_SLA.tar.gz">
+                        SLA</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_CHR.tar.gz">
+                        CHR</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_EMS.tar.gz">
+                        EMS</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_PSX.tar.gz">
+                        PSX</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_HDS.tar.gz">
+                        HDS</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_PCS.tar.gz">
+                        PCS</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_MER.tar.gz">
+                        MER</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_PRM.tar.gz">
+                        PRM</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_PAR.tar.gz">
+                        PAR</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_ARY.tar.gz">
+                        ARY</ulink>,
+                        <ulink url="&files-anduin;/sources/Starlink_AST.tar.gz">
+                        AST</ulink>)</para>
+                        <itemizedlist>
+                          <listitem>
+                            <para><ulink
+                            url="&blfs-wiki;/gcc3">a
+                            Fortran compiler</ulink></para>
+                          </listitem>
+                        </itemizedlist>
+                      </listitem>
+                    </itemizedlist>
+                  </listitem>
+                </itemizedlist>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+          <listitem>
+            <para><ulink
+            url="&files-anduin;/sources/GSD-&GSD-version;.tar.gz">
+            GSD-&GSD-version;</ulink></para>
+            <itemizedlist>
+              <listitem>
+                <para><ulink
+                url="&files-anduin;/sources/Starlink-Config-&Starlink-Config-version;.tar.gz">
+                Starlink-Config-&Starlink-Config-version;</ulink></para>
+                <itemizedlist>
+                  <listitem>
+                    <para><ulink
+                    url="&files-anduin;/sources/Starlink_GSD.tar.gz">
+                    Starlink GSD</ulink> (requires the following Starlink
+                    modules installed in this order:
+                    <ulink url="&files-anduin;/sources/Starlink_HTX.tar.gz">
+                    HTX</ulink>,
+                    <ulink url="&files-anduin;/sources/Starlink_SAE.tar.gz">
+                    SAE</ulink>,
+                    <ulink url="&files-anduin;/sources/Starlink_CNF.tar.gz">
+                    CNF</ulink>,
+                    <ulink url="&files-anduin;/sources/Starlink_CHR.tar.gz">
+                    CHR</ulink>,
+                    <ulink url="&files-anduin;/sources/Starlink_EMS.tar.gz">
+                    EMS</ulink>,
+                    <ulink url="&files-anduin;/sources/Starlink_PRM.tar.gz">
+                    PRM</ulink>)</para>
+                    <itemizedlist>
+                      <listitem>
+                        <para><ulink
+                        url="&blfs-wiki;/gcc3">a
+                        Fortran compiler</ulink></para>
+                      </listitem>
+                    </itemizedlist>
+                  </listitem>
+                </itemizedlist>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/pdl"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of PDL</title>
+
+    <para>Install <application>PDL</application> (and all the dependency
+    <application>Perl</application> modules) by running the following commands:</para>
+
+<screen><userinput>sed -i 's/\(dirname);\)/\1\nuse blib;/' Demos/BAD*demo.pm.PL &amp;&amp;
+perl Makefile.PL &amp;&amp;
+make &amp;&amp;
+make test</userinput></screen>
+
+    <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 '...' Demos/BAD*demo.pm.PL</command>: This is
+    necessary to fix a build issue caused by changes in
+    ExtUtils::MakeMaker-6.30 which was introduction in
+    <application>Perl</application>-5.8.8.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring PDL</title>
+
+    <sect3 id="pdl-config">
+      <title>Config Files</title>
+
+      <para><filename>~/.perldlrc</filename> and
+      <filename>local.perldlrc</filename> in the current directory</para>
+
+      <indexterm zone="pdl pdl-config">
+        <primary sortas="e-AA.perldlrc">~/.perldlrc</primary>
+      </indexterm>
+
+      <indexterm zone="pdl pdl-config">
+        <primary sortas="e-local.perldlrc">local.perldlrc</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>See <ulink
+      url="http://pdl.sourceforge.net/PDLdocs/perldl.html#the startup file ~/.perldlrc"/>
+      for information about configuring <command>perldl</command> to suit your
+      needs.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Modules</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>pdl, pdldoc, perldl, and pptemplate</seg>
+        <seg>90+ individual <application>Perl</application> modules</seg>
+        <seg>/usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/{,auto/}PDL</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="pdl-prog">
+        <term><command>pdl</command></term>
+        <listitem>
+          <para>is a binary program called from
+          <application>PDL</application> scripts which is used to
+          interface <command>perldl</command>.</para>
+          <indexterm zone="pdl pdl-prog">
+            <primary sortas="b-pdl">pdl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pdldoc">
+        <term><command>pdldoc</command></term>
+        <listitem>
+          <para>is a shell interface to
+          <application>PDL</application> documentation.</para>
+          <indexterm zone="pdl pdldoc">
+            <primary sortas="b-pdldoc">pdldoc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="perldl">
+        <term><command>perldl</command></term>
+        <listitem>
+          <para>is a simple shell (written in <application>Perl</application>)
+          for interactive use of <application>PDL</application>.</para>
+          <indexterm zone="pdl perldl">
+            <primary sortas="b-perldl">perldl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pptemplate">
+        <term><command>pptemplate</command></term>
+        <listitem>
+          <para>is a script to generate <filename>Makefile.PL</filename>
+          and PP file skeletons.</para>
+          <indexterm zone="pdl pptemplate">
+            <primary sortas="b-pptemplate">pptemplate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/pilot-link.xml
===================================================================
--- archive/pilot-link.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/pilot-link.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,203 @@
+<?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 pilot-link-download-http "http://downloads.pilot-link.org/pilot-link-&pilot-link-version;.tar.bz2">
+  <!ENTITY pilot-link-download-ftp  "&gentoo-ftp-repo;/pilot-link-&pilot-link-version;.tar.bz2">
+  <!ENTITY pilot-link-md5sum        "c1f4db8f32a2ee916fedb9a2dac8aa26">
+  <!ENTITY pilot-link-size          "964 KB">
+  <!ENTITY pilot-link-buildsize     "20 MB">
+  <!ENTITY pilot-link-time          "0.4 SBU">
+]>
+
+<sect1 id="pilot-link" xreflabel="pilot-link-&pilot-link-version;">
+  <?dbhtml filename="pilot-link.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>pilot-link-&pilot-link-version;</title>
+
+  <indexterm zone="pilot-link">
+    <primary sortas="a-Pilot-link">Pilot-link</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to pilot-link</title>
+
+    <para>The <application>pilot-link</application> package provides a suite of
+    tools containing a series of conduits, libraries, and language bindings for
+    moving information to and from your Palm device and your desktop or
+    server/workstation system, as well as across a network.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&pilot-link-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&pilot-link-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &pilot-link-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &pilot-link-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &pilot-link-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &pilot-link-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/pilot-link-&pilot-link-version;-bindings_fix-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">pilot-link Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="libpng"/>,
+    <xref linkend="popt"/>,
+    <xref linkend="libusb-compat"/>,
+    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
+    <xref linkend="tcl"/>,
+    <xref linkend="python2"/>,
+    <ulink url="http://www.bluez.org/">BlueZ</ulink>, and
+    <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/pilot-link"/></para>
+
+  </sect2>
+
+  <sect2 role="kernel" id="pilot-link-kernel">
+    <title>Kernel Configuration</title>
+
+    <indexterm zone="pilot-link pilot-link-kernel">
+      <primary sortas="d-USB-Palm-devices">USB Palm devices</primary>
+    </indexterm>
+
+    <para>You may need to configure the <quote>USB_SERIAL_VISOR</quote> device
+    into the kernel before your system can communicate with your Palm device.
+    Add this device by enabling the following kernel parameter setting and
+    rebuilding the kernel (and modules, if applicable):</para>
+
+<screen><literal>Device Drivers:
+  USB support:
+    USB Serial Converter support:
+      USB Handspring Visor / Palm m50x / Sony Client Driver</literal></screen>
+
+    <para>For additional information about connecting your USB Palm device,
+    see: <ulink url="http://www.pilot-link.org/README.usb"/>.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of pilot-link</title>
+
+    <para>Install <application>pilot-link</application> by running the following
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../pilot-link-&pilot-link-version;-bindings_fix-1.patch &amp;&amp;
+./configure --prefix=/usr \
+            --enable-threads \
+            --enable-conduits \
+            --with-perl &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 &amp;&amp;
+install -v -m755 -d /usr/share/doc/pilot-link-&pilot-link-version; &amp;&amp;
+install -v -m644 README doc/{README.*,TODO,CodingGuidelines} \
+                    /usr/share/doc/pilot-link-&pilot-link-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--enable-threads</parameter>: This parameter is required
+    to link the threading library into the build.</para>
+
+    <para><parameter>--enable-conduits</parameter>: This parameter is required
+    to build the userspace programs. Omit it if you only need the
+    <application>pilot-link</application> libraries.</para>
+
+    <para><parameter>--with-perl</parameter>: This parameter is required to
+    build the <application>Perl</application> bindings.</para>
+
+    <para><option>--with-java --with-tcl=/usr/lib
+    --with-python</option>: Use any or all of these options to enable the
+    respective language bindings desired.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Bindings</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+    <seglistitem>
+      <seg>pilot-650foto, pilot-addresses, pilot-clip, pilot-csd,
+      pilot-debugsh, pilot-dedupe, pilot-dlpsh, pilot-file, pilot-foto,
+      pilot-getram, pilot-getrom, pilot-getromtoken, pilot-hinotes,
+      pilot-ietf2datebook, pilot-install-datebook, pilot-install-expenses,
+      pilot-install-hinote, pilot-install-memo, pilot-install-netsync,
+      pilot-install-todo, pilot-install-todos, pilot-install-user,
+      pilot-memos, pilot-nredir, pilot-read-expenses, pilot-read-ical,
+      pilot-read-notepad, pilot-read-palmpix, pilot-read-screenshot,
+      pilot-read-todos, pilot-read-veo, pilot-reminders, pilot-schlep,
+      pilot-sync-plan, pilot-treofoto, pilot-undelete, pilot-wav,
+      pilot-xfer and optionally, pitclsh</seg>
+      <seg>libjpisock.so JDK library,
+      libpitcl.{so,a} <application>Tcl</application> library,
+      _pisock.so <application>Python</application> module and
+      Pilot.so <application>Perl</application> module</seg>
+      <seg>/usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/auto/PDA,
+      /usr/share/doc/pilot-link-0.12.2 and/usr/share/pilot-link</seg>
+    </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="pilot-link-programs">
+        <term><command>pilot-link programs and utilities</command></term>
+        <listitem>
+          <para>Describing the functionality of each
+          <application>pilot-link</application> program and utility would take several
+          pages. Instead, after you've installed the package, review the
+          <application>pilot-link</application> man page
+          (<command>man pilot-link</command>). If you wish to review before installing
+          the package, unpack the tarball and issue
+          <command>man doc/man/pilot-link.7.in</command>.</para>
+          <indexterm zone="pilot-link pilot-link-programs">
+            <primary sortas="b-pilot-link-programs">pilot-link programs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/poppler-014.xml
===================================================================
--- archive/poppler-014.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/poppler-014.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,231 @@
+<?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 poppler-014-download-http  "http://poppler.freedesktop.org/poppler-&poppler-014-version;.tar.gz">
+  <!ENTITY poppler-014-download-ftp   " ">
+  <!ENTITY poppler-014-md5sum         "a40fe96e1115f648ce4689e667743530">
+  <!ENTITY poppler-014-size           "1.7 MB">
+  <!-- these figures were for 6.7 with "most dependencies except Qt - that probably meant
+   without qt4, so leaving as best estimate -->
+  <!ENTITY poppler-014-buildsize      "137 MB">
+  <!ENTITY poppler-014-time           "1.3 SBU">
+]>
+
+<sect1 id="poppler-014" xreflabel="Poppler-&poppler-014-version;">
+  <?dbhtml filename="poppler-014.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Poppler-&poppler-014-version;</title>
+
+  <indexterm zone="poppler-014">
+    <primary sortas="a-Poppler-014">Poppler</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Poppler</title>
+
+    <para>The <application>Poppler</application> package contains a PDF
+    rendering library and command line tools used to manipulate PDF files.
+    This is useful for providing PDF rendering functionality as a shared
+    library.</para>
+
+    <para>This old version is usable by <xref linkend="kdegraphics"/>.  If you are not
+    building that package, please use <xref linkend="poppler"/>. The two versions of
+    <application>poppler</application> install similar programs, libraries, and
+    pkgconfig files.</para>
+
+    &lfs67_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&poppler-014-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&poppler-014-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &poppler-014-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &poppler-014-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &poppler-014-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &poppler-014-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Poppler Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="fontconfig"/>,
+    <xref linkend="pkgconfig"/>, and
+    <xref linkend="qt"/> (so that the
+    <filename class='libraryfile'>libpoppler-qt</filename> library is built)</para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended"><xref linkend="libjpeg"/>, <xref linkend="cairo"/>,
+     and <ulink url="http://www.openjpeg.org">OpenJPEG</ulink>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gtk2"/>,
+    <xref linkend="qt4"/>,
+    <xref linkend="curl"/>,
+    <xref linkend="libxml2"/>, and
+    <xref linkend="lcms"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/poppler-014"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Poppler</title>
+
+    <caution>
+      <para><application>Poppler</application> will overwrite command-line
+      utilities and man pages previously installed by the
+      <application>Xpdf</application> package. If you prefer to keep the
+      <application>Xpdf</application> versions of these files, pass the
+      <option>--disable-utils</option> parameter to the
+      <command>configure</command> command below.</para>
+    </caution>
+
+<screen><userinput>./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 &amp;&amp;
+install -v -m755 -d      /usr/share/doc/poppler-&poppler-014-version; &amp;&amp;
+install -v -m644 README* /usr/share/doc/poppler-&poppler-014-version;</userinput></screen>
+
+    <para>If you wish to download and install the optional encoding files to
+    render CJK and Cyrillic properly, please follow the instructions for the Additional
+    Encoding Data on the <xref linkend="poppler"/> page - this version of
+    <application>poppler</application> will automatically read them if they are
+    present when it runs.</para>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <!-- This is discouraged by the authors. There is built-in decompression
+         and zlib is not needed
+    <para><parameter>-enable-zlib</parameter>: This parameter forces the build
+    to link with the system-installed
+    <filename class='libraryfile'>libz</filename> library to enable compressed
+    PDF functionality.</para> -->
+
+    <para><parameter>--disable-cairo-output</parameter>: This parameter
+    disables building the <application>cairo</application> graphics backend.</para>
+
+    <para><parameter>--disable-poppler-glib</parameter> and
+    <parameter>--disable-gtk-test</parameter>: These parameters disable
+    building the <application>GLib</application> wrapper and
+    <application>GTK+</application> test program.</para>
+
+    <para><parameter>--disable-static</parameter>: Prevent static libraries
+    being built and installed.</para>
+
+    <para><parameter>--enable-xpdf-headers</parameter>: Install old
+    <application>Xpdf</application> headers required by certain programs. These
+    are unsupported by <application>Poppler</application>.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg><xref linkend="xpdf-content"/> for the pdf* programs</seg>
+        <seg>libpoppler.{so,a}, libpoppler-cpp.{so,a}, libpoppler-glib.{so,a}, libpoppler-qt.{so,a}
+        and libpoppler-qt4.{so,a}</seg>
+        <seg>/usr/include/poppler, /usr/share/doc/poppler-&poppler-version;,
+        /usr/share/gtk-doc/html/poppler and /usr/share/poppler</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libpoppler-014">
+        <term><filename class='libraryfile'>libpoppler.{so,a}</filename></term>
+        <listitem>
+          <para>contains the API functions to render PDF files.</para>
+          <indexterm zone="poppler-014 libpoppler-014">
+            <primary sortas="c-libpoppler">libpoppler.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpoppler-014-cpp">
+        <term><filename class='libraryfile'>libpoppler-cpp.{so,a}</filename></term>
+        <listitem>
+          <para>is a C++ backend for rendering PDF files.</para>
+          <indexterm zone="poppler-014 libpoppler-014-cpp">
+            <primary sortas="c-libpoppler-cpp">libpoppler-cpp.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpoppler-014-glib">
+        <term><filename class='libraryfile'>libpoppler-glib.{so,a}</filename></term>
+        <listitem>
+          <para>is a wrapper library used to interface the PDF rendering
+          functions with <application>GTK+</application>.</para>
+          <indexterm zone="poppler-014 libpoppler-014-glib">
+            <primary sortas="c-libpoppler-glib">libpoppler-glib.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpoppler-014-qt">
+        <term><filename class='libraryfile'>libpoppler-qt.{so,a}</filename></term>
+        <listitem>
+          <para>is a wrapper library used to interface the PDF rendering
+          functions with <application>Qt</application>.</para>
+          <indexterm zone="poppler-014 libpoppler-014-qt">
+            <primary sortas="c-libpoppler-qt">libpoppler-qt.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpoppler-014-qt4">
+        <term><filename class='libraryfile'>libpoppler-qt4.{so,a}</filename></term>
+        <listitem>
+          <para>is a wrapper library used to interface the PDF rendering
+          functions with <application>Qt</application>-4.</para>
+          <indexterm zone="poppler-014 libpoppler-014-qt4">
+            <primary sortas="c-libpoppler-qt4">libpoppler-qt4.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/recode.xml
===================================================================
--- archive/recode.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/recode.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY recode-download-http "http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6.orig.tar.gz">
+  <!-- <!ENTITY recode-download-ftp  "ftp://ftp.gnu.org/gnu/recode/recode-&recode-version;.tar.gz"> -->
+  <!ENTITY recode-download-ftp  " ">
+  <!ENTITY recode-md5sum        "be3f40ad2e93dae5cd5f628264bf1877">
+  <!ENTITY recode-size          "1.7 MB">
+  <!ENTITY recode-buildsize     "24 MB">
+  <!ENTITY recode-time          "0.1 SBU">
+]>
+
+<sect1 id="recode" xreflabel="Recode-&recode-version;">
+  <?dbhtml filename="recode.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Recode-&recode-version;</title>
+
+  <indexterm zone="recode">
+    <primary sortas="a-Recode">Recode</primary>
+  </indexterm>
+
+  <!--Required section-->
+  <sect2 role="package">
+    <title>Introduction to Recode</title>
+
+    <para>The <application>Recode</application> package contains a program for
+    converting text between character sets, and a library that exposes
+    this functionality to other applications. Note that the same functionality
+    (but with different API) is provided by <command>iconv</command>, which is
+    installed in LFS as a part of <application>Glibc</application>.</para>
+
+    <!-- This is not the case any longer. Apparently a new group has taken
+         interest in Recode and is planning future releases. See:
+         http://recode.progiciels-bpi.ca/
+    <note>
+      <para>The <application>Recode</application> package is no longer
+      maintained upstream. Wishlist bugs such as
+      <ulink url="http://bugs.debian.org/94966"/> will never be fixed.</para>
+    </note>
+    -->
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&recode-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&recode-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &recode-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &recode-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &recode-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &recode-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/recode-&recode-version;-fixes-2.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Recode Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="python2"/>
+    (for the <quote>bigauto</quote> test) and
+    <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/recode"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Recode</title>
+
+    <para>Install <application>Recode</application> by running the following
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../recode-&recode-version;-fixes-2.patch &amp;&amp;
+./configure --prefix=/usr --without-included-gettext &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue: <command>make check</command>. The
+    testsuite will warn about the <quote>bigauto</quote> test being
+    skipped. The editors did not attempt to run this test to the end, because
+    it uses obsolete Python constructions.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--without-included-gettext</parameter>: This parameter
+    forces the use of <function>gettext</function> implementation provided
+    by <application>Glibc</application> instead of the very old internal copy.
+    The internal copy produces incorrect output in UTF-8 locales.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>recode</seg>
+        <seg>librecode.{so,a}</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="recode-prog">
+        <term><command>recode</command></term>
+        <listitem>
+          <para>converts text between character sets.</para>
+          <indexterm zone="recode recode-prog">
+            <primary sortas="b-recode">recode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="librecode">
+        <term><filename class='libraryfile'>librecode.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions for character set conversion.</para>
+          <indexterm zone="recode librecode">
+            <primary sortas="c-librecode">librecode.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/rman.xml
===================================================================
--- archive/rman.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/rman.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -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 rman-download-http "&sourceforge-repo;/polyglotman/rman-3.2.tar.gz?download">
+  <!ENTITY rman-download-ftp  " ">
+  <!ENTITY rman-md5sum        "6d1d67641c6d042595a96a62340d3cc6">
+  <!ENTITY rman-size          "80 KB">
+  <!ENTITY rman-buildsize     "629 KB">
+  <!ENTITY rman-time          "0.1 SBU">
+]>
+
+<sect1 id="rman" xreflabel="rman-&rman-version;">
+  <?dbhtml filename="rman.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>rman-&rman-version;</title>
+
+  <indexterm zone="rman">
+    <primary sortas="a-rman">rman</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to rman</title>
+
+    <para><application>rman</application> is a utility to convert manual
+    pages into other formats.  It can currently supports HTML, ASCII, LaTeX,
+    LaTeX2e, RTF, POD, and partial DocBook XML output.</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&rman-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&rman-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &rman-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &rman-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &rman-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &rman-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url='&blfs-wiki;/rman'/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of rman</title>
+
+    <para>rman is no longer part of the <application>Xorg</application>
+    distribution, however, packages that use it may expect it to be in the
+    same location as your <application>Xorg</application> programs.  Adjust
+    the makefile to account for this:</para>
+
+<screen><userinput>sed -i -e "s@/opt/local@$XORG_PREFIX@" \
+    -e "s@/usr/local@$XORG_PREFIX@" Makefile</userinput></screen>
+
+    <para>Build <application>rman</application> by running the
+    following command:</para>
+
+<screen><userinput>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>
+
+      <seglistitem>
+        <seg>rman</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Description</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="rman-bin">
+        <term><filename>rman</filename></term>
+        <listitem>
+          <para>is a manpage converter.</para>
+          <indexterm zone="rman rman">
+            <primary sortas="b-rman">rman</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/scrollkeeper.xml
===================================================================
--- archive/scrollkeeper.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
+++ archive/scrollkeeper.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -0,0 +1,203 @@
+<?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 scrollkeeper-download-http "&gnome-download-http;/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
+  <!ENTITY scrollkeeper-download-ftp  "&gnome-download-ftp;/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
+  <!ENTITY scrollkeeper-md5sum        "b175e582a6cec3e50a9de73a5bb7455a">
+  <!ENTITY scrollkeeper-size          "546 KB">
+  <!ENTITY scrollkeeper-buildsize     "12 MB">
+  <!ENTITY scrollkeeper-time          "0.1 SBU">
+]>
+
+<sect1 id="scrollkeeper" xreflabel="ScrollKeeper-&scrollkeeper-version;">
+  <?dbhtml filename="scrollkeeper.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>ScrollKeeper-&scrollkeeper-version;</title>
+
+  <indexterm zone="scrollkeeper">
+    <primary sortas="a-ScrollKeeper">ScrollKeeper</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to ScrollKeeper</title>
+
+    <para>The <application>ScrollKeeper</application> package contains a
+    cataloging system for documentation. This is useful for managing
+    documentation metadata and providing an API to help browsers find, sort
+    and search the document catalog.</para>
+
+    &lfs67_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&scrollkeeper-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&scrollkeeper-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &scrollkeeper-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &scrollkeeper-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &scrollkeeper-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &scrollkeeper-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">ScrollKeeper Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="libxslt"/>,
+    <xref linkend="DocBook"/>, and
+    <xref linkend="perl-xml-parser"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="intltool"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/scrollkeeper"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of ScrollKeeper</title>
+
+    <para>Install <application>ScrollKeeper</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --disable-static \
+            --with-omfdirs=/usr/share/omf:\
+/opt/kde-&kde-version;/share/omf:\
+/opt/gnome-&gnome-version;&gnome-minor-version;/share/omf &amp;&amp;
+
+make</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--sysconfdir=/etc</parameter>: This switch puts the
+    configuration files in <filename class="directory">/etc</filename>
+    instead of <filename class='directory'>/usr/etc</filename>.</para>
+
+    <para><parameter>--localstatedir=/var</parameter>: This switch puts
+    <application>ScrollKeeper</application>'s database directory in
+    <filename class="directory">/var/lib/scrollkeeper</filename>.</para>
+
+    <para><parameter>--disable-static</parameter>: This switch prevents
+    the static library from being built.</para>
+
+    <para><parameter>--with-omfdirs=...</parameter>: This switch defines the
+    locations of <filename>OMF</filename> files for
+    <application>ScrollKeeper</application>. Change the locations if you have
+    <application>KDE</application> and/or <application>GNOME</application>-2
+    installed in a prefix other than the ones shown. This information is stored
+    in <filename>/etc/scrollkeeper.conf</filename> and can be updated manually,
+    if necessary.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring ScrollKeeper</title>
+
+    <sect3 id="scrollkeeper-config">
+      <title>Config Files</title>
+
+      <para><filename>/etc/scrollkeeper.conf</filename></para>
+
+      <indexterm zone="scrollkeeper scrollkeeper-config">
+        <primary sortas="e-etc-scrollkeeper.conf">/etc/scrollkeeper.conf</primary>
+      </indexterm>
+
+    </sect3>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>The configuration file sets the <envar>OMF_DIR</envar> variable
+      to the location of all of the <filename class="directory">omf</filename>
+      directories in the system. This was set in the
+      <command>configure</command> command so no further action is needed until
+      another <filename>OMF</filename> directory is created.</para>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>scrollkeeper-config, scrollkeeper-extract, scrollkeeper-gen-seriesid,
+        scrollkeeper-get-cl, scrollkeeper-get-content-list,
+        scrollkeeper-get-extended-content-list, scrollkeeper-get-index-from-docpath,
+        scrollkeeper-get-toc-from-docpath, scrollkeeper-get-toc-from-id,
+        scrollkeeper-install, scrollkeeper-preinstall, scrollkeeper-rebuilddb,
+        scrollkeeper-uninstall, and scrollkeeper-update</seg>
+        <seg>libscrollkeeper.so</seg>
+        <seg>/usr/share/doc/scrollkeeper-&scrollkeeper-version;,
+        /usr/share/{omf, {,xml/}scrollkeeper}, and
+        /var/lib/scrollkeeper</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry>
+        <term><command>ScrollKeeper utility programs</command></term>
+        <listitem>
+          <para>The <application>ScrollKeeper</application> utility programs
+          and scripts listed above are for performing installation, building,
+          getting and updating table of contents files.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libscrollkeeper">
+        <term><filename class='libraryfile'>libscrollkeeper.so</filename></term>
+        <listitem>
+          <para>provides the API necessary for help
+          browsers to interact with documentation written to utilize
+          <application>ScrollKeeper</application>.</para>
+          <indexterm zone="scrollkeeper libscrollkeeper">
+            <primary sortas="c-libscrollkeeper">libscrollkeeper.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: neral/genlib/clucene.xml
===================================================================
--- general/genlib/clucene.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY clucene-download-http "&sourceforge-repo;/clucene/clucene-core-&clucene-version;.tar.bz2">
-  <!ENTITY clucene-download-ftp  " ">
-  <!ENTITY clucene-md5sum        "ba1a8f764a2ca19c66ad907dddd88352">
-  <!ENTITY clucene-size          "1.5 MB">
-  <!ENTITY clucene-buildsize     "45 MB">
-  <!ENTITY clucene-time          "1 SBU">
-]>
-
-<sect1 id="clucene" xreflabel="clucene-&clucene-version;">
-  <?dbhtml filename="clucene.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>CLucene-&clucene-version;</title>
-
-  <indexterm zone="clucene">
-    <primary sortas="l-clucene">clucene</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CLucene</title>
-
-    <para><application>CLucene</application> is a C++ version of Lucene, a 
-    high performance text search engine.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&clucene-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&clucene-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &clucene-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &clucene-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &clucene-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &clucene-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/clucene-&clucene-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">clucene Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="net-tools"/>
-    </para>
--->
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/clucene"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CLucene</title>
-
-    <para>Install <application>clucene</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libclucene.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-automoc4">
-        <term><command>automoc4</command></term>
-        <listitem>
-          <para>is a testing utility for clucene-generated build trees.</para>
-          <indexterm zone="a-automoc4 automoc4">
-            <primary sortas="b-automoc4">automoc4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ general/genlib/genlib.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -49,5 +49,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxml2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgtkhtml.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm.xml"/>
@@ -79,11 +78,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtasn1.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunique.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liboil.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nspr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gobject-introspection.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libical.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libelf.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libggz.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdaemon.xml"/>
@@ -96,5 +92,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-mission-control.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clucene.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boost.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qca.xml"/>
@@ -105,6 +100,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exempi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ispell.xml"/> -->
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gwrap.xml"/> -->
 
 </chapter>
Index: neral/genlib/gwrap.xml
===================================================================
--- general/genlib/gwrap.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,187 +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 gwrap-download-http "http://www.gnucash.org/pub/g-wrap/source/g-wrap-&gwrap-version;.tar.gz">
-  <!ENTITY gwrap-download-ftp  "&gentoo-ftp-repo;/g-wrap-&gwrap-version;.tar.gz">
-  <!ENTITY gwrap-md5sum        "bf29b8b563cc27d9f7fd90a6243653aa">
-  <!ENTITY gwrap-size          "403 KB">
-  <!ENTITY gwrap-buildsize     "6.0 MB">
-  <!ENTITY gwrap-time          "0.2 SBU">
-]>
-
-<sect1 id="gwrap" xreflabel="G-Wrap-&gwrap-version;">
-  <?dbhtml filename="gwrap.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>G-Wrap-&gwrap-version;</title>
-
-  <indexterm zone="gwrap">
-    <primary sortas="a-G-Wrap">G-Wrap</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to G-Wrap</title>
-
-    <para>The <application>G-Wrap</application> package contains tools for
-    exporting <application>C</application> libraries into
-    <application>Scheme</application> interpreters.</para>
-
-    <!-- The version used here is
-    considered a development version, however it has been confirmed to be a
-    reliable replacement for the 'stable' version. The 'stable' version of
-    <application>G-Wrap</application> will not build against the recent
-    versions of <application>Guile</application> and
-    <application>SLIB</application> and there will be no further development
-    in the 'stable' series. For further information, please visit the
-    <application>G-Wrap</application> homepage at
-    <ulink url="http://www.nongnu.org/g-wrap/"/>.</para> -->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&gwrap-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&gwrap-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &gwrap-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &gwrap-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &gwrap-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &gwrap-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">G-Wrap Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="slib"/> and
-    <xref linkend="GLib"/></para>
-
-    <!-- <para>If you are building <application>G-Wrap</application> as a dependency
-    for <application>GnuCash</application>, ensure you have
-    <application>GLib</application>-1 installed and you pass the
-    <envar>GLIB_XXX</envar> environment variables to the
-    <command>configure</command> script as shown below.</para> -->
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><ulink
-    url="http://www.gnu.org/software/guile-gtk/">guile-gtk</ulink> and
-    <xref linkend="libffi"/> or <xref linkend="gcc"/> (build Java so that
-    <filename class='libraryfile'>libffi</filename> is built)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/gwrap"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of G-Wrap</title>
-
-    <para>Install <application>G-Wrap</application> by running the following
-    commands:</para>
-
-<!-- <screen><userinput>GLIB_CFLAGS=$(glib-config -\-cflags) \
-GLIB_LIBS=$(glib-config -\-libs) \ -->
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>If you have <xref linkend="texlive"/> installed and wish to create
-    alternate formats of the documentation, issue the following
-    commands:</para>
-
-<screen><userinput>cd doc &amp;&amp;
-texi2pdf g-wrap.texi &amp;&amp;
-texi2html g-wrap.texi &amp;&amp;
-makeinfo --plaintext -o g-wrap.txt g-wrap.texi &amp;&amp;
-mv texinfo.tex texinfo.tex.SAVE &amp;&amp;
-texi2dvi g-wrap.texi &amp;&amp;
-dvips -o g-wrap.ps g-wrap.dvi &amp;&amp;
-cd ..</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>
-
-    <para>If you created the alternate formats of the documentation, install
-    it using the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/g-wrap-&gwrap-version; &amp;&amp;
-install -v -m644 doc/g-wrap.{pdf,html,txt,dvi,ps} \
-                 /usr/share/doc/g-wrap-&gwrap-version;</userinput></screen>
-  </sect2>
-
-  <!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>GLIB_CFLAGS=$(glib-config ...) GLIB_LIBS=$(glib-config ...)
-    ./configure ...</command>: The <command>configure</command> script does
-    not pull in the proper <application>GLib</application>-1
-    <envar>CFLAGS</envar> and <envar>LIBS</envar> parameters so
-    <command>glib-config</command> is used to set them. Omit setting them like
-    this if you are not building <application>G-Wrap</application> as a
-    dependency for <application>GnuCash</application> and only issue the
-    <command>./configure</command> command instead.</para>
-
-  </sect2>
-  -->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>g-wrap-config</seg>
-        <seg>libgw-glib.{so,a}, libgw-gtk.{so,a}, libgw-standard.{so,a},
-        libgw-wct.{so,a}, libgwrap-glib.{so,a} and libgwrap-wct.{so,a}</seg>
-        <!-- <seg>/usr/lib/libffi.{so,a}, /usr/lib/libgw-guile-*.{so,a} and
-        /usr/lib/libgwrap-*.{so,a}</seg> -->
-        <seg>/usr/include/g-wrap, /usr/share/doc/g-wrap-&gwrap-version; and
-        /usr/share/guile/site</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="g-wrap-config">
-        <term><command>g-wrap-config</command></term>
-        <listitem>
-          <para>is a tool to generate <envar>CFLAGS</envar> for linking
-          <application>C</application> code to the
-          <application>Scheme</application> runtime libraries.</para>
-          <indexterm zone="gwrap g-wrap-config">
-            <primary sortas="b-g-wrap-config">g-wrap-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/ispell.xml
===================================================================
--- general/genlib/ispell.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(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;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY ispell-download-http "http://membled.com/work/patches/ispell/ispell-&ispell-version;.tar.bz2">
-  <!ENTITY ispell-download-ftp " ">
-  <!ENTITY ispell-md5sum "d5d867e62776524f60b3b5dcc3d8014f">
-  <!ENTITY ispell-size "1.2 MB">
-  <!ENTITY ispell-buildsize "11 MB">
-  <!ENTITY ispell-time "less than 0.1 SBU">
-]>
-
-<sect1 id="ispell" xreflabel="ispell-&ispell-version;">
-  <?dbhtml filename="ispell.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Ispell-&ispell-version;</title>
-
-  <indexterm zone="ispell">
-    <primary sortas="a-Ispell">Ispell</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Ispell</title>
-
-    <para>The <application>ispell</application> package contains a spell
-    checker that can handle international languages.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ispell-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ispell-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ispell-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ispell-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ispell-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ispell-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ispell"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ispell</title>
-
-    <para>The first step is to create <filename>local.h</filename>.</para>
-
-<screen><userinput>sed -e "s:/usr/local:/usr:g" -e "s:/lib:/share/ispell:" \
-    local.h.linux > local.h</userinput></screen>
-
-    <para>By default, <application>ispell</application> only installs an American
-    English dictionary. To set up other languages, check out the
-    <filename>config.X</filename> file for the #define entry to append to
-    <filename>local.h</filename>.</para>
-
-    <para>Build <application>ispell</application> using the
-    following commands:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>To test the build, issue: <command>make test</command>.</para>
-
-    <para>Now, as the <systemitem class='username'>root</systemitem> user:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -e "s:/usr/local:/usr:g" -e "s:/lib:/share/ispell:"
-    local.h.linux > local.h</command>: This command corrects the
-    installation directories of the package.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>ispell</seg>
-        <seg>None</seg>
-        <seg>/usr/share/ispell</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ispell-prog">
-        <term><command>ispell</command></term>
-        <listitem>
-          <para>is used for spell checking.</para>
-          <indexterm zone="ispell ispell-prog">
-            <primary sortas="b-ispell">ispell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libelf.xml
===================================================================
--- general/genlib/libelf.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,115 +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 libelf-download-http "http://www.mr511.de/software/libelf-&libelf-version;.tar.gz">
-  <!ENTITY libelf-download-ftp  " ">
-  <!ENTITY libelf-md5sum        "4136d7b4c04df68b686570afa26988ac">
-  <!ENTITY libelf-size          "145 KB">
-  <!ENTITY libelf-buildsize     "3 MB">
-  <!ENTITY libelf-time          "0.1 SBU">
-]>
-
-<sect1 id="libelf" xreflabel="libelf-&libelf-version;">
-  <?dbhtml filename="libelf.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libelf-&libelf-version;</title>
-
-  <indexterm zone="libelf">
-    <primary sortas="a-libelf">libelf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libelf</title>
-
-    <para>The <application>libelf</application> package is a object file access
-    library. It lets you read, modify or create ELF files in an
-    architecture-independent way.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libelf-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libelf-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libelf-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libelf-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libelf-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libelf-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libelf"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libelf</title>
-
-    <para>Install <application>libelf</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 Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libelf.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libelf-lib">
-        <term><filename class='libraryfile'>libelf.{so,a}</filename></term>
-        <listitem>
-          <para>contains the <application>libelf</application> API
-          functions.</para>
-          <indexterm zone="libelf libelf-lib">
-            <primary sortas="c-libelf">libelf.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libggz.xml
===================================================================
--- general/genlib/libggz.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,130 +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 libggz-download-http "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/&libggz-version;/libggz-&libggz-version;.tar.gz">
-  <!ENTITY libggz-download-ftp  "ftp://ftp.belnet.be/packages/ggzgamingzone/ggz/&libggz-version;/libggz-&libggz-version;.tar.gz">
-  <!ENTITY libggz-md5sum        "603739504648833779aa13b0327a1c3d">
-  <!ENTITY libggz-size          "466 KB">
-  <!ENTITY libggz-buildsize     "5 MB">
-  <!ENTITY libggz-time          "0.1 SBU">
-]>
-
-<sect1 id="libggz" xreflabel="libggz-&libggz-version;">
-  <?dbhtml filename="libggz.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libggz-&libggz-version;</title>
-
-  <indexterm zone="libggz">
-    <primary sortas="a-libggz">libggz</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libggz</title>
-
-    <para>The <application>libggz</application> package is the GGZ base library,
-    used by the GGZ Gaming Zone server (ggzd), the ggzcore library and other
-    components.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libggz-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libggz-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libggz-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libggz-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libggz-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libggz-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libggz Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gnutls"/>,
-    <xref linkend="libgcrypt"/>, and
-    <xref linkend="openssl"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libggz"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libggz</title>
-
-    <para>Install <application>libggz</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --with-tls &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--with-tls</parameter>: This parameter will automatically
-    select the use of either GnuTLS or OpenSSL if available.</para>
-
-  </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>libggz.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libggz-lib">
-        <term><filename class='libraryfile'>libggz.{so,a}</filename></term>
-        <listitem>
-          <para>contains the libggz API functions.</para>
-          <indexterm zone="libggz libggz-lib">
-            <primary sortas="c-libggz">libggz.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/libgtkhtml.xml
===================================================================
--- general/genlib/libgtkhtml.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,128 +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 libgtkhtml-download-http "&gnome-download-http;/libgtkhtml/2.11/libgtkhtml-&libgtkhtml-version;.tar.bz2">
-  <!ENTITY libgtkhtml-download-ftp  "&gnome-download-ftp;/libgtkhtml/2.11/libgtkhtml-&libgtkhtml-version;.tar.bz2">
-  <!ENTITY libgtkhtml-md5sum        "a1d1a197dcff8c4571659deef5495e24">
-  <!ENTITY libgtkhtml-size          "597 KB">
-  <!ENTITY libgtkhtml-buildsize     "36 MB">
-  <!ENTITY libgtkhtml-time          "0.8 SBU">
-]>
-
-<sect1 id="libgtkhtml" xreflabel="libgtkhtml-&libgtkhtml-version;">
-  <?dbhtml filename="libgtkhtml.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libgtkhtml-&libgtkhtml-version;</title>
-
-  <indexterm zone="libgtkhtml">
-    <primary sortas="a-Libgtkhtml">Libgtkhtml</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgtkhtml</title>
-
-    <para>The <application>libgtkhtml</application> package contains the
-    <filename class="libraryfile">libgtkhtml-2</filename> library. This
-    library provides an API for rendering HTML.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libgtkhtml-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libgtkhtml-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libgtkhtml-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libgtkhtml-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libgtkhtml-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libgtkhtml-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgtkhtml Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk2"/> and
-    <xref linkend="libxml2"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!--<xref linkend="gail"/> and
-      Gail no longer required since libgailutil is now part of GTK+.-->
-    <xref linkend="gnome-vfs"/> (only used in the test suite)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libgtkhtml"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgtkhtml</title>
-
-    <para>Install <application>libgtkhtml</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. You can run a test
-    program which includes many test cases; if desired, issue:
-    <command>( cd tests; ./testgtkhtml )</command></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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libgtkhtml-2.{so,a}</seg>
-        <seg>/usr/include/gtkhtml-2.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtkhtml-2">
-        <term><filename class='libraryfile'>libgtkhtml-2.{so,a}</filename></term>
-        <listitem>
-          <para>provides the functions necessary to render and/or
-          edit HTML.</para>
-          <indexterm zone="libgtkhtml libgtkhtml-2">
-            <primary sortas="c-libgtkhtml-2">libgtkhtml-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/liboil.xml
===================================================================
--- general/genlib/liboil.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,140 +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 liboil-download-http "http://liboil.freedesktop.org/download/liboil-&liboil-version;.tar.gz">
-  <!ENTITY liboil-download-ftp  " ">
-  <!ENTITY liboil-md5sum        "47dc734f82faeb2964d97771cfd2e701">
-  <!ENTITY liboil-size          "912 KB">
-  <!ENTITY liboil-buildsize     "34 MB">
-  <!ENTITY liboil-time          "0.5 SBU">
-]>
-
-<sect1 id="liboil" xreflabel="liboil-&liboil-version;">
-  <?dbhtml filename="liboil.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>liboil-&liboil-version;</title>
-
-  <indexterm zone="liboil">
-    <primary sortas="a-liboil">liboil</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liboil</title>
-
-    <para><application>Liboil</application> is a library of simple
-    functions that are optimized for various CPUs.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&liboil-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&liboil-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &liboil-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &liboil-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &liboil-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &liboil-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">liboil Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="pkgconfig"/> and
-    <xref linkend="gtk-doc"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/liboil"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liboil</title>
-
-    <para>Install <application>liboil</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>oil-bugreport</seg>
-        <seg>liboil-0.3{so,a}</seg>
-        <seg>/usr/include/liboil-0.3 and
-        /usr/share/gtk-doc/html/liboil</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="oil-bugreport">
-        <term><command>oil-bugreport</command></term>
-        <listitem>
-          <para>prints out API function stats.</para>
-          <indexterm zone="liboil oil-bugreport">
-            <primary sortas="b-oil-bugreport">oil-bugreport</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liboil-0.3">
-        <term><filename class='libraryfile'>liboil-0.3.{so,a}</filename></term>
-        <listitem>
-          <para>contains the liboil API functions.</para>
-          <indexterm zone="liboil liboil-0.3">
-            <primary sortas="c-liboil-0.3">liboil-0.3.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ general/genutils/genutils.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -29,5 +29,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hd2u.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-doc.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scrollkeeper.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="screen.xml"/>
@@ -35,10 +34,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop-file-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xscreensaver.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pilot-link.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unixodbc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libiodbc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphviz.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rman.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="recode.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icon-naming-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rxvt-unicode.xml"/>
@@ -46,5 +42,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rarian.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ggz-client-libs.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr-util.xml"/>
 
Index: neral/genutils/ggz-client-libs.xml
===================================================================
--- general/genutils/ggz-client-libs.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,174 +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 ggz-client-libs-download-http "http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/&ggz-client-libs-version;/ggz-client-libs-&ggz-client-libs-version;.tar.gz">
-  <!ENTITY ggz-client-libs-download-ftp  "ftp://ftp.belnet.be/packages/ggzgamingzone/ggz/&ggz-client-libs-version;/ggz-client-libs-&ggz-client-libs-version;.tar.gz">
-  <!ENTITY ggz-client-libs-md5sum        "299eaa93721b1d867b5bf7dc6ac764b0">
-  <!ENTITY ggz-client-libs-size          "600 KB">
-  <!ENTITY ggz-client-libs-buildsize     "8 MB">
-  <!ENTITY ggz-client-libs-time          "0.2 SBU">
-]>
-
-<sect1 id="ggz-client-libs" xreflabel="ggz-client-libs-&ggz-client-libs-version;">
-  <?dbhtml filename="ggz-client-libs.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>ggz-client-libs-&ggz-client-libs-version;</title>
-
-  <indexterm zone="ggz-client-libs">
-    <primary sortas="a-ggz-client-libs">ggz-client-libs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ggz-client-libs</title>
-
-    <para>The <application>ggz-client-libs</application> package provides the
-    common procedures and utilities required to run the GGZ client and games.
-    The routines are shared by other modules in order to ease coding and promote
-    compatibility and stability.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&ggz-client-libs-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&ggz-client-libs-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &ggz-client-libs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &ggz-client-libs-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &ggz-client-libs-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &ggz-client-libs-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ggz-client-libs Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="expat"/> and
-    <xref linkend="libggz"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/ggz-client-libs"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ggz-client-libs</title>
-
-    <para>Install <application>ggz-client-libs</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>ggz, ggz-config, ggz-wrapper, and ggzwrap</seg>
-        <seg>libggzcore.{so,a} and libggzmod.{so,a}</seg>
-        <seg>/usr/lib/ggz</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ggz">
-        <term><command>ggz</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone core client selector.</para>
-          <indexterm zone="ggz-client-libs ggz">
-            <primary sortas="b-ggz">ggz</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ggz-config">
-        <term><command>ggz-config</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone configuration manager.</para>
-          <indexterm zone="ggz-client-libs ggz-config">
-            <primary sortas="b-ggz-config">ggz-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ggz-wrapper">
-        <term><command>ggz-wrapper</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone command line core client.</para>
-          <indexterm zone="ggz-client-libs ggz-wrapper">
-            <primary sortas="b-ggz-wrapper">ggz-wrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ggzwrap">
-        <term><command>ggzwrap</command></term>
-        <listitem>
-          <para>is the GGZ Gaming Zone game client wrapper.</para>
-          <indexterm zone="ggz-client-libs ggzwrap">
-            <primary sortas="b-ggzwrap">ggzwrap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libggzcore">
-        <term><filename class='libraryfile'>libggzcore.{so,a}</filename></term>
-        <listitem>
-          <para>handles the connection of a client application to the GGZ
-          server.</para>
-          <indexterm zone="ggz-client-libs libggzcore">
-            <primary sortas="c-libggzcore">libggzcore.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libggzmod">
-        <term><filename class='libraryfile'>libggzmod.{so,a}</filename></term>
-        <listitem>
-          <para>facilitates the messaging from and to a GGZ core client in a
-          game client.</para>
-          <indexterm zone="ggz-client-libs libggzmod">
-            <primary sortas="c-libggzmod">libggzmod.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/pilot-link.xml
===================================================================
--- general/genutils/pilot-link.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,203 +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 pilot-link-download-http "http://downloads.pilot-link.org/pilot-link-&pilot-link-version;.tar.bz2">
-  <!ENTITY pilot-link-download-ftp  "&gentoo-ftp-repo;/pilot-link-&pilot-link-version;.tar.bz2">
-  <!ENTITY pilot-link-md5sum        "c1f4db8f32a2ee916fedb9a2dac8aa26">
-  <!ENTITY pilot-link-size          "964 KB">
-  <!ENTITY pilot-link-buildsize     "20 MB">
-  <!ENTITY pilot-link-time          "0.4 SBU">
-]>
-
-<sect1 id="pilot-link" xreflabel="pilot-link-&pilot-link-version;">
-  <?dbhtml filename="pilot-link.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>pilot-link-&pilot-link-version;</title>
-
-  <indexterm zone="pilot-link">
-    <primary sortas="a-Pilot-link">Pilot-link</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to pilot-link</title>
-
-    <para>The <application>pilot-link</application> package provides a suite of
-    tools containing a series of conduits, libraries, and language bindings for
-    moving information to and from your Palm device and your desktop or
-    server/workstation system, as well as across a network.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&pilot-link-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&pilot-link-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &pilot-link-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &pilot-link-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &pilot-link-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &pilot-link-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/pilot-link-&pilot-link-version;-bindings_fix-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">pilot-link Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="libpng"/>,
-    <xref linkend="popt"/>,
-    <xref linkend="libusb-compat"/>,
-    <xref linkend="icedtea6"/> or <xref linkend="jdk"/>,
-    <xref linkend="tcl"/>,
-    <xref linkend="python2"/>,
-    <ulink url="http://www.bluez.org/">BlueZ</ulink>, and
-    <ulink url="http://perens.com/FreeSoftware/">Electric Fence</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/pilot-link"/></para>
-
-  </sect2>
-
-  <sect2 role="kernel" id="pilot-link-kernel">
-    <title>Kernel Configuration</title>
-
-    <indexterm zone="pilot-link pilot-link-kernel">
-      <primary sortas="d-USB-Palm-devices">USB Palm devices</primary>
-    </indexterm>
-
-    <para>You may need to configure the <quote>USB_SERIAL_VISOR</quote> device
-    into the kernel before your system can communicate with your Palm device.
-    Add this device by enabling the following kernel parameter setting and
-    rebuilding the kernel (and modules, if applicable):</para>
-
-<screen><literal>Device Drivers:
-  USB support:
-    USB Serial Converter support:
-      USB Handspring Visor / Palm m50x / Sony Client Driver</literal></screen>
-
-    <para>For additional information about connecting your USB Palm device,
-    see: <ulink url="http://www.pilot-link.org/README.usb"/>.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of pilot-link</title>
-
-    <para>Install <application>pilot-link</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../pilot-link-&pilot-link-version;-bindings_fix-1.patch &amp;&amp;
-./configure --prefix=/usr \
-            --enable-threads \
-            --enable-conduits \
-            --with-perl &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 &amp;&amp;
-install -v -m755 -d /usr/share/doc/pilot-link-&pilot-link-version; &amp;&amp;
-install -v -m644 README doc/{README.*,TODO,CodingGuidelines} \
-                    /usr/share/doc/pilot-link-&pilot-link-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--enable-threads</parameter>: This parameter is required
-    to link the threading library into the build.</para>
-
-    <para><parameter>--enable-conduits</parameter>: This parameter is required
-    to build the userspace programs. Omit it if you only need the
-    <application>pilot-link</application> libraries.</para>
-
-    <para><parameter>--with-perl</parameter>: This parameter is required to
-    build the <application>Perl</application> bindings.</para>
-
-    <para><option>--with-java --with-tcl=/usr/lib
-    --with-python</option>: Use any or all of these options to enable the
-    respective language bindings desired.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Bindings</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-    <seglistitem>
-      <seg>pilot-650foto, pilot-addresses, pilot-clip, pilot-csd,
-      pilot-debugsh, pilot-dedupe, pilot-dlpsh, pilot-file, pilot-foto,
-      pilot-getram, pilot-getrom, pilot-getromtoken, pilot-hinotes,
-      pilot-ietf2datebook, pilot-install-datebook, pilot-install-expenses,
-      pilot-install-hinote, pilot-install-memo, pilot-install-netsync,
-      pilot-install-todo, pilot-install-todos, pilot-install-user,
-      pilot-memos, pilot-nredir, pilot-read-expenses, pilot-read-ical,
-      pilot-read-notepad, pilot-read-palmpix, pilot-read-screenshot,
-      pilot-read-todos, pilot-read-veo, pilot-reminders, pilot-schlep,
-      pilot-sync-plan, pilot-treofoto, pilot-undelete, pilot-wav,
-      pilot-xfer and optionally, pitclsh</seg>
-      <seg>libjpisock.so JDK library,
-      libpitcl.{so,a} <application>Tcl</application> library,
-      _pisock.so <application>Python</application> module and
-      Pilot.so <application>Perl</application> module</seg>
-      <seg>/usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/auto/PDA,
-      /usr/share/doc/pilot-link-0.12.2 and/usr/share/pilot-link</seg>
-    </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pilot-link-programs">
-        <term><command>pilot-link programs and utilities</command></term>
-        <listitem>
-          <para>Describing the functionality of each
-          <application>pilot-link</application> program and utility would take several
-          pages. Instead, after you've installed the package, review the
-          <application>pilot-link</application> man page
-          (<command>man pilot-link</command>). If you wish to review before installing
-          the package, unpack the tarball and issue
-          <command>man doc/man/pilot-link.7.in</command>.</para>
-          <indexterm zone="pilot-link pilot-link-programs">
-            <primary sortas="b-pilot-link-programs">pilot-link programs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/recode.xml
===================================================================
--- general/genutils/recode.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,167 +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 recode-download-http "http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6.orig.tar.gz">
-  <!-- <!ENTITY recode-download-ftp  "ftp://ftp.gnu.org/gnu/recode/recode-&recode-version;.tar.gz"> -->
-  <!ENTITY recode-download-ftp  " ">
-  <!ENTITY recode-md5sum        "be3f40ad2e93dae5cd5f628264bf1877">
-  <!ENTITY recode-size          "1.7 MB">
-  <!ENTITY recode-buildsize     "24 MB">
-  <!ENTITY recode-time          "0.1 SBU">
-]>
-
-<sect1 id="recode" xreflabel="Recode-&recode-version;">
-  <?dbhtml filename="recode.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Recode-&recode-version;</title>
-
-  <indexterm zone="recode">
-    <primary sortas="a-Recode">Recode</primary>
-  </indexterm>
-
-  <!--Required section-->
-  <sect2 role="package">
-    <title>Introduction to Recode</title>
-
-    <para>The <application>Recode</application> package contains a program for
-    converting text between character sets, and a library that exposes
-    this functionality to other applications. Note that the same functionality
-    (but with different API) is provided by <command>iconv</command>, which is
-    installed in LFS as a part of <application>Glibc</application>.</para>
-
-    <!-- This is not the case any longer. Apparently a new group has taken
-         interest in Recode and is planning future releases. See:
-         http://recode.progiciels-bpi.ca/
-    <note>
-      <para>The <application>Recode</application> package is no longer
-      maintained upstream. Wishlist bugs such as
-      <ulink url="http://bugs.debian.org/94966"/> will never be fixed.</para>
-    </note>
-    -->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&recode-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&recode-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &recode-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &recode-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &recode-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &recode-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/recode-&recode-version;-fixes-2.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Recode Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="python2"/>
-    (for the <quote>bigauto</quote> test) and
-    <ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/recode"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Recode</title>
-
-    <para>Install <application>Recode</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../recode-&recode-version;-fixes-2.patch &amp;&amp;
-./configure --prefix=/usr --without-included-gettext &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue: <command>make check</command>. The
-    testsuite will warn about the <quote>bigauto</quote> test being
-    skipped. The editors did not attempt to run this test to the end, because
-    it uses obsolete Python constructions.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--without-included-gettext</parameter>: This parameter
-    forces the use of <function>gettext</function> implementation provided
-    by <application>Glibc</application> instead of the very old internal copy.
-    The internal copy produces incorrect output in UTF-8 locales.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>recode</seg>
-        <seg>librecode.{so,a}</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="recode-prog">
-        <term><command>recode</command></term>
-        <listitem>
-          <para>converts text between character sets.</para>
-          <indexterm zone="recode recode-prog">
-            <primary sortas="b-recode">recode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librecode">
-        <term><filename class='libraryfile'>librecode.{so,a}</filename></term>
-        <listitem>
-          <para>contains functions for character set conversion.</para>
-          <indexterm zone="recode librecode">
-            <primary sortas="c-librecode">librecode.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/rman.xml
===================================================================
--- general/genutils/rman.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(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 rman-download-http "&sourceforge-repo;/polyglotman/rman-3.2.tar.gz?download">
-  <!ENTITY rman-download-ftp  " ">
-  <!ENTITY rman-md5sum        "6d1d67641c6d042595a96a62340d3cc6">
-  <!ENTITY rman-size          "80 KB">
-  <!ENTITY rman-buildsize     "629 KB">
-  <!ENTITY rman-time          "0.1 SBU">
-]>
-
-<sect1 id="rman" xreflabel="rman-&rman-version;">
-  <?dbhtml filename="rman.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>rman-&rman-version;</title>
-
-  <indexterm zone="rman">
-    <primary sortas="a-rman">rman</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to rman</title>
-
-    <para><application>rman</application> is a utility to convert manual
-    pages into other formats.  It can currently supports HTML, ASCII, LaTeX,
-    LaTeX2e, RTF, POD, and partial DocBook XML output.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&rman-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&rman-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &rman-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &rman-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &rman-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &rman-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/rman'/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of rman</title>
-
-    <para>rman is no longer part of the <application>Xorg</application>
-    distribution, however, packages that use it may expect it to be in the
-    same location as your <application>Xorg</application> programs.  Adjust
-    the makefile to account for this:</para>
-
-<screen><userinput>sed -i -e "s@/opt/local@$XORG_PREFIX@" \
-    -e "s@/usr/local@$XORG_PREFIX@" Makefile</userinput></screen>
-
-    <para>Build <application>rman</application> by running the
-    following command:</para>
-
-<screen><userinput>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>
-
-      <seglistitem>
-        <seg>rman</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Description</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rman-bin">
-        <term><filename>rman</filename></term>
-        <listitem>
-          <para>is a manpage converter.</para>
-          <indexterm zone="rman rman">
-            <primary sortas="b-rman">rman</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/genutils/scrollkeeper.xml
===================================================================
--- general/genutils/scrollkeeper.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,203 +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 scrollkeeper-download-http "&gnome-download-http;/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
-  <!ENTITY scrollkeeper-download-ftp  "&gnome-download-ftp;/scrollkeeper/0.3/scrollkeeper-&scrollkeeper-version;.tar.bz2">
-  <!ENTITY scrollkeeper-md5sum        "b175e582a6cec3e50a9de73a5bb7455a">
-  <!ENTITY scrollkeeper-size          "546 KB">
-  <!ENTITY scrollkeeper-buildsize     "12 MB">
-  <!ENTITY scrollkeeper-time          "0.1 SBU">
-]>
-
-<sect1 id="scrollkeeper" xreflabel="ScrollKeeper-&scrollkeeper-version;">
-  <?dbhtml filename="scrollkeeper.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>ScrollKeeper-&scrollkeeper-version;</title>
-
-  <indexterm zone="scrollkeeper">
-    <primary sortas="a-ScrollKeeper">ScrollKeeper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ScrollKeeper</title>
-
-    <para>The <application>ScrollKeeper</application> package contains a
-    cataloging system for documentation. This is useful for managing
-    documentation metadata and providing an API to help browsers find, sort
-    and search the document catalog.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&scrollkeeper-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&scrollkeeper-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &scrollkeeper-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &scrollkeeper-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &scrollkeeper-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &scrollkeeper-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">ScrollKeeper Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libxslt"/>,
-    <xref linkend="DocBook"/>, and
-    <xref linkend="perl-xml-parser"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="intltool"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/scrollkeeper"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ScrollKeeper</title>
-
-    <para>Install <application>ScrollKeeper</application> by running the
-    following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --with-omfdirs=/usr/share/omf:\
-/opt/kde-&kde-version;/share/omf:\
-/opt/gnome-&gnome-version;&gnome-minor-version;/share/omf &amp;&amp;
-
-make</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--sysconfdir=/etc</parameter>: This switch puts the
-    configuration files in <filename class="directory">/etc</filename>
-    instead of <filename class='directory'>/usr/etc</filename>.</para>
-
-    <para><parameter>--localstatedir=/var</parameter>: This switch puts
-    <application>ScrollKeeper</application>'s database directory in
-    <filename class="directory">/var/lib/scrollkeeper</filename>.</para>
-
-    <para><parameter>--disable-static</parameter>: This switch prevents
-    the static library from being built.</para>
-
-    <para><parameter>--with-omfdirs=...</parameter>: This switch defines the
-    locations of <filename>OMF</filename> files for
-    <application>ScrollKeeper</application>. Change the locations if you have
-    <application>KDE</application> and/or <application>GNOME</application>-2
-    installed in a prefix other than the ones shown. This information is stored
-    in <filename>/etc/scrollkeeper.conf</filename> and can be updated manually,
-    if necessary.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring ScrollKeeper</title>
-
-    <sect3 id="scrollkeeper-config">
-      <title>Config Files</title>
-
-      <para><filename>/etc/scrollkeeper.conf</filename></para>
-
-      <indexterm zone="scrollkeeper scrollkeeper-config">
-        <primary sortas="e-etc-scrollkeeper.conf">/etc/scrollkeeper.conf</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>The configuration file sets the <envar>OMF_DIR</envar> variable
-      to the location of all of the <filename class="directory">omf</filename>
-      directories in the system. This was set in the
-      <command>configure</command> command so no further action is needed until
-      another <filename>OMF</filename> directory is created.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>scrollkeeper-config, scrollkeeper-extract, scrollkeeper-gen-seriesid,
-        scrollkeeper-get-cl, scrollkeeper-get-content-list,
-        scrollkeeper-get-extended-content-list, scrollkeeper-get-index-from-docpath,
-        scrollkeeper-get-toc-from-docpath, scrollkeeper-get-toc-from-id,
-        scrollkeeper-install, scrollkeeper-preinstall, scrollkeeper-rebuilddb,
-        scrollkeeper-uninstall, and scrollkeeper-update</seg>
-        <seg>libscrollkeeper.so</seg>
-        <seg>/usr/share/doc/scrollkeeper-&scrollkeeper-version;,
-        /usr/share/{omf, {,xml/}scrollkeeper}, and
-        /var/lib/scrollkeeper</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry>
-        <term><command>ScrollKeeper utility programs</command></term>
-        <listitem>
-          <para>The <application>ScrollKeeper</application> utility programs
-          and scripts listed above are for performing installation, building,
-          getting and updating table of contents files.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libscrollkeeper">
-        <term><filename class='libraryfile'>libscrollkeeper.so</filename></term>
-        <listitem>
-          <para>provides the API necessary for help
-          browsers to interact with documentation written to utilize
-          <application>ScrollKeeper</application>.</para>
-          <indexterm zone="scrollkeeper libscrollkeeper">
-            <primary sortas="c-libscrollkeeper">libscrollkeeper.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ general/graphlib/graphlib.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -37,5 +37,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exiv2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fribidi.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler-014.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jasper.xml"/>
Index: neral/graphlib/poppler-014.xml
===================================================================
--- general/graphlib/poppler-014.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,231 +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 poppler-014-download-http  "http://poppler.freedesktop.org/poppler-&poppler-014-version;.tar.gz">
-  <!ENTITY poppler-014-download-ftp   " ">
-  <!ENTITY poppler-014-md5sum         "a40fe96e1115f648ce4689e667743530">
-  <!ENTITY poppler-014-size           "1.7 MB">
-  <!-- these figures were for 6.7 with "most dependencies except Qt - that probably meant
-   without qt4, so leaving as best estimate -->
-  <!ENTITY poppler-014-buildsize      "137 MB">
-  <!ENTITY poppler-014-time           "1.3 SBU">
-]>
-
-<sect1 id="poppler-014" xreflabel="Poppler-&poppler-014-version;">
-  <?dbhtml filename="poppler-014.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Poppler-&poppler-014-version;</title>
-
-  <indexterm zone="poppler-014">
-    <primary sortas="a-Poppler-014">Poppler</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Poppler</title>
-
-    <para>The <application>Poppler</application> package contains a PDF
-    rendering library and command line tools used to manipulate PDF files.
-    This is useful for providing PDF rendering functionality as a shared
-    library.</para>
-
-    <para>This old version is usable by <xref linkend="kdegraphics"/>.  If you are not
-    building that package, please use <xref linkend="poppler"/>. The two versions of
-    <application>poppler</application> install similar programs, libraries, and
-    pkgconfig files.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&poppler-014-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&poppler-014-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &poppler-014-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &poppler-014-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &poppler-014-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &poppler-014-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Poppler Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="fontconfig"/>,
-    <xref linkend="pkgconfig"/>, and
-    <xref linkend="qt"/> (so that the
-    <filename class='libraryfile'>libpoppler-qt</filename> library is built)</para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libjpeg"/>, <xref linkend="cairo"/>,
-     and <ulink url="http://www.openjpeg.org">OpenJPEG</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk2"/>,
-    <xref linkend="qt4"/>,
-    <xref linkend="curl"/>,
-    <xref linkend="libxml2"/>, and
-    <xref linkend="lcms"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/poppler-014"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Poppler</title>
-
-    <caution>
-      <para><application>Poppler</application> will overwrite command-line
-      utilities and man pages previously installed by the
-      <application>Xpdf</application> package. If you prefer to keep the
-      <application>Xpdf</application> versions of these files, pass the
-      <option>--disable-utils</option> parameter to the
-      <command>configure</command> command below.</para>
-    </caution>
-
-<screen><userinput>./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 &amp;&amp;
-install -v -m755 -d      /usr/share/doc/poppler-&poppler-014-version; &amp;&amp;
-install -v -m644 README* /usr/share/doc/poppler-&poppler-014-version;</userinput></screen>
-
-    <para>If you wish to download and install the optional encoding files to
-    render CJK and Cyrillic properly, please follow the instructions for the Additional
-    Encoding Data on the <xref linkend="poppler"/> page - this version of
-    <application>poppler</application> will automatically read them if they are
-    present when it runs.</para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- This is discouraged by the authors. There is built-in decompression
-         and zlib is not needed
-    <para><parameter>-enable-zlib</parameter>: This parameter forces the build
-    to link with the system-installed
-    <filename class='libraryfile'>libz</filename> library to enable compressed
-    PDF functionality.</para> -->
-
-    <para><parameter>--disable-cairo-output</parameter>: This parameter
-    disables building the <application>cairo</application> graphics backend.</para>
-
-    <para><parameter>--disable-poppler-glib</parameter> and
-    <parameter>--disable-gtk-test</parameter>: These parameters disable
-    building the <application>GLib</application> wrapper and
-    <application>GTK+</application> test program.</para>
-
-    <para><parameter>--disable-static</parameter>: Prevent static libraries
-    being built and installed.</para>
-
-    <para><parameter>--enable-xpdf-headers</parameter>: Install old
-    <application>Xpdf</application> headers required by certain programs. These
-    are unsupported by <application>Poppler</application>.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg><xref linkend="xpdf-content"/> for the pdf* programs</seg>
-        <seg>libpoppler.{so,a}, libpoppler-cpp.{so,a}, libpoppler-glib.{so,a}, libpoppler-qt.{so,a}
-        and libpoppler-qt4.{so,a}</seg>
-        <seg>/usr/include/poppler, /usr/share/doc/poppler-&poppler-version;,
-        /usr/share/gtk-doc/html/poppler and /usr/share/poppler</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpoppler-014">
-        <term><filename class='libraryfile'>libpoppler.{so,a}</filename></term>
-        <listitem>
-          <para>contains the API functions to render PDF files.</para>
-          <indexterm zone="poppler-014 libpoppler-014">
-            <primary sortas="c-libpoppler">libpoppler.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-014-cpp">
-        <term><filename class='libraryfile'>libpoppler-cpp.{so,a}</filename></term>
-        <listitem>
-          <para>is a C++ backend for rendering PDF files.</para>
-          <indexterm zone="poppler-014 libpoppler-014-cpp">
-            <primary sortas="c-libpoppler-cpp">libpoppler-cpp.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-014-glib">
-        <term><filename class='libraryfile'>libpoppler-glib.{so,a}</filename></term>
-        <listitem>
-          <para>is a wrapper library used to interface the PDF rendering
-          functions with <application>GTK+</application>.</para>
-          <indexterm zone="poppler-014 libpoppler-014-glib">
-            <primary sortas="c-libpoppler-glib">libpoppler-glib.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-014-qt">
-        <term><filename class='libraryfile'>libpoppler-qt.{so,a}</filename></term>
-        <listitem>
-          <para>is a wrapper library used to interface the PDF rendering
-          functions with <application>Qt</application>.</para>
-          <indexterm zone="poppler-014 libpoppler-014-qt">
-            <primary sortas="c-libpoppler-qt">libpoppler-qt.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpoppler-014-qt4">
-        <term><filename class='libraryfile'>libpoppler-qt4.{so,a}</filename></term>
-        <listitem>
-          <para>is a wrapper library used to interface the PDF rendering
-          functions with <application>Qt</application>-4.</para>
-          <indexterm zone="poppler-014 libpoppler-014-qt4">
-            <primary sortas="c-libpoppler-qt4">libpoppler-qt4.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/jdk.SAVE
===================================================================
--- general/prog/jdk.SAVE	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,966 +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 jdk-download-binary       "http://java.sun.com/javase/downloads/index.jsp">
-  <!ENTITY jdk-bin-md5sum            "f7528500c17c09546566e05988beda86">
-  <!ENTITY jdk-bin-size              "67 MB">
-  <!ENTITY jdk-bin-buildsize         "207 MB">
-  <!ENTITY jdk-bin-version           "6u5">
-
-  <!ENTITY jdk-source-jrl-md5sum     "83390379fb9f3193e93a9d5eed5b31d9">
-  <!ENTITY jdk-source-bin-md5sum     "8b6f1b8d8dec051c18385539111141ec">
-  <!ENTITY jdk-source-moz-md5sum     "6dcaf7af16211617adff5d672a8b79f4">
-
-  <!ENTITY jdk-source-jrl-size       "111 MB">
-  <!ENTITY jdk-source-bin-size       "2 MB">
-  <!ENTITY jdk-source-moz-size       "8.2 MB">
-
-  <!ENTITY jdk-src-buildsize         "1.5 GB">
-  <!ENTITY jdk-time                  "12.5 SBU (for both installations)">
-  <!ENTITY jdk-version-string        "6u3">
-  <!ENTITY jdk-bin-version-string    "1.6.0_05">
-
-  <!ENTITY jdk-download-source-jrl "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-src-b05-jrl-24_sep_2007.jar">
-  <!ENTITY jdk-download-source-bin "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-bin-b05-jrl-24_sep_2007.jar">
-  <!ENTITY jdk-download-source-moz "http://www.java.net/download/jdk6/&jdk-version-string;/promoted/b05/jdk-&jdk-version-string;-fcs-mozilla_headers-b05-unix-24_sep_2007.jar">
-
-]>
-
-<sect1 id="jdk" xreflabel="JDK-&jdk-version;">
-  <?dbhtml filename="jdk.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy: randy $</othername>
-    <date>$Date: 2008-05-10 13:50:47 -0500 (Sat, 10 May 2008) $</date>
-  </sect1info>
-
-  <title>JDK-&jdk-version;</title>
-
-  <indexterm zone="jdk">
-    <primary sortas="a-JDK">JDK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JDK</title>
-
-    <para>The <application>JDK</application> package contains
-    Sun's <application>Java</application> development environment. This is
-    useful for developing <application>Java</application> programs and provides
-    the runtime environment necessary to run <application>Java</application>
-    programs.  It also includes a plug-in for browsers so that they can be
-    <application>Java</application> aware.</para>
-
-    <!-- Previously, the plugin included
-    in the <application>JDK</application> binary package was unusable on LFS
-    owing to incompatibilities with <application>GCC</application>-3 compiled
-    browsers.  This is not the case anymore.</para> -->
-
-    <para>The <application>JDK</application> comes in two flavors, a
-    precompiled binary and a source package. You will first need to download
-    and install the binary version of the <application>JDK</application>
-    (you'll need to click and agree to the <quote>Sun Microsystems, Inc.
-    Binary Code License Agreement</quote>). To build from the source, you
-    will need to read, and agree to the Sun
-    <!--<ulink url="&patch-root;/jdk-Readme.txt">-->Java Research License<!--</ulink>-->.
-    You will also need to download the additional files and patches to
-    complete the source build as detailed below. Note that in some countries
-    you cannot download the source code.</para>
-
-    <warning><para>Sun has recently decided not to provide JRL sources for
-    the latest update versions of the JDK.  The source build instructions and
-    patches are here for reference only, and contain known security
-    vulnerabilities.  For more information, please see Sun Alerts
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-231246-1">231246</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233321-1">233321</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233322-1">233322</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233323-1">233323</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233324-1">233324</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233325-1">233325</ulink>,
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233326-1">233326</ulink>, and
-    <ulink url="http://sunsolve.sun.com/search/document.do?assetkey=1-66-233327-1">233327</ulink>.</para>
-    <para>  Sun is actively working on a GPL'd version of the JDK, titled
-    <ulink url="http://openjdk.java.net/projects/jdk6/">OpenJDK</ulink>.
-    This new JDK will be licensed under the
-    <ulink url="http://openjdk.java.net/legal/gplv2+ce.html">GNU General
-    Public License, version 2, with the Classpath Exception</ulink>.
-    A stable OpenJDK was not available at the time of writing.</para></warning>
-
-
-    <bridgehead renderas="sect3">Binary Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Binary download (jdk-&jdk-bin-version;-linux-i586.bin):
-        <ulink url="&jdk-download-binary;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &jdk-bin-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size (binary): &jdk-bin-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &jdk-bin-buildsize;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Source Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>JRL Source
-          <simplelist>
-            <member><ulink url="&jdk-download-source-jrl;"/></member>
-            <member>&jdk-source-jrl-md5sum;</member>
-            <member>&jdk-source-jrl-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Source Binaries
-          <simplelist>
-            <member><ulink url="&jdk-download-source-bin;"/></member>
-            <member>&jdk-source-bin-md5sum;</member>
-            <member>&jdk-source-bin-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Mozilla Headers
-          <simplelist>
-            <member><ulink url="&jdk-download-source-moz;"/></member>
-            <member>&jdk-source-moz-md5sum;</member>
-            <member>&jdk-source-moz-size;</member>
-          </simplelist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &jdk-src-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &jdk-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <bridgehead renderas="sect4">Required Patches</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/jdk-&jdk-version-string;-gcc4-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/jdk-&jdk-version-string;-motif_fixes-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para><ulink
-        url="&patch-root;/jdk-&jdk-version-string;-remove_fixed_paths-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JDK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies (for binary
-    installation)</bridgehead>
-    <para role="optional">
-    <xref linkend="alsa-lib"/>,
-    <xref linkend="cups"/>, and
-    <xref linkend="gtk2"/></para>
-
-    <bridgehead renderas="sect4">Additional Requirements
-    (for source build, including optional requirements)</bridgehead>
-    <para role="required">
-    <xref linkend="cpio"/>,
-    <xref linkend="ksh"/>,
-    <xref linkend="unzip"/>,
-    <xref linkend="which"/>, and
-    <xref linkend="zip"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/jdk"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JDK</title>
-
-    <para>The instructions below install both the binary and source versions.
-    You may stop after installing the binary version or continue on installing
-    the source version. You can choose to keep either or both.</para>
-
-    <tip>
-      <para>The <command>./jdk-&jdk-bin-version;-linux-i586.bin</command>
-      command below unpacks the distribution into a
-      <filename class='directory'>jdk&jdk-bin-version-string;</filename>
-      directory.  You will be required to view, and then accept (by entering a
-      <keycap>y</keycap> keypress), a license agreement before any files are
-      unpacked. If you are scripting (automating) the build, you'll need to
-      account for this. There is information about automating build commands
-      in the <xref linkend="automating-builds"/> section of Chapter 2. Towards
-      the end of this section, specific information for automating this type of
-      installation is discussed.</para>
-    </tip>
-
-    <para>Normally in BLFS, the files are unpacked into a subdirectory
-    and the starting point for the installation procedures is that
-    location.  For this application only, start in the directory where all
-    the downloaded files are located.</para>
-
-    <para>Install the binary <application>JDK</application> with the
-    following commands:</para>
-
-<screen><userinput>chmod 755 jdk-&jdk-bin-version;-linux-i586.bin &amp;&amp;
-./jdk-&jdk-bin-version;-linux-i586.bin</userinput></screen>
-
-    <note><para>The installation will end with a message
-    "./jdk-&jdk-bin-version;-linux-i586.bin: line 43: 20283 Aborted" as
-    javaprefix is unset in the environment.  This is by design as
-    <application>GTK+</application> may not be installed during the
-    installation, however, the installation will still exit with a zero error
-    value if scripting the build.</para></note>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cd jdk&jdk-bin-version-string; &amp;&amp;
-install -v -m755 -d /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
-mv -v * /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
-chown -v -R root:root /opt/jdk-bin-&jdk-bin-version; &amp;&amp;
-ln -v -sf xawt/libmawt.so \
-    /opt/jdk-bin-&jdk-bin-version;/jre/lib/i386/ &amp;&amp;
-cd ..</userinput></screen>
-
-    <para>Recent versions of libX11 break libmawt
-    when used with the Xinerama extension.  While still the
-    <systemitem class="username">root</systemitem> user, apply the
-    following sed to the installed binary to work around this
-    problem:</para>
-
-<screen role="root"><userinput>sed -i 's@XINERAMA@FAKEEXTN@g' \
-    /opt/jdk-bin-&jdk-bin-version;/jre/lib/i386/xawt/libmawt.so</userinput></screen>
-
-    <para>The binary version is now installed.</para>
-
-    <para>If you don't want to compile the source or are not in a position to
-    download the source owing to license restrictions, skip ahead to the
-    configuration section.</para>
-
-    <para>Save the existing path, and append the recently installed
-    <application>JDK</application>.</para>
-
-<screen><userinput>export JAVA_HOME=/opt/jdk-bin-&jdk-bin-version; &amp;&amp;
-export PATH_HOLD=${PATH} &amp;&amp;
-export PATH=${PATH}:${JAVA_HOME}/bin</userinput></screen>
-
-    <para>The source code is contained in self-extracting
-    <filename class='extension'>jar</filename> files.  You
-    will need to be in a windowed environment to extract the sources.
-    Create a directory to store the extracted sources.  Choose the newly
-    created <filename class="directory">jdk-build</filename> directory
-    when prompted for the target directory.</para>
-
-<screen><userinput>mkdir jdk-build &amp;&amp;
-cd jdk-build &amp;&amp;
-for JAR in ../jdk-&jdk-version-string;*.jar
-    do java -jar ${JAR}
-done</userinput></screen>
-
-    <para>Apply all the patches downloaded above:</para>
-
-<screen><userinput>for PATCH in ../jdk-&jdk-version-string;*.patch
-    do patch -Np1 -i ${PATCH}
-done</userinput></screen>
-
-    <para>Use the following commands to apply some minor changes that
-    are a little more specific to BLFS, such as lack of a gcc-2.9
-    compiler, removing a broken demo, and forcing to link to shared
-    libraries.  See the 'Command Explanations' section for more detail:</para>
-
-<screen><userinput>sed -i '/^.*linux)/ { N; /.*/ { N; /.*/d }}' \
-    deploy/make/plugin/{adapter,nscore}/Makefile &amp;&amp;
-sed -i '/.*mtrace.*/ { N; /.*/ s/.*mtrace.*\n.*/\t  mtrace/ }' \
-    j2se/make/mkdemo/jvmti/Makefile &amp;&amp;
-sed -i 's/= true/= false/' \
-    j2se/make/common/shared/Compiler-gcc.gmk</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/X11R6_symlink.xml"/>
-
-    <!-- <para>If your <application>X Window System</application> is installed into
-    any prefix other than <filename class="directory">/usr/X11R6</filename>,
-    execute the following commands, replacing
-    <replaceable>&lt;PREFIX&gt;</replaceable> with the installation prefix of
-    the <application>X Window System</application>:</para>
-
-<screen><userinput>for file in `find . -name Makefile \
-    -or -name Imakefile -or -name *.gmk`
-do sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' $file
-done &amp;&amp;
-sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' \
-    j2se/src/solaris/native/sun/awt/fontpath.c \
-    j2se/src/solaris/classes/sun/awt/motif/linux.fontconfig.Sun.properties \
-    j2se/src/solaris/classes/sun/awt/motif/linux.fontconfig.RedHat.3.properties</userinput></screen> -->
-
-    <para>Set/unset some variables which affect the build:</para>
-
-<screen><userinput>export ALT_BOOTDIR=${JAVA_HOME} &amp;&amp;
-export CLASSPATH_HOLD=${CLASSPATH} &amp;&amp;
-export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts &amp;&amp;
-export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin &amp;&amp;
-export MILESTONE="03-BLFS" &amp;&amp;
-export BUILD_NUMBER="b05" &amp;&amp;
-export INSANE=true &amp;&amp;
-export DEV_ONLY=true &amp;&amp;
-export SKIP_FASTDEBUG_BUILD=true &amp;&amp;
-unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS</userinput></screen>
-
-      <warning><para>Setting CFLAGS/CXXFLAGS/LDFLAGS is guaranteed to make
-      the build fail. If you are interested in optimizing the build, set
-      OTHER_CFLAGS/OTHER_CXXFLAGS/OTHER_LDFLAGS instead.  -O3, even in
-      OTHER_C{,XX}FLAGS, is known to cause a build failure.</para></warning>
-
-
-    <para>Additionally, if you would like to <command>make</command> in
-    parallel, add the following:</para>
-
-<screen><userinput>export HOTSPOT_BUILD_JOBS=<replaceable>&lt;3&gt;</replaceable></userinput></screen>
-
-    <para>Build the <application>JDK</application> with the following
-    commands. There will be a few messages about missing files that look like
-    errors. These are caused by not meeting the expected build environment
-    (Red Hat).  As long as the build doesn't stop, the messages
-    are harmless.</para>
-
-<screen><userinput>pushd control/make &amp;&amp;
-make &amp;&amp;
-popd</userinput></screen>
-
-    <para>To test the results, you can run one of the provided demo programs
-    using the newly created <command>java</command> binary. Issue the
-    following commands:</para>
-
-<screen><userinput>pushd control/build/linux-i586/j2sdk-image/demo/jfc/Java2D &amp;&amp;
-../../../bin/java -jar Java2Demo.jar &amp;&amp;
-popd</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user,
-    install the <application>JDK</application>:</para>
-
-<screen role="root"><userinput>pushd control/build/linux-i586 &amp;&amp;
-cp -v -a j2sdk-image /opt/jdk-&jdk-version-string; &amp;&amp;
-chown -v -R root:root /opt/jdk-&jdk-version-string; &amp;&amp;
-ln -v -sf xawt/libmawt.so  /opt/jdk-&jdk-version-string;/jre/lib/i386/ &amp;&amp;
-popd</userinput></screen>
-
-    <para>Restore the unprivileged user's environment using the following
-    commands:</para>
-
-<screen><userinput>export JAVA_HOME=${ALT_BOOTDIR} &amp;&amp;
-export CLASSPATH=${CLASSPATH_HOLD} &amp;&amp;
-export PATH=${PATH_HOLD} &amp;&amp;
-unset PATH_HOLD ALT_BOOTDIR CLASSPATH_HOLD \
-    ALT_CACERTS_FILE ALT_MOZILLA_HEADERS_PATH \
-    BUILD_NUMBER MILESTONE INSANE DEV_ONLY \
-    SKIP_FASTDEBUG_BUILD</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i '/^.*linux)/...</command>: This command disables
-    the build of a gcc-2.9 compatible browser plugin.  LFS does not contain
-    gcc-2.9, and hasn't in quite a few years.</para>
-
-    <para><command>sed -i '/.*mtrace.*/...</command>: This command disables
-    building of the broken 'waiters' demo.</para>
-
-    <para><command>sed -i 's/= true/= false/'...</command>: This command
-    forces the compiler to link against the standard C libraries
-    dynamically.</para>
-
-    <para><command>export ALT_BOOTDIR=${JAVA_HOME}</command>: This variable sets
-    the location of the bootstrap <application>JDK</application>.</para>
-
-    <para><command>export ALT_CACERTS_FILE...</command>: Specifies the
-    certificate file to use (from the installed binary
-    <application>JDK</application>).</para>
-
-    <para><command>export ALT_MOZILLA_HEADERS_PATH=${PWD}/share/plugin/</command>:
-    This tells the build exactly where to find the
-    <application>Mozilla</application> headers.  This has changed since the
-    previous version and is not mentioned in the installation documentation
-    included with the package source.</para>
-
-    <para><command>export MILESTONE="03-BLFS"</command>: This appends
-    the string '03-BLFS' to the buld number.  'internal' is
-    unconditionally added if MILESTONE is unset.  This is similar
-    to the format used by Sun for the official release.</para>
-
-    <para><command>export BUILD_NUMBER="b05"</command>:
-    This will help you identify the compiled version of the runtime
-    environment and virtual machine by appending this information to
-    the version string. This is the same build number used by Sun to
-    identify the official release.</para>
-
-    <para><command>export INSANE=true</command>: The certified platform for the
-    build is Redhat Enterprise Advanced Server 2.1. This variable ensures that
-    all the errors related to compiling on a non-certified platform will be
-    displayed as warnings instead of errors.</para>
-
-    <para><command>export DEV_ONLY=true</command>: This command
-    skips compiling the comparison build.</para>
-
-    <para><command>export SKIP_FASTDEBUG_BUILD=true</command>: This command
-    skips building of the debug version.  Omit this command if you need
-    to build the fastdebug target.</para>
-
-    <para><command>unset JAVA_HOME CLASSPATH CFLAGS CXXFLAGS LDFLAGS</command>:
-    These variables cause miscompilation of the build. Never set them.</para>
-
-    <para><command>ln -sf xawt/libmawt.so
-    /opt/jdk-&jdk-version-string;/jre/lib/i386/</command>: This fixes
-    linking issues with other applications that expect to find the
-    <application>motif</application> libraries with the other
-    <application>JDK</application> libraries.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring JDK</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>There are now two Java 2 SDKs installed in
-      <filename>/opt</filename>. You should decide on which one you
-      would like to use as the default. For example if you decide to use the
-      precompiled <application>JDK</application>, do the following as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>ln -v -nsf jdk-bin-&jdk-bin-version; /opt/jdk</userinput></screen>
-
-    <para>The information below assumes your system is set up using the
-    instructions found in
-    <quote><xref linkend="postlfs-config-profile"/></quote>. You may need to
-    extract the relevant information below and incorporate it into your
-    system's startup files if your system is set up differently.</para>
-
-    <para>Add the following <filename>jdk.sh</filename> shell startup file to
-    the <filename>/etc/profile.d</filename> directory with the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/jdk.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/jdk.sh
-
-# Set JAVA_HOME directory
-JAVA_HOME=/opt/jdk
-
-# Adjust PATH
-pathappend ${JAVA_HOME}/bin PATH
-
-# Auto Java CLASSPATH
-# Copy jar files to, or create symlinks in this directory
-AUTO_CLASSPATH_DIR=/usr/lib/classpath
-pathprepend . CLASSPATH
-for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
-    pathappend $dir CLASSPATH
-done
-
-export JAVA_HOME CLASSPATH
-unset AUTO_CLASSPATH_DIR
-unset dir
-
-# End /etc/profile.d/jdk.sh</literal>
-EOF</userinput></screen>
-
-    <para>The <application>Java</application> plugin is located in
-    <filename class="directory">$JAVA_HOME/jre/plugin/i?86/ns7/</filename>.
-    Make a symbolic link to the file in that directory from your browser(s)
-    plugins directory.</para>
-
-    <important>
-      <para>The plugin must be a symlink for it to work. If not, the browsers
-      will crash when you attempt to load a <application>Java</application>
-      application.</para>
-    </important>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>appletviewer, apt, extcheck, idlj, HtmlConverter, jar,
-        jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi,
-        javaws, jconsole, jdb, jhat, jinfo, jmap, jps,
-        jrunscript, jsadebugd, jstack, jstat, jstatd, keytool,
-        native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry,
-        schemagen, serialver, servertool, tnameserv, unpack200,
-        wsgen, wsimport, and xjc</seg>
-        <seg><envar>$JAVA_HOME</envar>/lib/*,
-        <envar>$JAVA_HOME</envar>/jre/lib/*,
-        and libjavaplugin_oji.so</seg>
-        <seg>/opt/jdk-&jdk-version-string;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="appletviewer">
-        <term><command>appletviewer</command></term>
-        <listitem>
-          <para>runs Java applets outside of the context of a browser.</para>
-          <indexterm zone="jdk appletviewer">
-            <primary sortas="b-appletviewer">appletviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="apt">
-        <term><command>apt</command></term>
-        <listitem>
-          <para>is an annotation processing tool.</para>
-          <indexterm zone="jdk apt">
-            <primary sortas="b-apt">apt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="extcheck">
-        <term><command>extcheck</command></term>
-        <listitem>
-          <para>checks a specified jar file for title and version conflicts
-          with any extensions installed in the <application>JDK</application>
-          software.</para>
-          <indexterm zone="jdk extcheck">
-            <primary sortas="b-extcheck">extcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="HtmlConverter">
-        <term><command>HtmlConverter</command></term>
-        <listitem>
-          <para>adds Java auto download to html and asp pages. </para>
-          <indexterm zone="jdk HtmlConverter">
-            <primary sortas="b-HtmlConverter">HtmlConverter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="idlj">
-        <term><command>idlj</command></term>
-        <listitem>
-          <para>generates Java bindings from a given IDL file.</para>
-          <indexterm zone="jdk idlj">
-            <primary sortas="b-idlj">idlj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jar">
-        <term><command>jar</command></term>
-        <listitem>
-          <para>combines multiple files into a single jar archive.</para>
-          <indexterm zone="jdk jar">
-            <primary sortas="b-jar">jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jarsigner">
-        <term><command>jarsigner</command></term>
-        <listitem>
-          <para>signs jar files and verifies the signatures and integrity
-          of a signed jar file.</para>
-          <indexterm zone="jdk jarsigner">
-            <primary sortas="b-jarsigner">jarsigner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java">
-        <term><command>java</command></term>
-        <listitem>
-          <para>launches a Java application by starting a Java runtime
-          environment, loading a specified class and invoking its main
-          method.</para>
-          <indexterm zone="jdk java">
-            <primary sortas="b-java">java</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javac">
-        <term><command>javac</command></term>
-        <listitem>
-          <para>reads class and interface definitions, written in the
-          Java programming language, and compiles them into bytecode
-          class files.</para>
-          <indexterm zone="jdk javac">
-            <primary sortas="b-javac">javac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javadoc">
-        <term><command>javadoc</command></term>
-        <listitem>
-          <para>parses the declarations and documentation comments in a
-          set of Java source files and produces a corresponding set of
-          HTML pages describing the classes, interfaces,constructors,
-          methods, and fields.</para>
-          <indexterm zone="jdk javadoc">
-            <primary sortas="b-javadoc">javadoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javah">
-        <term><command>javah</command></term>
-        <listitem>
-          <para>generates C header and source files
-          that are needed to implement native methods.</para>
-          <indexterm zone="jdk javah">
-            <primary sortas="b-javah">javah</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javap">
-        <term><command>javap</command></term>
-        <listitem>
-          <para>disassembles a Java class file.</para>
-          <indexterm zone="jdk javap">
-            <primary sortas="b-javap">javap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java-rmi.cgi">
-        <term><command>java-rmi.cgi</command></term>
-        <listitem>
-          <para>is the Java RMI client.</para>
-          <indexterm zone="jdk java-rmi.cgi">
-            <primary sortas="b-java-rmi.cgi">java-rmi.cgi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javaws">
-        <term><command>javaws</command></term>
-        <listitem>
-          <para>launches Java application/applets hosted on a network.</para>
-          <indexterm zone="jdk javaws">
-            <primary sortas="b-javaws">javaws</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jconsole">
-        <term><command>jconsole</command></term>
-        <listitem>
-          <para>is a graphical console tool to monitor and manage both
-          local and remote Java applications and virtual machines.</para>
-          <indexterm zone="jdk jconsole">
-            <primary sortas="b-jconsole">jconsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jdb">
-        <term><command>jdb</command></term>
-        <listitem>
-          <para>is a simple command-line debugger for Java classes.</para>
-          <indexterm zone="jdk jdb">
-            <primary sortas="b-jdb">jdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jhat">
-        <term><command>jhat</command></term>
-        <listitem>
-          <para>parses a java heap dump file and allows viewing
-          in a webbrowser.</para>
-          <indexterm zone="jdk jhat">
-            <primary sortas="b-jhat">jhat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jinfo">
-        <term><command>jinfo</command></term>
-        <listitem>
-          <para>prints Java configuration information for a given Java
-          process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jinfo">
-            <primary sortas="b-jinfo">jinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jmap">
-        <term><command>jmap</command></term>
-        <listitem>
-          <para>prints shared object memory maps or heap memory details
-          of a given process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jmap">
-            <primary sortas="b-jmap">jmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jps">
-        <term><command>jps</command></term>
-        <listitem>
-          <para>lists the instrumented JVMs on the target system.</para>
-          <indexterm zone="jdk jps">
-            <primary sortas="b-jps">jps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jrunscript">
-        <term><command>jrunscript</command></term>
-        <listitem>
-          <para>is a command line script shell.</para>
-          <indexterm zone="jdk jrunscript">
-            <primary sortas="b-jrunscript">jrunscript</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jsadebugd">
-        <term><command>jsadebugd</command></term>
-        <listitem>
-          <para>attaches to a Java process or core file and acts as a
-          debug server.</para>
-          <indexterm zone="jdk jsadebugd">
-            <primary sortas="b-jsadebugd">jsadebugd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstack">
-        <term><command>jstack</command></term>
-        <listitem>
-          <para>prints Java stack traces of Java threads for a given
-          Java process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jstack">
-            <primary sortas="b-jstack">jstack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstat">
-        <term><command>jstat</command></term>
-        <listitem>
-          <para>displays performance statistics for an instrumented JVM.</para>
-          <indexterm zone="jdk jstat">
-            <primary sortas="b-jstat">jstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstatd">
-        <term><command>jstatd</command></term>
-        <listitem>
-          <para>is an RMI server application that monitors for the creation
-          and termination of instrumented JVMs.</para>
-          <indexterm zone="jdk jstatd">
-            <primary sortas="b-jstatd">jstatd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="keytool">
-        <term><command>keytool</command></term>
-        <listitem>
-          <para>is a key and certificate management utility.</para>
-          <indexterm zone="jdk keytool">
-            <primary sortas="b-keytool">keytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="native2ascii">
-        <term><command>native2ascii</command></term>
-        <listitem>
-          <para> converts files that contain non-supported character encoding
-          into files containing Latin-1 or Unicode-encoded characters.</para>
-          <indexterm zone="jdk native2ascii">
-            <primary sortas="b-native2ascii">native2ascii</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="orbd">
-        <term><command>orbd</command></term>
-        <listitem>
-          <para>is used to enable clients to transparently locate and invoke
-          persistent objects on servers in the CORBA environment.</para>
-          <indexterm zone="jdk orbd">
-            <primary sortas="b-orbd">orbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pack200">
-        <term><command>pack200</command></term>
-        <listitem>
-          <para>is a Java application that transforms a jar file into a
-          compressed pack200 file using the Java gzip compressor.</para>
-          <indexterm zone="jdk pack200">
-            <primary sortas="b-pack200">pack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="policytool">
-        <term><command>policytool</command></term>
-        <listitem>
-          <para>creates and manages a policy file graphically.</para>
-          <indexterm zone="jdk policytool">
-            <primary sortas="b-policytool">policytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmic">
-        <term><command>rmic</command></term>
-        <listitem>
-          <para>generates stub and skeleton class files for remote objects
-          from the names of compiled Java classes that contain remote
-          object implementations.</para>
-          <indexterm zone="jdk rmic">
-            <primary sortas="b-rmic">rmic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmid">
-        <term><command>rmid</command></term>
-        <listitem>
-          <para>starts the activation system daemon.</para>
-          <indexterm zone="jdk rmid">
-            <primary sortas="b-rmid">rmid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmiregistry">
-        <term><command>rmiregistry</command></term>
-        <listitem>
-          <para>creates and starts a remote object registry on the specified
-          port on the current host.</para>
-          <indexterm zone="jdk rmiregistry">
-            <primary sortas="b-rmiregistry">rmiregistry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="schemagen">
-        <term><command>schemagen</command></term>
-        <listitem>
-          <para>is a Java XML binding schema generator.</para>
-          <indexterm zone="jdk schemagen">
-            <primary sortas="b-schemagen">schemagen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="serialver">
-        <term><command>serialver</command></term>
-        <listitem>
-          <para>returns the serialVersionUID for one or more classes in a
-          form suitable for copying into an evolving class.</para>
-          <indexterm zone="jdk serialver">
-            <primary sortas="b-serialver">serialver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="servertool">
-        <term><command>servertool</command></term>
-        <listitem>
-          <para>provides an ease-of-use interface for application programmers
-          to register, unregister, startup and shutdown a server.</para>
-          <indexterm zone="jdk servertool">
-            <primary sortas="b-servertool">servertool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tnameserv">
-        <term><command>tnameserv</command></term>
-        <listitem>
-          <para>starts the Java IDL name server.</para>
-          <indexterm zone="jdk tnameserv">
-            <primary sortas="b-tnameserv">tnameserv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unpack200">
-        <term><command>unpack200</command></term>
-        <listitem>
-          <para>is a native implementation that transforms a packed file
-          produced by <application>pack200</application> into a jar
-          file.</para>
-          <indexterm zone="jdk unpack200">
-            <primary sortas="b-unpack200">unpack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wsgen">
-        <term><command>wsgen</command></term>
-        <listitem>
-          <para>generates JAX-WS portable artifacts used in JAX-WS
-          web services.</para>
-          <indexterm zone="jdk wsgen">
-            <primary sortas="b-wsgen">wsgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wsimport">
-        <term><command>wsimport</command></term>
-        <listitem>
-          <para>generates JAX-WS portable artifacts.</para>
-          <indexterm zone="jdk wsimport">
-            <primary sortas="b-wsimport">wsimport</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xjc">
-        <term><command>xjc</command></term>
-        <listitem>
-          <para>is a Java XML binding compiler.</para>
-          <indexterm zone="jdk xjc">
-            <primary sortas="b-xjc">xjc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/jdk.xml
===================================================================
--- general/prog/jdk.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,703 +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 jdk-download-http   "http://java.sun.com/javase/downloads/index.jsp">
-  <!ENTITY jdk-md5sum          "ad5ee976522bf5767100a8b4b981c690">
-  <!ENTITY jdk-size            "85 MB">
-  <!ENTITY jdk-buildsize       "250 MB">
-  <!ENTITY jdk-bin-version     "6u18">
-  <!ENTITY jdk-build-time      "0.1 SBU">
-  <!ENTITY jdk-version-string  "1.6.0_18">
-
-]>
-
-<sect1 id="jdk" xreflabel="JDK-&jdk-version;">
-  <?dbhtml filename="jdk.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>JDK-&jdk-version;</title>
-
-  <indexterm zone="jdk">
-    <primary sortas="a-JDK">JDK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JDK</title>
-
-    <para>The <application>JDK</application> package contains
-    Sun's <application>Java</application> development environment. This is
-    useful for developing <application>Java</application> programs and provides
-    the runtime environment necessary to run <application>Java</application>
-    programs.  It also includes a plug-in for browsers so that they can be
-    <application>Java</application> aware.</para>
-
-
-<!--
-    <note><para>Sun has recently decided not to provide JRL sources for
-    the latest update versions of the JDK. Sun is actively working on a GPL'd
-    version of the JDK, titled
-    <ulink url="http://openjdk.java.net/projects/jdk6/">OpenJDK</ulink>.
-    This new JDK will be licensed under the
-    <ulink url="http://openjdk.java.net/legal/gplv2+ce.html">GNU General
-    Public License, version 2, with the Classpath Exception</ulink>.
-    A stable OpenJDK was not available at the time of writing.</para></note>
--->
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (jdk-&jdk-bin-version;-linux-i586.bin):
-        <ulink url="&jdk-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &jdk-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size (binary): &jdk-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &jdk-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &jdk-build-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JDK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
-    <para role="optional">
-    <xref linkend="alsa-lib"/>,
-    <xref linkend="cups"/>, and
-    <xref linkend="gtk2"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/jdk"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JDK</title>
-
-    <tip>
-      <para>The <command>./jdk-&jdk-bin-version;-linux-i586.bin</command>
-      command below unpacks the distribution into a
-      <filename class='directory'>jdk&jdk-version-string;</filename>
-      directory.  You will be required to view, and then accept (by entering a
-      <keycap>y</keycap> keypress), a license agreement before any files are
-      unpacked. If you are scripting (automating) the build, you'll need to
-      account for this. There is information about automating build commands
-      in the <xref linkend="automating-builds"/> section of Chapter 2. Towards
-      the end of this section, specific information for automating this type of
-      installation is discussed.</para>
-    </tip>
-
-    <para>Normally in BLFS, the files are unpacked into a subdirectory
-    and the starting point for the installation procedures is that
-    location.  For this application only, start in the directory where all
-    the downloaded files are located.</para>
-
-    <para>Install the <application>JDK</application> with the
-    following commands:</para>
-
-<screen><userinput>chmod 755 jdk-&jdk-bin-version;-linux-i586.bin &amp;&amp;
-./jdk-&jdk-bin-version;-linux-i586.bin</userinput></screen>
-
-    <note><para>The installation will end with a message
-    "./jdk-&jdk-bin-version;-linux-i586.bin: line 43: 20283 Aborted" as
-    javaprefix is unset in the environment.  This is by design as
-    <application>GTK+</application> may not be installed during the
-    installation, however, the installation will still exit with a zero error
-    value if scripting the build.</para></note>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cd jdk&jdk-version-string; &amp;&amp;
-install -v -m755 -d /opt/jdk-&jdk-bin-version; &amp;&amp;
-mv -v * /opt/jdk-&jdk-bin-version; &amp;&amp;
-chown -v -R root:root /opt/jdk-&jdk-bin-version; &amp;&amp;
-ln -v -sf xawt/libmawt.so \
-    /opt/jdk-&jdk-bin-version;/jre/lib/i386/ &amp;&amp;
-cd ..</userinput></screen>
-
-    <para>Recent versions of libX11 break libmawt
-    when used with the Xinerama extension.  While still the
-    <systemitem class="username">root</systemitem> user, apply the
-    following sed to work around this problem:</para>
-
-<screen role="root"><userinput>sed -i 's@XINERAMA@FAKEEXTN@g' \
-    /opt/jdk-&jdk-bin-version;/jre/lib/i386/xawt/libmawt.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>ln -sf xawt/libmawt.so
-    /opt/jdk-&jdk-bin-version;/jre/lib/i386/</command>: This fixes
-    linking issues with other applications that expect to find the
-    <application>motif</application> libraries with the other
-    <application>JDK</application> libraries.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring JDK</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-    <para>As the <systemitem class="username">root</systemitem> user, create
-    a symlink to the installation directory:</para>
-
-<screen role="root"><userinput>ln -v -nsf jdk-&jdk-bin-version; /opt/jdk</userinput></screen>
-
-    <para>The information below assumes your system is set up using the
-    instructions found in
-    <quote><xref linkend="postlfs-config-profile"/></quote>. You may need to
-    extract the relevant information below and incorporate it into your
-    system's startup files if your system is set up differently.</para>
-
-    <para>Add the following <filename>jdk.sh</filename> shell startup file to
-    the <filename>/etc/profile.d</filename> directory with the following
-    commands as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/jdk.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/jdk.sh
-
-# Set JAVA_HOME directory
-JAVA_HOME=/opt/jdk
-
-# Adjust PATH
-pathappend ${JAVA_HOME}/bin PATH
-
-# Auto Java CLASSPATH
-# Copy jar files to, or create symlinks in this directory
-AUTO_CLASSPATH_DIR=/usr/lib/classpath
-pathprepend . CLASSPATH
-for dir in `find ${AUTO_CLASSPATH_DIR} -type d 2>/dev/null`; do
-    pathappend $dir CLASSPATH
-done
-
-export JAVA_HOME CLASSPATH
-unset AUTO_CLASSPATH_DIR
-unset dir
-
-# End /etc/profile.d/jdk.sh</literal>
-EOF</userinput></screen>
-
-    <para>The <application>Java</application> plugin is located at
-    <filename class="directory">$JAVA_HOME/jre/lib/i386/libnpjp2.so</filename>.
-    Make a symbolic link to the file from your browser(s) plugins
-    directory.</para>
-
-    <important>
-      <para>The plugin must be a symlink for it to work. If not, the browsers
-      will crash when you attempt to load a <application>Java</application>
-      application.</para>
-    </important>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>appletviewer, apt, extcheck, idlj, HtmlConverter, jar,
-        jarsigner, java, javac, javadoc, javah, javap, java-rmi.cgi,
-        javaws, jconsole, jcontrol, jdb, jhat, jinfo, jmap, jps,
-        jrunscript, jsadebugd, jstack, jstat, jstatd, jvisualvm, keytool,
-        native2ascii, orbd, pack200, policytool, rmic, rmid, rmiregistry,
-        schemagen, serialver, servertool, tnameserv, unpack200,
-        wsgen, wsimport, and xjc</seg>
-        <seg><envar>$JAVA_HOME</envar>/lib/*,
-        <envar>$JAVA_HOME</envar>/jre/lib/*</seg>
-        <seg>/opt/jdk-&jdk-bin-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="appletviewer">
-        <term><command>appletviewer</command></term>
-        <listitem>
-          <para>runs Java applets outside of the context of a browser.</para>
-          <indexterm zone="jdk appletviewer">
-            <primary sortas="b-appletviewer">appletviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="apt">
-        <term><command>apt</command></term>
-        <listitem>
-          <para>is an annotation processing tool.</para>
-          <indexterm zone="jdk apt">
-            <primary sortas="b-apt">apt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="extcheck">
-        <term><command>extcheck</command></term>
-        <listitem>
-          <para>checks a specified jar file for title and version conflicts
-          with any extensions installed in the <application>JDK</application>
-          software.</para>
-          <indexterm zone="jdk extcheck">
-            <primary sortas="b-extcheck">extcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="HtmlConverter">
-        <term><command>HtmlConverter</command></term>
-        <listitem>
-          <para>adds Java auto download to html and asp pages. </para>
-          <indexterm zone="jdk HtmlConverter">
-            <primary sortas="b-HtmlConverter">HtmlConverter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="idlj">
-        <term><command>idlj</command></term>
-        <listitem>
-          <para>generates Java bindings from a given IDL file.</para>
-          <indexterm zone="jdk idlj">
-            <primary sortas="b-idlj">idlj</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jar">
-        <term><command>jar</command></term>
-        <listitem>
-          <para>combines multiple files into a single jar archive.</para>
-          <indexterm zone="jdk jar">
-            <primary sortas="b-jar">jar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jarsigner">
-        <term><command>jarsigner</command></term>
-        <listitem>
-          <para>signs jar files and verifies the signatures and integrity
-          of a signed jar file.</para>
-          <indexterm zone="jdk jarsigner">
-            <primary sortas="b-jarsigner">jarsigner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java">
-        <term><command>java</command></term>
-        <listitem>
-          <para>launches a Java application by starting a Java runtime
-          environment, loading a specified class and invoking its main
-          method.</para>
-          <indexterm zone="jdk java">
-            <primary sortas="b-java">java</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javac">
-        <term><command>javac</command></term>
-        <listitem>
-          <para>reads class and interface definitions, written in the
-          Java programming language, and compiles them into bytecode
-          class files.</para>
-          <indexterm zone="jdk javac">
-            <primary sortas="b-javac">javac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javadoc">
-        <term><command>javadoc</command></term>
-        <listitem>
-          <para>parses the declarations and documentation comments in a
-          set of Java source files and produces a corresponding set of
-          HTML pages describing the classes, interfaces,constructors,
-          methods, and fields.</para>
-          <indexterm zone="jdk javadoc">
-            <primary sortas="b-javadoc">javadoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javah">
-        <term><command>javah</command></term>
-        <listitem>
-          <para>generates C header and source files
-          that are needed to implement native methods.</para>
-          <indexterm zone="jdk javah">
-            <primary sortas="b-javah">javah</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javap">
-        <term><command>javap</command></term>
-        <listitem>
-          <para>disassembles a Java class file.</para>
-          <indexterm zone="jdk javap">
-            <primary sortas="b-javap">javap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="java-rmi.cgi">
-        <term><command>java-rmi.cgi</command></term>
-        <listitem>
-          <para>is the Java RMI client.</para>
-          <indexterm zone="jdk java-rmi.cgi">
-            <primary sortas="b-java-rmi.cgi">java-rmi.cgi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="javaws">
-        <term><command>javaws</command></term>
-        <listitem>
-          <para>launches Java application/applets hosted on a network.</para>
-          <indexterm zone="jdk javaws">
-            <primary sortas="b-javaws">javaws</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jconsole">
-        <term><command>jconsole</command></term>
-        <listitem>
-          <para>is a graphical console tool to monitor and manage both
-          local and remote Java applications and virtual machines.</para>
-          <indexterm zone="jdk jconsole">
-            <primary sortas="b-jconsole">jconsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jcontrol">
-        <term><command>jcontrol</command></term>
-        <listitem>
-          <para>is a graphical control panel for Java.</para>
-          <indexterm zone="jdk jcontrol">
-            <primary sortas="b-jcontrol">jcontrol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jdb">
-        <term><command>jdb</command></term>
-        <listitem>
-          <para>is a simple command-line debugger for Java classes.</para>
-          <indexterm zone="jdk jdb">
-            <primary sortas="b-jdb">jdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jhat">
-        <term><command>jhat</command></term>
-        <listitem>
-          <para>parses a java heap dump file and allows viewing
-          in a webbrowser.</para>
-          <indexterm zone="jdk jhat">
-            <primary sortas="b-jhat">jhat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jinfo">
-        <term><command>jinfo</command></term>
-        <listitem>
-          <para>prints Java configuration information for a given Java
-          process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jinfo">
-            <primary sortas="b-jinfo">jinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jmap">
-        <term><command>jmap</command></term>
-        <listitem>
-          <para>prints shared object memory maps or heap memory details
-          of a given process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jmap">
-            <primary sortas="b-jmap">jmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jps">
-        <term><command>jps</command></term>
-        <listitem>
-          <para>lists the instrumented JVMs on the target system.</para>
-          <indexterm zone="jdk jps">
-            <primary sortas="b-jps">jps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jrunscript">
-        <term><command>jrunscript</command></term>
-        <listitem>
-          <para>is a command line script shell.</para>
-          <indexterm zone="jdk jrunscript">
-            <primary sortas="b-jrunscript">jrunscript</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jsadebugd">
-        <term><command>jsadebugd</command></term>
-        <listitem>
-          <para>attaches to a Java process or core file and acts as a
-          debug server.</para>
-          <indexterm zone="jdk jsadebugd">
-            <primary sortas="b-jsadebugd">jsadebugd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstack">
-        <term><command>jstack</command></term>
-        <listitem>
-          <para>prints Java stack traces of Java threads for a given
-          Java process, core file, or a remote debug server.</para>
-          <indexterm zone="jdk jstack">
-            <primary sortas="b-jstack">jstack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstat">
-        <term><command>jstat</command></term>
-        <listitem>
-          <para>displays performance statistics for an instrumented JVM.</para>
-          <indexterm zone="jdk jstat">
-            <primary sortas="b-jstat">jstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jstatd">
-        <term><command>jstatd</command></term>
-        <listitem>
-          <para>is an RMI server application that monitors for the creation
-          and termination of instrumented JVMs.</para>
-          <indexterm zone="jdk jstatd">
-            <primary sortas="b-jstatd">jstatd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jvisualvm">
-        <term><command>jvisualvm</command></term>
-        <listitem>
-          <para>is an intuitive graphical user interface that provides detailed
-          information about Java applications while they are running on a given
-          JVM.</para>
-          <indexterm zone="jdk jvisualvm">
-            <primary sortas="b-jvisualvm">jvisualvm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="keytool">
-        <term><command>keytool</command></term>
-        <listitem>
-          <para>is a key and certificate management utility.</para>
-          <indexterm zone="jdk keytool">
-            <primary sortas="b-keytool">keytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="native2ascii">
-        <term><command>native2ascii</command></term>
-        <listitem>
-          <para> converts files that contain non-supported character encoding
-          into files containing Latin-1 or Unicode-encoded characters.</para>
-          <indexterm zone="jdk native2ascii">
-            <primary sortas="b-native2ascii">native2ascii</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="orbd">
-        <term><command>orbd</command></term>
-        <listitem>
-          <para>is used to enable clients to transparently locate and invoke
-          persistent objects on servers in the CORBA environment.</para>
-          <indexterm zone="jdk orbd">
-            <primary sortas="b-orbd">orbd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pack200">
-        <term><command>pack200</command></term>
-        <listitem>
-          <para>is a Java application that transforms a jar file into a
-          compressed pack200 file using the Java gzip compressor.</para>
-          <indexterm zone="jdk pack200">
-            <primary sortas="b-pack200">pack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="policytool">
-        <term><command>policytool</command></term>
-        <listitem>
-          <para>creates and manages a policy file graphically.</para>
-          <indexterm zone="jdk policytool">
-            <primary sortas="b-policytool">policytool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmic">
-        <term><command>rmic</command></term>
-        <listitem>
-          <para>generates stub and skeleton class files for remote objects
-          from the names of compiled Java classes that contain remote
-          object implementations.</para>
-          <indexterm zone="jdk rmic">
-            <primary sortas="b-rmic">rmic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmid">
-        <term><command>rmid</command></term>
-        <listitem>
-          <para>starts the activation system daemon.</para>
-          <indexterm zone="jdk rmid">
-            <primary sortas="b-rmid">rmid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmiregistry">
-        <term><command>rmiregistry</command></term>
-        <listitem>
-          <para>creates and starts a remote object registry on the specified
-          port on the current host.</para>
-          <indexterm zone="jdk rmiregistry">
-            <primary sortas="b-rmiregistry">rmiregistry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="schemagen">
-        <term><command>schemagen</command></term>
-        <listitem>
-          <para>is a Java XML binding schema generator.</para>
-          <indexterm zone="jdk schemagen">
-            <primary sortas="b-schemagen">schemagen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="serialver">
-        <term><command>serialver</command></term>
-        <listitem>
-          <para>returns the serialVersionUID for one or more classes in a
-          form suitable for copying into an evolving class.</para>
-          <indexterm zone="jdk serialver">
-            <primary sortas="b-serialver">serialver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="servertool">
-        <term><command>servertool</command></term>
-        <listitem>
-          <para>provides an ease-of-use interface for application programmers
-          to register, unregister, startup and shutdown a server.</para>
-          <indexterm zone="jdk servertool">
-            <primary sortas="b-servertool">servertool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tnameserv">
-        <term><command>tnameserv</command></term>
-        <listitem>
-          <para>starts the Java IDL name server.</para>
-          <indexterm zone="jdk tnameserv">
-            <primary sortas="b-tnameserv">tnameserv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unpack200">
-        <term><command>unpack200</command></term>
-        <listitem>
-          <para>is a native implementation that transforms a packed file
-          produced by <application>pack200</application> into a jar
-          file.</para>
-          <indexterm zone="jdk unpack200">
-            <primary sortas="b-unpack200">unpack200</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wsgen">
-        <term><command>wsgen</command></term>
-        <listitem>
-          <para>generates JAX-WS portable artifacts used in JAX-WS
-          web services.</para>
-          <indexterm zone="jdk wsgen">
-            <primary sortas="b-wsgen">wsgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wsimport">
-        <term><command>wsimport</command></term>
-        <listitem>
-          <para>generates JAX-WS portable artifacts.</para>
-          <indexterm zone="jdk wsimport">
-            <primary sortas="b-wsimport">wsimport</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xjc">
-        <term><command>xjc</command></term>
-        <listitem>
-          <para>is a Java XML binding compiler.</para>
-          <indexterm zone="jdk xjc">
-            <primary sortas="b-xjc">xjc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,648 +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;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY pdl-download-http "&sourceforge-repo;/pdl/PDL-&pdl-version;.tar.gz">
-  <!ENTITY pdl-download-ftp  "&gentoo-ftp-repo;/PDL-&pdl-version;.tar.gz">
-  <!ENTITY pdl-md5sum        "edd056a006eae8b46e8ef804b9774a93">
-  <!ENTITY pdl-size          "2.1 MB">
-  <!ENTITY pdl-buildsize     "74 MB">
-  <!ENTITY pdl-time          "2.56 SBU">
-]>
-
-<sect1 id="pdl" xreflabel="PDL-&pdl-version;">
-  <?dbhtml filename="pdl.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>PDL-&pdl-version;</title>
-
-  <indexterm zone="pdl">
-    <primary sortas="a-PDL">PDL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PDL</title>
-
-    <para><application>PDL</application> (Perl Data Language) gives
-    standard <application>Perl</application> the ability to compactly store
-    and quickly manipulate the large N-dimensional data arrays common to
-    scientific computing. <application>PDL</application> turns
-    <application>Perl</application> into an array-oriented, numerical language
-    similar to such commercial packages as <application>IDL</application>
-    and <application>MatLab</application>. One can write simple
-    <application>Perl</application> expressions to manipulate entire numerical
-    arrays all at once.</para>
-
-    <para><application>PDL</application> provides extensive numerical and
-    semi-numerical functionality with support for two- and three-dimensional
-    visualisation as well as a variety of I/O formats. The goal is to allow
-    <application>PDL</application> to interact with a variety of external
-    numerical packages, graphics and visualisation systems. Easy interfacing
-    to such systems is one of the core design features of
-    <application>PDL</application>.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&pdl-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&pdl-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &pdl-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &pdl-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &pdl-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &pdl-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PDL Dependencies</bridgehead>
-
-    <para><application>PDL</application> is a collection of over 90
-    <application>Perl</application> modules. Some of these modules require
-    additional libraries, packages and/or <application>Perl</application>
-    modules for full functionality. Listed below are the modules which require
-    additional software or configuration. If you don't need a particular
-    module's functionality, you don't need to install its dependencies. The
-    dependency tree for each module is listed downward, meaning you'll need to
-    start at the bottom of a module's tree and work up. The dependencies are
-    listed in the same order as they are in the
-    <filename>DEPENDENCIES</filename> file, found in the package source
-    tree.</para>
-
-    <para>This package (and many of the dependency packages) requires a Fortran
-    compiler for full functionality of all the different modules. The
-    <command>gfortran</command> compiler installed with the current BLFS
-    version of <application>GCC</application> (&gcc-version;) will not work. If
-    you want to compile the parts of this package that require a Fortran
-    compiler, you'll need to install a
-    <application>GCC</application>-3.x.x version of Fortran. The
-    <application>GCC</application> developers recommend using Fortran from
-    <application>GCC</application>-3.4.6. You can find specific instructions
-    to install a <application>GCC</application>-3.4.6 compiler on the
-    <ulink url="&blfs-wiki;/gcc3">BLFS
-    Wiki</ulink>. <!-- Alternatively, if you have a need to install
-    <xref linkend="gcc3"/>, you can add the Fortran compiler to the list of
-    compilers installed in those instructions. Don't forget to put the
-    directory containing the <command>{g,f}77</command> commands at the
-    beginning of your <envar>PATH</envar> environment variable before
-    beginning the compilation.--> </para>
-
-    <bridgehead renderas="sect4">PDL::NiceSlice</bridgehead>
-
-    <para>The <application>PDL</application>::NiceSlice module is used to
-    enhance <application>PDL</application>'s slice syntax.
-    <quote>Slicing</quote> is a term used in the process of creating a
-    cross-section, or slice, of a <application>PDL</application> object
-    (piddle).</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/P/PM/PMQS/Filter-&Filter-version;.tar.gz">
-        Filter-&Filter-version;</ulink></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Inline::Pdlpp</bridgehead>
-
-    <para>The Inline::Pdlpp module allows you to define fast PP
-    code inline in your scripts.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/I/IN/INGY/Inline-&Inline-version;.tar.gz">
-        Inline-&Inline-version;</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><ulink
-            url="http://www.cpan.org/authors/id/D/DC/DCONWAY/Parse-RecDescent-&Parse-RecDescent-version;.tar.gz">
-            Parse-RecDescent-&Parse-RecDescent-version;</ulink></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Perldl</bridgehead>
-
-    <para><command>perldl</command> is a simple shell (written in
-    <application>Perl</application>) which allows interactive
-    use of <application>PDL</application>.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-&Term-ReadLine-Gnu-version;.tar.gz">
-        Term-ReadLine-Gnu-&Term-ReadLine-Gnu-version;</ulink></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Graphics::TriD</bridgehead>
-
-    <para>The <application>PDL</application>::Graphics::TriD module implements
-    a generic 3D plotting interface for <application>PDL</application>. Points,
-    lines and surfaces (among other objects) are supported.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>OpenGL (<xref linkend="x-window-system"/>)</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Graphics::PGPLOT</bridgehead>
-
-    <para>The <application>PDL</application>::Graphics::PGPLOT module is a
-    convenience interface to the <application>PGPLOT</application> commands,
-    implemented using the object oriented <application>PGPLOT</application>
-    plotting package in the PDL::Graphics::PGPLOT::Window module.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/K/KG/KGB/PGPLOT-&PGPLOT-perl-version;.tar.gz">
-        PGPLOT-&PGPLOT-perl-version;</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><ulink
-            url="http://www.cpan.org/authors/id/K/KG/KGB/ExtUtils-F77-&ExtUtils-F77-version;.tar.gz">
-            ExtUtils-F77-&ExtUtils-F77-version;</ulink></para>
-            <itemizedlist>
-              <listitem>
-                <para><ulink
-                url="&blfs-wiki;/gcc3">a Fortran
-                compiler</ulink></para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para><ulink
-            url="http://astro.caltech.edu/~tjp/pgplot/">PGPLOT</ulink></para>
-            <itemizedlist>
-              <listitem>
-                <para><xref linkend="x-window-system"/>,
-                <!-- <xref linkend="lesstif"/>, -->
-                <ulink url="http://sourceforge.net/projects/lesstif/">LessTif</ulink>,
-                <xref linkend="tk"/>, and <ulink
-                url="&blfs-wiki;/gcc3">a Fortran
-                compiler</ulink></para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Graphics::PLPLOT</bridgehead>
-
-    <para>The <application>PDL</application>::Graphics::PLPLOT module is a
-    simple interface to the <application>PLplot</application> plotting library.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink url="http://plplot.sourceforge.net/">PLplot</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><!-- <xref linkend="pkgconfig"/>, -->
-            <xref linkend="x-window-system"/>,
-            <xref linkend="freetype2"/>,
-            <ulink url="http://www.boutell.com/gd/">GD</ulink>,
-            <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
-            <!-- <xref linkend="gnome-libs"/>, -->
-            <ulink url="&gnome-download-http;/gnome-libs/1.4/">GNOME
-            Libraries-1.4</ulink>,
-            <xref linkend="icedtea6"/>, <!-- or <xref linkend="jdk"/>, -->
-            <xref linkend="tk"/>,
-            <xref linkend="python2"/> (with
-            <ulink url="http://www.numpy.org/">Numeric Python</ulink>),
-            <ulink url="&blfs-wiki;/gcc3">a
-            Fortran compiler</ulink>,
-            <ulink url="http://www.swig.org/">SWIG</ulink>, and
-            <ulink url="http://sourceforge.net/projects/incrtcl/">iTcl</ulink></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Graphics::IIS</bridgehead>
-
-    <para>The <application>PDL</application>::Graphics::IIS
-    module provides an interface to any image display <quote>device</quote>
-    which supports the <quote>IIS protocol</quote>.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://tdc-www.harvard.edu/software/saoimage.html">SAOimage</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="x-window-system"/></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-      <listitem>
-        <para><ulink
-        url="http://iraf.noao.edu/iraf/web/projects/x11iraf/x11iraf.html">X11
-        IRAF</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="x-window-system"/> and
-            <xref linkend="tk"/></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Graphics::Karma</bridgehead>
-
-    <para>The <application>PDL</application>::Graphics::Karma
-    module is an interface to <application>Karma</application> visualisation
-    applications.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.atnf.csiro.au/computing/software/karma/">Karma</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><xref linkend="x-window-system"/></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <para><emphasis>Note:</emphasis> You may need to modify the
-    <option>WHERE_KARMA =&gt; undef</option> line in the source tree
-    <filename>perldl.conf</filename> file to point to your installation
-    of <application>Karma</application></para>
-
-    <bridgehead renderas="sect4">PDL::IO::Pic</bridgehead>
-
-    <para> The <application>PDL</application>::IO::Pic module implements I/O
-    for a number of popular image formats by exploiting the
-    <command>xxxtopnm</command> and <command>pnmtoxxx</command>
-    converters from the <application>Netpbm</application> package and the
-    <command>cjpeg</command> and <command>djpeg</command> converters.
-    It also  contains the routine wmpeg to write MPEG movies from piddles
-    representing image stacks.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink url="http://netpbm.sourceforge.net/">Netpbm</ulink>,
-        <xref linkend="libjpeg"/> and
-        <ulink url="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/">
-        mpeg_encode</ulink></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::Slatec</bridgehead>
-
-    <para> The <application>PDL</application>::Slatec module serves the dual
-    purpose of providing an interface to parts of the slatec library and showing
-    how to interface <application>PDL</application> to an external library.
-    The module provides routines to manipulate matrices, calculate FFTs, fit
-    data using polynomials, and interpolate/integrate data using piecewise
-    cubic Hermite interpolation.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/K/KG/KGB/ExtUtils-F77-&ExtUtils-F77-version;.tar.gz">
-        ExtUtils-F77-&ExtUtils-F77-version;</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><ulink
-            url="&blfs-wiki;/gcc3">a Fortran
-            compiler</ulink></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::GSL</bridgehead>
-
-    <para> The <application>PDL</application>::<application>GSL</application>
-    module is an interface to the functions provided by the Gnu Scientific Library.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><xref linkend="gsl"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::FFTW</bridgehead>
-
-    <para> The <application>PDL</application>::<application>FFTW</application>
-    module is a means to interface <application>PDL</application> with the
-    <application>FFTW</application> library. It's similar to the standard FFT
-    routine but it's usually faster and has support for real transforms. It works
-    well for the types of piddles for which the library was compiled (otherwise it
-    must do conversions).</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink url="http://www.fftw.org/">FFTW-2.x</ulink></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">PDL::IO::Browser</bridgehead>
-
-    <para>The <application>PDL</application>::IO::Browser module
-    is a 2D cursor terminal data browser for piddles.</para>
-
-    <para>There is no additional software required to use the module. However,
-    the default is to not install the module because some platforms don't provide
-    a curses compatible library. To enable the module, issue the following
-    command:</para>
-
-<screen><userinput>sed -i -e "s/WITH_IO_BROWSER =&gt; 0/WITH_IO_BROWSER =&gt; 1/" \
-    perldl.conf</userinput></screen>
-
-    <bridgehead renderas="sect4">PDL::IO::NDF</bridgehead>
-
-    <para>The <application>PDL</application>::IO::NDF module adds the ability to
-    read and write Starlink N-dimensional data files as N-dimensional piddles.</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><ulink
-        url="http://www.cpan.org/authors/id/A/AA/AALLAN/Astro-FITS-Header-&Astro-FITS-Header-version;.tar.gz">
-        Astro-FITS-Header-&Astro-FITS-Header-version;</ulink></para>
-        <itemizedlist>
-          <listitem>
-            <para><ulink
-            url="http://www.cpan.org/authors/id/P/PR/PRATZLAFF/Astro-FITS-CFITSIO-&Astro-FITS-CFITSIO-version;.tar.gz">
-            Astro-FITS-CFITSIO-&Astro-FITS-CFITSIO-version;</ulink></para>
-            <itemizedlist>
-              <listitem>
-                <para><ulink
-                url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/">CFITSIO</ulink></para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para><ulink
-            url="&files-anduin;/sources/NDF-&NDF-version;.tar.gz">
-            NDF-&NDF-version;</ulink></para>
-            <itemizedlist>
-              <listitem>
-                <para><ulink
-                url="&files-anduin;/sources/Starlink-Config-&Starlink-Config-version;.tar.gz">
-                Starlink-Config-&Starlink-Config-version;</ulink></para>
-                <itemizedlist>
-                  <listitem>
-                    <para><ulink
-                    url="&files-anduin;/sources/Starlink_IMG.tar.gz">
-                    Starlink IMG</ulink></para>
-                    <itemizedlist>
-                      <listitem>
-                        <para><ulink
-                        url="&files-anduin;/sources/Starlink_NDF.tar.gz">
-                        Starlink NDF</ulink> (requires the following Starlink
-                        modules installed in this order, some will already be
-                        installed if you installed Starlink GSD):
-                        <ulink url="&files-anduin;/sources/Starlink_HTX.tar.gz">
-                        HTX</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_SAE.tar.gz">
-                        SAE</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_HLP.tar.gz">
-                        HLP</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_CNF.tar.gz">
-                        CNF</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_SLA.tar.gz">
-                        SLA</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_CHR.tar.gz">
-                        CHR</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_EMS.tar.gz">
-                        EMS</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_PSX.tar.gz">
-                        PSX</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_HDS.tar.gz">
-                        HDS</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_PCS.tar.gz">
-                        PCS</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_MER.tar.gz">
-                        MER</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_PRM.tar.gz">
-                        PRM</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_PAR.tar.gz">
-                        PAR</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_ARY.tar.gz">
-                        ARY</ulink>,
-                        <ulink url="&files-anduin;/sources/Starlink_AST.tar.gz">
-                        AST</ulink>)</para>
-                        <itemizedlist>
-                          <listitem>
-                            <para><ulink
-                            url="&blfs-wiki;/gcc3">a
-                            Fortran compiler</ulink></para>
-                          </listitem>
-                        </itemizedlist>
-                      </listitem>
-                    </itemizedlist>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para><ulink
-            url="&files-anduin;/sources/GSD-&GSD-version;.tar.gz">
-            GSD-&GSD-version;</ulink></para>
-            <itemizedlist>
-              <listitem>
-                <para><ulink
-                url="&files-anduin;/sources/Starlink-Config-&Starlink-Config-version;.tar.gz">
-                Starlink-Config-&Starlink-Config-version;</ulink></para>
-                <itemizedlist>
-                  <listitem>
-                    <para><ulink
-                    url="&files-anduin;/sources/Starlink_GSD.tar.gz">
-                    Starlink GSD</ulink> (requires the following Starlink
-                    modules installed in this order:
-                    <ulink url="&files-anduin;/sources/Starlink_HTX.tar.gz">
-                    HTX</ulink>,
-                    <ulink url="&files-anduin;/sources/Starlink_SAE.tar.gz">
-                    SAE</ulink>,
-                    <ulink url="&files-anduin;/sources/Starlink_CNF.tar.gz">
-                    CNF</ulink>,
-                    <ulink url="&files-anduin;/sources/Starlink_CHR.tar.gz">
-                    CHR</ulink>,
-                    <ulink url="&files-anduin;/sources/Starlink_EMS.tar.gz">
-                    EMS</ulink>,
-                    <ulink url="&files-anduin;/sources/Starlink_PRM.tar.gz">
-                    PRM</ulink>)</para>
-                    <itemizedlist>
-                      <listitem>
-                        <para><ulink
-                        url="&blfs-wiki;/gcc3">a
-                        Fortran compiler</ulink></para>
-                      </listitem>
-                    </itemizedlist>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/pdl"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PDL</title>
-
-    <para>Install <application>PDL</application> (and all the dependency
-    <application>Perl</application> modules) by running the following commands:</para>
-
-<screen><userinput>sed -i 's/\(dirname);\)/\1\nuse blib;/' Demos/BAD*demo.pm.PL &amp;&amp;
-perl Makefile.PL &amp;&amp;
-make &amp;&amp;
-make test</userinput></screen>
-
-    <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 '...' Demos/BAD*demo.pm.PL</command>: This is
-    necessary to fix a build issue caused by changes in
-    ExtUtils::MakeMaker-6.30 which was introduction in
-    <application>Perl</application>-5.8.8.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring PDL</title>
-
-    <sect3 id="pdl-config">
-      <title>Config Files</title>
-
-      <para><filename>~/.perldlrc</filename> and
-      <filename>local.perldlrc</filename> in the current directory</para>
-
-      <indexterm zone="pdl pdl-config">
-        <primary sortas="e-AA.perldlrc">~/.perldlrc</primary>
-      </indexterm>
-
-      <indexterm zone="pdl pdl-config">
-        <primary sortas="e-local.perldlrc">local.perldlrc</primary>
-      </indexterm>
-
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>See <ulink
-      url="http://pdl.sourceforge.net/PDLdocs/perldl.html#the startup file ~/.perldlrc"/>
-      for information about configuring <command>perldl</command> to suit your
-      needs.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Modules</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>pdl, pdldoc, perldl, and pptemplate</seg>
-        <seg>90+ individual <application>Perl</application> modules</seg>
-        <seg>/usr/lib/perl5/site_perl/&lfs-perl-version;/i686-linux/{,auto/}PDL</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pdl-prog">
-        <term><command>pdl</command></term>
-        <listitem>
-          <para>is a binary program called from
-          <application>PDL</application> scripts which is used to
-          interface <command>perldl</command>.</para>
-          <indexterm zone="pdl pdl-prog">
-            <primary sortas="b-pdl">pdl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdldoc">
-        <term><command>pdldoc</command></term>
-        <listitem>
-          <para>is a shell interface to
-          <application>PDL</application> documentation.</para>
-          <indexterm zone="pdl pdldoc">
-            <primary sortas="b-pdldoc">pdldoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perldl">
-        <term><command>perldl</command></term>
-        <listitem>
-          <para>is a simple shell (written in <application>Perl</application>)
-          for interactive use of <application>PDL</application>.</para>
-          <indexterm zone="pdl perldl">
-            <primary sortas="b-perldl">perldl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pptemplate">
-        <term><command>pptemplate</command></term>
-        <listitem>
-          <para>is a script to generate <filename>Makefile.PL</filename>
-          and PP file skeletons.</para>
-          <indexterm zone="pdl pptemplate">
-            <primary sortas="b-pptemplate">pptemplate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ general/prog/prog.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -37,5 +37,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="guile.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icedtea6.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jdk.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="junit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librep.xml"/>
@@ -43,7 +42,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mercurial.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nasm.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pdl.xml"/>
-  -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl-modules.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="php.xml"/>
Index: neral/sysutils/DeviceKit.xml
===================================================================
--- general/sysutils/DeviceKit.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,152 +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 DeviceKit-download-http "http://hal.freedesktop.org/releases/DeviceKit-&DeviceKit-version;.tar.gz">
-  <!ENTITY DeviceKit-download-ftp  " ">
-  <!ENTITY DeviceKit-md5sum        "8b311547f4a2c8c6b6598e3318d66cd7">
-  <!ENTITY DeviceKit-size          "375 KB">
-  <!ENTITY DeviceKit-buildsize     "3 MB">
-  <!ENTITY DeviceKit-time          "0.1 SBU">
-]>
-
-<sect1 id="DeviceKit" xreflabel="DeviceKit-&DeviceKit-version;">
-  <?dbhtml filename="DeviceKit.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>DeviceKit-&DeviceKit-version;</title>
-
-  <indexterm zone="DeviceKit">
-    <primary sortas="a-DeviceKit">DeviceKit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to DeviceKit</title>
-
-    <para>The <application>DeviceKit</application> is a modular HAL designed for
-    use in Linux systems that is designed to simplify device management and
-    replace the current monolithic Linux <application>HAL</application>.
-    DeviceKit includes the ability to enumerate system devices and send
-    notifications when hardware is added or removed from the computer
-    system.</para>
-
-    &lfs65_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&DeviceKit-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&DeviceKit-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &DeviceKit-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &DeviceKit-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &DeviceKit-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &DeviceKit-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">DeviceKit Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-glib"/> and
-    <xref linkend="docbook-xsl"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/DeviceKit"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DeviceKit</title>
-
-    <para>Install <application>DeviceKit</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/DeviceKit &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>devkit and devkit-daemon</seg>
-        <seg>libdevkit-gobject.{so,a}</seg>
-        <seg>/usr/{include/DeviceKit/devkit-gobject,lib/DeviceKit},
-        /var/run/devkit</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="devkit">
-        <term><command>devkit</command></term>
-        <listitem>
-          <para>is a simple command line client for the
-          <application>DeviceKit</application> daemon.</para>
-          <indexterm zone="DeviceKit devkit">
-            <primary sortas="b-devkit">devkit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="devkit-daemon">
-        <term><command>devkit-daemon</command></term>
-        <listitem>
-          <para>provides the org.freedesktop.DeviceKit service on the system
-          message bus.</para>
-          <indexterm zone="DeviceKit devkit-daemon">
-            <primary sortas="b-devkit-daemon">devkit-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdevkit-gobject">
-        <term><filename class='libraryfile'>libdevkit-gobject.{so,a}</filename></term>
-        <listitem>
-          <para>contains the <application>DeviceKit</application> API
-          functions.</para>
-          <indexterm zone="DeviceKit libdevkit-gobject">
-            <primary sortas="c-libdevkit-gobject">libdevkit-gobject.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: neral/sysutils/hal.xml
===================================================================
--- general/sysutils/hal.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ 	(revision )
@@ -1,606 +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 hal-download-http      "http://hal.freedesktop.org/releases/hal-&hal-version;.tar.bz2">
-  <!ENTITY hal-download-ftp       " ">
-  <!ENTITY hal-md5sum             "c627d8fb0f9afff94f3c687b5216bc06">
-  <!ENTITY hal-size               "924 KB">
-  <!ENTITY hal-buildsize          "25 MB">
-  <!ENTITY hal-time               "0.5 SBU">
-
-  <!ENTITY hal-info-version       "20091130">
-  <!ENTITY hal-info-download-http "http://hal.freedesktop.org/releases/hal-info-&hal-info-version;.tar.bz2">
-  <!ENTITY hal-info-download-ftp  " ">
-  <!ENTITY hal-info-md5sum        "995b8d2dbfb0646b07c92bb8d23cbcf1">
-  <!ENTITY hal-info-size          "108 KB">
-]>
-
-<sect1 id="hal" xreflabel="HAL-&hal-version;">
-  <?dbhtml filename="hal.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>HAL-&hal-version;</title>
-
-  <indexterm zone="hal">
-    <primary sortas="a-HAL">HAL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to HAL</title>
-
-    <para><application>HAL</application> is a hardware abstraction layer, which
-    is a piece of software that provides a view of the various hardware
-    attached to a system. In addition to this, <application>HAL</application>
-    keeps detailed metadata for each piece of hardware and provides hooks such
-    that system and desktop-level software can react to changes in the hardware
-    configuration in order to maintain system policy.</para>
-
-    <para>The most important goal of <application>HAL</application> is to
-    provide plug-and-play facilities for UNIX-like desktops with focus on
-    providing a rich and extensible description of device characteristics and
-    features. One example of the functionality provided by
-    <application>HAL</application> is when you plug in a USB storage device.
-    <application>HAL</application> can automatically create a mount point in
-    <filename class="directory">/media</filename> and mount the device.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&hal-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&hal-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &hal-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &hal-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &hal-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &hal-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Package Download</bridgehead>
-    <itemizedlist spacing='compact'>
-      <title>Required Hardware Data</title>
-      <listitem>
-        <para>Download (HTTP): <ulink url="&hal-info-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&hal-info-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &hal-info-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &hal-info-size;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">HAL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-glib"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="pciutils"/>
-    (with a current <filename>pci.ids</filename> file) and
-    <xref linkend="usbutils"/>
-    (with a current <filename>usb.ids</filename> file)</para>
-
-    <bridgehead renderas="sect4">Optional (to Create Documentation)</bridgehead>
-    <para role="optional"><xref linkend="xmlto"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/>,
-    <xref linkend="acl"/>,
-    <xref linkend="gperf"/>,
-    <ulink url="http://www.freedesktop.org/wiki/Software/PolicyKit">PolicyKit</ulink>,
-    <xref linkend="consolekit"/>,
-    <xref linkend="intltool"/>,
-    <xref linkend="parted"/>, and
-    <ulink url="https://fedorahosted.org/libsmbios/">libsmbios</ulink></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/hal"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of HAL</title>
-
-    <para>You must create a dedicated user and group before installing the
-    package. Though the default BLFS instructions run the
-    <application>HAL</application> daemon as the
-    <systemitem class="username">root</systemitem> user, a configuration file
-    is installed which has the dedicated user's name hard-coded in it. This
-    causes a confusing message to be generated when starting the
-    <application>D-BUS</application> daemon. Issue the following commands as
-    the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>groupadd -fg 19 haldaemon &amp;&amp;
-useradd -c "HAL Daemon User" -d /dev/null -u 19 \
-        -g haldaemon -s /bin/false haldaemon || [ $? == 9 ]</userinput></screen>
-
-    <para>Install <application>HAL</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/hal \
-            --localstatedir=/var \
-            --docdir=/usr/share/doc/hal-&hal-version; \
-            --enable-policy-kit=no &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>
-
-    <para>Install the <application>HAL</application> hardware data with the
-    following commands:</para>
-
-<screen><userinput>tar -xf ../hal-info-&hal-info-version;.tar.bz2 &amp;&amp;
-cd hal-info-&hal-info-version; &amp;&amp;
-./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>--libexecdir=/usr/lib/hal</parameter>: This parameter
-    forces the installation of libexec files to
-    <filename class='directory'>/usr/lib/hal</filename> instead of
-    <filename class='directory'>/usr/libexec</filename>.</para>
-
-    <para><parameter>--localstatedir=/var</parameter>: This parameter forces
-    the creation of the <filename>pid</filename> file to
-    <filename class='directory'>/var/run/hald</filename> instead of
-    <filename class='directory'>/usr/var/run/hald</filename>.</para>
-
-    <para><parameter>--enable-policy-kit=no</parameter>: This parameter is
-    required if PolicyKit is not installed. Remove it if PolicyKit is
-    installed.</para>
-
-    <para><parameter>--enable-docbook-docs
-    --docdir=/usr/share/doc/hal-&hal-version;</parameter>: If <xref
-    linkend="xmlto"/> is available, these parameters enable the
-    <application>HAL</application> specification documentation to be
-    built.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Run-Time Dependencies</title>
-
-    <para>A few more packages enable more functionality in
-    <application>HAL</application> at run-time.
-    These include <xref linkend="eject"/>, <ulink
-    url="http://www.nongnu.org/dmidecode/">dmidecode</ulink>,
-    <xref linkend="lvm2"/> (device-mapper),
-    <ulink url="http://luks.endorphin.org/dm-crypt">Cryptsetup-LUKS</ulink>, and
-    <ulink url="http://pm-utils.freedesktop.org/wiki/">pm-utils</ulink>.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring HAL</title>
-
-    <sect3 id="hal-config">
-      <title>Config Files</title>
-      <para><filename>/etc/dbus-1/system.d/hal.conf</filename>,
-      <filename>/etc/dbus-1/system.d/halusers.conf</filename> and
-      <filename>/etc/hal/*</filename></para>
-
-      <indexterm zone="hal hal-config">
-        <primary sortas="e-etc-dbus-1-system.d-hal.conf">/etc/dbus-1/system.d/hal.conf</primary>
-      </indexterm>
-
-      <indexterm zone="hal hal-config">
-        <primary sortas="e-etc-dbus-1-system.d-halusers.conf">/etc/dbus-1/system.d/halusers.conf</primary>
-      </indexterm>
-
-      <indexterm zone="hal hal-config">
-        <primary sortas="e-etc-hal-star">/etc/hal/*</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-    <sect4><title>Allowing users to invoke HAL methods</title>
-
-      <para>The default setup for <application>HAL</application> is to allow
-      only certain users to invoke methods such as Mount(). These are
-      the <systemitem class="username">root</systemitem> user and the user
-      determined to be at the active console using <ulink
-      url="&blfs-wiki;/linux-pam">pam_console</ulink>. If you are not set
-      up to use <xref linkend="linux-pam"/> and <ulink
-      url="&blfs-wiki;/linux-pam">pam_console</ulink>, create a group that
-      is allowed to invoke <application>HAL</application> methods with the
-      following commands:</para>
-
-<screen role="root"><userinput>groupadd -fg 61 halusers &amp;&amp;
-cat &gt; /etc/dbus-1/system.d/halusers.conf &lt;&lt; "EOF"
-<literal>&lt;!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"&gt;
-&lt;busconfig&gt;
-
- &lt;!-- Allow users in the halusers group invoke HAL methods --&gt;
- &lt;policy group="halusers"&gt;
-  &lt;allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/&gt;
-  &lt;allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/&gt;
-  &lt;allow send_interface="org.freedesktop.Hal.Device.Volume"/&gt;
-  &lt;allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/&gt;
- &lt;/policy&gt;
-
-&lt;/busconfig&gt;</literal>
-EOF</userinput></screen>
-
-      <para>Now add the users you would like to the <systemitem
-      class="groupname">halusers</systemitem> group to use
-      <application>HAL</application>.</para>
-
-<screen role="root"><userinput>usermod -a -G halusers <replaceable>&lt;username&gt;</replaceable></userinput></screen>
-
-      <para>Note that these users still need
-      to have appropriate permissions to access the devices that
-      <application>HAL</application> will invoke its methods on.</para>
-
-      <para>With the above configuration in place, authorized users now
-      have the ability to unmount disk partitions mounted at non-standard
-      locations such as <filename class='directory'>/pub</filename>. If
-      you'd like to restrict this policy to only drives which are considered
-      removable or hotpluggable, add the following configuration file as
-      the <systemitem class='username'>root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/hal/fdi/policy/no-fixed-drives.fdi &lt;&lt; "EOF"
-<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;!-- -*- SGML -*- --&gt;
-
-&lt;!-- Don't allow HAL methods on disks that are not
-     removable or hotpluggable --&gt;
-
-&lt;deviceinfo version="0.2"&gt;
-&lt;device&gt;
-  &lt;match key="@block.storage_device:storage.hotpluggable" bool="false"&gt;
-    &lt;match key="@block.storage_device:storage.removable" bool="false"&gt;
-      &lt;merge key="volume.ignore" type="bool"&gt;true&lt;/merge&gt;
-    &lt;/match&gt;
-  &lt;/match&gt;
-&lt;/device&gt;
-&lt;/deviceinfo&gt;</literal>
-EOF</userinput></screen>
-      </sect4>
-
-      <sect4><title>Installing mount helpers</title>
-      <para><application>HAL</application> only provides the methods such
-      as Mount() to act on hardware. In order to take advantage of these,
-      a <application>HAL</application> event handler such as <ulink
-      url="http://ivman.sourceforge.net/">Ivman</ulink> should be
-      installed.</para>
-      <!-- FIXME: is Ivman still alive? -->
-      <!-- FIXME: explicitly name the mount helpers
-           from KDE (???) and Xfce (exo-mount) -->
-      </sect4>
-
-      <sect4><title>Changing default mount options</title>
-      <para>In some cases, it is necessary to specify some default mount
-      options for filesystems. E.g., in non-English environments, the
-      <option>iocharset</option> and <option>codepage</option> options
-      are needed for filesystems of Windows origin in order to show
-      national characters correctly. Also, due to a
-      <ulink url="https://launchpad.net/bugs/133567">bug</ulink> in the
-      Linux kernel version in LFS (2.6.22.x), you may want to pass the
-      <option>usefree</option> option to vfat filesystems in order to reduce
-      the time needed to determine the amount of free space on the
-      filesystem.</para>
-
-      <para>Google search results for <quote>hal default mount options</quote>
-      are still full of recommendations to create <filename>*.fdi</filename>
-      files mentioning either
-      <option>volume.policy</option> or <option>storage.policy</option> keys.
-      Such recommendations worked for HAL-0.4.x only and are invalid now.
-      For HAL-&hal-version;, mount options are expected to be handled
-      as follows:</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>An event handler from the desktop environment receives an
-          event describing the newly-added storage device.</para>
-        </listitem>
-        <listitem>
-          <para>If the storage device is not already mentioned in
-          <filename>/etc/fstab</filename>, mount options are fetched from
-          a database of user preferences, which is specific to the desktop
-          environment, and passed back to HAL.
-          This process can be influenced by the filesystem type
-          and possibly other volume properties available from HAL.</para>
-        </listitem>
-        <listitem>
-          <para>If the options are in the list of permitted ones, HAL
-          mounts the volume.</para>
-        </listitem>
-      </itemizedlist>
-
-      <para>The important point above is that the configuration procedure is
-      desktop-specific. However, as of December, 2007, only GNOME allows the
-      user to set default mount options on a per-filesystem basis,
-      as described in the next paragraph.
-      KDE allows the mount options to be set only on a per-volume basis,
-      not per-filesystem, which is a
-      <ulink url="http://bugs.kde.org/show_bug.cgi?id=133456">bug</ulink>,
-      because, as mentioned in the report, <quote>for every new device (let's
-      say your friend's USB stick) you have to first not mount it, then change
-      options and then mount</quote>. Xfce, if compiled with HAL support,
-      <ulink url="http://bugzilla.xfce.org/show_bug.cgi?id=2891">hard-codes</ulink>
-      the mount options without any means to override them,
-      which is even worse.
-      <!-- (for BLFS editors only: they mention policy-kit as a future
-           solution, but, from the description, policy-kit looks like
-           an XML-ized sudo-like configuration parser, which has nothing
-           common with the "default mount options" problem. -->
-      In KDE and Xfce, if the built-in default mount options are not suitable,
-      it is needed to mention every possible removable storage device in
-      <filename>/etc/fstab</filename> with the correct options, thus mostly
-      defeating the point of installing HAL.</para>
-
-      <para>In order to adjust the default mount options, GNOME users should
-      change the
-      <systemitem>/system/storage/default_options/[fs_type]/mount_options</systemitem>
-      GConf key <!--either using <xref linkend="gconf-editor"/>, or -->from the
-      command line, as demonstrated in the following example:</para>
-
-<screen><userinput>gconftool-2 --type list --list-type=string \
-    --set /system/storage/default_options/vfat/mount_options \
-    "[shortname=mixed,uid=,usefree,iocharset=koi8-r,codepage=866]"</userinput></screen>
-
-      <para>See more details in the gnome-mount(1) manual page.</para>
-      </sect4>
-
-      <sect4><title>Adding allowed mount options</title>
-      <para>The list of mount options permitted in the default HAL
-      configuration resides in the
-      <filename>/usr/share/hal/fdi/policy/10osvendor/20-storage-methods.fdi</filename>
-      file. GNOME and KDE users may want to use options not in this
-      list (in the above example, this applies to the <option>usefree</option>
-      option). In this case, as <systemitem class="username">root</systemitem>
-      user, create a custom policy file that mentions unknown mount
-      options:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/hal/fdi/policy/user-options.fdi &lt;&lt; "EOF"
-<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt; &lt;!-- -*- SGML -*- --&gt;
-
-&lt;!--
-This file is used to set custom options to the HAL policy settings.
-The default policy settings are defined in files contained in the
-/usr/share/hal/fdi/policy subdirectories. User defined customizations
-should be in files contained in the /etc/hal/fdi/policy directory.
---&gt;
-
-&lt;deviceinfo version="0.2"&gt;
-  &lt;device&gt;
-
-    &lt;!-- this is to be able to mount media in drives we cannot poll,
-         e.g. IDE Zip Drives and PC style floppy drives --&gt;
-    &lt;match key="storage.media_check_enabled" bool="false"&gt;
-      &lt;match key="storage.no_partitions_hint" bool="true"&gt;
-        &lt;append key="volume.mount.valid_options" type="strlist"&gt;usefree&lt;/append&gt;
-        &lt;!-- Insert other options here --&gt;
-      &lt;/match&gt;
-    &lt;/match&gt;
-
-    &lt;match key="volume.fsusage" string="filesystem"&gt;
-
-      &lt;!-- allow these mount options for vfat --&gt;
-      &lt;match key="volume.fstype" string="vfat"&gt;
-        &lt;append key="volume.mount.valid_options" type="strlist"&gt;usefree&lt;/append&gt;
-        &lt;!-- Insert other options here --&gt;
-      &lt;/match&gt;
-    &lt;/match&gt;
-
-  &lt;/device&gt;
-&lt;/deviceinfo&gt;</literal>
-EOF</userinput></screen>
-
-    </sect4>
-    </sect3>
-
-    <sect3  id="hal-init">
-      <title>Boot Script</title>
-
-      <para>To automatically start the <command>hald</command> daemon
-      when the system is rebooted, install the
-      <filename>/etc/rc.d/init.d/haldaemon</filename>
-      bootscript from the
-      <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="hal hal-init">
-        <primary sortas="f-haldaemon">haldaemon</primary>
-      </indexterm>
-
-      <important>
-        <para>If the system-wide <application>D-BUS</application> daemon was
-        running during the installation of <application>HAL</application>,
-        ensure you stop and restart the <application>D-BUS</application>
-        daemon before attempting to start the <command>hald</command>
-        daemon.</para>
-      </important>
-
-<screen role="root"><userinput>make install-haldaemon</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>hal-device, hal-disable-polling,
-        hal-find-by-capability, hal-find-by-property, hal-get-property,
-        hal-is-caller-locked-out, hal-lock, hal-set-property, hald and
-        lshal</seg>
-        <seg>libhal.{so,a} and libhal-storage,{so,a}</seg>
-        <seg>/etc/hal, /usr/include/hal, /usr/lib/hal,
-        /usr/share/doc/hal-&hal-version;, /usr/share/hal, /var/cache/hald,
-        /var/lib/hal, and /var/run/hald</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hal-device">
-        <term><command>hal-device</command></term>
-        <listitem>
-          <para>is used to create, remove or show a
-          <application>HAL</application> device.</para>
-          <indexterm zone="hal hal-device">
-            <primary sortas="b-hal-device">hal-device</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-disable-polling">
-        <term><command>hal-disable-polling</command></term>
-        <listitem>
-          <para>can be used to to disable and enable media detection on
-          drives with removable storage.</para>
-          <indexterm zone="hal hal-disable-polling">
-            <primary sortas="b-hal-disable-polling">hal-disable-polling</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-find-by-capability">
-        <term><command>hal-find-by-capability</command></term>
-        <listitem>
-          <para>prints the Unique Device Identifiers for
-          <application>HAL</application> device objects of a given
-          capability.</para>
-          <indexterm zone="hal hal-find-by-capability">
-            <primary sortas="b-hal-find-by-capability">hal-find-by-capability</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-find-by-property">
-        <term><command>hal-find-by-property</command></term>
-        <listitem>
-          <para>prints the Unique Device Identifiers for
-          <application>HAL</application> device objects where a given property
-          assumes a given value.</para>
-          <indexterm zone="hal hal-find-by-property">
-            <primary sortas="b-hal-find-by-property">hal-find-by-property</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-get-property">
-        <term><command>hal-get-property</command></term>
-        <listitem>
-          <para>retrieves a property from a device.</para>
-          <indexterm zone="hal hal-get-property">
-            <primary sortas="b-hal-get-property">hal-get-property</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-set-property">
-        <term><command>hal-set-property</command></term>
-        <listitem>
-          <para>attempts to set property for a device. Note that, due to
-          security considerations, it may not be possible to set a
-          property.</para>
-          <indexterm zone="hal hal-set-property">
-            <primary sortas="b-hal-set-property">hal-set-property</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hal-is-caller-locked-out">
-        <term><command>hal-is-caller-locked-out</command></term>
-        <listitem>
-          <para>determines if a specific caller is locked out of a specific
-          <application>D-Bus</application> interface on a specific device.</para>
-          <indexterm zone="hal hal-is-caller-locked-out">
-            <primary sortas="b-hal-is-caller-locked-out">hal-is-caller-locked-out</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hald">
-        <term><command>hald</command></term>
-        <listitem>
-          <para>is the <application>HAL</application> daemon program.</para>
-          <indexterm zone="hal hald">
-            <primary sortas="b-hald">hald</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lshal">
-        <term><command>lshal</command></term>
-        <listitem>
-          <para>shows all devices and their properties. If the --monitor option
-          is given then the device list and all devices are monitored for
-          changes.</para>
-          <indexterm zone="hal lshal">
-            <primary sortas="b-lshal">lshal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhal">
-        <term><filename class='libraryfile'>libhal.{so,a}</filename></term>
-        <listitem>
-          <para>contains the API functions required by the
-          <application>HAL</application> programs.</para>
-          <indexterm zone="hal libhal">
-            <primary sortas="c-libhal">libhal.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhal-storage">
-        <term><filename class='libraryfile'>libhal-storage.{so,a}</filename></term>
-        <listitem>
-          <para>contains the API functions required by the
-          <application>HAL</application> storage and volume utility
-          programs.</para>
-          <indexterm zone="hal libhal-storage">
-            <primary sortas="c-libhal-storage">libhal-storage.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision 556a307ab836ac03b6ef26d86986c096dfd6273c)
+++ general/sysutils/sysutils.xml	(revision d0cf3963c752f5a2c724a18ec087e38a8195d0cb)
@@ -37,7 +37,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus-bindings.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="DeviceKit.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="upower.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
@@ -49,5 +47,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gvfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libarchive.xml"/>
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="raptor.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="rasqal.xml"/>
