Remove unused files and make

idref's more regular

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11746 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 7 insertions, 773 deletions

diff --git a/chapter06/check.xml b/chapter06/check.xml
index ee72a0725..e7936f6b2 100644
--- a/chapter06/check.xml
+++ b/chapter06/check.xml
@@ -5,7 +5,7 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-tools-check" role="wrap">
+<sect1 id="ch-system-check" role="wrap">
   <?dbhtml filename="check.html"?>
 
   <sect1info condition="script">
@@ -16,7 +16,7 @@
 
   <title>Check-&check-version;</title>
 
-  <indexterm zone="ch-tools-check">
+  <indexterm zone="ch-system-check">
     <primary sortas="a-Check">Check</primary>
   </indexterm>
 
@@ -87,7 +87,7 @@ sed -i '1 s/tools/usr/' /usr/bin/checkmk</userinput></screen>
         <listitem>
           <para>Awk script for generating C unit tests for use with the Check
           unit testing framework</para>
-          <indexterm zone="ch-tools-check checkmk">
+          <indexterm zone="ch-system-check checkmk">
             <primary sortas="b-checmk">checkmk</primary>
           </indexterm>
         </listitem>
@@ -98,7 +98,7 @@ sed -i '1 s/tools/usr/' /usr/bin/checkmk</userinput></screen>
         <listitem>
           <para>Contains functions that allow Check to be called from a test
           program</para>
-          <indexterm zone="ch-tools-check libcheck">
+          <indexterm zone="ch-system-check libcheck">
             <primary sortas="c-libcheck">libcheck</primary>
           </indexterm>
         </listitem>
diff --git a/chapter06/db.xml b/chapter06/db.xml
deleted file mode 100644
index ab737dd79..000000000
--- a/chapter06/db.xml
+++ /dev/null
@@ -1,301 +0,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;
-]>
-
-<sect1 id="ch-system-db" role="wrap">
-  <?dbhtml filename="db.html"?>
-
-  <sect1info condition="script">
-    <productname>db</productname>
-    <productnumber>&db-version;</productnumber>
-    <address>&db-url;</address>
-  </sect1info>
-
-  <title>Berkeley DB-&db-version;</title>
-
-  <indexterm zone="ch-system-db">
-    <primary sortas="a-Berkeley-DB">Berkeley DB</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Berkeley DB package contains programs and utilities used by many
-    other applications for database related functions.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&db-ch6-sbu;</seg>
-        <seg>&db-ch6-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <tip>
-      <title>Other Installation Possibilities</title>
-
-      <para>There are instructions to build this package in the BLFS book if you
-      need to build the RPC server or additional language bindings. The
-      additional language bindings will require additional packages to be
-      installed. See <ulink url="&blfs-book;server/databases.html#db"/>
-      for suggested installation instructions.</para>
-
-      <para>Also, GDBM <emphasis>could</emphasis> be used in place of Berkeley
-      DB to satisfy Man-DB. However, since Berkeley DB is considered a core part
-      of the LFS build, it will not be listed as a dependency for any package in
-      the BLFS book. Likewise, many hours go into testing LFS with Berkeley DB
-      installed, not with GDBM. If you fully understand the risks versus
-      benefits of using GDBM and wish to use it anyway, see the BLFS
-      instructions located at <ulink
-      url="&blfs-book;general/gdbm.html"/></para>
-
-    </tip>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Berkeley DB</title>
-
-    <para>Apply an upstream patch so that replication clients can open a
-    sequence:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&db-fixes-patch;</userinput></screen>
-
-    <para>Prepare Berkeley DB for compilation:</para>
-
-<screen><userinput remap="configure">cd build_unix
-../dist/configure --prefix=/usr --enable-compat185 --enable-cxx</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-compat185</parameter></term>
-        <listitem>
-          <para>This option enables building Berkeley DB 1.85 compatibility
-          API.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-cxx</parameter></term>
-        <listitem>
-          <para>This option enables building C++ API libraries.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>It is not possible to test the package meaningfully, because
-    that would involve building Tcl bindings. Tcl bindings cannot be
-    built properly now because Tcl is linked against Glibc in
-    <filename class="directory">/tools</filename>, not against Glibc in
-    <filename class="directory">/usr</filename>.</para>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make docdir=/usr/share/doc/db-&db-version; install</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-        <term><parameter>docdir=...</parameter></term>
-        <listitem>
-          <para>This variable specifies the correct place for the
-          documentation.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>Fix the ownership of the installed documentation:</para>
-
-<screen><userinput remap="install">chown -Rv root:root /usr/share/doc/db-&db-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-db" role="content">
-    <title>Contents of Berkeley DB</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>db_archive, db_checkpoint, db_codegen, db_deadlock, db_dump,
-        db_hotbackup, db_load, db_printlog, db_recover, db_stat, db_upgrade, and
-        db_verify</seg>
-        <seg>libdb.{a,so}and libdb_cxx.{a,so}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="db_archive">
-        <term><command>db_archive</command></term>
-        <listitem>
-          <para>Prints the pathnames of log files that are no longer in use</para>
-          <indexterm zone="ch-system-db db_archive">
-            <primary sortas="b-db_archive">db_archive</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_checkpoint">
-        <term><command>db_checkpoint</command></term>
-        <listitem>
-          <para>A daemon used to monitor and checkpoint database logs</para>
-          <indexterm zone="ch-system-db db_checkpoint">
-            <primary sortas="b-db_checkpoint">db_checkpoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_codegen">
-        <term><command>db_codegen</command></term>
-        <listitem>
-          <para>Generates application code to create and configure Berkeley DB
-          database environments and databases based on a simple description
-          language, and writes it to one or more output files</para>
-          <indexterm zone="ch-system-db db_codegen">
-            <primary sortas="b-db_codegen">db_codegen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_deadlock">
-        <term><command>db_deadlock</command></term>
-        <listitem>
-          <para>A daemon used to abort lock requests when deadlocks are
-          detected</para>
-          <indexterm zone="ch-system-db db_deadlock">
-            <primary sortas="b-db_deadlock">db_deadlock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_dump">
-        <term><command>db_dump</command></term>
-        <listitem>
-          <para>Converts database files to a plain-text file format readable
-          by <command>db_load</command></para>
-          <indexterm zone="ch-system-db db_dump">
-            <primary sortas="b-db_dump">db_dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_hotbackup">
-        <term><command>db_hotbackup</command></term>
-        <listitem>
-          <para>Creates <quote>hot backup</quote> or <quote>hot failover</quote>
-          snapshots of Berkeley DB databases</para>
-          <indexterm zone="ch-system-db db_hotbackup">
-            <primary sortas="b-db_hotbackup">db_hotbackup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_load">
-        <term><command>db_load</command></term>
-        <listitem>
-          <para>Is used to create database files from plain-text files</para>
-          <indexterm zone="ch-system-db db_load">
-            <primary sortas="b-db_load">db_load</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_printlog">
-        <term><command>db_printlog</command></term>
-        <listitem>
-          <para>Converts database log files to human readable text</para>
-          <indexterm zone="ch-system-db db_printlog">
-            <primary sortas="b-db_printlog">db_printlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_recover">
-        <term><command>db_recover</command></term>
-        <listitem>
-          <para>Is used to restore a database to a consistent state after a
-          failure</para>
-          <indexterm zone="ch-system-db db_recover">
-            <primary sortas="b-db_recover">db_recover</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_stat">
-        <term><command>db_stat</command></term>
-        <listitem>
-          <para>Displays statistics for Berkeley databases</para>
-          <indexterm zone="ch-system-db db_stat">
-            <primary sortas="b-db_stat">db_stat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_upgrade">
-        <term><command>db_upgrade</command></term>
-        <listitem>
-          <para>Is used to upgrade database files to a newer version of
-          Berkeley DB</para>
-          <indexterm zone="ch-system-db db_upgrade">
-            <primary sortas="b-db_upgrade">db_upgrade</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="db_verify">
-        <term><command>db_verify</command></term>
-        <listitem>
-          <para>Is used to run consistency checks on database files</para>
-          <indexterm zone="ch-system-db db_verify">
-            <primary sortas="b-db_verify">db_verify</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-
-      <varlistentry id="libdb">
-        <term><filename class="libraryfile">libdb.{a,so}</filename></term>
-        <listitem>
-          <para>Contains functions to manipulate database files from C
-          programs</para>
-          <indexterm zone="ch-system-db libdb">
-            <primary sortas="c-libdb">libdb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdb_cxx">
-        <term><filename class="libraryfile">libdb_cxx.{a,so}</filename></term>
-        <listitem>
-          <para>Contains functions to manipulate database files from C++
-          programs</para>
-          <indexterm zone="ch-system-db libdb_cxx">
-            <primary sortas="c-libdb_cxx">libdb_cxx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index bbce23d95..08612ab3f 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -132,7 +132,8 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
     <para>One of the E2fsprogs tests will attempt to allocate 256 MB of memory.
     If you do not have significantly more RAM than this, be sure to enable
     sufficient swap space for the test. See <xref
-    linkend="space-creatingfilesystem"/> and <xref linkend="space-mounting"/>
+    linkend="ch-partitioning-creatingfilesystem"/> and <xref
+    linkend="ch-partitioning-mounting"/>
     for details on creating and enabling swap space.</para>
 
     <para>Install the package:</para>
diff --git a/chapter06/libpipeline.xml b/chapter06/libpipeline.xml
index 2ad05deee..6496e792d 100644
--- a/chapter06/libpipeline.xml
+++ b/chapter06/libpipeline.xml
@@ -55,7 +55,7 @@
         <term><parameter>PKG_CONFIG_PATH</parameter></term>
         <listitem>
           <para>Use pkg-config to obtain the location of the test
-          library metadata built in <xref linkend="ch-tools-check"/>.</para>
+          library metadata built in <xref linkend="ch-system-check"/>.</para>
         </listitem>
       </varlistentry>
 
diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml
deleted file mode 100644
index 929382894..000000000
--- a/chapter06/module-init-tools.xml
+++ /dev/null
@@ -1,185 +0,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;
-]>
-
-<sect1 id="ch-system-module-init-tools" role="wrap">
-  <?dbhtml filename="module-init-tools.html"?>
-
-  <sect1info condition="script">
-    <productname>module-init-tools</productname>
-    <productnumber>&module-init-tools-version;</productnumber>
-    <address>&module-init-tools-url;</address>
-  </sect1info>
-
-  <title>Module-Init-Tools-&module-init-tools-version;</title>
-
-  <indexterm zone="ch-system-module-init-tools">
-    <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Module-Init-Tools package contains programs for handling kernel
-    modules in Linux kernels greater than or equal to version 2.5.47.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&module-init-tools-ch6-sbu;</seg>
-        <seg>&module-init-tools-ch6-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Module-Init-Tools</title>
-
-    <para>Apply a patch that contains the generated man pages that were missing
-    from the released source tarball:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&module-init-tools-man-patch;</userinput></screen>
-
-    <para>The test suite of this package is geared towards the needs of its
-    Maintainer. The command <command>make check</command> builds a specially
-    wrapped version of modprobe which is useless for normal operation. To run
-    this (about 0.2 SBU), issue the following commands (note that the
-    <command>make clean</command> command is required to clean up the source
-    tree before recompiling for normal use):</para>
-
-<screen><userinput remap="test">DOCBOOKTOMAN=/bin/true ./configure
-make check
-sed -i -e 's@../../configure@DOCBOOKTOMAN=/bin/true &amp;@' tests/runtests
-./tests/runtests
-make clean</userinput></screen>
-
-    <para>Prepare Module-Init-Tools for compilation:</para>
-
-<screen><userinput remap="configure">DOCBOOKTOMAN=/bin/true ./configure --prefix=/ \
-    --enable-zlib-dynamic --mandir=/usr/share/man</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make INSTALL=install install</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the make parameter:</title>
-      <varlistentry>
-        <term><parameter>INSTALL=install</parameter></term>
-        <listitem>
-          <para>Normally, <command>make install</command> will not install the
-          binaries if they already exist. This option overrides that behavior by
-          calling <command>install</command> instead of using the default
-          wrapper script.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-  <sect2 id="contents-module-init-tools" role="content">
-    <title>Contents of Module-Init-Tools</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>depmod, insmod, insmod.static, lsmod, modinfo, modprobe, and rmmod</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="depmod">
-        <term><command>depmod</command></term>
-        <listitem>
-          <para>Creates a dependency file based on the symbols it finds in the
-          existing set of modules; this dependency file is used by
-          <command>modprobe</command> to automatically load the required
-          modules</para>
-          <indexterm zone="ch-system-module-init-tools depmod">
-            <primary sortas="b-depmod">depmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="insmod">
-        <term><command>insmod</command></term>
-        <listitem>
-          <para>Installs a loadable module in the running kernel</para>
-          <indexterm zone="ch-system-module-init-tools insmod">
-            <primary sortas="b-insmod">insmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="insmod.static">
-        <term><command>insmod.static</command></term>
-        <listitem>
-          <para>A statically compiled version of <command>insmod</command></para>
-          <indexterm zone="ch-system-module-init-tools insmod.static">
-            <primary sortas="b-insmod.static">insmod.static</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lsmod">
-        <term><command>lsmod</command></term>
-        <listitem>
-          <para>Lists currently loaded modules</para>
-          <indexterm zone="ch-system-module-init-tools lsmod">
-            <primary sortas="b-lsmod">lsmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="modinfo">
-        <term><command>modinfo</command></term>
-        <listitem>
-          <para>Examines an object file associated with a kernel module and
-          displays any information that it can glean</para>
-          <indexterm zone="ch-system-module-init-tools modinfo">
-            <primary sortas="b-modinfo">modinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="modprobe">
-        <term><command>modprobe</command></term>
-        <listitem>
-          <para>Uses a dependency file, created by
-          <command>depmod</command>, to automatically load relevant modules</para>
-          <indexterm zone="ch-system-module-init-tools modprobe">
-            <primary sortas="b-modprobe">modprobe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmmod">
-        <term><command>rmmod</command></term>
-        <listitem>
-          <para>Unloads modules from the running kernel</para>
-          <indexterm zone="ch-system-module-init-tools rmmod">
-            <primary sortas="b-rmmod">rmmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
diff --git a/chapter06/pcre.xml b/chapter06/pcre.xml
deleted file mode 100644
index cc7955ab6..000000000
--- a/chapter06/pcre.xml
+++ /dev/null
@@ -1,187 +0,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;
-]>
-
-<sect1 id="ch-system-pcre" role="wrap">
-  <?dbhtml filename="pcre.html"?>
-
-  <sect1info condition="script">
-    <productname>pcre</productname>
-    <productnumber>&pcre-version;</productnumber>
-    <address>&pcre-url;</address>
-  </sect1info>
-
-  <title>PCRE-&pcre-version;</title>
-
-  <indexterm zone="ch-system-pcre">
-    <primary sortas="a-PCRE">PCRE</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The PCRE package contains Perl Compatible Regular Expression
-    libraries. These are useful for implementing regular expression pattern
-    matching using the same syntax and semantics as Perl 5.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&pcre-ch6-sbu;</seg>
-        <seg>&pcre-ch6-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PCRE</title>
-
-    <para>Prepare PCRE for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/usr \
-            --docdir=/usr/share/doc/pcre-&pcre-version; \
-            --enable-utf8 \
-            --enable-unicode-properties \
-            --enable-pcregrep-libz \
-            --enable-pcregrep-libbz2</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-utf8</parameter></term>
-        <listitem>
-          <para>This switch includes the code for handling UTF-8 character
-                strings in the library.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>--enable-unicode-properties</parameter></term>
-        <listitem>
-          <para>This switch enables Unicode properties support.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>--enable-pcregrep-lib*</parameter></term>
-        <listitem>
-          <para>These switches enable the PCRE library to read files compressed
-          with <command>gzip</command> and <command>bzip2</command>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>To test the results, issue:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
-
-    <para>The <command>grep</command> binary will be installed in <filename class="directory">/bin</filename> and will link against the PCRE library; as such,
-move the library to <filename class="directory">/lib</filename>:</para>
-
-<screen><userinput remap="install">mv -v /usr/lib/libpcre.so.* /lib/
-ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-pcre" role="content">
-    <title>Contents of PCRE</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>pcregrep, pcretest, and pcre-config</seg>
-        <seg>libpcre.{a,so}, libpcrecpp.{a,so} and libpcreposix.{a,so}</seg>
-        <seg>/usr/share/doc/pcre-&pcre-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pcregrep">
-        <term><command>pcregrep</command></term>
-        <listitem>
-          <para>A grep that understands Perl compatible regular
-          expressions.</para>
-          <indexterm zone="ch-system-pcre pcregrep">
-            <primary sortas="b-pcre">pcregrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcretest">
-        <term><command>pcretest</command></term>
-        <listitem>
-          <para>Tests a Perl compatible regular expression</para>
-          <indexterm zone="ch-system-pcre pcretest">
-            <primary sortas="b-pcretest">pcretest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcre-config">
-        <term><command>pcre-config</command></term>
-        <listitem>
-          <para>Used during the compilation process of programs linking to the
-          PCRE libraries</para>
-          <indexterm zone="ch-system-pcre pcre-config">
-            <primary sortas="b-pcre-config">pcre-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpcre">
-        <term><filename class="libraryfile">libpcre</filename></term>
-        <listitem>
-          <para>Provides functions useful for working with regular
-          expressions</para>
-          <indexterm zone="ch-system-pcre libpcre">
-            <primary sortas="c-libpcre">libpcre</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpcrecpp">
-        <term><filename class="libraryfile">libpcrecpp</filename></term>
-        <listitem>
-          <para>Provides C++ wrapper functions for the libpcre library</para>
-          <indexterm zone="ch-system-pcre libpcrecpp">
-            <primary sortas="c-libpcrecpp">libpcrecpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpcreposix">
-        <term><filename class="libraryfile">libpcreposix</filename></term>
-        <listitem>
-          <para>Provides wrapper functions based on the POSIX regular expression
-          API</para>
-          <indexterm zone="ch-system-pcre libpcreposix">
-            <primary sortas="c-libpcreposix">libpcreposix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
diff --git a/chapter06/popt.xml b/chapter06/popt.xml
deleted file mode 100644
index cc7c6bdc2..000000000
--- a/chapter06/popt.xml
+++ /dev/null
@@ -1,94 +0,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;
-]>
-
-<sect1 id="ch-system-popt" role="wrap">
-  <?dbhtml filename="popt.html"?>
-
-  <sect1info condition="script">
-    <productname>popt</productname>
-    <productnumber>&popt-version;</productnumber>
-    <address>&popt-url;</address>
-  </sect1info>
-
-  <title>Popt-&popt-version;</title>
-
-  <indexterm zone="ch-system-popt">
-    <primary sortas="a-popt">popt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Popt package contains a library used by some programs
-    to parse command-line options.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&popt-ch6-sbu;</seg>
-        <seg>&popt-ch6-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Popt</title>
-
-    <para>Prepare Popt4 for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>To test the results, issue:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
-
-  </sect2>
-
-
-  <sect2 id="contents-popt" role="content">
-    <title>Contents of Popt</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries:</segtitle>
-
-      <seglistitem>
-        <seg>libpopt.{a,so}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpopt">
-         <!-- Don't remove the extra space, it prevet a FOP warning. -->
-        <term><filename class="libraryfile">libpopt</filename></term>
-        <listitem>
-          <para>is used to parse command-line options</para>
-          <indexterm zone="ch-system-popt libpopt">
-            <primary sortas="b-libpopt">libpopt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>