Index: chapter06/config-glibc.xml
===================================================================
--- chapter06/config-glibc.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/config-glibc.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -56,2 +56,35 @@
 </sect2>
 
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Configuring Dynamic Loader</title>
+
+<para>By default, the dynamic loader
+(<filename>/lib/ld-linux.so.2</filename>) searches through <filename
+class="directory">/lib</filename> and <filename
+class="directory">/usr/lib</filename> for dynamic libraries that are needed
+by programs when you run them. However, if there are libraries in
+directories other than <filename class="directory">/lib</filename> and
+<filename class="directory">/usr/lib</filename>, you need to add them to
+the <filename>/etc/ld.so.conf</filename> file for the dynamic
+loader to find them. Two directories that are commonly known to contain
+additional libraries are <filename
+class="directory">/usr/local/lib</filename> and <filename
+class="directory">/opt/lib</filename>, so we add those directories to the
+dynamic loader's search path.</para>
+
+<para>Create a new file <filename>/etc/ld.so.conf</filename> by running the
+following:</para>
+
+<para><screen><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"</userinput>
+# Begin /etc/ld.so.conf
+
+/usr/local/lib
+/opt/lib
+
+# End /etc/ld.so.conf
+<userinput>EOF</userinput></screen></para>
+
+</sect2>
+
Index: chapter06/config-ldso.xml
===================================================================
--- chapter06/config-ldso.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<sect2>
-<title>Configuring Dynamic Loader</title>
-
-<para>By default, the dynamic loader
-(<filename>/lib/ld-linux.so.2</filename>) searches through <filename
-class="directory">/lib</filename> and <filename
-class="directory">/usr/lib</filename> for dynamic libraries that are needed
-by programs when you run them. However, if there are libraries in
-directories other than <filename class="directory">/lib</filename> and
-<filename class="directory">/usr/lib</filename>, you need to add them to
-the <filename>/etc/ld.so.conf</filename> file for the dynamic
-loader to find them. Two directories that are commonly known to contain
-additional libraries are <filename
-class="directory">/usr/local/lib</filename> and <filename
-class="directory">/opt/lib</filename>, so we add those directories to the
-dynamic loader's search path.</para>
-
-<para>Create a new file <filename>/etc/ld.so.conf</filename> by running the
-following:</para>
-
-<para><screen><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"</userinput>
-# Begin /etc/ld.so.conf
-
-/usr/local/lib
-/opt/lib
-
-# End /etc/ld.so.conf
-<userinput>EOF</userinput></screen></para>
-
-</sect2>
-
Index: chapter06/config-shadowpwd.xml
===================================================================
--- chapter06/config-shadowpwd.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/config-shadowpwd.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -1,2 +1,4 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2><title>Configuring Shadow Password Suite</title>
 
Index: chapter06/config-sysklogd.xml
===================================================================
--- chapter06/config-sysklogd.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/config-sysklogd.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -1,2 +1,4 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2><title>Configuring Sysklogd</title>
 
Index: chapter06/config-sysvinit.xml
===================================================================
--- chapter06/config-sysvinit.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/config-sysvinit.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -1,2 +1,4 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2><title>Configuring Sysvinit</title>
 
Index: chapter06/config-vim.xml
===================================================================
--- chapter06/config-vim.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/config-vim.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -1,2 +1,4 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2><title>Configuring Vim</title>
 
Index: chapter06/configure.xml
===================================================================
--- chapter06/configure.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/configure.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -1,15 +1,9 @@
 <sect1 id="ch06-configure">
-<title>Configuring essential software</title>
+<title>Configuring system components</title>
 <?dbhtml filename="configure.html" dir="chapter06"?>
 
-<para>Now that all software is installed, all that we need to do to get a few
-programs running properly is to create their configuration files.</para>
+<para>Now that all software is installed, all that we need to do is perform
+a few configuration tasks.</para>
 
-&c6-cf-vim;
-&c6-cf-glibc;
-&c6-cf-ldso;
-&c6-cf-sysklogd;
-&c6-cf-shadowpwd;
-&c6-cf-sysvinit;
 &c6-cf-keyboard;
 &c6-cf-utmp;
Index: chapter06/e2fsprogs-inst.xml
===================================================================
--- chapter06/e2fsprogs-inst.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/e2fsprogs-inst.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -5,5 +5,5 @@
 
 <para>It is recommended to build E2fsprogs outside of the
-source tree. Create the build directory:</para>
+source tree:</para>
 
 <para><screen><userinput>mkdir ../e2fsprogs-build &amp;&amp;
@@ -19,13 +19,12 @@
 <itemizedlist>
 
-<listitem><para><userinput>--with-root-prefix="":</userinput> This option
-is used because of the e2fsprogs Makefile. Some programs are essential for
-system use when, for example, <filename class="directory">/usr</filename>
-isn't mounted (like the e2fsck program). These  programs and libraries,
-therefore, belong in directories like <filename
-class="directory">/lib</filename> and <filename
-class="directory">/sbin</filename>. If this option isn't passed to
-E2fsprogs's configure, the programs are placed in the <filename
-class="directory">/usr</filename> directory, which is not what we
+<listitem><para><userinput>--with-root-prefix="":</userinput> Certain
+programs (such as the e2fsck program) are considered essential programs.
+When, for example, <filename class="directory">/usr</filename> isn't
+mounted, these essential program have to be available. They belong in
+directories like <filename class="directory">/lib</filename> and
+<filename class="directory">/sbin</filename>. If this option isn't passed
+to E2fsprogs's configure, the programs are placed in the
+<filename class="directory">/usr</filename> directory, which is not what we
 want.</para></listitem>
 
Index: chapter06/lilo-inst.xml
===================================================================
--- chapter06/lilo-inst.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/lilo-inst.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -16,9 +16,4 @@
 <para><screen><userinput>make install</userinput></screen></para>
 
-<para>It appears that compilation of this package fails on certain machines
-when the <emphasis>-g</emphasis> compiler flag is used. If you can't compile
-Lilo at all, you should try to remove the <emphasis>-g</emphasis> value from
-the CFLAGS variable in the <filename>Makefile</filename> file.</para>
-
 <para>At the end of the installation, a message will appear stating that
 <filename>/sbin/lilo</filename> has to be executed. This is pointless because
Index: chapter06/patch-inst.xml
===================================================================
--- chapter06/patch-inst.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/patch-inst.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -6,6 +6,5 @@
 <para>Prepare Patch to be compiled:</para>
 
-<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE \
-&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=/usr</userinput></screen></para>
+<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr</userinput></screen></para>
 
 <para>Continue with compiling the package:</para>
Index: chapter06/shadowpwd-inst.xml
===================================================================
--- chapter06/shadowpwd-inst.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/shadowpwd-inst.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -12,6 +12,6 @@
 <para>Prepare Shadow to be compiled:</para>
 
-<para><screen><userinput>./configure --prefix=/usr \
-&nbsp;&nbsp;&nbsp;&nbsp;--libdir=/usr/lib --enable-shared</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --libdir=/usr/lib \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared</userinput></screen></para>
 
 <para>Continue with compiling the package:</para>
Index: chapter06/shadowpwd.xml
===================================================================
--- chapter06/shadowpwd.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/shadowpwd.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -9,4 +9,5 @@
 &aa-shadowpwd-dep;
 &c6-shadowpwd-inst;
+&c6-cf-shadowpwd;
 
 </sect1>
Index: chapter06/sysklogd.xml
===================================================================
--- chapter06/sysklogd.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/sysklogd.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -9,4 +9,5 @@
 &aa-sysklogd-dep;
 &c6-sysklogd-inst;
+&c6-cf-sysklogd;
 
 </sect1>
Index: chapter06/sysvinit.xml
===================================================================
--- chapter06/sysvinit.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/sysvinit.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -9,4 +9,5 @@
 &aa-sysvinit-dep;
 &c6-sysvinit-inst;
+&c6-cf-sysvinit;
 
 </sect1>
Index: chapter06/tar-inst.xml
===================================================================
--- chapter06/tar-inst.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/tar-inst.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -15,6 +15,6 @@
 <para>Prepare Tar to be compiled:</para>
 
-<para><screen><userinput>./configure --prefix=/usr \
-&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin --bindir=/bin</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --bindir=/bin \
+&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin</userinput></screen></para>
 
 <para>Continue with compiling the package:</para>
Index: chapter06/vim.xml
===================================================================
--- chapter06/vim.xml	(revision 7bfad056d62e2e8299cdc834750d87e76199c113)
+++ chapter06/vim.xml	(revision 4f8a3af985f20d9f462210294a732dad1b7e595d)
@@ -10,4 +10,5 @@
 &aa-vim-dep;
 &c6-vim-inst;
+&c6-cf-vim;
 
 </sect1>
