Merge r7314:7324, in order to bring the branch up to date with trunk

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

23 files changed, 1077 insertions, 842 deletions

diff --git a/appendixa/acronymlist.xml b/appendixa/acronymlist.xml
index fff2327f5..ccb1d453e 100644
--- a/appendixa/acronymlist.xml
+++ b/appendixa/acronymlist.xml
@@ -326,7 +326,7 @@
     <varlistentry>
       <term><emphasis role="bold">LSB</emphasis></term>
       <listitem>
-        <para>Linux Standards Base</para>
+        <para>Linux Standard Base</para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b28c3d074..685031f6d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,22 +37,54 @@
 -->
 
     <listitem>
+      <para>January 30, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Adjust binutils-pass1 so we don't need to hang
+          on to its source directories. Also use 'gcc -dumpmachine' instead
+          of the MACHTYPE var.</para>
+        </listitem>
+        <listitem>
+          <para>[jhuntwork] - Various textual corrections. Thanks Chris
+          Staub.</para>
+        </listitem>
+        <listitem>
+          <para>[jhuntwork] - Remove unnecessary LDFLAGS variables in binutils
+          pass 1 and 2. Thanks Dan Nicholson.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>January 29, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Restore the use of *startfile_prefix_spec.</para>
+        </listitem>
+        <listitem>
+          <para>[jhuntwork] - Remove a spurious -i from the perl command when
+          readjusting the toolchain. Thanks Dan Nicholson.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 26, 2006</para>
       <itemizedlist>
         <listitem>
           <para>[jhuntwork] - Modify chapter 6 Glibc's make install command to
-	  allow test-installation.pl to run.</para>
+          allow test-installation.pl to run.</para>
+        </listitem>
+        <listitem>
+          <para>[jhuntwork] - Adjust chapter 5 binutils to build a static ld-new
+          for use in the chapter 6 readjusting section. Also add some extended
+          sanity checks. These fixes are adapted from DIY-Linux and Greg Schafer.
+          Thanks to Dan Nicholson for the report, as well.</para>
+        </listitem>
+        <listitem>
+          <para>[jhuntwork] - Added 'nodump' to commands in the Package Management
+          section.</para>
         </listitem>
-	<listitem>
-	  <para>[jhuntwork] - Adjust chapter 5 binutils to build a static ld-new
-	  for use in the chapter 6 readjusting section. Also add some extended
-	  sanity checks. These fixes are adapted from DIY-Linux and Greg Schafer.
-	  Thanks to Dan Nicholson for the report, as well.</para>
-	</listitem>
-	<listitem>
-	  <para>[jhuntwork] - Added 'nodump' to commands in the Package Management
-	  section.</para>
-	</listitem>
       </itemizedlist>
     </listitem>
 
@@ -60,22 +92,23 @@
       <para>January 25, 2006</para>
       <itemizedlist>
         <listitem>
-          <para>[jhuntwork] - Remove ppc specific instructions from chapter 6 patch.
-	  Cross-LFS can handle non-x86 arch specifics at this point.</para>
+          <para>[jhuntwork] - Remove ppc specific instructions from chapter 6
+          patch. Cross-LFS can handle non-x86 arch specifics at this point.</para>
+        </listitem>
+        <listitem>
+          <para>[jhuntwork] - Fix chapter 6 Glibc's test-installation.pl to test
+          the correct Glibc. Fixes bug 1675. Thanks to Dan Nicholson for the report
+          and Greg Schafer for the fix.</para>
+        </listitem>
+        <listitem>
+          <para>[jhuntwork] - Fixed the re-adjusting of the toolchain in chapter
+          6 so that chapter 6 GCC and Binutils links against the proper Glibc and
+          so that we don't have to keep the binutils directories from chapter 5.
+          Also moved a note about saving the /tools directory to the beginning of
+          chapter 6. Fixes bug 1677. Thanks to Chris Staub, Alexander Patrakov,
+          Greg Schafer and Tushar Teredesai for reporting and resolving this
+          issue.</para>
         </listitem>
-	<listitem>
-	  <para>[jhuntwork] - Fix chapter 6 Glibc's test-installation.pl to test
-	  the correct Glibc. Fixes bug 1675. Thanks to Dan Nicholson for the report
-	  and Greg Schafer for the fix.</para>
-	</listitem>
-	<listitem>
-	  <para>[jhuntwork] - Fixed the re-adjusting of the toolchain in chapter 6
-	  so that chapter 6 GCC and Binutils links against the proper Glibc and so
-	  that we don't have to keep the binutils directories from chapter 5. Also
-	  moved a note about saving the /tools directory to the beginning of chapter 6.
-	  Fixes bug 1677. Thanks to Chris Staub, Alexander Patrakov, Greg Schafer and
-	  Tushar Teredesai for reporting and resolving this issue.</para>
-	</listitem>
         <listitem>
           <para>[matthew] - Upgrade coreutils i18n patch to version 2 to fix
           <command>sort -n</command> and add the en_US.UTF-8 locale to improve
@@ -112,7 +145,7 @@
         </listitem>
         <listitem>
           <para>[matthew] - Install documentation for the Linux kernel.  Thanks
-to Tushar for the report.  Fixes bug 1683.</para>
+          to Tushar for the report.  Fixes bug 1683.</para>
         </listitem>
         <listitem>
           <para>[matthew] - Added a patch to enable Perl's DB_File module to
@@ -127,7 +160,8 @@ to Tushar for the report.  Fixes bug 1683.</para>
       <itemizedlist>
         <listitem>
           <para>[jhuntwork] - Added a patch to fix the sprintf security
-	  vulnerability in Perl. Thanks to Tim van der Molen for pointing it out.</para>
+          vulnerability in Perl. Thanks to Tim van der Molen for pointing
+          it out.</para>
         </listitem>
       </itemizedlist>
     </listitem>
@@ -137,7 +171,7 @@ to Tushar for the report.  Fixes bug 1683.</para>
       <itemizedlist>
         <listitem>
           <para>[jhuntwork] - Fixed locale generation for French UTF-8. Thanks
-	  to Dan McGhee for the report and Alexander Patrakov for the fix.</para>
+          to Dan McGhee for the report and Alexander Patrakov for the fix.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index d54a835f3..d2b3b3380 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -191,7 +191,7 @@
     <varlistentry>
       <term>Sysklogd 8-Bit Cleanness Patch - 1 KB:</term>
       <listitem>
-        <para><ulink url="&lfs-root;patches/downloads/sysklogd/&sysklogd-8bit-patch;"/></para>
+        <para><ulink url="&patches-root;&sysklogd-8bit-patch;"/></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml
index b48a17128..f512b6cf4 100644
--- a/chapter05/adjusting.xml
+++ b/chapter05/adjusting.xml
@@ -15,27 +15,20 @@
   these libraries. In order to accomplish this, the linker and the
   compiler's specs file need to be adjusted.</para>
 
-  <para>The linker, adjusted at the end of the first pass of Binutils,
-  is installed by running the following command from within the
-  <filename class="directory">binutils-build</filename> directory:</para>
+  <para>The linker, adjusted at the end of the first pass of Binutils, needs
+  to be renamed so that it can be properly found and used. First, backup the
+  original linker, then replace it with the adjusted linker. We'll also
+  create a link to its counterpart in <filename class="directory">
+  /tools/$(gcc -dumpmachine)/bin</filename></para>
 
-<screen><userinput>make -C ld install</userinput></screen>
+<screen><userinput>mv -v /tools/bin/{ld,ld-old}
+mv -v /tools/$(gcc -dumpmachine)/bin/{ld,ld-old}
+mv -v /tools/bin/{ld-new,ld}
+ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
 
   <para>From this point onwards, everything will link only against the
   libraries in <filename class="directory">/tools/lib</filename>.</para>
 
-  <note>
-    <para>If the earlier warning to retain the Binutils source and
-    build directories from the first pass was missed, ignore the above
-    command. This results in a small chance that the subsequent testing
-    programs will link against libraries on the host. This is not ideal,
-    but it is not a major problem. The situation is corrected when the
-    second pass of Binutils is installed later.</para>
-  </note>
-
-  <para>Now that the adjusted linker is installed, the Binutils build and source
-  directories should be removed.</para>
-
   <para>The next task is to point GCC to the new dynamic linker. This is done by
   dumping GCC's <quote>specs</quote> file to a location where GCC will look for it
   by default. A simple <command>sed</command> substitution then alters the
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index e71640991..025789793 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -46,12 +46,12 @@
 <screen><userinput>./configure --prefix=/tools --without-bash-malloc</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the configure option:</title>
 
       <varlistentry>
         <term><parameter>--without-bash-malloc</parameter></term>
         <listitem>
-          <para>This options turns off the use of Bash's memory allocation
+          <para>This option turns off the use of Bash's memory allocation
           (<function>malloc</function>) function which is known to cause
           segmentation faults. By turning this option off, Bash will use
           the <function>malloc</function> functions from Glibc which are
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 4435cfca0..66babd397 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -105,7 +105,8 @@ cd ../binutils-build</userinput></screen>
     later on:</para>
 
 <screen><userinput>make -C ld clean
-make -C ld LIB_PATH=/tools/lib</userinput></screen>
+make -C ld LIB_PATH=/tools/lib
+cp -v ld/ld-new /tools/bin</userinput></screen>
 
     <variablelist>
       <title>The meaning of the make parameters:</title>
@@ -134,12 +135,6 @@ make -C ld LIB_PATH=/tools/lib</userinput></screen>
 
     </variablelist>
 
-    <warning>
-      <para><emphasis>Do not</emphasis> remove the Binutils build and source
-      directories yet. These will be needed again in their current state later
-      in this chapter.</para>
-    </warning>
-
   </sect2>
 
   <sect2 role="content">
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index cc9cdcb6a..eecf6eb5f 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -86,7 +86,7 @@ cd ../binutils-build</userinput></screen>
     the next chapter:</para>
 
 <screen><userinput>make -C ld clean
-make -C ld LDFLAGS="-s" LIB_PATH=/usr/lib:/lib
+make -C ld LIB_PATH=/usr/lib:/lib
 cp -v ld/ld-new /tools/bin</userinput></screen>
 
 
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index aa2ea3623..28fe4385d 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -93,7 +93,7 @@ cd ../gcc-build</userinput></screen>
 <screen><userinput>make bootstrap</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the make parameters:</title>
+      <title>The meaning of the make parameter:</title>
 
       <varlistentry>
         <term><parameter>bootstrap</parameter></term>
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 58063a815..cb7a2ea4f 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -50,7 +50,7 @@
 ./configure --prefix=/tools --disable-shared</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the configure option:</title>
 
       <varlistentry>
         <term><parameter>--disable-shared</parameter></term>
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index 49012584a..fbcafbf87 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -47,7 +47,7 @@
     --disable-perl-regexp</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the configure option:</title>
 
       <varlistentry>
         <term><parameter>--disable-perl-regexp</parameter></term>
diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml
index fd1a3692e..1704086ef 100644
--- a/chapter05/introduction.xml
+++ b/chapter05/introduction.xml
@@ -52,10 +52,7 @@
   <important>
     <para>After installing each package, delete its source and build directories,
     unless specifically instructed otherwise. Deleting the sources prevents
-    mis-configuration when the same package is reinstalled later. Only three
-    of the packages need to retain the source and build directories in order
-    for their contents to be used by later commands. Pay special attention to
-    these reminders.</para>
+    mis-configuration when the same package is reinstalled later.</para>
   </important>
 
   <para>Check one last time that the <envar>LFS</envar> environment
diff --git a/chapter06/aboutdebug.xml b/chapter06/aboutdebug.xml
index 5ba986652..5cecada9c 100644
--- a/chapter06/aboutdebug.xml
+++ b/chapter06/aboutdebug.xml
@@ -1,50 +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-system-aboutdebug">
-<title>About Debugging Symbols</title>
-<?dbhtml filename="aboutdebug.html"?>
-
-<para>Most programs and libraries are, by default, compiled with
-debugging symbols included (with <command>gcc</command>'s
-<parameter>-g</parameter> option). This means that when debugging a
-program or library that was compiled with debugging information
-included, the debugger can provide not only memory addresses, but also
-the names of the routines and variables.</para>
-
-<para>However, the inclusion of these debugging symbols enlarges a
-program or library significantly. The following is an example of the
-amount of space these symbols occupy:</para>
- 
-<itemizedlist>
-
-<listitem><para>a bash binary 
-with debugging symbols: 1200 KB</para></listitem>
-
-<listitem><para>a bash binary
-without debugging symbols: 480 KB</para></listitem>
-
-<listitem><para>Glibc and GCC files (<filename class="directory">/lib</filename>
-and <filename class="directory">/usr/lib</filename>)
-with debugging symbols: 87 MB</para></listitem>
 
-<listitem><para>Glibc and GCC files
-without debugging symbols: 16 MB</para></listitem>
-
-</itemizedlist>
-
-<para>Sizes may vary depending on which compiler and C
-library were used, but when comparing programs with and without debugging
-symbols, the difference will usually be a factor between two and
-five.</para>
-
-<para>Because most users will never use a debugger on their system
-software, a lot of disk space can be regained by removing these
-symbols. The next section shows how to strip all debugging symbols
-from the programs and libraries. Additional information on system
-optimization can be found at <ulink url="&hints-root;optimization.txt"/>.</para>
+<sect1 id="ch-system-aboutdebug">
+  <?dbhtml filename="aboutdebug.html"?>
+
+  <title>About Debugging Symbols</title>
+
+  <para>Most programs and libraries are, by default, compiled with
+  debugging symbols included (with <command>gcc</command>'s
+  <parameter>-g</parameter> option). This means that when debugging a
+  program or library that was compiled with debugging information
+  included, the debugger can provide not only memory addresses, but also
+  the names of the routines and variables.</para>
+
+  <para>However, the inclusion of these debugging symbols enlarges a
+  program or library significantly. The following is an example of the
+  amount of space these symbols occupy:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>A <command>bash</command> binary with debugging symbols:
+      1200 KB</para>
+    </listitem>
+    <listitem>
+      <para>A <command>bash</command> binary without debugging symbols:
+      480 KB</para>
+    </listitem>
+    <listitem>
+      <para>Glibc and GCC files (<filename class="directory">/lib</filename>
+      and <filename class="directory">/usr/lib</filename>) with debugging
+      symbols: 87 MB</para>
+    </listitem>
+    <listitem>
+      <para>Glibc and GCC files without debugging symbols: 16 MB</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>Sizes may vary depending on which compiler and C library were used,
+  but when comparing programs with and without debugging symbols, the
+  difference will usually be a factor between two and five.</para>
+
+  <para>Because most users will never use a debugger on their system software,
+  a lot of disk space can be regained by removing these symbols. The next
+  section shows how to strip all debugging symbols from the programs and
+  libraries. Additional information on system optimization can be found at
+  <ulink url="&hints-root;optimization.txt"/>.</para>
 
 </sect1>
-
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 4067d02d0..77dc301c7 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -1,143 +1,177 @@
 <?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-system-autoconf" role="wrap">
-<title>Autoconf-&autoconf-version;</title>
-<?dbhtml filename="autoconf.html"?>
+  <?dbhtml filename="autoconf.html"?>
+
+  <title>Autoconf-&autoconf-version;</title>
+
+  <indexterm zone="ch-system-autoconf">
+    <primary sortas="a-Autoconf">Autoconf</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-system-autoconf"><primary sortas="a-Autoconf">Autoconf</primary></indexterm>
+    <para>The Autoconf package contains programs for producing shell scripts that
+    can automatically configure source code.</para>
 
-<sect2 role="package"><title/>
-<para>The Autoconf package contains programs for producing shell scripts that
-can automatically configure source code.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.5 SBU</seg><seg>8.5 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.5 SBU</seg>
+        <seg>8.5 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Coreutils, Diffutils, Grep,
-M4, Make, Perl, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+    <segmentedlist>
+    <segtitle>&dependencies;</segtitle>
 
-<sect2 role="installation">
-<title>Installation of Autoconf</title>
+      <seglistitem>
+        <seg>Bash, Coreutils, Diffutils, Grep, M4, Make, Perl, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para>Prepare Autoconf for compilation:</para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Autoconf</title>
+
+    <para>Prepare Autoconf for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make check</userinput>. This takes a long time, about 2 SBUs.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.
+    This takes a long time, about 2 SBUs.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
-
-<sect2 id="contents-autoconf" role="content"><title>Contents of Autoconf</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>autoconf, autoheader, autom4te,
-autoreconf, autoscan, autoupdate, and ifnames</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="autoconf">
-<term><command>autoconf</command></term>
-<listitem>
-<para>Produces shell scripts that automatically
-configure software source code packages to adapt to many kinds of
-Unix-like systems. The configuration scripts it produces are
-independent&mdash;running them does not require the <command>autoconf</command> program.</para>
-<indexterm zone="ch-system-autoconf autoconf"><primary sortas="b-autoconf">autoconf</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="autoheader">
-<term><command>autoheader</command> </term>
-<listitem>
-<para>A tool for creating template files of C
-<emphasis>#define</emphasis> statements for configure to use</para>
-<indexterm zone="ch-system-autoconf autoheader"><primary sortas="b-autoheader">autoheader</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="autom4te">
-<term><command>autom4te</command></term>
-<listitem>
-<para>A wrapper for the M4 macro processor</para>
-<indexterm zone="ch-system-autoconf autom4te"><primary sortas="b-autom4te">autom4te</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="autoreconf">
-<term><command>autoreconf</command></term>
-<listitem>
-<para>Automatically runs <command>autoconf</command>,
-<command>autoheader</command>, <command>aclocal</command>,
-<command>automake</command>, <command>gettextize</command>, and
-<command>libtoolize</command> in the correct order to save time
-when changes are made to <command>autoconf</command> and 
-<command>automake</command> template files</para>
-<indexterm zone="ch-system-autoconf autoreconf"><primary sortas="b-autoreconf">autoreconf</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="autoscan">
-<term><command>autoscan</command> </term>
-<listitem>
-<para>Helps to create a <filename>configure.in</filename> file for a
-software package; it examines the source files in a directory tree,
-searching them for common portability issues, and creates a
-<filename>configure.scan</filename> file that serves as as a
-preliminary <filename>configure.in</filename> file for the
-package</para>
-<indexterm zone="ch-system-autoconf autoscan"><primary sortas="b-autoscan">autoscan</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="autoupdate">
-<term><command>autoupdate</command></term>
-<listitem>
-<para>Modifies a <filename>configure.in</filename> file that still
-calls <command>autoconf</command> macros by their old names to use the 
-current macro names</para>
-<indexterm zone="ch-system-autoconf autoupdate"><primary sortas="b-autoupdate">autoupdate</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ifnames">
-<term><command>ifnames</command> </term>
-<listitem>
-<para>Helps when writing <filename>configure.in</filename> files
-for a software package; it prints the identifiers that the package
-uses in C preprocessor conditionals. If a package has already been set
-up to have some portability, this program can help determine what
-<command>configure</command> needs to check for. It can also fill in
-gaps in a <filename>configure.in</filename> file generated by
-<command>autoscan</command></para>
-<indexterm zone="ch-system-autoconf ifnames"><primary sortas="b-ifnames">ifnames</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
+
+  <sect2 id="contents-autoconf" role="content">
+    <title>Contents of Autoconf</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate,
+        and ifnames</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="autoconf">
+        <term><command>autoconf</command></term>
+        <listitem>
+          <para>Produces shell scripts that automatically configure software
+          source code packages to adapt to many kinds of Unix-like systems.
+          The configuration scripts it produces are independent&mdash;running
+          them does not require the <command>autoconf</command> program.</para>
+          <indexterm zone="ch-system-autoconf autoconf">
+            <primary sortas="b-autoconf">autoconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoheader">
+        <term><command>autoheader</command> </term>
+        <listitem>
+          <para>A tool for creating template files of C
+          <emphasis>#define</emphasis> statements for configure to use</para>
+          <indexterm zone="ch-system-autoconf autoheader">
+            <primary sortas="b-autoheader">autoheader</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autom4te">
+        <term><command>autom4te</command></term>
+        <listitem>
+          <para>A wrapper for the M4 macro processor</para>
+          <indexterm zone="ch-system-autoconf autom4te">
+            <primary sortas="b-autom4te">autom4te</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoreconf">
+        <term><command>autoreconf</command></term>
+        <listitem>
+          <para>Automatically runs <command>autoconf</command>,
+          <command>autoheader</command>, <command>aclocal</command>,
+          <command>automake</command>, <command>gettextize</command>, and
+          <command>libtoolize</command> in the correct order to save time
+          when changes are made to <command>autoconf</command> and
+          <command>automake</command> template files</para>
+          <indexterm zone="ch-system-autoconf autoreconf">
+            <primary sortas="b-autoreconf">autoreconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoscan">
+        <term><command>autoscan</command> </term>
+        <listitem>
+          <para>Helps to create a <filename>configure.in</filename> file for a
+          software package; it examines the source files in a directory tree,
+          searching them for common portability issues, and creates a
+          <filename>configure.scan</filename> file that serves as as a
+          preliminary <filename>configure.in</filename> file for the
+          package</para>
+          <indexterm zone="ch-system-autoconf autoscan">
+            <primary sortas="b-autoscan">autoscan</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="autoupdate">
+        <term><command>autoupdate</command></term>
+        <listitem>
+          <para>Modifies a <filename>configure.in</filename> file that still
+          calls <command>autoconf</command> macros by their old names to use the
+          current macro names</para>
+          <indexterm zone="ch-system-autoconf autoupdate">
+            <primary sortas="b-autoupdate">autoupdate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ifnames">
+        <term><command>ifnames</command> </term>
+        <listitem>
+          <para>Helps when writing <filename>configure.in</filename> files
+          for a software package; it prints the identifiers that the package
+          uses in C preprocessor conditionals. If a package has already been set
+          up to have some portability, this program can help determine what
+          <command>configure</command> needs to check for. It can also fill in
+          gaps in a <filename>configure.in</filename> file generated by
+          <command>autoscan</command></para>
+          <indexterm zone="ch-system-autoconf ifnames">
+            <primary sortas="b-ifnames">ifnames</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 71350a2db..884776983 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -1,217 +1,272 @@
 <?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-system-automake" role="wrap">
-<title>Automake-&automake-version;</title>
-<?dbhtml filename="automake.html"?>
+  <?dbhtml filename="automake.html"?>
+
+  <title>Automake-&automake-version;</title>
+
+  <indexterm zone="ch-system-automake">
+    <primary sortas="a-Automake">Automake</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-system-automake"><primary sortas="a-Automake">Automake</primary></indexterm>
+    <para>The Automake package contains programs for generating Makefiles for use
+    with Autoconf.</para>
 
-<sect2 role="package"><title/>
-<para>The Automake package contains programs for generating Makefiles for use
-with Autoconf.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.2 SBU</seg><seg>8.8 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.2 SBU</seg>
+        <seg>8.8 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Autoconf, Bash, Coreutils,
-Diffutils, Grep, M4, Make, Perl, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<sect2 role="installation">
-<title>Installation of Automake</title>
+      <seglistitem>
+        <seg>Autoconf, Bash, Coreutils, Diffutils, Grep, M4, Make, Perl,
+        and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para>Prepare Automake for compilation:</para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Automake</title>
+
+    <para>Prepare Automake for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make check</userinput>. This takes a long time, about 5 SBUs.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.
+    This takes a long time, about 5 SBUs.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
-
-
-<sect2 id="contents-automake" role="content"><title>Contents of Automake</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>acinstall, aclocal, aclocal-&automake-version;,
-automake, automake-&automake-version;,
-compile, config.guess, config.sub, depcomp, elisp-comp, install-sh, mdate-sh, 
-missing, mkinstalldirs, py-compile, symlink-tree, and ylwrap</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="acinstall">
-<term><command>acinstall</command></term>
-<listitem>
-<para>A script that installs aclocal-style M4 files</para>
-<indexterm zone="ch-system-automake acinstall"><primary sortas="b-acinstall">acinstall</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="aclocal">
-<term><command>aclocal</command></term>
-<listitem>
-<para>Generates <filename>aclocal.m4</filename>
-files based on the contents of <filename>configure.in</filename> files</para>
-<indexterm zone="ch-system-automake aclocal"><primary sortas="b-aclocal">aclocal</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="aclocal-version">
-<term><command>aclocal-&automake-version;</command></term>
-<listitem>
-<para>A hard link to <command>aclocal</command></para>
-<indexterm zone="ch-system-automake aclocal-version"><primary
-sortas="b-aclocal-&automake-version;">aclocal-&automake-version;</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="automake">
-<term><command>automake</command></term>
-<listitem>
-<para>A tool for automatically generating
-<filename>Makefile.in</filename> files from
-<filename>Makefile.am</filename> files. To create all the
-<filename>Makefile.in</filename> files for a package, run this program
-in the top-level directory. By scanning the
-<filename>configure.in</filename> file, it automatically finds each
-appropriate <filename>Makefile.am</filename> file and generates the
-corresponding <filename>Makefile.in</filename> file</para>
-<indexterm zone="ch-system-automake automake"><primary sortas="b-automake">automake</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="automake-version">
-<term><command>automake-&automake-version;</command></term>
-<listitem>
-<para>A hard link to <command>automake</command></para>
-<indexterm zone="ch-system-automake automake-version"><primary
-sortas="b-automake-&automake-version;">automake-&automake-version;</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="compile">
-<term><command>compile</command></term>
-<listitem>
-<para>A wrapper for compilers</para>
-<indexterm zone="ch-system-automake compile"><primary sortas="b-compile">compile</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="config.guess">
-<term><command>config.guess</command></term>
-<listitem>
-<para>A script that attempts to guess
-the canonical triplet for the given build, host, or target architecture</para>
-<indexterm zone="ch-system-automake config.guess"><primary sortas="b-config.guess">config.guess</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="config.sub">
-<term><command>config.sub</command></term>
-<listitem>
-<para>A configuration validation subroutine script</para>
-<indexterm zone="ch-system-automake config.sub"><primary sortas="b-config.sub">config.sub</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="depcomp">
-<term><command>depcomp</command></term>
-<listitem>
-<para>A script for compiling a program so that dependency information
-is generated in addition to the desired output</para>
-<indexterm zone="ch-system-automake depcomp"><primary sortas="b-depcomp">depcomp</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="elisp-comp">
-<term><command>elisp-comp</command></term>
-<listitem>
-<para>Byte-compiles Emacs Lisp code</para>
-<indexterm zone="ch-system-automake elisp-comp"><primary sortas="b-elisp-comp">elisp-comp</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="install-sh">
-<term><command>install-sh</command></term>
-<listitem>
-<para>A script that installs a program, script, or data file</para>
-<indexterm zone="ch-system-automake install-sh"><primary sortas="b-install-sh">install-sh</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mdate-sh">
-<term><command>mdate-sh</command></term>
-<listitem>
-<para>A script that prints the modification time of a file or directory</para>
-<indexterm zone="ch-system-automake mdate-sh"><primary sortas="b-mdate-sh">mdate-sh</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="missing">
-<term><command>missing</command></term>
-<listitem>
-<para>A script acting as a common stub for missing GNU programs during
-an installation</para>
-<indexterm zone="ch-system-automake missing"><primary sortas="b-missing">missing</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mkinstalldirs">
-<term><command>mkinstalldirs</command></term>
-<listitem>
-<para>A script that creates a directory tree</para>
-<indexterm zone="ch-system-automake mkinstalldirs"><primary sortas="b-mkinstalldirs">mkinstalldirs</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="py-compile">
-<term><command>py-compile</command></term>
-<listitem>
-<para>Compiles a Python program</para>
-<indexterm zone="ch-system-automake py-compile"><primary sortas="b-py-compile">py-compile</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="symlink-tree">
-<term><command>symlink-tree</command></term>
-<listitem>
-<para>A script to create a symlink tree of a directory tree</para>
-<indexterm zone="ch-system-automake symlink-tree"><primary sortas="b-symlink-tree">symlink-tree</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ylwrap">
-<term><command>ylwrap</command></term>
-<listitem>
-<para>A wrapper for <command>lex</command> and <command>yacc</command></para>
-<indexterm zone="ch-system-automake ylwrap"><primary sortas="b-ylwrap">ylwrap</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
+
+
+  <sect2 id="contents-automake" role="content">
+    <title>Contents of Automake</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>acinstall, aclocal, aclocal-&automake-version;, automake,
+        automake-&automake-version;, compile, config.guess, config.sub,
+        depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs,
+        py-compile, symlink-tree, and ylwrap</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="acinstall">
+        <term><command>acinstall</command></term>
+        <listitem>
+          <para>A script that installs aclocal-style M4 files</para>
+          <indexterm zone="ch-system-automake acinstall">
+            <primary sortas="b-acinstall">acinstall</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aclocal">
+        <term><command>aclocal</command></term>
+        <listitem>
+          <para>Generates <filename>aclocal.m4</filename> files based on the
+          contents of <filename>configure.in</filename> files</para>
+          <indexterm zone="ch-system-automake aclocal">
+            <primary sortas="b-aclocal">aclocal</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="aclocal-version">
+        <term><command>aclocal-&automake-version;</command></term>
+        <listitem>
+          <para>A hard link to <command>aclocal</command></para>
+          <indexterm zone="ch-system-automake aclocal-version">
+            <primary sortas="b-aclocal-&automake-version;">aclocal-&automake-version;</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="automake">
+        <term><command>automake</command></term>
+        <listitem>
+          <para>A tool for automatically generating
+          <filename>Makefile.in</filename> files from
+          <filename>Makefile.am</filename> files. To create all the
+          <filename>Makefile.in</filename> files for a package, run this program
+          in the top-level directory. By scanning the
+          <filename>configure.in</filename> file, it automatically finds each
+          appropriate <filename>Makefile.am</filename> file and generates the
+          corresponding <filename>Makefile.in</filename> file</para>
+          <indexterm zone="ch-system-automake automake">
+            <primary sortas="b-automake">automake</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="automake-version">
+        <term><command>automake-&automake-version;</command></term>
+        <listitem>
+          <para>A hard link to <command>automake</command></para>
+          <indexterm zone="ch-system-automake automake-version">
+            <primary sortas="b-automake-&automake-version;">automake-&automake-version;</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="compile">
+        <term><command>compile</command></term>
+        <listitem>
+          <para>A wrapper for compilers</para>
+          <indexterm zone="ch-system-automake compile">
+            <primary sortas="b-compile">compile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="config.guess">
+        <term><command>config.guess</command></term>
+        <listitem>
+          <para>A script that attempts to guess the canonical triplet for
+          the given build, host, or target architecture</para>
+          <indexterm zone="ch-system-automake config.guess">
+            <primary sortas="b-config.guess">config.guess</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="config.sub">
+        <term><command>config.sub</command></term>
+        <listitem>
+          <para>A configuration validation subroutine script</para>
+          <indexterm zone="ch-system-automake config.sub">
+            <primary sortas="b-config.sub">config.sub</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="depcomp">
+        <term><command>depcomp</command></term>
+        <listitem>
+          <para>A script for compiling a program so that dependency information
+          is generated in addition to the desired output</para>
+          <indexterm zone="ch-system-automake depcomp">
+            <primary sortas="b-depcomp">depcomp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="elisp-comp">
+        <term><command>elisp-comp</command></term>
+        <listitem>
+          <para>Byte-compiles Emacs Lisp code</para>
+          <indexterm zone="ch-system-automake elisp-comp">
+            <primary sortas="b-elisp-comp">elisp-comp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="install-sh">
+        <term><command>install-sh</command></term>
+        <listitem>
+          <para>A script that installs a program, script, or data file</para>
+          <indexterm zone="ch-system-automake install-sh">
+            <primary sortas="b-install-sh">install-sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mdate-sh">
+        <term><command>mdate-sh</command></term>
+        <listitem>
+          <para>A script that prints the modification time of a file or
+          directory</para>
+          <indexterm zone="ch-system-automake mdate-sh">
+            <primary sortas="b-mdate-sh">mdate-sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="missing">
+        <term><command>missing</command></term>
+        <listitem>
+          <para>A script acting as a common stub for missing GNU programs during
+          an installation</para>
+          <indexterm zone="ch-system-automake missing">
+            <primary sortas="b-missing">missing</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkinstalldirs">
+        <term><command>mkinstalldirs</command></term>
+        <listitem>
+          <para>A script that creates a directory tree</para>
+          <indexterm zone="ch-system-automake mkinstalldirs">
+            <primary sortas="b-mkinstalldirs">mkinstalldirs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="py-compile">
+        <term><command>py-compile</command></term>
+        <listitem>
+          <para>Compiles a Python program</para>
+          <indexterm zone="ch-system-automake py-compile">
+            <primary sortas="b-py-compile">py-compile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="symlink-tree">
+        <term><command>symlink-tree</command></term>
+        <listitem>
+          <para>A script to create a symlink tree of a directory tree</para>
+          <indexterm zone="ch-system-automake symlink-tree">
+            <primary sortas="b-symlink-tree">symlink-tree</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ylwrap">
+        <term><command>ylwrap</command></term>
+        <listitem>
+          <para>A wrapper for <command>lex</command> and
+          <command>yacc</command></para>
+          <indexterm zone="ch-system-automake ylwrap">
+            <primary sortas="b-ylwrap">ylwrap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 3010805b7..82608f068 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -1,122 +1,154 @@
 <?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-system-bash" role="wrap">
-<title>Bash-&bash-version;</title>
-<?dbhtml filename="bash.html"?>
+  <?dbhtml filename="bash.html"?>
+
+  <title>Bash-&bash-version;</title>
+
+  <indexterm zone="ch-system-bash">
+    <primary sortas="a-Bash">Bash</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-system-bash"><primary sortas="a-Bash">Bash</primary></indexterm>
+    <para>The Bash package contains the Bourne-Again SHell.</para>
 
-<sect2 role="package"><title/>
-<para>The Bash package contains the Bourne-Again SHell.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>1.2 SBU</seg><seg>24.6 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>1.2 SBU</seg>
+        <seg>24.6 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Binutils, Coreutils, Diffutils, Gawk,
-GCC, Glibc, Grep, Make, Ncurses, and Sed.</seg></seglistitem>
-</segmentedlist>
-</sect2>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<sect2 role="installation">
-<title>Installation of Bash</title>
+      <seglistitem>
+        <seg>Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, Make,
+        Ncurses, and Sed.</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para>If you downloaded the Bash documentation tarball and wish to install HTML
-documentation, issue the following commands:</para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Bash</title>
+
+    <para>If you downloaded the Bash documentation tarball and wish to install
+    HTML documentation, issue the following commands:</para>
 
 <screen><userinput>tar -xvf ../bash-doc-&bash-doc-version;.tar.gz &amp;&amp;
 sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
     Makefile.in</userinput></screen>
 
-<para>Prepare Bash for compilation:</para>
+    <para>Prepare Bash for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin \
     --without-bash-malloc --with-installed-readline</userinput></screen>
 
-<para>The meaning of the configure options:</para>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
 
-<variablelist>
-<varlistentry>
-<term><parameter>--with-installed-readline</parameter></term>
-<listitem><para>This option tells Bash to use the
-<filename class="libraryfile">readline</filename> library that is already installed
-on the system rather than using its own readline version.</para></listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry>
+        <term><parameter>--with-installed-readline</parameter></term>
+        <listitem>
+          <para>This option tells Bash to use the <filename
+          class="libraryfile">readline</filename> library that is already
+          installed on the system rather than using its own readline
+          version.</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 tests</userinput>.</para>
+    <para>To test the results, issue:
+    <userinput>make tests</userinput>.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Run the newly compiled <command>bash</command> program (replacing the one that is
-currently being executed):</para>
+    <para>Run the newly compiled <command>bash</command> program (replacing the one that is
+    currently being executed):</para>
 
 <screen role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
 
-<note><para>The parameters used make the <command>bash</command>
-process an interactive login shell and continue to disable hashing so
-that new programs are found as they become available.</para></note>
-
-</sect2>
-
-
-<sect2 id="contents-bash" role="content"><title>Contents of Bash</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>bash, bashbug, and sh (link to bash)</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="bash">
-<term><command>bash</command></term>
-<listitem>
-<para>A widely-used command interpreter; it performs many types of
-expansions and substitutions on a given command line before executing
-it, thus making this interpreter a powerful tool</para>
-<indexterm zone="ch-system-bash bash"><primary sortas="b-bash">bash</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="bashbug">
-<term><command>bashbug</command></term>
-<listitem>
-<para>A shell script to help the user compose and mail standard formatted bug
-reports concerning <command>bash</command></para>
-<indexterm zone="ch-system-bash bashbug"><primary sortas="b-bashbug">bashbug</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="sh">
-<term><command>sh</command></term>
-<listitem>
-<para>A symlink to the <command>bash</command> program; when invoked
-as <command>sh</command>, <command>bash</command> tries to mimic the
-startup behavior of historical versions of <command>sh</command> as
-closely as possible, while conforming to the POSIX standard as well</para>
-<indexterm zone="ch-system-bash sh"><primary sortas="b-sh">sh</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+    <note>
+      <para>The parameters used make the <command>bash</command>
+      process an interactive login shell and continue to disable hashing so
+      that new programs are found as they become available.</para>
+    </note>
+
+  </sect2>
+
+  <sect2 id="contents-bash" role="content">
+    <title>Contents of Bash</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>bash, bashbug, and sh (link to bash)</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="bash">
+        <term><command>bash</command></term>
+        <listitem>
+          <para>A widely-used command interpreter; it performs many types of
+          expansions and substitutions on a given command line before executing
+          it, thus making this interpreter a powerful tool</para>
+          <indexterm zone="ch-system-bash bash">
+            <primary sortas="b-bash">bash</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="bashbug">
+        <term><command>bashbug</command></term>
+        <listitem>
+          <para>A shell script to help the user compose and mail standard
+          formatted bug reports concerning <command>bash</command></para>
+          <indexterm zone="ch-system-bash bashbug">
+            <primary sortas="b-bashbug">bashbug</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sh">
+        <term><command>sh</command></term>
+        <listitem>
+          <para>A symlink to the <command>bash</command> program; when invoked
+          as <command>sh</command>, <command>bash</command> tries to mimic the
+          startup behavior of historical versions of <command>sh</command> as
+          closely as possible, while conforming to the POSIX standard as
+          well</para>
+          <indexterm zone="ch-system-bash sh">
+            <primary sortas="b-sh">sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 7c25fe1f9..59a0f0ca4 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -1,268 +1,336 @@
 <?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-system-binutils" role="wrap">
-<title>Binutils-&binutils-version;</title>
-<?dbhtml filename="binutils.html"?>
+  <?dbhtml filename="binutils.html"?>
+
+  <title>Binutils-&binutils-version;</title>
+
+  <indexterm zone="ch-system-binutils">
+    <primary sortas="a-Binutils">Binutils</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Binutils package contains a linker, an assembler, and other
+    tools for handling object files.</para>
 
-<indexterm zone="ch-system-binutils"><primary sortas="a-Binutils">Binutils</primary></indexterm>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<sect2 role="package"><title/>
-<para>The Binutils package contains a linker, an assembler, and other tools for
-handling object files.</para>
+      <seglistitem>
+        <seg>1.3 SBU</seg>
+        <seg>158 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>1.3 SBU</seg><seg>158 MB</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Coreutils, Diffutils, GCC, Gettext,
-Glibc, Grep, M4, Make, Perl, Sed, and Texinfo</seg></seglistitem>
-</segmentedlist>
-</sect2>
+      <seglistitem>
+        <seg>Bash, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep, M4,
+        Make, Perl, Sed, and Texinfo</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2 role="installation">
-<title>Installation of Binutils</title>
+  </sect2>
 
-<para>Verify that the PTYs are working properly inside the chroot
-environment. Check that everything is set up correctly by performing a
-simple test:</para>
+  <sect2 role="installation">
+    <title>Installation of Binutils</title>
+
+    <para>Verify that the PTYs are working properly inside the chroot
+    environment. Check that everything is set up correctly by performing a
+    simple test:</para>
 
 <screen><userinput>expect -c "spawn ls"</userinput></screen>
 
-<para>If the following message shows up, the chroot environment is not
-set up for proper PTY operation:</para>
+    <para>If the following message shows up, the chroot environment is not
+    set up for proper PTY operation:</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>This issue needs to be resolved before running the test suites
-for Binutils and GCC.</para>
+    <para>This issue needs to be resolved before running the test suites
+    for Binutils and GCC.</para>
 
-<para>The Binutils documentation recommends building Binutils outside of the
-source directory in a dedicated build directory:</para>
+    <para>The Binutils documentation recommends building Binutils outside of the
+    source directory in a dedicated build directory:</para>
 
 <screen><userinput>mkdir -v ../binutils-build
 cd ../binutils-build</userinput></screen>
 
-<para>Prepare Binutils for compilation:</para>
+    <para>Prepare Binutils for compilation:</para>
 
 <screen><userinput>../binutils-&binutils-version;/configure --prefix=/usr \
     --enable-shared</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make tooldir=/usr</userinput></screen>
 
-<para>Normally, the tooldir (the directory where the executables will ultimately
-be located) is set to <filename
-class="directory">$(exec_prefix)/$(target_alias)</filename>. For example, i686
-machines would expand that to <filename
-class="directory">/usr/i686-pc-linux-gnu</filename>. Because this is a custom
-system, this target-specific directory in <filename
-class="directory">/usr</filename> is not required. <filename
-class="directory">$(exec_prefix)/$(target_alias)</filename> would be used if the
-system was used to cross-compile (for example, compiling a package on an Intel
-machine that generates code that can be executed on PowerPC machines).</para>
-
-<important><para>The test suite for Binutils in this section is
-considered critical. Do not skip it under any
-circumstances.</para></important>
-
-<para>Test the results:</para>
+    <variablelist>
+      <title>The meaning of the make parameter:</title>
+
+      <varlistentry>
+        <term><parameter>tooldir=/usr</parameter></term>
+        <listitem>
+          <para>Normally, the tooldir (the directory where the executables will
+          ultimately be located) is set to <filename
+          class="directory">$(exec_prefix)/$(target_alias)</filename>. For
+          example, i686 machines would expand that to <filename
+          class="directory">/usr/i686-pc-linux-gnu</filename>. Because this is
+          a custom system, this target-specific directory in <filename
+          class="directory">/usr</filename> is not required. <filename
+          class="directory">$(exec_prefix)/$(target_alias)</filename> would be
+          used if the system was used to cross-compile (for example, compiling a
+          package on an Intel machine that generates code that can be executed
+          on PowerPC machines).</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <important>
+      <para>The test suite for Binutils in this section is considered critical.
+      Do not skip it under any circumstances.</para>
+    </important>
+
+    <para>Test the results:</para>
 
 <screen><userinput>make check</userinput></screen>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make tooldir=/usr install</userinput></screen>
 
-<para>Install the <filename class="headerfile">libiberty</filename> header file that is needed by
-some packages:</para>
+    <para>Install the <filename class="headerfile">libiberty</filename> header
+    file that is needed by some packages:</para>
 
 <screen><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen>
 
-</sect2>
-
-
-<sect2 id="contents-binutils" role="content"><title>Contents of Binutils</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<segtitle>Installed libraries</segtitle>
-<seglistitem><seg>addr2line, ar, as, c++filt, gprof, ld, nm, objcopy, objdump, 
-ranlib, readelf, size, strings, and strip</seg>
-<seg>libiberty.a, libbfd.[a,so], and libopcodes.[a,so]</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="addr2line">
-<term><command>addr2line</command></term>
-<listitem>
-<para>Translates program addresses to file names and line numbers;
-given an address and the name of an executable, it uses the debugging
-information in the executable to determine which source file and line
-number are associated with the address</para>
-<indexterm zone="ch-system-binutils addr2line"><primary sortas="b-addr2line">addr2line</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ar">
-<term><command>ar</command></term>
-<listitem>
-<para>Creates, modifies, and extracts from archives</para>
-<indexterm zone="ch-system-binutils ar"><primary sortas="b-ar">ar</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="as">
-<term><command>as</command></term>
-<listitem>
-<para>An assembler that assembles the output of <command>gcc</command>
-into object files</para>
-<indexterm zone="ch-system-binutils as"><primary sortas="b-as">as</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="c-filt">
-<term><command>c++filt</command></term>
-<listitem>
-<para>Used by the linker to de-mangle C++ and Java symbols and to keep
-overloaded functions from clashing</para>
-<indexterm zone="ch-system-binutils c-filt"><primary sortas="b-c++filt">c++filt</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="gprof">
-<term><command>gprof</command></term>
-<listitem>
-<para>Displays call graph profile data</para>
-<indexterm zone="ch-system-binutils gprof"><primary sortas="b-gprof">gprof</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ld">
-<term><command>ld</command></term>
-<listitem>
-<para>A linker that combines a number of object and archive files into a single file, 
-relocating their data and tying up symbol references</para>
-<indexterm zone="ch-system-binutils ld"><primary sortas="b-ld">ld</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="nm">
-<term><command>nm</command></term>
-<listitem>
-<para>Lists the symbols occurring in a given object file</para>
-<indexterm zone="ch-system-binutils nm"><primary sortas="b-nm">nm</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="objcopy">
-<term><command>objcopy</command></term>
-<listitem>
-<para>Translates one type of object file into another</para>
-<indexterm zone="ch-system-binutils objcopy"><primary sortas="b-objcopy">objcopy</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="objdump">
-<term><command>objdump</command></term>
-<listitem>
-<para>Displays information about the given object file, with options
-controlling the particular information to display; the information
-shown is useful to programmers who are working on the compilation
-tools</para>
-<indexterm zone="ch-system-binutils objdump"><primary sortas="b-objdump">objdump</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ranlib">
-<term><command>ranlib</command></term>
-<listitem>
-<para>Generates an index of the contents of an archive and stores it
-in the archive; the index lists all of the symbols defined by archive
-members that are relocatable object files</para>
-<indexterm zone="ch-system-binutils ranlib"><primary sortas="b-ranlib">ranlib</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="readelf">
-<term><command>readelf</command></term>
-<listitem>
-<para>Displays information about ELF type binaries</para>
-<indexterm zone="ch-system-binutils readelf"><primary sortas="b-readelf">readelf</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="size">
-<term><command>size</command></term>
-<listitem>
-<para>Lists the section sizes and the total size for the given object files</para>
-<indexterm zone="ch-system-binutils size"><primary sortas="b-size">size</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="strings">
-<term><command>strings</command></term>
-<listitem>
-<para>Outputs, for each given file, the sequences of printable
-characters that are of at least the specified length (defaulting to
-four); for object files, it prints, by default, only the strings from
-the initializing and loading sections while for other types of files, it
-scans the entire file</para>
-<indexterm zone="ch-system-binutils strings"><primary sortas="b-strings">strings</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="strip">
-<term><command>strip</command></term>
-<listitem>
-<para>Discards symbols from object files</para>
-<indexterm zone="ch-system-binutils strip"><primary sortas="b-strip">strip</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="libiberty">
-<term><filename class="libraryfile">libiberty</filename></term>
-<listitem>
-<para>Contains routines used by various GNU programs, including
-<command>getopt</command>, <command>obstack</command>,
-<command>strerror</command>, <command>strtol</command>, and
-<command>strtoul</command></para>
-<indexterm zone="ch-system-binutils libiberty"><primary sortas="c-libiberty">libiberty</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="libbfd">
-<term><filename class="libraryfile">libbfd</filename></term>
-<listitem>
-<para>The Binary File Descriptor library</para>
-<indexterm zone="ch-system-binutils libbfd"><primary sortas="c-libbfd">libbfd</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="libopcodes">
-<term><filename class="libraryfile">libopcodes</filename></term>
-<listitem>
-<para>A library for dealing with opcodes&mdash;the <quote>readable
-text</quote> versions of instructions for the processor;
-it is used for building utilities like
-<command>objdump</command>.</para>
-<indexterm zone="ch-system-binutils libopcodes"><primary sortas="c-libopcodes">libopcodes</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
+
+
+  <sect2 id="contents-binutils" role="content">
+    <title>Contents of Binutils</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+
+      <seglistitem>
+        <seg>addr2line, ar, as, c++filt, gprof, ld, nm, objcopy, objdump,
+        ranlib, readelf, size, strings, and strip</seg>
+        <seg>libiberty.a, libbfd.[a,so], and libopcodes.[a,so]</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="addr2line">
+        <term><command>addr2line</command></term>
+        <listitem>
+          <para>Translates program addresses to file names and line numbers;
+          given an address and the name of an executable, it uses the debugging
+          information in the executable to determine which source file and line
+          number are associated with the address</para>
+          <indexterm zone="ch-system-binutils addr2line">
+            <primary sortas="b-addr2line">addr2line</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ar">
+        <term><command>ar</command></term>
+        <listitem>
+          <para>Creates, modifies, and extracts from archives</para>
+          <indexterm zone="ch-system-binutils ar">
+            <primary sortas="b-ar">ar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="as">
+        <term><command>as</command></term>
+        <listitem>
+          <para>An assembler that assembles the output of <command>gcc</command>
+          into object files</para>
+          <indexterm zone="ch-system-binutils as">
+            <primary sortas="b-as">as</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="c-filt">
+        <term><command>c++filt</command></term>
+        <listitem>
+          <para>Used by the linker to de-mangle C++ and Java symbols and to keep
+          overloaded functions from clashing</para>
+          <indexterm zone="ch-system-binutils c-filt">
+            <primary sortas="b-c++filt">c++filt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gprof">
+        <term><command>gprof</command></term>
+        <listitem>
+          <para>Displays call graph profile data</para>
+          <indexterm zone="ch-system-binutils gprof">
+            <primary sortas="b-gprof">gprof</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ld">
+        <term><command>ld</command></term>
+        <listitem>
+          <para>A linker that combines a number of object and archive files
+          into a single file, relocating their data and tying up symbol
+          references</para>
+          <indexterm zone="ch-system-binutils ld">
+            <primary sortas="b-ld">ld</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nm">
+        <term><command>nm</command></term>
+        <listitem>
+          <para>Lists the symbols occurring in a given object file</para>
+          <indexterm zone="ch-system-binutils nm">
+            <primary sortas="b-nm">nm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="objcopy">
+        <term><command>objcopy</command></term>
+        <listitem>
+          <para>Translates one type of object file into another</para>
+          <indexterm zone="ch-system-binutils objcopy">
+            <primary sortas="b-objcopy">objcopy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="objdump">
+        <term><command>objdump</command></term>
+        <listitem>
+          <para>Displays information about the given object file, with options
+          controlling the particular information to display; the information
+          shown is useful to programmers who are working on the compilation
+          tools</para>
+          <indexterm zone="ch-system-binutils objdump">
+            <primary sortas="b-objdump">objdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ranlib">
+        <term><command>ranlib</command></term>
+        <listitem>
+          <para>Generates an index of the contents of an archive and stores it
+          in the archive; the index lists all of the symbols defined by archive
+          members that are relocatable object files</para>
+          <indexterm zone="ch-system-binutils ranlib">
+            <primary sortas="b-ranlib">ranlib</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="readelf">
+        <term><command>readelf</command></term>
+        <listitem>
+          <para>Displays information about ELF type binaries</para>
+          <indexterm zone="ch-system-binutils readelf">
+            <primary sortas="b-readelf">readelf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="size">
+        <term><command>size</command></term>
+        <listitem>
+          <para>Lists the section sizes and the total size for the given
+          object files</para>
+          <indexterm zone="ch-system-binutils size">
+            <primary sortas="b-size">size</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="strings">
+        <term><command>strings</command></term>
+        <listitem>
+          <para>Outputs, for each given file, the sequences of printable
+          characters that are of at least the specified length (defaulting to
+          four); for object files, it prints, by default, only the strings from
+          the initializing and loading sections while for other types of files, it
+          scans the entire file</para>
+          <indexterm zone="ch-system-binutils strings">
+            <primary sortas="b-strings">strings</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="strip">
+        <term><command>strip</command></term>
+        <listitem>
+          <para>Discards symbols from object files</para>
+          <indexterm zone="ch-system-binutils strip">
+            <primary sortas="b-strip">strip</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libiberty">
+        <term><filename class="libraryfile">libiberty</filename></term>
+        <listitem>
+          <para>Contains routines used by various GNU programs, including
+          <command>getopt</command>, <command>obstack</command>,
+          <command>strerror</command>, <command>strtol</command>, and
+          <command>strtoul</command></para>
+          <indexterm zone="ch-system-binutils libiberty">
+            <primary sortas="c-libiberty">libiberty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libbfd">
+        <term><filename class="libraryfile">libbfd</filename></term>
+        <listitem>
+          <para>The Binary File Descriptor library</para>
+          <indexterm zone="ch-system-binutils libbfd">
+            <primary sortas="c-libbfd">libbfd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libopcodes">
+        <term><filename class="libraryfile">libopcodes</filename></term>
+        <listitem>
+          <para>A library for dealing with opcodes&mdash;the <quote>readable
+          text</quote> versions of instructions for the processor;
+          it is used for building utilities like
+          <command>objdump</command>.</para>
+          <indexterm zone="ch-system-binutils libopcodes">
+            <primary sortas="c-libopcodes">libopcodes</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index d5fb0ae82..3e208fe02 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -1,102 +1,129 @@
 <?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-system-bison" role="wrap">
-<title>Bison-&bison-version;</title>
-<?dbhtml filename="bison.html"?>
+  <?dbhtml filename="bison.html"?>
+
+  <title>Bison-&bison-version;</title>
+
+  <indexterm zone="ch-system-bison">
+    <primary sortas="a-Bison">Bison</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-system-bison"><primary sortas="a-Bison">Bison</primary></indexterm>
+    <para>The Bison package contains a parser generator.</para>
 
-<sect2 role="package"><title/>
-<para>The Bison package contains a parser generator.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.6 SBU</seg><seg>9.9 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.6 SBU</seg>
+        <seg>9.9 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Gettext, Glibc, Grep, M4, Make, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<sect2 role="installation">
-<title>Installation of Bison</title>
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc,
+        Grep, M4, Make, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para>Prepare Bison for compilation:</para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Bison</title>
+
+    <para>Prepare Bison for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-<para>The configure system causes bison to be built without support for
-internationalization of error messages if a <command>bison</command>
-program is not already in $PATH.  The following addition will correct
-this.</para>
+    <para>The configure system causes bison to be built without support for
+    internationalization of error messages if a <command>bison</command>
+    program is not already in $PATH.  The following addition will correct
+    this.</para>
 
-<screen>echo '#define YYENABLE_NLS 1' >> config.h</screen>  
+<screen>echo '#define YYENABLE_NLS 1' >> config.h</screen>
 
-<para>Compile the package:</para>
+    <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 id="contents-bison" role="content"><title>Contents of Bison</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<segtitle>Installed library</segtitle>
-<seglistitem><seg>bison and yacc</seg><seg>liby.a</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="bison">
-<term><command>bison</command></term>
-<listitem>
-<para>Generates, from a series of rules, a program for analyzing the structure
-of text files; Bison is a replacement for Yacc (Yet Another Compiler
-Compiler)</para>
-<indexterm zone="ch-system-bison bison"><primary sortas="b-bison">bison</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="yacc">
-<term><command>yacc</command></term>
-<listitem>
-<para>A wrapper for <command>bison</command>, meant for programs
-that still call <command>yacc</command> instead of <command>bison</command>;
-it calls <command>bison</command> with the <parameter>-y</parameter> option</para>
-<indexterm zone="ch-system-bison yacc"><primary sortas="b-yacc">yacc</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="liby.a">
-<term><filename class="libraryfile">liby.a</filename></term>
-<listitem>
-<para>The Yacc library containing implementations of Yacc-compatible
-<emphasis>yyerror</emphasis> and <emphasis>main</emphasis> functions;
-this library is normally not very useful, but POSIX requires
-it</para>
-<indexterm zone="ch-system-bison liby.a"><primary sortas="c-liby.a">liby.a</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
+
+  <sect2 id="contents-bison" role="content">
+    <title>Contents of Bison</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed library</segtitle>
+
+      <seglistitem>
+        <seg>bison and yacc</seg>
+        <seg>liby.a</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="bison">
+        <term><command>bison</command></term>
+        <listitem>
+          <para>Generates, from a series of rules, a program for analyzing the
+          structure of text files; Bison is a replacement for Yacc (Yet Another
+          Compiler Compiler)</para>
+          <indexterm zone="ch-system-bison bison">
+            <primary sortas="b-bison">bison</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="yacc">
+        <term><command>yacc</command></term>
+        <listitem>
+          <para>A wrapper for <command>bison</command>, meant for programs that
+          still call <command>yacc</command> instead of <command>bison</command>;
+          it calls <command>bison</command> with the <parameter>-y</parameter>
+          option</para>
+          <indexterm zone="ch-system-bison yacc">
+            <primary sortas="b-yacc">yacc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="liby.a">
+        <term><filename class="libraryfile">liby.a</filename></term>
+        <listitem>
+          <para>The Yacc library containing implementations of Yacc-compatible
+          <function>yyerror</function> and <function>main</function> functions;
+          this library is normally not very useful, but POSIX requires it</para>
+          <indexterm zone="ch-system-bison liby.a">
+            <primary sortas="c-liby.a">liby.a</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/changingowner.xml b/chapter06/changingowner.xml
index a22e199c5..618fa40d8 100644
--- a/chapter06/changingowner.xml
+++ b/chapter06/changingowner.xml
@@ -32,9 +32,8 @@ command:</para>
 
 <para>The command uses <parameter>0:0</parameter> instead of
 <parameter>root:root</parameter>, because <command>chown</command>
-is unable to resolve the name <quote>root</quote> until the password
-file has been created. This book assumes you ran this
-<command>chown</command> command.</para>
+is unable to resolve the name <quote>root</quote> until the
+<filename>passwd</filename> file has been created.</para>
 
 </sect1>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index e8c49be34..b67e4ede7 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -99,6 +99,11 @@ To support those packages, create this symlink:</para>
 
 <screen><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
 
+<para>Many packages use the name <command>cc</command> to call the C
+compiler. To satisfy those packages, create a symlink:</para>
+
+<screen><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
+
 <note><para>At this point, it is strongly recommended to repeat the
 sanity check performed earlier in this chapter. Refer back to <xref
 linkend="ch-system-readjusting" role=","/> and repeat the check. If the results
diff --git a/chapter06/readjusting.xml b/chapter06/readjusting.xml
index ef46f1a3d..18fc83d4a 100644
--- a/chapter06/readjusting.xml
+++ b/chapter06/readjusting.xml
@@ -19,18 +19,24 @@ be guided from that same <filename class="directory">/tools/lib</filename>
 directory to the LFS <filename class="directory">/{,usr/}lib</filename>
 directories.</para>
 
-<para>First, create a symlink to the adjusted linker we created in chapter 5.</para>
+<para>First, backup the <filename class="directory">/tools</filename> linker, and
+replace it with the adjusted linker we made in chapter 5. We'll also create a 
+link to its counterpart in <filename class="directory">/tools/$(gcc -dumpmachine)/bin</filename>.</para>
 
-<screen><userinput>ln -sv /tools/bin/ld-new /usr/bin/ld</userinput></screen>
+<screen><userinput>mv -v /tools/bin/{ld,ld-old}
+mv -v /tools/$(gcc -dumpmachine)/bin/{ld,ld-old}
+mv -v /tools/bin/{ld-new,ld}
+ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
 
 <para>Next, amend the GCC specs file so that it points to the new
-dynamic linker. A <command>sed</command> command accomplishes this:</para>
+dynamic linker, and so that GCC knows where to find its start files.
+A <command>perl</command> command accomplishes this:</para>
 
-<screen><userinput>SPECFILE=`dirname $(gcc -print-libgcc-file-name)`/specs &amp;&amp;
-gcc -dumpspecs > $SPECFILE &amp;&amp;
-sed -i -e '/^\*link:$/{n;s,$, -L/usr/lib,}' \
-       -e 's@^/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' $SPECFILE &amp;&amp;
-unset SPECFILE</userinput></screen>
+<screen><userinput>gcc -dumpspecs | \
+perl -p -e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g;' \
+     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' &gt; \
+     `dirname $(gcc --print-libgcc-file-name)`/specs
+</userinput></screen>
 
 <para>It is a good idea to visually inspect the specs file to verify the intended 
 change was actually made.</para>
@@ -43,18 +49,6 @@ dynamic linker in the above commands. Refer back to <xref
 linkend="ch-tools-toolchaintechnotes" role=","/> if
 necessary.</para></important>
 
-<para>Now create a temporary wrapper script for <filename>gcc</filename>.
-This script will point to the real <filename>gcc</filename>
-in <filename class="directory">/tools</filename> but with adjusted parameters
-to ensure that GCC in the next section links to our newly installed Glibc.</para>
-
-<screen><userinput>cat &gt; /usr/bin/gcc &lt;&lt; "EOF"
-#!/bin/bash
-/tools/bin/gcc -B/usr/lib/ -B/usr/bin/ $@
-EOF
-chmod 755 /usr/bin/gcc
-ln -s gcc /usr/bin/cc</userinput></screen>
-
 <caution><para>It is imperative at this point to stop and ensure that
 the basic functions (compiling and linking) of the adjusted toolchain
 are working as expected. To do this, perform a sanity
diff --git a/chapter06/strippingagain.xml b/chapter06/strippingagain.xml
index 7a4090fd3..af1352e04 100644
--- a/chapter06/strippingagain.xml
+++ b/chapter06/strippingagain.xml
@@ -17,7 +17,7 @@ debug the software fully anymore.</para>
 experience any difficulties. However, it is easy to make a typo and
 render the new system unusable, so before running the 
 <command>strip</command> command, it is a good idea to make a
-backup of the current situation.</para>
+backup of the LFS system in its current state.</para>
 
 <para>Before performing the stripping, take special care to ensure that
 none of the binaries that are about to be stripped are running. If
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index bd21f2f32..d58dbb6b7 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -113,7 +113,7 @@ url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para>
 </sect2>
 
 <sect2 id="conf-vim" role="configuration"><title>Configuring Vim</title>
-<indexterm zone="conf-vim"><primary sortas="e-/etc/vim">/etc/vim</primary></indexterm>
+<indexterm zone="conf-vim"><primary sortas="e-/etc/vimrc">/etc/vimrc</primary></indexterm>
 
 <para>By default, <command>vim</command> runs in vi-incompatible mode. This may
 be new to users who have used other editors in the past. The
diff --git a/general.ent b/general.ent
index 419131d6c..46b985ea2 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060126">
-<!ENTITY releasedate "January 26, 2006">
+<!ENTITY version "SVN-20060131">
+<!ENTITY releasedate "January 31, 2006">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
@@ -22,7 +22,6 @@
 <!ENTITY alpha-gnu "ftp://alpha.gnu.org/gnu/">
 <!ENTITY kernel "http://www.kernel.org/pub/">
 <!ENTITY sourceforge "http://prdownloads.sourceforge.net/">
-<!ENTITY alexpatches "&lfs-root;~alexander/patches/">
 
 <!ENTITY % patches-entities SYSTEM "patches.ent">
 %patches-entities;