Indenting chapter 05, part 3

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

6 files changed, 597 insertions, 453 deletions

diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index d2989fa42..aa2ea3623 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -1,115 +1,141 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-gcc-pass1" role="wrap">
-<title>GCC-&gcc-version; - Pass 1</title>
-<?dbhtml filename="gcc-pass1.html"?>
+  <?dbhtml filename="gcc-pass1.html"?>
+
+  <title>GCC-&gcc-version; - Pass 1</title>
+
+  <indexterm zone="ch-tools-gcc-pass1">
+    <primary sortas="a-GCC">GCC</primary>
+    <secondary>tools, pass 1</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-gcc-pass1">
-<primary sortas="a-GCC">GCC</primary>
-<secondary>tools, pass 1</secondary></indexterm>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/gcc.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>4.4 SBU</seg><seg>219 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>4.4 SBU</seg>
+        <seg>219 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/gcc.xml"
+    xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of GCC</title>
+  <sect2 role="installation">
+    <title>Installation of GCC</title>
 
-<para>The GCC documentation recommends building GCC outside of the
-source directory in a dedicated build directory:</para>
+    <para>The GCC documentation recommends building GCC outside of the
+    source directory in a dedicated build directory:</para>
 
 <screen><userinput>mkdir -v ../gcc-build
 cd ../gcc-build</userinput></screen>
 
-<para>Prepare GCC for compilation:</para>
+    <para>Prepare GCC for compilation:</para>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
     --with-local-prefix=/tools --disable-nls --enable-shared \
     --enable-languages=c</userinput></screen>
 
-<para>The meaning of the configure options:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>--with-local-prefix=/tools</parameter></term>
-<listitem><para>The purpose of this switch is to remove <filename class="directory">/usr/local/include</filename>
-from <command>gcc</command>'s include search path. This is not absolutely
-essential, however, it helps to minimize the influence of the host
-system.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--enable-shared</parameter></term>
-<listitem><para>This switch allows the building of
-<filename class="libraryfile">libgcc_s.so.1</filename> and
-<filename class="libraryfile">libgcc_eh.a</filename>.  Having
-<filename class="libraryfile">libgcc_eh.a</filename> available ensures that the
-configure script for Glibc (the next package we compile) produces the proper
-results.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--enable-languages=c</parameter></term>
-<listitem><para>This option ensures that only the C compiler is built.
-</para></listitem>
-</varlistentry>
-</variablelist>
-
-<para>Continue with compiling the package:</para>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--with-local-prefix=/tools</parameter></term>
+        <listitem>
+          <para>The purpose of this switch is to remove <filename
+          class="directory">/usr/local/include</filename> from
+          <command>gcc</command>'s include search path. This is not
+          absolutely essential, however, it helps to minimize the
+          influence of the host system.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-shared</parameter></term>
+        <listitem>
+          <para>This switch allows the building of <filename
+          class="libraryfile">libgcc_s.so.1</filename> and
+          <filename class="libraryfile">libgcc_eh.a</filename>.
+          Having <filename class="libraryfile">libgcc_eh.a</filename>
+          available ensures that the configure script for Glibc (the
+          next package we compile) produces the proper results.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-languages=c</parameter></term>
+        <listitem>
+          <para>This option ensures that only the C compiler is built.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para>Continue with compiling the package:</para>
 
 <screen><userinput>make bootstrap</userinput></screen>
 
-<para>The meaning of the make parameters:</para>
+    <variablelist>
+      <title>The meaning of the make parameters:</title>
 
-<variablelist>
-<varlistentry>
-<term><parameter>bootstrap</parameter></term>
-<listitem><para>This target does not just compile GCC, but compiles it
-several times. It uses the programs compiled in a first round to
-compile itself a second time, and then again a third time. It then
-compares these second and third compiles to make sure it can reproduce
-itself flawlessly.  This also implies that it was compiled
-correctly.</para></listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry>
+        <term><parameter>bootstrap</parameter></term>
+        <listitem>
+          <para>This target does not just compile GCC, but compiles it
+          several times. It uses the programs compiled in a first round
+          to compile itself a second time, and then again a third time.
+          It then compares these second and third compiles to make sure
+          it can reproduce itself flawlessly. This also implies that it
+          was compiled correctly.</para>
+        </listitem>
+      </varlistentry>
 
-<para>Compilation is now complete. At this point, the test suite would
-normally be run, but, as mentioned before, the test suite framework is
-not in place yet. The benefits of running the tests at this point
-are minimal since the programs from this first pass will soon be
-replaced.</para>
+    </variablelist>
 
-<para>Install the package:</para>
+    <para>Compilation is now complete. At this point, the test suite would
+    normally be run, but, as mentioned before, the test suite framework is
+    not in place yet. The benefits of running the tests at this point
+    are minimal since the programs from this first pass will soon be
+    replaced.</para>
+
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>As a finishing touch, create a symlink. Many programs and
-scripts run <command>cc</command> instead of <command>gcc</command>, which is used to keep programs generic
-and therefore usable on all kinds of UNIX systems where the GNU C compiler
-is not always installed. Running <command>cc</command> leaves the system administrator
-free to decide which C compiler to install.</para>
+    <para>As a finishing touch, create a symlink. Many programs and scripts
+    run <command>cc</command> instead of <command>gcc</command>, which is
+    used to keep programs generic and therefore usable on all kinds of UNIX
+    systems where the GNU C compiler is not always installed. Running
+    <command>cc</command> leaves the system administrator free to decide
+    which C compiler to install.</para>
 
 <screen><userinput>ln -vs gcc /tools/bin/cc</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2 role="content"><title/>
-<para>Details on this package are located in <xref
-linkend="contents-gcc" role="."/></para>
-</sect2>
+  <sect2 role="content">
+    <title/>
 
-</sect1>
+    <para>Details on this package are located in
+    <xref linkend="contents-gcc" role="."/></para>
 
+  </sect2>
+
+</sect1>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 9d206d724..254b3517d 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -1,103 +1,120 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-gcc-pass2" role="wrap">
-<title>GCC-&gcc-version; - Pass 2</title>
-<?dbhtml filename="gcc-pass2.html"?>
+  <?dbhtml filename="gcc-pass2.html"?>
+
+  <title>GCC-&gcc-version; - Pass 2</title>
+
+  <indexterm zone="ch-tools-gcc-pass2">
+    <primary sortas="a-GCC">GCC</primary>
+    <secondary>tools, pass 2</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-gcc-pass2">
-<primary sortas="a-GCC">GCC</primary>
-<secondary>tools, pass 2</secondary></indexterm>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/gcc.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<sect2 role="package"><title/>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>11.0 SBU</seg><seg>292 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>11.0 SBU</seg>
+        <seg>292 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/gcc.xml"
+    xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Re-installation of GCC</title>
+  <sect2 role="installation">
+    <title>Re-installation of GCC</title>
 
-<para>The tools required to test GCC and Binutils&mdash;Tcl, Expect
-and DejaGNU&mdash;are installed now. GCC and Binutils can now be
-rebuilt, linking them against the new Glibc and testing them properly
-(if running the test suites in this chapter). Please note that these
-test suites are highly dependent on properly functioning PTYs which
-are provided by the host. PTYs are most commonly implemented via the
-<systemitem class="filesystem">devpts</systemitem> file system. Check
-to see if the host system is set up correctly in this regard by
-performing a quick test:</para>
+    <para>The tools required to test GCC and Binutils&mdash;Tcl, Expect
+    and DejaGNU&mdash;are installed now. GCC and Binutils can now be
+    rebuilt, linking them against the new Glibc and testing them properly
+    (if running the test suites in this chapter). Please note that these
+    test suites are highly dependent on properly functioning PTYs which
+    are provided by the host. PTYs are most commonly implemented via the
+    <systemitem class="filesystem">devpts</systemitem> file system. Check
+    to see if the host system is set up correctly in this regard by
+    performing a quick test:</para>
 
 <screen><userinput>expect -c "spawn ls"</userinput></screen>
 
-<para>The response might be:</para>
+    <para>The response might be:</para>
 
-<screen><computeroutput>The system has no more ptys.  
+<screen><computeroutput>The system has no more ptys.
 Ask your system administrator to create more.</computeroutput></screen>
 
-<para>If the above message is received, the host does not have its PTYs set up
-properly. In this case, there is no point in running the test suites for GCC and
-Binutils until this issue is resolved. Please consult the LFS FAQ at <ulink
-url="&lfs-root;/lfs/faq.html#no-ptys"/> for more information on how to get PTYs
-working.</para>
-
-<para>As previously explained in <xref linkend="ch-tools-adjusting"/>,  under
-normal circumstances the GCC <command>fixincludes</command> script is run in
-order to fix potentially broken header files.  As GCC-&gcc-version; and
-Glibc-&glibc-version; have already been installed at this point, and their
-respective header files are known to not require fixing, the
-<command>fixincludes</command> script is not required.  As mentioned previously,
-the script may in fact pollute the build environment by installing fixed headers
-from the host system into GCC's private include directory.  The running of the
-<command>fixincludes</command> script can be suppressed by issuing the following
-commands:</para>
+    <para>If the above message is received, the host does not have its PTYs
+    set up properly. In this case, there is no point in running the test
+    suites for GCC and Binutils until this issue is resolved. Please consult
+    the LFS FAQ at <ulink url="&lfs-root;/lfs/faq.html#no-ptys"/> for more
+    information on how to get PTYs working.</para>
+
+    <para>As previously explained in <xref linkend="ch-tools-adjusting"/>,
+    under normal circumstances the GCC <command>fixincludes</command> script
+    is run in order to fix potentially broken header files. As GCC-&gcc-version;
+    and Glibc-&glibc-version; have already been installed at this point, and
+    their respective header files are known to not require fixing, the
+    <command>fixincludes</command> script is not required. As mentioned
+    previously, the script may in fact pollute the build environment by
+    installing fixed headers from the host system into GCC's private include
+    directory. The running of the <command>fixincludes</command> script can
+    be suppressed by issuing the following commands:</para>
 
 <screen><userinput>cp -v gcc/Makefile.in{,.orig} &amp;&amp;
 sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
 
-<para>The bootstrap build performed in <xref linkend="ch-tools-gcc-pass1"/>
-built GCC with the <option>-fomit-frame-pointer</option> compiler flag.
-Non-bootstrap builds omit this flag by default, so apply the following
-<command>sed</command> to use it in order to ensure consistent compiler builds.
-</para>
+    <para>The bootstrap build performed in <xref linkend="ch-tools-gcc-pass1"/>
+    built GCC with the <option>-fomit-frame-pointer</option> compiler flag.
+    Non-bootstrap builds omit this flag by default, so apply the following
+    <command>sed</command> to use it in order to ensure consistent compiler
+    builds.</para>
 
 <screen><userinput>cp -v gcc/Makefile.in{,.tmp} &amp;&amp;
 sed 's/^XCFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in.tmp \
-	&gt; gcc/Makefile.in</userinput></screen>
+  &gt; gcc/Makefile.in</userinput></screen>
 
-<para>Apply the following patch to change the location of GCC's default dynamic
-linker (typically <filename class="libraryfile">ld-linux.so.2</filename>):</para>
+    <para>Apply the following patch to change the location of GCC's default
+    dynamiclinker (typically <filename
+    class="libraryfile">ld-linux.so.2</filename>):</para>
 
 <screen><userinput>patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
 
-<para>The above patch also removes
-<filename class="directory">/usr/include</filename> from GCC's include search
-path. Patching now rather than adjusting the specs file after installation
-ensures that the new dynamic linker is used during the actual build of GCC. That
-is, all of the binaries created during the build will link against the new
-Glibc.</para>
+    <para>The above patch also removes <filename
+    class="directory">/usr/include</filename> from GCC's include search path.
+    Patching now rather than adjusting the specs file after installation
+    ensures that the new dynamic linker is used during the actual build of
+    GCC. That is, all of the binaries created during the build will link
+    against the new Glibc.</para>
 
-<important><para>The above patch is critical in ensuring a
-successful overall build. Do not forget to apply
-it.</para></important>
+    <important>
+      <para>The above patch is critical in ensuring a successful overall
+      build. Do not forget to apply it.</para>
+    </important>
 
-<para>Create a separate build directory again:</para>
+    <para>Create a separate build directory again:</para>
 
 <screen><userinput>mkdir -v ../gcc-build
 cd ../gcc-build</userinput></screen>
 
-<para>Before starting to build GCC, remember to unset any environment
-variables that override the default optimization flags.</para>
+    <para>Before starting to build GCC, remember to unset any environment
+    variables that override the default optimization flags.</para>
 
-<para>Now prepare GCC for compilation:</para>
+    <para>Now prepare GCC for compilation:</para>
 
 <screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
     --with-local-prefix=/tools --enable-clocale=gnu \
@@ -105,105 +122,116 @@ variables that override the default optimization flags.</para>
     --enable-__cxa_atexit --enable-languages=c,c++ \
     --disable-libstdcxx-pch</userinput></screen>
 
-<para>The meaning of the new configure options:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>--enable-clocale=gnu</parameter></term>
-<listitem><para>This option ensures the correct locale model is
-selected for the C++ libraries under all circumstances. If the
-configure script finds the <emphasis>de_DE</emphasis> locale installed, it will select the
-correct gnu locale model. However, if the <emphasis>de_DE</emphasis> locale is not
-installed, there is the risk of building Application Binary Interface
-(ABI)-incompatible C++ libraries because the incorrect generic locale
-model may be selected.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--enable-threads=posix</parameter></term>
-<listitem><para>This enables C++ exception handling for multi-threaded
-code.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--enable-__cxa_atexit</parameter></term>
-<listitem><para>This option allows use of
-<emphasis>__cxa_atexit</emphasis>, rather than
-<emphasis>atexit</emphasis>, to register C++ destructors for local
-statics and global objects.  This option is essential for fully
-standards-compliant handling of destructors. It also affects the C++
-ABI, and therefore results in C++ shared libraries and C++ programs
-that are interoperable with other Linux
-distributions.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--enable-languages=c,c++</parameter></term>
-<listitem><para>This option
-ensures that both the C and C++ compilers are built.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--disable-libstdcxx-pch</parameter></term>
-<listitem><para>Do not build the pre-compiled header (PCH) for
-<filename class="libraryfile">libstdc++</filename>. It takes up a lot of space,
-and we have no use for it.</para></listitem>
-</varlistentry>
-</variablelist>
-
-<para>Compile the package:</para>
+    <variablelist>
+      <title>The meaning of the new configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--enable-clocale=gnu</parameter></term>
+        <listitem>
+          <para>This option ensures the correct locale model is selected
+          for the C++ libraries under all circumstances. If the configure
+          script finds the <emphasis>de_DE</emphasis> locale installed,
+          it will select the correct gnu locale model. However, if the
+          <emphasis>de_DE</emphasis> locale is not installed, there is the
+          risk of building Application Binary Interface (ABI)-incompatible
+          C++ libraries because the incorrect generic locale model may be
+          selected.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-threads=posix</parameter></term>
+        <listitem>
+          <para>This enables C++ exception handling for multi-threaded code.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-__cxa_atexit</parameter></term>
+        <listitem>
+          <para>This option allows use of <function>__cxa_atexit</function>,
+          rather than <function>atexit</function>, to register C++ destructors
+          for local statics and global objects. This option is essential for
+          fully standards-compliant handling of destructors. It also affects
+          the C++ ABI, and therefore results in C++ shared libraries and C++
+          programs that are interoperable with other Linux distributions.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-languages=c,c++</parameter></term>
+        <listitem>
+          <para>This option ensures that both the C and C++ compilers are
+          built.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--disable-libstdcxx-pch</parameter></term>
+        <listitem>
+          <para>Do not build the pre-compiled header (PCH) for
+          <filename class="libraryfile">libstdc++</filename>. It takes up a
+          lot of space, and we have no use for it.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>There is no need to use the <parameter>bootstrap</parameter>
-target now because the compiler being used to compile this GCC was
-built from the exact same version of the GCC sources used
-earlier.</para>
+    <para>There is no need to use the <parameter>bootstrap</parameter> target
+    now because the compiler being used to compile this GCC was built from
+    the exact same version of the GCC sources used earlier.</para>
 
-<para>Compilation is now complete. As previously mentioned, running
-the test suites for the temporary tools compiled in this chapter is
-not mandatory. To run the GCC test suite anyway, use the following
-command:</para>
+    <para>Compilation is now complete. As previously mentioned, running the test
+    suites for the temporary tools compiled in this chapter is not mandatory.
+    To run the GCC test suite anyway, use the following command:</para>
 
 <screen><userinput>make -k check</userinput></screen>
 
-<para>The <parameter>-k</parameter> flag is used to make the test suite run
-through to completion and not stop at the first failure. The GCC test
-suite is very comprehensive and is almost guaranteed to generate a few
-failures. To receive a summary of the test suite results, run:</para>
- 
+    <para>The <parameter>-k</parameter> flag is used to make the test suite run
+    through to completion and not stop at the first failure. The GCC test
+    suite is very comprehensive and is almost guaranteed to generate a few
+    failures. To receive a summary of the test suite results, run:</para>
+
 <screen><userinput>../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
 
-<para>For only the summaries, pipe the output through
-<userinput>grep -A7 Summ</userinput>.</para>
+    <para>For only the summaries, pipe the output through
+    <userinput>grep -A7 Summ</userinput>.</para>
 
-<para>Results can be compared with those located at <ulink
-url="&test-results;"/>.</para>
+    <para>Results can be compared with those located at <ulink
+    url="&test-results;"/>.</para>
 
-<para>A few unexpected failures cannot always be avoided. The GCC developers are
-usually aware of these issues, but have not resolved them yet. In particular,
-the <filename class="libraryfile">libmudflap</filename> tests are known be
-particularly problematic as a result of a bug in GCC (<ulink
-url="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20003"/>).  Unless the test
-results are vastly different from those at the above URL, it is safe to
-continue.</para>
+    <para>A few unexpected failures cannot always be avoided. The GCC developers
+    are usually aware of these issues, but have not resolved them yet. In
+    particular, the <filename class="libraryfile">libmudflap</filename> tests
+    are known be particularly problematic as a result of a bug in GCC
+    (<ulink url="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20003"/>).
+    Unless the test results are vastly different from those at the above URL,
+    it is safe to continue.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<note><para>At this point it is strongly recommended to repeat the
-sanity check we performed earlier in this chapter. Refer back to <xref
-linkend="ch-tools-adjusting" role=","/> and repeat the test compilation.  If
-the result is wrong, the most likely reason is that the GCC Specs
-patch was not properly applied.</para></note>
+    <note>
+      <para>At this point it is strongly recommended to repeat the sanity
+      check we performed earlier in this chapter. Refer back to <xref
+      linkend="ch-tools-adjusting" role=","/> and repeat the test compilation.
+      If the result is wrong, the most likely reason is that the GCC Specs
+      patch was not properly applied.</para>
+    </note>
 
-</sect2>
+  </sect2>
 
-<sect2 role="content"><title/>
-<para>Details on this package are located in <xref
-linkend="contents-gcc" role="."/></para>
-</sect2>
+  <sect2 role="content">
+    <title/>
 
-</sect1>
+    <para>Details on this package are located in
+    <xref linkend="contents-gcc" role="."/></para>
 
+  </sect2>
+
+</sect1>
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 030c9c2c3..58063a815 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -1,68 +1,89 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-gettext" role="wrap">
-<title>Gettext-&gettext-version;</title>
-<?dbhtml filename="gettext.html"?>
+  <?dbhtml filename="gettext.html"?>
+
+  <title>Gettext-&gettext-version;</title>
+
+  <indexterm zone="ch-tools-gettext">
+    <primary sortas="a-Gettext">Gettext</primary>
+    <secondary>tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-gettext">
-<primary sortas="a-Gettext">Gettext</primary>
-<secondary>tools</secondary></indexterm>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/gettext.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gettext.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.5 SBU</seg><seg>63.0 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.5 SBU</seg>
+        <seg>63.0 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gettext.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/gettext.xml"
+    xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of Gettext</title>
+  <sect2 role="installation">
+    <title>Installation of Gettext</title>
 
-<para>For our temporary set of tools, we only need to build and install one binary from Gettext.</para>
+    <para>For our temporary set of tools, we only need to build and install
+    one binary from Gettext.</para>
 
-<para>Prepare Gettext for compilation:</para>
+    <para>Prepare Gettext for compilation:</para>
 
 <screen><userinput>cd gettext-tools
 ./configure --prefix=/tools --disable-shared</userinput></screen>
 
-<para>The meaning of the configure options:</para>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
 
-<variablelist>
-<varlistentry>
-<term><parameter>--disable-shared</parameter></term>
-<listitem><para>We do not need to install any of the shared gettext libraries at
-this time, therefore there is no need to build them.</para></listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry>
+        <term><parameter>--disable-shared</parameter></term>
+        <listitem>
+          <para>We do not need to install any of the shared Gettext libraries at
+          this time, therefore there is no need to build them.</para>
+        </listitem>
+      </varlistentry>
 
-<para>Compile the package:</para>
+    </variablelist>
+
+    <para>Compile the package:</para>
 
 <screen><userinput>make -C lib
 make -C src msgfmt</userinput></screen>
 
-<para>As only one binary has been compiled, it is not possible to run the
-testsuite without compiling additional support libraries from the Gettext
-package.  It is therefore not recommended to attempt to run the testsuite at
-this stage.</para>
+    <para>As only one binary has been compiled, it is not possible to run the
+    testsuite without compiling additional support libraries from the Gettext
+    package. It is therefore not recommended to attempt to run the testsuite at
+    this stage.</para>
 
-<para>Install the <command>msgfmt</command> binary:</para>
+    <para>Install the <command>msgfmt</command> binary:</para>
 
 <screen><userinput>cp -v src/msgfmt /tools/bin</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2 role="content"><title/>
-<para>Details on this package are located in <xref linkend="contents-gettext" role="."/></para>
-</sect2>
+  <sect2 role="content">
+    <title/>
 
-</sect1>
+    <para>Details on this package are located in
+    <xref linkend="contents-gettext" role="."/></para>
 
+  </sect2>
+
+</sect1>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index cf6a2ee34..19891d165 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -1,39 +1,53 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-glibc" role="wrap">
-<title>Glibc-&glibc-version;</title>
-<?dbhtml filename="glibc.html"?>
+  <?dbhtml filename="glibc.html"?>
+
+  <title>Glibc-&glibc-version;</title>
+
+  <indexterm zone="ch-tools-glibc">
+    <primary sortas="a-Glibc">Glibc</primary>
+    <secondary>tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-glibc">
-<primary sortas="a-Glibc">Glibc</primary>
-<secondary>tools</secondary></indexterm>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/glibc.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>11.8 SBU</seg><seg>454 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>11.8 SBU</seg>
+        <seg>454 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/glibc.xml"
+    xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of Glibc</title>
+  <sect2 role="installation">
+    <title>Installation of Glibc</title>
 
-<para>The Glibc documentation recommends building Glibc outside of the source
-directory in a dedicated build directory:</para>
+    <para>The Glibc documentation recommends building Glibc outside of the source
+    directory in a dedicated build directory:</para>
 
 <screen><userinput>mkdir -v ../glibc-build
 cd ../glibc-build</userinput></screen>
 
-<para>Next, prepare Glibc for compilation:</para>
+    <para>Next, prepare Glibc for compilation:</para>
 
 <screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \
     --disable-profile --enable-add-ons \
@@ -41,133 +55,152 @@ cd ../glibc-build</userinput></screen>
     --without-gd --with-headers=/tools/include \
     --without-selinux</userinput></screen>
 
-<para>The meaning of the configure options:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>--disable-profile</parameter></term>
-<listitem><para>This builds the libraries without profiling
-information. Omit this option if profiling on the temporary tools is
-necessary.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--enable-add-ons</parameter></term>
-<listitem><para>This tells Glibc to use the NPTL add-on as its threading 
-library.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--enable-kernel=2.6.0</parameter></term>
-<listitem><para>This tells Glibc to compile the library with support
-for 2.6.x Linux kernels.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--with-binutils=/tools/bin</parameter></term>
-<listitem><para>While not required, this switch ensures that there are
-no errors pertaining to which Binutils programs get used during the
-Glibc build.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--without-gd</parameter></term>
-<listitem><para>This prevents the build of the
-<command>memusagestat</command> program, which insists on linking
-against the host's libraries (libgd, libpng, libz,
-etc.).</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--with-headers=/tools/include</parameter></term>
-<listitem><para>This tells Glibc to compile itself against the headers recently
-installed to the tools directory, so that it knows exactly what features the
-kernel has and can optimize itself accordingly.</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term><parameter>--without-selinux</parameter></term>
-<listitem><para>When building from hosts that include SELinux functionality
-(e.g., Fedora Core 3), Glibc will build with support for SELinux. As the LFS
-tools environment does not contain support for SELinux, a Glibc compiled with
-such support will fail to operate correctly.</para></listitem>
-</varlistentry>
-</variablelist>
-
-<para>During this stage the following warning might appear:</para>
-
-<blockquote><screen><computeroutput>configure: WARNING:
-*** These auxiliary programs are missing or 
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--disable-profile</parameter></term>
+        <listitem>
+          <para>This builds the libraries without profiling information. Omit
+          this option if profiling on the temporary tools is necessary.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-add-ons</parameter></term>
+        <listitem>
+          <para>This tells Glibc to use the NPTL add-on as its threading
+          library.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-kernel=2.6.0</parameter></term>
+        <listitem>
+          <para>This tells Glibc to compile the library with support
+          for 2.6.x Linux kernels.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-binutils=/tools/bin</parameter></term>
+        <listitem>
+          <para>While not required, this switch ensures that there are
+          no errors pertaining to which Binutils programs get used during the
+          Glibc build.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--without-gd</parameter></term>
+        <listitem>
+          <para>This prevents the build of the <command>memusagestat</command>
+          program, which insists on linking against the host's libraries
+          (libgd, libpng, libz, etc.).</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-headers=/tools/include</parameter></term>
+        <listitem>
+          <para>This tells Glibc to compile itself against the headers recently
+          installed to the tools directory, so that it knows exactly what
+          features the kernel has and can optimize itself accordingly.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--without-selinux</parameter></term>
+        <listitem>
+          <para>When building from hosts that include SELinux functionality
+          (e.g., Fedora Core 3), Glibc will build with support for SELinux.
+          As the LFS tools environment does not contain support for SELinux, a
+          Glibc compiled with such support will fail to operate correctly.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para>During this stage the following warning might appear:</para>
+
+    <blockquote>
+<screen><computeroutput>configure: WARNING:
+*** These auxiliary programs are missing or
 *** incompatible versions: msgfmt
 *** some features will be disabled.
-*** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
+*** Check the INSTALL file for required versions.</computeroutput></screen>
+    </blockquote>
 
-<para>The missing or incompatible <command>msgfmt</command> program is
-generally harmless, but it can sometimes cause issues when running the
-test suite. This <command>msgfmt</command> program is part of the
-Gettext package which the host distribution should provide. If
-<command>msgfmt</command> is present but deemed incompatible, upgrade
-the host system's Gettext package or continue without it and see if
-the test suite runs without problems regardless.</para>
+    <para>The missing or incompatible <command>msgfmt</command> program is
+    generally harmless, but it can sometimes cause issues when running the
+    test suite. This <command>msgfmt</command> program is part of the
+    Gettext package which the host distribution should provide. If
+    <command>msgfmt</command> is present but deemed incompatible, upgrade
+    the host system's Gettext package or continue without it and see if
+    the test suite runs without problems regardless.</para>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>Compilation is now complete. As mentioned earlier, running the
-test suites for the temporary tools installed in this chapter is not
-mandatory. To run the Glibc test suite (if desired), the following
-command will do so:</para>
+    <para>Compilation is now complete. As mentioned earlier, running the
+    test suites for the temporary tools installed in this chapter is not
+    mandatory. To run the Glibc test suite (if desired), the following
+    command will do so:</para>
 
 <screen><userinput>make check</userinput></screen>
 
-<para>For a discussion of test failures that are of particular
-importance, please see <xref linkend="ch-system-glibc" role="."/></para>
+    <para>For a discussion of test failures that are of particular
+    importance, please see <xref linkend="ch-system-glibc" role="."/></para>
 
-<para>In this chapter, some tests can be adversely affected by
-existing tools or environmental issues on the host system. Glibc test
-suite failures in this chapter are typically not worrisome. The Glibc
-installed in <xref linkend="chapter-building-system"/> is the one that
-will ultimately end up being used, so that is the one that needs to pass
-most tests (even in <xref linkend="chapter-building-system"/>, some
-failures could still occur, for example, with the math tests).</para>
+    <para>In this chapter, some tests can be adversely affected by
+    existing tools or environmental issues on the host system. Glibc test
+    suite failures in this chapter are typically not worrisome. The Glibc
+    installed in <xref linkend="chapter-building-system"/> is the one that
+    will ultimately end up being used, so that is the one that needs to pass
+    most tests (even in <xref linkend="chapter-building-system"/>, some
+    failures could still occur, for example, with the math tests).</para>
 
-<para>When experiencing a failure, make a note of it, then continue by
-reissuing the <command>make check</command> command. The test suite should pick up where it left
-off and continue. This stop-start sequence can be circumvented by
-issuing a <command>make -k check</command> command. If using this option, be sure to log the
-output so that the log file can be examined for failures later.</para>
+    <para>When experiencing a failure, make a note of it, then continue by
+    reissuing the <command>make check</command> command. The test suite
+    should pick up where it left off and continue. This stop-start sequence
+    can be circumvented by issuing a <command>make -k check</command> command.
+    If using this option, be sure to log the output so that the log file can
+    be examined for failures later.</para>
 
-<para>The install stage of Glibc will issue a harmless warning at the
-end about the absence of <filename>/tools/etc/ld.so.conf</filename>. 
-Prevent this warning with:</para>
+    <para>The install stage of Glibc will issue a harmless warning at the
+    end about the absence of <filename>/tools/etc/ld.so.conf</filename>.
+    Prevent this warning with:</para>
 
 <screen><userinput>mkdir -v /tools/etc
 touch /tools/etc/ld.so.conf</userinput></screen>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Different countries and cultures have varying conventions for
-how to communicate. These conventions range from the format for
-representing dates and times to more complex issues, such as the
-language spoken. The <quote>internationalization</quote> of GNU
-programs works by locale.</para>
+    <para>Different countries and cultures have varying conventions for
+    how to communicate. These conventions range from the format for
+    representing dates and times to more complex issues, such as the
+    language spoken. The <quote>internationalization</quote> of GNU
+    programs works by locale.</para>
 
-<note><para>If the test suites are not being run in this chapter (as
-per the recommendation), there is no need to install the locales now.
-The appropriate locales will be installed in the next
-chapter. To install the Glibc locales anyway, use instructions from
-<xref linkend="ch-system-glibc" role="."/>
-</para></note>
+    <note>
+      <para>If the test suites are not being run in this chapter (as per
+      the recommendation), there is no need to install the locales now.
+      The appropriate locales will be installed in the next chapter.
+      To install the Glibc locales anyway, use instructions from
+      <xref linkend="ch-system-glibc" role="."/></para>
+    </note>
 
-</sect2>
+  </sect2>
 
-<sect2 role="content"><title/>
-<para>Details on this package are located in <xref
-linkend="contents-glibc" role="."/></para>
-</sect2>
+  <sect2 role="content">
+    <title/>
 
-</sect1>
+    <para>Details on this package are located in
+    <xref linkend="contents-glibc" role="."/></para>
+
+  </sect2>
 
+</sect1>
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index bf0cbe71a..49012584a 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -1,65 +1,85 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-grep" role="wrap">
-<title>Grep-&grep-version;</title>
-<?dbhtml filename="grep.html"?>
+  <?dbhtml filename="grep.html"?>
+
+  <title>Grep-&grep-version;</title>
+
+  <indexterm zone="ch-tools-grep">
+    <primary sortas="a-Grep">Grep</primary>
+    <secondary>tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-grep">
-<primary sortas="a-Grep">Grep</primary>
-<secondary>tools</secondary></indexterm>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/grep.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/grep.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>4.5 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>4.5 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/grep.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/grep.xml"
+    xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of Grep</title>
+  <sect2 role="installation">
+    <title>Installation of Grep</title>
 
-<para>Prepare Grep for compilation:</para>
+    <para>Prepare Grep for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools \
     --disable-perl-regexp</userinput></screen>
 
-<para>The meaning of the configure options:</para>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
 
-<variablelist>
-<varlistentry>
-<term><parameter>--disable-perl-regexp</parameter></term>
-<listitem><para>This ensures that the <command>grep</command> program does not
-get linked against a Perl Compatible Regular Expression (PCRE) library that may
-be present on the host but will not be available once we enter the
-<command>chroot</command> environment.</para></listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry>
+        <term><parameter>--disable-perl-regexp</parameter></term>
+        <listitem>
+          <para>This ensures that the <command>grep</command> program does
+          not get linked against a Perl Compatible Regular Expression (PCRE)
+          library that may be present on the host but will not be available
+          once we enter the <command>chroot</command> environment.</para>
+        </listitem>
+      </varlistentry>
 
-<para>Compile the package:</para>
+    </variablelist>
+
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue: <userinput>make check</userinput>.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2 role="content"><title/>
-<para>Details on this package are located in <xref
-linkend="contents-grep" role="."/></para>
-</sect2>
+  <sect2 role="content">
+    <title/>
 
-</sect1>
+    <para>Details on this package are located in
+    <xref linkend="contents-grep" role="."/></para>
 
+  </sect2>
+
+</sect1>
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 5e5883230..84f22972e 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -1,52 +1,68 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-tools-gzip" role="wrap">
-<title>Gzip-&gzip-version;</title>
-<?dbhtml filename="gzip.html"?>
+  <?dbhtml filename="gzip.html"?>
+
+  <title>Gzip-&gzip-version;</title>
+
+  <indexterm zone="ch-tools-gzip">
+    <primary sortas="a-Gzip">Gzip</primary>
+    <secondary>tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-tools-gzip">
-<primary sortas="a-Gzip">Gzip</primary>
-<secondary>tools</secondary></indexterm>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/gzip.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<sect2 role="package"><title/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gzip.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>2.2 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>2.2 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gzip.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/gzip.xml"
+    xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of Gzip</title>
+  <sect2 role="installation">
+    <title>Installation of Gzip</title>
 
-<para>Prepare Gzip for compilation:</para>
+    <para>Prepare Gzip for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2 role="content"><title/>
-<para>Details on this package are located in <xref
-linkend="contents-gzip" role="."/></para>
-</sect2>
+  <sect2 role="content">
+    <title/>
 
-</sect1>
+    <para>Details on this package are located in
+    <xref linkend="contents-gzip" role="."/></para>
+
+  </sect2>
 
+</sect1>