Removed text in chapter 05 - last round.

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

12 files changed, 28 insertions, 391 deletions

diff --git a/chapter05/make.xml b/chapter05/make.xml
index 2d8bccdcf..5fa9a6aa1 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -12,7 +12,6 @@
 <secondary>tools</secondary></indexterm>
 
 <sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/make.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -20,8 +19,6 @@
 <seglistitem><seg>0.2 SBU</seg><seg>8.8 MB</seg></seglistitem>
 </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/make.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
-
 </sect2>
 
 <sect2 role="installation">
@@ -31,21 +28,17 @@
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>Compile the program:</para>
+<para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>(If you want to test the results, then issue:
-<userinput>make check</userinput>.)</para>
+<para>To test the results,  issue:
+<userinput>make check</userinput></para>
 
-<para>Then install it and its documentation:</para>
+<para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
 </sect2>
 
-<sect2 role="content"><title/>
-<para>The details on this package are found in <xref linkend="contents-make"/>.</para>
-</sect2>
-
 </sect1>
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index 9bc86e181..c6edfe343 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -12,7 +12,6 @@
 <secondary>tools</secondary></indexterm>
 
 <sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/ncurses.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -20,8 +19,6 @@
 <seglistitem><seg>0.7 SBU</seg><seg>26 MB</seg></seglistitem>
 </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/ncurses.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
-
 </sect2>
 
 <sect2 role="installation">
@@ -32,38 +29,14 @@
 <screen><userinput>./configure --prefix=/tools --with-shared \
     --without-debug --without-ada --enable-overwrite</userinput></screen>
 
-<para>The meaning of the configure options:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>--without-ada</parameter></term>
-<listitem><para>This tells Ncurses not
-to build its Ada bindings, even if an Ada compiler is installed on the host.
-This must be done because once we enter the chroot environment, Ada will no
-longer be available.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--enable-overwrite</parameter></term>
-<listitem><para>This tells Ncurses to install its header files into 
-<filename class="directory">/tools/include</filename> instead of 
-<filename class="directory">/tools/include/ncurses</filename> to ensure that 
-other packages can find the Ncurses headers successfully.</para></listitem>
-</varlistentry>
-</variablelist>
-
-<para>Compile the programs and libraries:</para>
+<para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>Then install them and their documentation:</para>
+<para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
 </sect2>
 
-<sect2 role="content"><title/>
-<para>The details on this package are found in <xref linkend="contents-ncurses"/>.</para>
-</sect2>
-
 </sect1>
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index 6f7fa5746..0fe5f59c5 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -12,7 +12,6 @@
 <secondary>tools</secondary></indexterm>
 
 <sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/patch.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -20,31 +19,23 @@
 <seglistitem><seg>0.1 SBU</seg><seg>1.9 MB</seg></seglistitem>
 </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/patch.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
-
 </sect2>
 
 <sect2 role="installation">
 <title>Installation of Patch</title>
 
-<para>Prepare Patch for compilation (the preprocessor flag
-<parameter>-D_GNU_SOURCE</parameter> is only needed on the PowerPC platform, on
-other architectures you can leave it out):</para>
+<para>Prepare Patch for compilation:</para>
 
 <screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/tools</userinput></screen>
 
-<para>Compile the program:</para>
+<para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>Then install it and its documentation:</para>
+<para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
 </sect2>
 
-<sect2 role="content"><title/>
-<para>The details on this package are found in <xref linkend="contents-patch"/>.</para>
-</sect2>
-
 </sect1>
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index c0de05a45..9c489e1fc 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -12,7 +12,6 @@
 <secondary>tools</secondary></indexterm>
 
 <sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/perl.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -20,8 +19,6 @@
 <seglistitem><seg>0.8 SBU</seg><seg>74 MB</seg></seglistitem>
 </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/perl.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
-
 </sect2>
 
 <sect2 role="installation">
@@ -31,22 +28,10 @@
 
 <screen><userinput>patch -Np1 -i ../perl-&perl-version;-libc-1.patch</userinput></screen>
 
-<para>Now prepare Perl for compilation (make sure you get the 'IO Fcntl POSIX'
-right, they are all letters):</para>
+<para>Now prepare Perl for compilation:</para>
 
 <screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='IO Fcntl POSIX'</userinput></screen>
 
-<para>The meaning of the configure option:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>-Dstatic_ext='IO Fcntl POSIX'</parameter></term>
-<listitem><para>This tells
-Perl to build the minimum set of static extensions needed for installing and
-testing the Coreutils package in the next chapter.</para></listitem>
-</varlistentry>
-</variablelist>
-
 <para>Compile only the required tools:</para>
 
 <screen><userinput>make perl utilities</userinput></screen>
@@ -59,8 +44,4 @@ cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
 
 </sect2>
 
-<sect2 role="content"><title/>
-<para>The details on this package are found in <xref linkend="contents-perl"/>.</para>
-</sect2>
-
 </sect1>
diff --git a/chapter05/sed.xml b/chapter05/sed.xml
index 265486c96..6de3aa83e 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -12,7 +12,6 @@
 <secondary>tools</secondary></indexterm>
 
 <sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/sed.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -20,8 +19,6 @@
 <seglistitem><seg>0.2 SBU</seg><seg>5.2 MB</seg></seglistitem>
 </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/sed.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
-
 </sect2>
 
 <sect2 role="installation">
@@ -31,21 +28,17 @@
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>Compile the program:</para>
+<para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>(If you want to test the results, then issue:
-<userinput>make check</userinput>.)</para>
+<para>To test the results,  issue:
+<userinput>make check</userinput></para>
 
-<para>Then install it and its documentation:</para>
+<para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
 </sect2>
 
-<sect2 role="content"><title/>
-<para>The details on this package are found in <xref linkend="contents-sed"/>.</para>
-</sect2>
-
 </sect1>
diff --git a/chapter05/stripping.xml b/chapter05/stripping.xml
index 935f848e6..586df1089 100644
--- a/chapter05/stripping.xml
+++ b/chapter05/stripping.xml
@@ -7,29 +7,9 @@
 <title>Stripping</title>
 <?dbhtml filename="stripping.html"?>
 
-<para>The steps in this section are optional, but if your LFS partition is
-rather small, you will be glad to learn that you can remove some unnecessary
-things. The executables and libraries you have built so far contain about 130
-MB of unneeded debugging symbols. Remove those symbols with:</para>
-
 <screen><userinput>strip --strip-debug /tools/lib/*
 strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
 
-<para>The last of the above commands will skip some twenty files, reporting
-that it doesn't recognize their file format. Most of them are scripts instead
-of binaries.</para>
-
-<para>Take care <emphasis>not</emphasis> to use
-<parameter>--strip-unneeded</parameter> on the libraries -- the static ones
-would be destroyed and you would have to build the three toolchain packages
-all over again.</para>
-
-<para>To save another 30 MB, you can remove all the documentation:</para>
-
 <screen><userinput>rm -rf /tools/{doc,info,man}</userinput></screen>
 
-<para>You will now need to have at least 850 MB of free space on your LFS
-file system to be able to build and install Glibc in the next phase. If you can
-build and install Glibc, you can build and install the rest too.</para>
-
 </sect1>
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 62896f359..9602803b5 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -12,7 +12,6 @@
 <secondary>tools</secondary></indexterm>
 
 <sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/tar.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -20,8 +19,6 @@
 <seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
 </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/tar.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
-
 </sect2>
 
 <sect2 role="installation">
@@ -31,21 +28,17 @@
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>Compile the programs:</para>
+<para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>(If you want to test the results, then issue:
-<userinput>make check</userinput>.)</para>
+<para>To test the results,  issue:
+<userinput>make check</userinput></para>
 
-<para>Then install them and their documentation:</para>
+<para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
 </sect2>
 
-<sect2 role="content"><title/>
-<para>The details on this package are found in <xref linkend="contents-tar"/>.</para>
-</sect2>
-
 </sect1>
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 381cec992..74ee69e07 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -10,7 +10,6 @@
 <indexterm zone="ch-tools-tcl"><primary sortas="a-Tcl">Tcl</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The Tcl package contains the Tool Command Language.</para>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -18,25 +17,11 @@
 <seglistitem><seg>0.9 SBU</seg><seg>23 MB</seg></seglistitem>
 </segmentedlist>
 
-<segmentedlist>
-<segtitle>Tcl installation depends on</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
-</segmentedlist>
-
 </sect2>
 
 <sect2 role="installation">
 <title>Installation of Tcl</title>
 
-<para>This package and the next two are only installed to support running the
-test suites for GCC and Binutils. Installing three packages just for testing
-purposes may seem like overkill, but it is very reassuring, if not essential,
-to know that our most important tools are working properly. Even if the
-the test suites are not run in this chapter (we recommend not running them),
-these packages are still required to run the test suites in the next
-chapter.</para>
-
 <para>Prepare Tcl for compilation:</para>
 
 <screen><userinput>cd unix
@@ -46,15 +31,8 @@ chapter.</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>If you want to test the results, then issue:
-<userinput>TZ=UTC make test</userinput>. However, the Tcl test suite is known
-to experience failures under certain host conditions that are not fully
-understood. Therefore, test suite failures here are not surprising, and are not
-considered critical. The <parameter>TZ=UTC</parameter> parameter sets the time
-zone to Coordinated Universal Time (UTC) also known as Greenwich Mean Time
-(GMT), but only for the duration of the test suite run. This ensures the clock
-tests are exercised correctly. More information on the TZ environment variable
-will be given later on in <xref linkend="chapter-bootscripts"/>.</para>
+<para>To test the results,  issue:
+<userinput>TZ=UTC make test</userinput>.</para>
 
 <para>Install the package:</para>
 
@@ -72,30 +50,7 @@ will need its internal headers.</para></warning>
 
 <sect2 id="contents-tcl" role="content"><title>Contents of Tcl</title>
 
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<segtitle>Installed library</segtitle>
-<seglistitem><seg>tclsh (link to tclsh8.4), tclsh8.4</seg><seg>libtcl8.4.so</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><title>Short descriptions</title>
-
-<varlistentry id="tclsh8.4">
-<term><command>tclsh8.4</command></term>
-<listitem>
-<indexterm zone="ch-tools-tcl tclsh8.4"><primary sortas="b-tclsh8.4">tclsh8.4</primary></indexterm>
-<para>is the Tcl command shell.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="libtcl8.4.so">
-<term><filename class="libraryfile">libtcl8.4.so</filename></term>
-<listitem>
-<indexterm zone="ch-tools-tcl libtcl8.4.so"><primary sortas="c-libtcl8.4.so">libtcl8.4.so</primary></indexterm>
-<para>is the Tcl library.</para>
-</listitem>
-</varlistentry>
-</variablelist>
+<para>See testing</para>
 
 </sect2>
 
diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml
index d5e4faeac..5de86eab9 100644
--- a/chapter05/texinfo.xml
+++ b/chapter05/texinfo.xml
@@ -12,7 +12,6 @@
 <secondary>tools</secondary></indexterm>
 
 <sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/texinfo.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -20,8 +19,6 @@
 <seglistitem><seg>0.2 SBU</seg><seg>16 MB</seg></seglistitem>
 </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/texinfo.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
-
 </sect2>
 
 <sect2 role="installation">
@@ -31,21 +28,17 @@
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>Compile the programs:</para>
+<para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>(If you want to test the results, then issue:
-<userinput>make check</userinput>.)</para>
+<para>To test the results,  issue:
+<userinput>make check</userinput></para>
 
-<para>Then install them and their documentation:</para>
+<para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
 </sect2>
 
-<sect2 role="content"><title/>
-<para>The details on this package are found in <xref linkend="contents-texinfo"/>.</para>
-</sect2>
-
 </sect1>
diff --git a/chapter05/toolchaintechnotes.xml b/chapter05/toolchaintechnotes.xml
index 666e181e2..c644ba162 100644
--- a/chapter05/toolchaintechnotes.xml
+++ b/chapter05/toolchaintechnotes.xml
@@ -7,197 +7,6 @@
 <title>Toolchain technical notes</title>
 <?dbhtml filename="toolchaintechnotes.html"?>
 
-<para>This section attempts to explain some of the rationale and technical
-details behind the overall build method. It's not essential that you understand
-everything here immediately. Most of it will make sense once you have performed
-an actual build. Feel free to refer back here at any time.</para>
-
-<para>The overall goal of <xref linkend="chapter-temporary-tools"/> is to provide a sane,
-temporary environment that we can chroot into, and from which we can produce a
-clean, trouble-free build of the target LFS system in
-<xref linkend="chapter-building-system"/>. Along the way, we attempt to divorce ourselves
-from the host system as much as possible, and in so doing build a
-self-contained and self-hosted toolchain. It should be noted that the
-build process has been designed to minimize the risks for
-new readers and provide maximum educational value at the same time. In other
-words, more advanced techniques could be used to build the system.</para>
-
-<important>
-<para>Before continuing, you really should be aware of the name of your working
-platform, often also referred to as the <emphasis>target triplet</emphasis>. For
-many folks the target triplet will probably be
-<emphasis>i686-pc-linux-gnu</emphasis>. A simple way to determine your target
-triplet is to run the <command>config.guess</command> script that comes with
-the source for many packages. Unpack the Binutils sources and run the script:
-<userinput>./config.guess</userinput> and note the output.</para>
-
-<para>You'll also need to be aware of the name of your platform's
-<emphasis>dynamic linker</emphasis>, often also referred to as the
-<emphasis>dynamic loader</emphasis>, not to be confused with the standard linker
-<command>ld</command> that is part of Binutils. The dynamic linker is provided
-by Glibc and has the job of finding and loading the shared libraries needed by a
-program, preparing the program to run and then running it. For most folks the
-name of the dynamic linker will be <filename>ld-linux.so.2</filename>. On
-platforms that are less prevalent, the name might be
-<filename>ld.so.1</filename> and newer 64 bit platforms might even have
-something completely different. You should be able to determine the name
-of your platform's dynamic linker by looking in the
-<filename class="directory">/lib</filename> directory on your host system. A
-sure-fire way is to inspect a random binary from your host system by running:
-<userinput>readelf -l &lt;name of binary&gt; | grep interpreter</userinput>
-and noting the output. The authoritative reference covering all platforms is in
-the <filename>shlib-versions</filename> file in the root of the Glibc source
-tree.</para>
-</important>
-
-<para>Some key technical points of how the <xref linkend="chapter-temporary-tools"/> build
-method works:</para>
-
-<itemizedlist>
-<listitem><para>Similar in principle to cross compiling whereby tools installed
-into the same prefix work in cooperation and thus utilize a little GNU
-<quote>magic</quote>.</para></listitem>
-
-<listitem><para>Careful manipulation of the standard linker's library search
-path to ensure programs are linked only against libraries we
-choose.</para></listitem>
-
-<listitem><para>Careful manipulation of <command>gcc</command>'s
-<filename>specs</filename> file to tell the compiler which target dynamic
-linker will be used.</para></listitem>
-</itemizedlist>
-
-<para>Binutils is installed first because the <command>./configure</command> runs of both GCC and Glibc perform various
-feature tests on the assembler and linker
-to determine which software features to enable
-or disable. This is more important than one might first realize. An incorrectly
-configured GCC or Glibc can result in a subtly broken toolchain where the impact
-of such breakage might not show up until near the end of the build of a whole
-distribution. Thankfully, a test suite failure will usually alert us before too
-much time is wasted.</para>
-
-<para>Binutils installs its assembler and linker into two locations,
-<filename class="directory">/tools/bin</filename> and
-<filename class="directory">/tools/$TARGET_TRIPLET/bin</filename>. In reality,
-the tools in one location are hard linked to the other. An important facet of
-the linker is its library search order. Detailed information can be obtained
-from <command>ld</command> by passing it the <parameter>--verbose</parameter>
-flag. For example: <command>ld --verbose | grep SEARCH</command> will
-show you the current search paths and their order. You can see what files are
-actually linked by <command>ld</command> by compiling a dummy program and
-passing the <parameter>--verbose</parameter> switch to the linker. For example:
-<userinput>gcc dummy.c -Wl,--verbose 2&gt;&amp;1 | grep succeeded</userinput>
-will show you all the files successfully opened during the linking.</para>
-
-<para>The next package installed is GCC and during its run of
-<command>./configure</command> you'll see, for example:</para>
-
-<blockquote><screen><computeroutput>checking what assembler to use... /tools/i686-pc-linux-gnu/bin/as
-checking what linker to use... /tools/i686-pc-linux-gnu/bin/ld</computeroutput></screen></blockquote>
-
-<para>This is important for the reasons mentioned above. It also demonstrates
-that GCC's configure script does not search the PATH directories to find which
-tools to use. However, during the actual operation of <command>gcc</command>
-itself, the same search paths are not necessarily used. You can find out which
-standard linker <command>gcc</command> will use by running:
-<userinput>gcc -print-prog-name=ld</userinput>.
-Detailed information can be obtained from <command>gcc</command> by passing
-it the <parameter>-v</parameter> flag while compiling a dummy program. For
-example: <userinput>gcc -v dummy.c</userinput> will show you detailed
-information about the preprocessor, compilation and assembly stages, including
-<command>gcc</command>'s include search paths and their order.</para>
- 
-<para>The next package installed is Glibc. The most important considerations for
-building Glibc are the compiler, binary tools and kernel headers. The compiler
-is generally no problem as Glibc will always use the <command>gcc</command>
-found in a PATH directory. The binary tools and kernel headers can be a little
-more troublesome. Therefore we take no risks and use the available configure
-switches to enforce the correct selections. After the run of
-<command>./configure</command> you can check the contents of the
-<filename>config.make</filename> file in the
-<filename class="directory">glibc-build</filename> directory for all the
-important details. You'll note some interesting items like the use of
-<parameter>CC="gcc -B/tools/bin/"</parameter> to control which binary tools are
-used, and also the use of the <parameter>-nostdinc</parameter> and
-<parameter>-isystem</parameter> flags to control the compiler's include search
-path. These items help to highlight an important aspect of the Glibc package:
-it is very self-sufficient in terms of its build machinery and generally does
-not rely on toolchain defaults.</para>
-
-<para>After the Glibc installation, we make some adjustments to ensure that
-searching and linking take place only within our <filename class="directory">/tools</filename>
-prefix. We install an adjusted <command>ld</command>, which has a hard-wired
-search path limited to <filename class="directory">/tools/lib</filename>. Then
-we amend <command>gcc</command>'s specs file to point to our new dynamic
-linker in <filename class="directory">/tools/lib</filename>. This last step is
-<emphasis>vital</emphasis> to the whole process. As mentioned above, a
-hard-wired path to a dynamic linker is embedded into every ELF shared
-executable. You can inspect this by running:
-<userinput>readelf -l &lt;name of binary&gt; | grep interpreter</userinput>.
-By amending <command>gcc</command>'s specs file, we are ensuring that every
-program compiled from here through the end of this chapter will use our new
-dynamic linker in <filename class="directory">/tools/lib</filename>.</para>
-
-<para>The need to use the new dynamic linker is also the reason why we apply the
-Specs patch for the second pass of GCC. Failure to do so will result in the GCC
-programs themselves having the name of the dynamic linker from the host system's
-<filename class="directory">/lib</filename> directory embedded into them, which
-would defeat our goal of getting away from the host.</para>
-
-<para>During the second pass of Binutils, we are able to utilize the
-<parameter>--with-lib-path</parameter> configure switch to control
-<command>ld</command>'s library search path. From this point onwards, the
-core toolchain is self-contained and self-hosted. The remainder of the
-<xref linkend="chapter-temporary-tools"/> packages all build against the new Glibc in
-<filename class="directory">/tools</filename> and all is well.</para>
-
-<para>Upon entering the chroot environment in <xref linkend="chapter-building-system"/>, the
-first major package we install is Glibc, due to its self-sufficient nature that
-we mentioned above. Once this Glibc is installed into
-<filename class="directory">/usr</filename>, we perform a quick changeover of
-the toolchain defaults, then proceed for real in building the rest of the
-target LFS system.</para>
-
-<sect2>
-<title>Notes on static linking</title>
-
-<para>Most programs have to perform, beside their specific task, many rather
-common and sometimes trivial operations. These include allocating memory,
-searching directories, reading and writing files, string handling, pattern
-matching, arithmetic and many other tasks. Instead of obliging each program to
-reinvent the wheel, the GNU system provides all these basic functions in
-ready-made libraries. The major library on any Linux system is
-<emphasis>Glibc</emphasis>.</para>
-
-<para>There are two primary ways of linking the functions from a library to a
-program that uses them: statically or dynamically. When a program is linked
-statically, the code of the used functions is included in the executable,
-resulting in a rather bulky program. When a program is dynamically linked, what
-is included is a reference to the dynamic linker, the name of the library, and
-the name of the function, resulting in a much smaller executable. (A third way
-is to use the programming interface of the dynamic linker. See the
-<emphasis>dlopen</emphasis> man page for more information.)</para>
-
-<para>Dynamic linking is the default on Linux and has three major advantages
-over static linking. First, you need only one copy of the executable library
-code on your hard disk, instead of having many copies of the same code included
-into a whole bunch of programs -- thus saving disk space. Second, when several
-programs use the same library function at the same time, only one copy of the
-function's code is required in core -- thus saving memory space. Third, when a
-library function gets a bug fixed or is otherwise improved, you only need to
-recompile this one library, instead of having to recompile all the programs that
-make use of the improved function.</para>
-
-<para>If dynamic linking has several advantages, why then do we statically link
-the first two packages in this chapter? The reasons are threefold: historical,
-educational, and technical. Historical, because earlier versions of LFS
-statically linked every program in this chapter. Educational, because knowing
-the difference is useful. Technical, because we gain an element of independence
-from the host in doing so, meaning that those programs can be used
-independently of the host system. However, it's worth noting that an overall
-successful LFS build can still be achieved when the first two packages are
-built dynamically.</para>
-
-</sect2>
+<para>See testing</para>
 
 </sect1>
diff --git a/chapter05/udev.xml b/chapter05/udev.xml
index b13120178..cd929ea64 100644
--- a/chapter05/udev.xml
+++ b/chapter05/udev.xml
@@ -12,7 +12,6 @@
 <secondary>tools</secondary></indexterm>
 
 <sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/udev.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -20,10 +19,6 @@
 <seglistitem><seg>0.2 SBU</seg><seg>5.2 MB</seg></seglistitem>
 </segmentedlist>
 
-<!--
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/udev.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
- -->
-
 </sect2>
 
 <sect2 role="installation">
@@ -37,20 +32,13 @@
 
 <screen><userinput>make prefix=/tools udevdir=/dev</userinput></screen>
 
-<para>Install it:</para>
+<para>Install the package:</para>
 
 <screen><userinput>make DESTDIR=/tools udevdir=/dev install</userinput></screen>
 
-<para>Udev's configuration is far from ideal by default, so we install our own
-configuration files here:</para>
-
 <screen><userinput>cp ../udev-config-2.permissions /tools/etc/udev/permissions.d/00-lfs.permissions
 cp ../udev-config-1.rules /tools/etc/udev/rules.d/00-lfs.rules</userinput></screen>
 
 </sect2>
 
-<sect2 role="content"><title/>
-<para>The details on this package are found in <xref linkend="contents-udev"/>.</para>
-</sect2>
-
 </sect1>
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index 04a4a375e..e0087812e 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -12,7 +12,6 @@
 <secondary>tools</secondary></indexterm>
 
 <sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/util-linux.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -20,17 +19,11 @@
 <seglistitem><seg>0.2 SBU</seg><seg>16 MB</seg></seglistitem>
 </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/util-linux.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
-
 </sect2>
 
 <sect2 role="installation">
 <title>Installation of Util-linux</title>
 
-<para>Util-linux doesn't use the freshly installed headers and libraries
-from the <filename class="directory">/tools</filename> directory.  This is fixed by altering the configure
-script:</para>
-
 <screen><userinput>sed -i 's@/usr/include@/tools/include@g' configure</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>
@@ -41,8 +34,7 @@ script:</para>
 
 <screen><userinput>make -C lib</userinput></screen>
 
-<para>Since you'll only need a couple of the utilities contained in
-this package, build just those:</para>
+<para>Build the needed utilities:</para>
 
 <screen><userinput>make -C mount mount umount
 make -C text-utils more</userinput></screen>
@@ -52,8 +44,4 @@ make -C text-utils more</userinput></screen>
 <screen><userinput>cp mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
 
 </sect2>
-
-<sect2 role="content"><title/>
-<para>The details on this package are found in <xref linkend="contents-utillinux"/>.</para>
-</sect2>
 </sect1>