Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter01/changelog.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="ch-scatter-changelog">
+<sect1 id="ch-intro-changelog">
   <?dbhtml filename="changelog.html"?>
 
Index: chapter01/how.xml
===================================================================
--- chapter01/how.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter01/how.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -83,5 +83,5 @@
 
   <para>To finish the installation, the basic system configuration is set up in
-  <xref linkend="chapter-bootscripts"/>, and the kernel and boot loader are set
+  <xref linkend="chapter-config"/>, and the kernel and boot loader are set
   up in <xref linkend="chapter-bootable"/>. <xref linkend="chapter-finalizing"/>
   contains information on continuing the LFS experience beyond this book.
Index: chapter02/creatingfilesystem.xml
===================================================================
--- chapter02/creatingfilesystem.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter02/creatingfilesystem.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="space-creatingfilesystem">
+<sect1 id="ch-partitioning-creatingfilesystem">
   <?dbhtml filename="creatingfilesystem.html"?>
 
Index: chapter02/creatingpartition.xml
===================================================================
--- chapter02/creatingpartition.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter02/creatingpartition.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="space-creatingpartition">
+<sect1 id="ch-partitioning-creatingpartition">
   <?dbhtml filename="creatingpartition.html"?>
 
Index: chapter02/hostreqs.xml
===================================================================
--- chapter02/hostreqs.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter02/hostreqs.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="pre-hostreqs" xreflabel="Host System Requirements">
+<sect1 id="ch-partitioning-hostreqs" xreflabel="Host System Requirements">
   <?dbhtml filename="hostreqs.html"?>
 
Index: chapter02/introduction.xml
===================================================================
--- chapter02/introduction.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter02/introduction.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="space-introduction">
+<sect1 id="ch-partitioning-introduction">
   <?dbhtml filename="introduction.html"?>
 
Index: chapter02/mounting.xml
===================================================================
--- chapter02/mounting.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter02/mounting.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="space-mounting">
+<sect1 id="ch-partitioning-mounting">
   <?dbhtml filename="mounting.html"?>
 
Index: chapter02/stages.xml
===================================================================
--- chapter02/stages.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter02/stages.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="stages">
+<sect1 id="ch-partitioning-stages">
   <?dbhtml filename="stages.html"?>
 
Index: chapter03/introduction.xml
===================================================================
--- chapter03/introduction.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter03/introduction.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="materials-introduction">
+<sect1 id="ch-materials-introduction">
   <?dbhtml filename="introduction.html"?>
 
Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter03/packages.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="materials-packages">
+<sect1 id="ch-materials-packages">
   <?dbhtml filename="packages.html"?>
 
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter03/patches.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="materials-patches">
+<sect1 id="ch-materials-patches">
   <?dbhtml filename="patches.html"?>
 
Index: chapter04/aboutlfs.xml
===================================================================
--- chapter04/aboutlfs.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter04/aboutlfs.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="prepare-aboutlfs">
+<sect1 id="ch-preps-aboutlfs">
   <?dbhtml filename="aboutlfs.html"?>
 
Index: chapter04/aboutsbus.xml
===================================================================
--- chapter04/aboutsbus.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter04/aboutsbus.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="prepare-aboutsbus">
+<sect1 id="ch-preps-aboutsbus">
   <?dbhtml filename="aboutsbus.html"?>
 
Index: chapter04/abouttestsuites.xml
===================================================================
--- chapter04/abouttestsuites.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter04/abouttestsuites.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="prepare-abouttestsuites">
+<sect1 id="ch-preps-abouttestsuites">
   <?dbhtml filename="abouttestsuites.html"?>
 
Index: chapter04/addinguser.xml
===================================================================
--- chapter04/addinguser.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter04/addinguser.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="ch-tools-addinguser">
+<sect1 id="ch-preps-addinguser">
   <?dbhtml filename="addinguser.html"?>
 
Index: chapter04/creatingtoolsdir.xml
===================================================================
--- chapter04/creatingtoolsdir.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter04/creatingtoolsdir.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="ch-tools-creatingtoolsdir">
+<sect1 id="ch-preps-creatingtoolsdir">
   <?dbhtml filename="creatingtoolsdir.html"?>
 
Index: chapter04/introduction.xml
===================================================================
--- chapter04/introduction.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter04/introduction.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="prepare-introduction">
+<sect1 id="ch-preps-introduction">
   <?dbhtml filename="introduction.html"?>
 
Index: chapter04/settingenviron.xml
===================================================================
--- chapter04/settingenviron.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter04/settingenviron.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="ch-tools-settingenviron">
+<sect1 id="ch-preps-settingenviron">
   <?dbhtml filename="settingenvironment.html"?>
 
Index: apter05/e2fsprogs.xml
===================================================================
--- chapter05/e2fsprogs.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ 	(revision )
@@ -1,98 +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;
-]>
-
-<sect1 id="ch-tools-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <sect1info condition="script">
-    <productname>e2fsprogs</productname>
-    <productnumber>&e2fsprogs-version;</productnumber>
-    <address>&e2fsprogs-url;</address>
-  </sect1info>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-tools-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../chapter06/e2fsprogs.xml"
-    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&e2fsprogs-ch5-sbu;</seg>
-        <seg>&e2fsprogs-ch5-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <para>The E2fsprogs documentation recommends that the package be built in
-    a subdirectory of the source tree: </para>
-
-<screen><userinput remap="pre">mkdir -v build
-cd build</userinput></screen>
-
-    <para>Prepare E2fsprogs for compilation:</para>
-
-<screen><userinput remap="configure">../configure --prefix=/tools --disable-libblkid --disable-libuuid</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--disable-libblkid</parameter></term>
-        <listitem>
-          <para>This prevents E2fsprogs from building its own copy of the
-          libblkid library, which Util-Linux-NG provides.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-libuuid</parameter></term>
-        <listitem>
-          <para>This prevents E2fsprogs from building its own copy of the
-          libuuid library, which Util-Linux-NG provides.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>Install the static libraries and headers required by Util-linux:</para>
-
-<screen><userinput remap="install">make install-libs</userinput></screen>
-
-    <para>Make the installed static libraries writable so debugging symbols can
-    be removed later:</para>
-
-<screen><userinput remap="install">chmod -v u+w \
-    /tools/lib/{libcom_err,libe2p,libext2fs,libss}.a</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in
-    <xref linkend="contents-e2fsprogs" role="."/></para>
-  </sect2>
-
-</sect1>
Index: apter05/flex.xml
===================================================================
--- chapter05/flex.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ 	(revision )
@@ -1,84 +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;
-]>
-
-<sect1 id="ch-tools-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <sect1info condition="script">
-    <productname>flex</productname>
-    <productnumber>&flex-version;</productnumber>
-    <address>&flex-url;</address>
-  </sect1info>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-tools-flex">
-    <primary sortas="a-Flex">Flex</primary>
-    <secondary>tools</secondary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../chapter06/flex.xml"
-    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&flex-ch5-sbu;</seg>
-        <seg>&flex-ch5-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-<!--
-    <para>Flex contains several known bugs. These can be fixed with the
-    following patch:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
-
-    <para>The GNU autotools will detect that the Flex source code has been
-    modified by the previous patch and tries to update the man page
-    accordingly.  This does not work on many systems, and the default page is
-    fine, so make sure it does not get regenerated:</para>
-
-<screen><userinput remap="pre">touch doc/flex.1</userinput></screen>
--->
-    <para>Prepare Flex for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/tools</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 role="content">
-    <title/>
-
-    <para>Details on this package are located in
-    <xref linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: chapter05/gcc-pass2.xml
===================================================================
--- chapter05/gcc-pass2.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter05/gcc-pass2.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -218,5 +218,5 @@
     list. If the <envar>PATH</envar> is wrong it could mean that you are not
     logged in as user <systemitem class="username">lfs</systemitem> or that
-    something went wrong back in <xref linkend="ch-tools-settingenviron"
+    something went wrong back in <xref linkend="ch-preps-settingenviron"
     role="."/></para>
 
Index: chapter05/generalinstructions.xml
===================================================================
--- chapter05/generalinstructions.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter05/generalinstructions.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -54,6 +54,6 @@
 
       <para>The build instructions assume that the <xref
-      linkend='pre-hostreqs'/>, including symbolic links, have been set
-      properly:</para>
+      linkend='ch-partitioning-hostreqs'/>, including symbolic links, have
+      been set properly:</para>
 
       <itemizedlist role='important'>
Index: apter05/gmp.xml
===================================================================
--- chapter05/gmp.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ 	(revision )
@@ -1,84 +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;
-]>
-
-<sect1 id="ch-tools-gmp" role="wrap">
-  <?dbhtml filename="gmp.html"?>
-
-  <sect1info condition="script">
-    <productname>gmp</productname>
-    <productnumber>&gmp-version;</productnumber>
-    <address>&gmp-url;</address>
-  </sect1info>
-
-  <title>GMP-&gmp-version;</title>
-
-  <indexterm zone="ch-tools-gmp">
-    <primary sortas="a-GMP">GMP</primary>
-    <secondary>tools</secondary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../chapter06/gmp.xml"
-    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&gmp-ch5-sbu;</seg>
-        <seg>&gmp-ch5-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GMP</title>
-
-    <para>Prepare GMP for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/tools --enable-mpbsd</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-mpbsd</parameter></term>
-        <listitem>
-          <para>This builds the Berkeley MP compatibility library</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>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in
-    <xref linkend="contents-gmp" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: apter05/mpfr.xml
===================================================================
--- chapter05/mpfr.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ 	(revision )
@@ -1,72 +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;
-]>
-
-<sect1 id="ch-tools-mpfr" role="wrap">
-  <?dbhtml filename="mpfr.html"?>
-
-  <sect1info condition="script">
-    <productname>mpfr</productname>
-    <productnumber>&mpfr-version;</productnumber>
-    <address>&mpfr-url;</address>
-  </sect1info>
-
-  <title>MPFR-&mpfr-version;</title>
-
-  <indexterm zone="ch-tools-mpfr">
-    <primary sortas="a-MPFR">MPFR</primary>
-    <secondary>tools</secondary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../chapter06/mpfr.xml"
-    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&mpfr-ch5-sbu;</seg>
-        <seg>&mpfr-ch5-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of MPFR</title>
-
-    <para>Prepare MPFR for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/tools --enable-thread-safe</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 role="content">
-    <title/>
-
-    <para>Details on this package are located in
-    <xref linkend="contents-mpfr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: chapter05/tcl.xml
===================================================================
--- chapter05/tcl.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter05/tcl.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -75,5 +75,5 @@
     for the duration of the test suite run. This ensures that the clock tests
     are exercised correctly. Details on the <envar>TZ</envar> environment
-    variable are provided in <xref linkend="chapter-bootscripts"/>.</para>
+    variable are provided in <xref linkend="chapter-config"/>.</para>
 
     <para>Install the package:</para>
Index: chapter06/check.xml
===================================================================
--- chapter06/check.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter06/check.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="ch-tools-check" role="wrap">
+<sect1 id="ch-system-check" role="wrap">
   <?dbhtml filename="check.html"?>
 
@@ -17,5 +17,5 @@
   <title>Check-&check-version;</title>
 
-  <indexterm zone="ch-tools-check">
+  <indexterm zone="ch-system-check">
     <primary sortas="a-Check">Check</primary>
   </indexterm>
@@ -88,5 +88,5 @@
           <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>
@@ -99,5 +99,5 @@
           <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>
Index: apter06/db.xml
===================================================================
--- chapter06/db.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ 	(revision )
@@ -1,301 +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;
-]>
-
-<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>
Index: chapter06/e2fsprogs.xml
===================================================================
--- chapter06/e2fsprogs.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter06/e2fsprogs.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -133,5 +133,6 @@
     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>
 
Index: chapter06/libpipeline.xml
===================================================================
--- chapter06/libpipeline.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter06/libpipeline.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -56,5 +56,5 @@
         <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>
Index: apter06/module-init-tools.xml
===================================================================
--- chapter06/module-init-tools.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ 	(revision )
@@ -1,185 +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;
-]>
-
-<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>
Index: apter06/pcre.xml
===================================================================
--- chapter06/pcre.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ 	(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;
-]>
-
-<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>
Index: apter06/popt.xml
===================================================================
--- chapter06/popt.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ 	(revision )
@@ -1,94 +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;
-]>
-
-<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>
Index: chapter07/bootscripts.xml
===================================================================
--- chapter07/bootscripts.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/bootscripts.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="ch-scripts-bootscripts" role="wrap" revision="sysv">
+<sect1 id="ch-config-bootscripts" role="wrap" revision="sysv">
   <?dbhtml filename="bootscripts.html"?>
 
@@ -17,5 +17,5 @@
   <title>LFS-Bootscripts-&lfs-bootscripts-version;</title>
 
-  <indexterm zone="ch-scripts-bootscripts">
+  <indexterm zone="ch-config-bootscripts">
     <primary sortas="a-Bootscripts">Bootscripts</primary>
   </indexterm>
@@ -76,5 +76,5 @@
           <para>Checks the integrity of the file systems before they are mounted
           (with the exception of journal and network based file systems)</para>
-          <indexterm zone="ch-scripts-bootscripts checkfs-bootscripts">
+          <indexterm zone="ch-config-bootscripts checkfs-bootscripts">
             <primary sortas="d-checkfs">checkfs</primary>
           </indexterm>
@@ -91,5 +91,5 @@
           <filename>/etc/nologin</filename>, <filename>/fastboot</filename>, and
           <filename>/forcefsck</filename> files</para>
-          <indexterm zone="ch-scripts-bootscripts cleanfs-bootscripts">
+          <indexterm zone="ch-config-bootscripts cleanfs-bootscripts">
             <primary sortas="d-cleanfs">cleanfs</primary>
           </indexterm>
@@ -102,5 +102,5 @@
           <para>Loads the correct keymap table for the desired keyboard layout;
           it also sets the screen font</para>
-          <indexterm zone="ch-scripts-bootscripts console-bootscripts">
+          <indexterm zone="ch-config-bootscripts console-bootscripts">
             <primary sortas="d-console">console</primary>
           </indexterm>
@@ -113,5 +113,5 @@
           <para>Contains common functions, such as error and status checking,
           that are used by several bootscripts</para>
-          <indexterm zone="ch-scripts-bootscripts functions-bootscripts">
+          <indexterm zone="ch-config-bootscripts functions-bootscripts">
             <primary sortas="d-functions">functions</primary>
           </indexterm>
@@ -123,5 +123,5 @@
         <listitem>
           <para>Halts the system</para>
-          <indexterm zone="ch-scripts-bootscripts halt-bootscripts">
+          <indexterm zone="ch-config-bootscripts halt-bootscripts">
             <primary sortas="d-halt">halt</primary>
           </indexterm>
@@ -133,5 +133,5 @@
         <listitem>
           <para>Stops a network device</para>
-          <indexterm zone="ch-scripts-bootscripts ifdown-bootscripts">
+          <indexterm zone="ch-config-bootscripts ifdown-bootscripts">
             <primary sortas="d-ifdown">ifdown</primary>
           </indexterm>
@@ -143,5 +143,5 @@
         <listitem>
           <para>Initializes a network device</para>
-          <indexterm zone="ch-scripts-bootscripts ifup-bootscripts">
+          <indexterm zone="ch-config-bootscripts ifup-bootscripts">
             <primary sortas="d-ifup">ifup</primary>
           </indexterm>
@@ -153,5 +153,5 @@
         <listitem>
           <para>Sets up the system's hostname and local loopback device</para>
-          <indexterm zone="ch-scripts-bootscripts localnet-bootscripts">
+          <indexterm zone="ch-config-bootscripts localnet-bootscripts">
             <primary sortas="d-localnet">localnet</primary>
           </indexterm>
@@ -165,5 +165,5 @@
           <filename>/etc/sysconfig/modules</filename>, using arguments
           that are also given there</para>
-          <indexterm zone="ch-scripts-bootscripts modules-bootscripts">
+          <indexterm zone="ch-config-bootscripts modules-bootscripts">
             <primary sortas="d-modules">modules</primary>
           </indexterm>
@@ -176,5 +176,5 @@
           <para>Mounts all file systems, except ones that are marked
           <emphasis>noauto</emphasis> or are network based</para>
-          <indexterm zone="ch-scripts-bootscripts mountfs-bootscripts">
+          <indexterm zone="ch-config-bootscripts mountfs-bootscripts">
             <primary sortas="d-mountfs">mountfs</primary>
           </indexterm>
@@ -187,5 +187,5 @@
           <para>Mounts virtual kernel file systems, such as <systemitem
           class="filesystem">proc</systemitem></para>
-          <indexterm zone="ch-scripts-bootscripts mountvirtfs-bootscripts">
+          <indexterm zone="ch-config-bootscripts mountvirtfs-bootscripts">
             <primary sortas="d-mountvirtfs">mountvirtfs</primary>
           </indexterm>
@@ -198,5 +198,5 @@
           <para>Sets up network interfaces, such as network cards, and sets up
           the default gateway (where applicable)</para>
-          <indexterm zone="ch-scripts-bootscripts network-bootscripts">
+          <indexterm zone="ch-config-bootscripts network-bootscripts">
             <primary sortas="d-network">network</primary>
           </indexterm>
@@ -210,5 +210,5 @@
           running all the other bootscripts one-by-one, in a sequence determined
           by the name of the symbolic links being processed</para>
-          <indexterm zone="ch-scripts-bootscripts rc-bootscripts">
+          <indexterm zone="ch-config-bootscripts rc-bootscripts">
             <primary sortas="d-rc">rc</primary>
           </indexterm>
@@ -220,5 +220,5 @@
         <listitem>
           <para>Reboots the system</para>
-          <indexterm zone="ch-scripts-bootscripts reboot-bootscripts">
+          <indexterm zone="ch-config-bootscripts reboot-bootscripts">
             <primary sortas="d-reboot">reboot</primary>
           </indexterm>
@@ -231,5 +231,5 @@
           <para>Makes sure every process is terminated before the system reboots
           or halts</para>
-          <indexterm zone="ch-scripts-bootscripts sendsignals-bootscripts">
+          <indexterm zone="ch-config-bootscripts sendsignals-bootscripts">
             <primary sortas="d-sendsignals">sendsignals</primary>
           </indexterm>
@@ -242,5 +242,5 @@
           <para>Resets the kernel clock to local time in case the hardware clock
           is not set to UTC time</para>
-          <indexterm zone="ch-scripts-bootscripts setclock-bootscripts">
+          <indexterm zone="ch-config-bootscripts setclock-bootscripts">
             <primary sortas="d-setclock">setclock</primary>
           </indexterm>
@@ -253,5 +253,5 @@
           <para>Provides the functionality needed to assign a static Internet
           Protocol (IP) address to a network interface</para>
-          <indexterm zone="ch-scripts-bootscripts ipv4-static-bootscripts">
+          <indexterm zone="ch-config-bootscripts ipv4-static-bootscripts">
             <primary sortas="d-ipv4-static">ipv4-static</primary>
           </indexterm>
@@ -263,5 +263,5 @@
         <listitem>
           <para>Enables and disables swap files and partitions</para>
-          <indexterm zone="ch-scripts-bootscripts swap-bootscripts">
+          <indexterm zone="ch-config-bootscripts swap-bootscripts">
             <primary sortas="d-swap">swap</primary>
           </indexterm>
@@ -275,5 +275,5 @@
           <filename>/etc/sysctl.conf</filename>, if that file exists,
           into the running kernel</para>
-          <indexterm zone="ch-scripts-bootscripts sysctl-bootscripts">
+          <indexterm zone="ch-config-bootscripts sysctl-bootscripts">
             <primary sortas="d-sysctl">sysctl</primary>
           </indexterm>
@@ -285,5 +285,5 @@
         <listitem>
           <para>Starts and stops the system and kernel log daemons</para>
-          <indexterm zone="ch-scripts-bootscripts sysklogd-bootscripts">
+          <indexterm zone="ch-config-bootscripts sysklogd-bootscripts">
             <primary sortas="d-sysklogd">sysklogd</primary>
           </indexterm>
@@ -296,5 +296,5 @@
           <para>A template to create custom bootscripts for other
           daemons</para>
-          <indexterm zone="ch-scripts-bootscripts template-bootscripts">
+          <indexterm zone="ch-config-bootscripts template-bootscripts">
             <primary sortas="d-template">template</primary>
           </indexterm>
@@ -307,5 +307,5 @@
           <para>Prepares the <filename class="directory">/dev</filename>
           directory and starts Udev</para>
-          <indexterm zone="ch-scripts-bootscripts udev-bootscripts">
+          <indexterm zone="ch-config-bootscripts udev-bootscripts">
             <primary sortas="d-udev">udev</primary>
           </indexterm>
@@ -319,5 +319,5 @@
           files from <filename class="directory">/run/udev</filename> to
           <filename class="directory">/etc/udev/rules.d</filename> if required</para>
-          <indexterm zone="ch-scripts-bootscripts udev-retry-bootscripts">
+          <indexterm zone="ch-config-bootscripts udev-retry-bootscripts">
             <primary sortas="d-udev-retry">udev_retry</primary>
           </indexterm>
Index: chapter07/chapter07.xml
===================================================================
--- chapter07/chapter07.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/chapter07.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<chapter id="chapter-bootscripts" xreflabel="Chapter&nbsp;7">
+<chapter id="chapter-config" xreflabel="Chapter&nbsp;7">
   <?dbhtml dir="chapter07"?>
   <?dbhtml filename="chapter07.html"?>
Index: chapter07/clock.xml
===================================================================
--- chapter07/clock.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/clock.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,10 +6,10 @@
 ]>
 
-<sect1 id="ch-scripts-clock" revision="systemd">
+<sect1 id="ch-config-clock" revision="systemd">
   <?dbhtml filename="clock.html"?>
 
   <title>Configuring the system clock</title>
 
-  <indexterm zone="ch-scripts-clock">
+  <indexterm zone="ch-config-clock">
     <primary sortas="d-clock">clock</primary>
   <secondary>configuring</secondary></indexterm>
Index: chapter07/consoled.xml
===================================================================
--- chapter07/consoled.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/consoled.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,10 +6,10 @@
 ]>
 
-<sect1 id="ch-scripts-console" revision="systemd">
+<sect1 id="ch-config-console" revision="systemd">
   <?dbhtml filename="console.html"?>
 
   <title>Configuring the Linux Console</title>
 
-  <indexterm zone="ch-scripts-console">
+  <indexterm zone="ch-config-console">
     <primary sortas="d-console">console</primary>
     <secondary>configuring</secondary>
Index: chapter07/inputrc.xml
===================================================================
--- chapter07/inputrc.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/inputrc.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,10 +6,10 @@
 ]>
 
-<sect1 id="ch-scripts-inputrc">
+<sect1 id="ch-config-inputrc">
   <?dbhtml filename="inputrc.html"?>
 
   <title>Creating the /etc/inputrc File</title>
 
-  <indexterm zone="ch-scripts-inputrc">
+  <indexterm zone="ch-config-inputrc">
     <primary sortas="e-/etc/inputrc">/etc/inputrc</primary>
   </indexterm>
Index: chapter07/introduction.xml
===================================================================
--- chapter07/introduction.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/introduction.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="ch-scripts-introduction" revision="sysv">
+<sect1 id="ch-config-introduction" revision="sysv">
   <?dbhtml filename="introduction.html"?>
 
Index: chapter07/introductiond.xml
===================================================================
--- chapter07/introductiond.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/introductiond.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="ch-scripts-introduction" revision="systemd">
+<sect1 id="ch-config-introduction" revision="systemd">
   <?dbhtml filename="introduction.html"?>
 
@@ -17,11 +17,11 @@
   <itemizedlist>
      <listitem>
-       <para><xref linkend="ch-scripts-network" role="."/></para>
+       <para><xref linkend="ch-config-network" role="."/></para>
      </listitem>
      <listitem>
-       <para><xref linkend="ch-scripts-hostname" role="."/></para>
+       <para><xref linkend="ch-config-hostname" role="."/></para>
      </listitem>
      <listitem>
-       <para><xref linkend="ch-scripts-hosts" role="."/></para>
+       <para><xref linkend="ch-config-hosts" role="."/></para>
      </listitem>
   </itemizedlist>
@@ -32,8 +32,8 @@
   <itemizedlist>
      <listitem>
-       <para><xref linkend="ch-scripts-udev" role="."/></para>
+       <para><xref linkend="ch-config-udev" role="."/></para>
      </listitem>
      <listitem>
-       <para><xref linkend="ch-scripts-symlinks" role="."/></para>
+       <para><xref linkend="ch-config-symlinks" role="."/></para>
      </listitem>
   </itemizedlist>
@@ -43,8 +43,8 @@
   <itemizedlist>
      <listitem>
-       <para><xref linkend="ch-scripts-clock" role="."/></para>
+       <para><xref linkend="ch-config-clock" role="."/></para>
      </listitem>
      <listitem>
-       <para><xref linkend="ch-scripts-console" role="."/></para>
+       <para><xref linkend="ch-config-console" role="."/></para>
      </listitem>
   </itemizedlist>
@@ -56,8 +56,8 @@
   <itemizedlist>
      <listitem>
-       <para><xref linkend="ch-scripts-locale" role="."/></para>
+       <para><xref linkend="ch-config-locale" role="."/></para>
      </listitem>
      <listitem>
-       <para><xref linkend="ch-scripts-inputrc" role="."/></para>
+       <para><xref linkend="ch-config-inputrc" role="."/></para>
      </listitem>
   </itemizedlist>
@@ -67,5 +67,5 @@
   <itemizedlist>
      <listitem>
-       <para><xref linkend="ch-scripts-systemd-custom" role="."/></para>
+       <para><xref linkend="ch-config-systemd-custom" role="."/></para>
      </listitem>
   </itemizedlist>
Index: chapter07/locale.xml
===================================================================
--- chapter07/locale.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/locale.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,10 +6,10 @@
 ]>
 
-<sect1 id="ch-scripts-locale" revision="systemd">
+<sect1 id="ch-config-locale" revision="systemd">
   <?dbhtml filename="locale.html"?>
 
   <title>Configuring the System Locale</title>
 
-  <indexterm zone="ch-scripts-locale">
+  <indexterm zone="ch-config-locale">
     <primary sortas="e-etc-locale-conf">/etc/locale.conf</primary>
   </indexterm>
Index: chapter07/network.xml
===================================================================
--- chapter07/network.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/network.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,10 +6,10 @@
 ]>
 
-<sect1 id="ch-scripts-network" revision="sysv">
+<sect1 id="ch-config-network" revision="sysv">
   <?dbhtml filename="network.html"?>
 
   <title>General Network Configuration</title>
 
-  <indexterm zone="ch-scripts-network">
+  <indexterm zone="ch-config-network">
     <primary sortas="d-network">network</primary>
   <secondary>configuring</secondary></indexterm>
@@ -23,5 +23,5 @@
   from all run-level directories (<filename
   class="directory">/etc/rc.d/rc*.d</filename>) after the bootscripts are
-  installed in <xref linkend="ch-scripts-bootscripts"/>.</para>
+  installed in <xref linkend="ch-config-bootscripts"/>.</para>
 -->
   <sect2>
@@ -139,8 +139,8 @@
   </sect2>
 
-  <sect2 id="ch-scripts-hostname">
+  <sect2 id="ch-config-hostname">
     <title>Configuring the system hostname</title>
 
-    <indexterm zone="ch-scripts-hostname">
+    <indexterm zone="ch-config-hostname">
       <primary sortas="d-hostname">hostname</primary>
       <secondary>configuring</secondary>
@@ -162,17 +162,17 @@
   </sect2>
 
-  <sect2 id="ch-scripts-hosts">
+  <sect2 id="ch-config-hosts">
      <title>Customizing the /etc/hosts File</title>
 
-     <indexterm zone="ch-scripts-hosts">
+     <indexterm zone="ch-config-hosts">
        <primary sortas="e-/etc/hosts">/etc/hosts</primary>
      </indexterm>
    
-     <indexterm zone="ch-scripts-hosts">
+     <indexterm zone="ch-config-hosts">
        <primary sortas="d-localnet">localnet</primary>
        <secondary>/etc/hosts</secondary>
      </indexterm>
    
-     <indexterm zone="ch-scripts-hosts">
+     <indexterm zone="ch-config-hosts">
        <primary sortas="d-network">network</primary>
        <secondary>/etc/hosts</secondary>
Index: chapter07/networkd.xml
===================================================================
--- chapter07/networkd.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/networkd.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,10 +6,10 @@
 ]>
 
-<sect1 id="ch-scripts-network" revision="systemd">
+<sect1 id="ch-config-network" revision="systemd">
   <?dbhtml filename="network.html"?>
 
   <title>General Network Configuration</title>
 
-  <indexterm zone="ch-scripts-network">
+  <indexterm zone="ch-config-network">
     <primary sortas="d-network">network</primary>
   <secondary>configuring</secondary></indexterm>
@@ -222,8 +222,8 @@
   </sect2>
 
-  <sect2 id="ch-scripts-hostname">
+  <sect2 id="ch-config-hostname">
     <title>Configuring the system hostname</title>
 
-    <indexterm zone="ch-scripts-hostname">
+    <indexterm zone="ch-config-hostname">
       <primary sortas="d-hostname">hostname</primary>
       <secondary>configuring</secondary>
@@ -245,17 +245,17 @@
   </sect2>
 
-  <sect2 id="ch-scripts-hosts">
+  <sect2 id="ch-config-hosts">
      <title>Customizing the /etc/hosts File</title>
 
-     <indexterm zone="ch-scripts-hosts">
+     <indexterm zone="ch-config-hosts">
        <primary sortas="e-/etc/hosts">/etc/hosts</primary>
      </indexterm>
    
-     <indexterm zone="ch-scripts-hosts">
+     <indexterm zone="ch-config-hosts">
        <primary sortas="d-localnet">localnet</primary>
        <secondary>/etc/hosts</secondary>
      </indexterm>
    
-     <indexterm zone="ch-scripts-hosts">
+     <indexterm zone="ch-config-hosts">
        <primary sortas="d-network">network</primary>
        <secondary>/etc/hosts</secondary>
Index: chapter07/profile.xml
===================================================================
--- chapter07/profile.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/profile.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,10 +6,10 @@
 ]>
 
-<sect1 id="ch-scripts-profile" revision="sysv">
+<sect1 id="ch-config-profile" revision="sysv">
   <?dbhtml filename="profile.html"?>
 
   <title>The Bash Shell Startup Files</title>
 
-  <indexterm zone="ch-scripts-profile">
+  <indexterm zone="ch-config-profile">
     <primary sortas="e-/etc/profile">/etc/profile</primary>
   </indexterm>
Index: chapter07/symlinks.xml
===================================================================
--- chapter07/symlinks.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/symlinks.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="ch-scripts-symlinks">
+<sect1 id="ch-config-symlinks">
   <?dbhtml filename="symlinks.html"?>
 
@@ -207,5 +207,5 @@
     <title>Dealing with duplicate devices</title>
 
-    <para>As explained in <xref linkend="ch-scripts-udev"/>, the order in
+    <para>As explained in <xref linkend="ch-config-udev"/>, the order in
     which devices with the same function appear in
     <filename class="directory">/dev</filename> is essentially random.
@@ -217,5 +217,5 @@
     fixable by creating Udev rules for custom persistent symlinks.
     The case of network cards is covered separately in
-    <xref linkend="ch-scripts-network"/>, and sound card configuration can
+    <xref linkend="ch-config-network"/>, and sound card configuration can
     be found in <ulink url="&blfs-book;postlfs/devices.html">BLFS</ulink>.</para>
 
Index: chapter07/systemd-custom.xml
===================================================================
--- chapter07/systemd-custom.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/systemd-custom.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,10 +6,10 @@
 ]>
 
-<sect1 id="ch-scripts-systemd-custom" revision="systemd">
+<sect1 id="ch-config-systemd-custom" revision="systemd">
   <?dbhtml filename="systemd-custom.html"?>
 
   <title>Systemd Usage and Configuration</title>
 
-  <indexterm zone="ch-scripts-systemd-custom">
+  <indexterm zone="ch-config-systemd-custom">
     <primary sortas="e-Systemd">Systemd Customization</primary>
   </indexterm>
Index: chapter07/udev.xml
===================================================================
--- chapter07/udev.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/udev.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -6,10 +6,10 @@
 ]>
 
-<sect1 id="ch-scripts-udev">
+<sect1 id="ch-config-udev">
   <?dbhtml filename="udev.html"?>
 
   <title>Overview of Device and Module Handling</title>
 
-  <indexterm zone="ch-scripts-udev">
+  <indexterm zone="ch-config-udev">
     <primary sortas="a-Udev">Udev</primary>
     <secondary>usage</secondary>
@@ -304,6 +304,6 @@
       stable names based on some stable attributes of the device, such as a
       serial number or the output of various *_id utilities installed by Udev.
-      See <xref linkend="ch-scripts-symlinks"/> and
-      <xref linkend="ch-scripts-network"/> for examples.</para>
+      See <xref linkend="ch-config-symlinks"/> and
+      <xref linkend="ch-config-network"/> for examples.</para>
 
     </sect3>
Index: chapter07/usage.xml
===================================================================
--- chapter07/usage.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter07/usage.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -7,10 +7,10 @@
 ]>
 
-<sect1 id="ch-scripts-usage" revision="sysv">
+<sect1 id="ch-config-usage" revision="sysv">
   <?dbhtml filename="usage.html"?>
 
   <title>System V Bootscript Usage and Configuration</title>
 
-  <indexterm zone="ch-scripts-usage">
+  <indexterm zone="ch-config-usage">
     <primary sortas="a-Bootscripts">Bootscripts</primary>
     <secondary>usage</secondary>
@@ -282,9 +282,9 @@
   </sect2>
 
-  <sect2 id="ch-scripts-clock">
+  <sect2 id="ch-config-clock">
     <title>Configuring the System Clock</title>
 
-    <indexterm zone="ch-scripts-clock">
-      <primary sortas="d-scripts-setclock">setclock</primary>
+    <indexterm zone="ch-config-clock">
+      <primary sortas="d-setclock">setclock</primary>
     <secondary>configuring</secondary></indexterm>
 
@@ -342,10 +342,10 @@
   </sect2>
 
-  <sect2 id="ch-scripts-console">
+  <sect2 id="ch-config-console">
   <?dbhtml filename="console.html"?>
 
   <title>Configuring the Linux Console</title>
 
-  <indexterm zone="ch-scripts-console">
+  <indexterm zone="ch-config-console">
     <primary sortas="d-console">console</primary>
     <secondary>configuring</secondary>
@@ -578,8 +578,8 @@
   </sect2>
 
-  <sect2 id="ch-scripts-createfiles">
+  <sect2 id="ch-config-createfiles">
     <title>Creating Files at Boot</title>
   
-    <indexterm zone="ch-scripts-createfiles">
+    <indexterm zone="ch-config-createfiles">
       <primary sortas="d-createfiles">File creation at boot</primary>
       <secondary>configuring</secondary>
@@ -594,8 +594,8 @@
   </sect2>
 
-  <sect2 id="ch-scripts-sysklogd">
+  <sect2 id="ch-config-sysklogd">
     <title>Configuring the sysklogd Script</title>
   
-    <indexterm zone="ch-scripts-sysklogd">
+    <indexterm zone="ch-config-sysklogd">
       <primary sortas="d-sysklogd">sysklogd</primary>
       <secondary>configuring</secondary>
@@ -617,8 +617,8 @@
   </sect2>
 
-  <sect2 id="ch-scripts-site">
+  <sect2 id="ch-config-site">
     <title>The rc.site File</title>
   
-    <indexterm zone="ch-scripts-site">
+    <indexterm zone="ch-config-site">
       <primary sortas="a-rc.site">rc.site</primary>
     </indexterm>
Index: chapter08/kernel.xml
===================================================================
--- chapter08/kernel.xml	(revision 6b041a031d9b5fc57a225e46cb88799a3cca7fd2)
+++ chapter08/kernel.xml	(revision afcfd745aec2ed1976187b2ea2c21a26ad2ca850)
@@ -208,5 +208,5 @@
     class="directory">/etc/modprobe.d</filename> may be required.
     Information pertaining to modules and kernel configuration is
-    located in <xref linkend="ch-scripts-udev"/> and in the kernel
+    located in <xref linkend="ch-config-udev"/> and in the kernel
     documentation in the <filename
     class="directory">linux-&linux-version;/Documentation</filename> directory.
