Index: chapter05/e2fsprogs.xml
===================================================================
--- chapter05/e2fsprogs.xml	(revision ae11e15dd75cb622f21c7660f2fdb0eaaeaaa59f)
+++ 	(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: chapter05/flex.xml
===================================================================
--- chapter05/flex.xml	(revision ae11e15dd75cb622f21c7660f2fdb0eaaeaaa59f)
+++ 	(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 ae11e15dd75cb622f21c7660f2fdb0eaaeaaa59f)
+++ 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 ae11e15dd75cb622f21c7660f2fdb0eaaeaaa59f)
+++ 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: chapter05/gmp.xml
===================================================================
--- chapter05/gmp.xml	(revision ae11e15dd75cb622f21c7660f2fdb0eaaeaaa59f)
+++ 	(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: chapter05/mpfr.xml
===================================================================
--- chapter05/mpfr.xml	(revision ae11e15dd75cb622f21c7660f2fdb0eaaeaaa59f)
+++ 	(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 ae11e15dd75cb622f21c7660f2fdb0eaaeaaa59f)
+++ 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>
