Index: chapter06/binutils-inst.xml
===================================================================
--- chapter06/binutils-inst.xml	(revision f57e3d1ad9e6bfe96ebf823be19da0e07d81d52b)
+++ chapter06/binutils-inst.xml	(revision f861982929d526b7628fc1a6f19386c665f28e31)
@@ -56,7 +56,7 @@
 <para><screen><userinput>make check</userinput></screen></para>
 
-<para>The test suite notes from the "Installing Binutils - Pass 2" section in
-Chapter 5 are still very much appropriate here. Be sure to refer back there
-should you have any doubts.</para>
+<para>The test suite notes from <xref linkend="ch05-binutils-pass2"/> are still
+very much appropriate here. Be sure to refer back there should you have any
+doubts.</para>
 
 <para>Install the package:</para>
Index: chapter06/coreutils-inst.xml
===================================================================
--- chapter06/coreutils-inst.xml	(revision f57e3d1ad9e6bfe96ebf823be19da0e07d81d52b)
+++ chapter06/coreutils-inst.xml	(revision f861982929d526b7628fc1a6f19386c665f28e31)
@@ -24,4 +24,11 @@
 <para><screen><userinput>make</userinput></screen></para>
 
+<para>The <userinput>su</userinput> program from Coreutils wasn't installed in
+Chapter 5 because it needed <emphasis>root</emphasis> privilege to do so. We're
+going to need it in a few moments for the test suite. Therefore we work around
+the problem by installing it now:</para>
+
+<para><screen><userinput>make install-root</userinput></screen></para>
+
 <para>This package has a test suite available which can perform a number of
 checks to ensure it built correctly. However, this particular test suite makes
@@ -35,10 +42,4 @@
 echo "dummy2:x:1001:dummy" >> /etc/group
 echo "dummy:x:1000:1000:::/bin/bash" >> /etc/passwd</userinput></screen></para>
-
-<para>The <userinput>su</userinput> program from Coreutils wasn't installed in
-Chapter 5 because it needed <emphasis>root</emphasis> privilege to install. We
-work around this problem by installing it now:</para>
-
-<para><screen><userinput>make install-root</userinput></screen></para>
 
 <para>Some tests are meant to run as <emphasis>root</emphasis>:</para>
Index: chapter06/gcc-2953-inst.xml
===================================================================
--- chapter06/gcc-2953-inst.xml	(revision f57e3d1ad9e6bfe96ebf823be19da0e07d81d52b)
+++ chapter06/gcc-2953-inst.xml	(revision f861982929d526b7628fc1a6f19386c665f28e31)
@@ -19,5 +19,5 @@
 <note><para>We don't install the C++ compiler or libraries here. However, there
 may be reasons why you would want to install them. More information can be found
-at <ulink url="&blfs-root;view/cvs/general/gcc2.html"/>.</para></note>
+at <ulink url="&blfs-root;view/stable/general/gcc2.html"/>.</para></note>
 
 <para>We'll install this older release of GCC into the non-standard prefix of
Index: chapter06/gcc-inst.xml
===================================================================
--- chapter06/gcc-inst.xml	(revision f57e3d1ad9e6bfe96ebf823be19da0e07d81d52b)
+++ chapter06/gcc-inst.xml	(revision f861982929d526b7628fc1a6f19386c665f28e31)
@@ -19,5 +19,5 @@
 GCC-testsuite package. The full GCC package contains even more
 compilers. Instructions for building these can be found at
-<ulink url="&blfs-root;view/cvs/general/gcc.html"/>.</para>
+<ulink url="&blfs-root;view/stable/general/gcc.html"/>.</para>
 
 <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-nofixincludes-patch-version;.patch
@@ -55,4 +55,8 @@
 have any doubts.</para>
 
+<para>The test suite notes from <xref linkend="ch05-gcc-pass2"/> are still very
+much appropriate here. Be sure to refer back there should you have any
+doubts.</para>
+
 <para>And install the package:</para>
 
@@ -71,7 +75,8 @@
 
 <note><para>At this point it is strongly recommended to repeat the sanity check
-we performed earlier in the chapter. Refer back to the "Re-adjusting the
-toolchain" section and repeat the check. If the results are wrong then most
-likely, you erroneously applied the GCC Specs patch from Chapter 5.</para></note>
+we performed earlier in the chapter. Refer back to
+<xref linkend="ch06-adjustingtoolchain"/> and repeat the check. If the results
+are wrong then most likely, you erroneously applied the GCC Specs patch from
+Chapter 5.</para></note>
 
 </sect2>
Index: chapter06/glibc-inst.xml
===================================================================
--- chapter06/glibc-inst.xml	(revision f57e3d1ad9e6bfe96ebf823be19da0e07d81d52b)
+++ chapter06/glibc-inst.xml	(revision f861982929d526b7628fc1a6f19386c665f28e31)
@@ -59,7 +59,6 @@
 <para><screen><userinput>make check</userinput></screen></para>
 
-<para>The test suite notes from the "Installing Glibc" section in Chapter 5 are
-still very much appropriate here. Be sure to refer back there should you have
-any doubts.</para>
+<para>The test suite notes from <xref linkend="ch05-glibc"/> are still very much
+appropriate here. Be sure to refer back there should you have any doubts.</para>
 
 <para>And install the package:</para>
Index: chapter06/grub-inst.xml
===================================================================
--- chapter06/grub-inst.xml	(revision f57e3d1ad9e6bfe96ebf823be19da0e07d81d52b)
+++ chapter06/grub-inst.xml	(revision f861982929d526b7628fc1a6f19386c665f28e31)
@@ -10,6 +10,5 @@
 Grub.</para>
 
-<para>Grub needs a patch applied that fixes a compile problem with
-GCC-3.3.1:</para>
+<para>Grub needs a patch to fix a compilation problem with GCC-3.3.1</para>
 
 <para><screen><userinput>patch -Np1 -i ../grub-&grub-patch-version;.patch</userinput></screen></para>
Index: chapter06/inetutils-inst.xml
===================================================================
--- chapter06/inetutils-inst.xml	(revision f57e3d1ad9e6bfe96ebf823be19da0e07d81d52b)
+++ chapter06/inetutils-inst.xml	(revision f861982929d526b7628fc1a6f19386c665f28e31)
@@ -33,5 +33,5 @@
 are insecure by nature and are only considered safe on trusted networks. More
 information can be found at
-<ulink url="&blfs-root;view/cvs/basicnet/inetutils.html"/>. Note that better
+<ulink url="&blfs-root;view/stable/basicnet/inetutils.html"/>. Note that better
 replacements are available for many of these servers.</para></listitem>
 </itemizedlist>
Index: chapter06/revisedchroot.xml
===================================================================
--- chapter06/revisedchroot.xml	(revision f57e3d1ad9e6bfe96ebf823be19da0e07d81d52b)
+++ chapter06/revisedchroot.xml	(revision f861982929d526b7628fc1a6f19386c665f28e31)
@@ -6,9 +6,10 @@
 it, you should run the following modified chroot command.</para>
 
-<para>Additionally, now that all software has been installed there is no
-need to use anything from the <filename
-class="directory">/tools</filename> directory anymore, so it may be deleted.
-However, since the Tcl, Expect, and DejaGnu packages only exist here, you
-may want to reinstall them after removing that directory.</para>
+<para>Additionally, now that all software has been installed, there is no longer
+a need for the <filename class="directory">/tools</filename> directory. You may
+delete it. This will also remove the temporary copies of Tcl, Expect and
+DejaGnu, which were used for running tests on the software as it was built. If
+you want to use these programs later, you will need to compile and install them
+on your new LFS system.</para>
 
 <para><screen><userinput>chroot $LFS /usr/bin/env -i \
Index: chapter06/sysvinit-inst.xml
===================================================================
--- chapter06/sysvinit-inst.xml	(revision f57e3d1ad9e6bfe96ebf823be19da0e07d81d52b)
+++ chapter06/sysvinit-inst.xml	(revision f861982929d526b7628fc1a6f19386c665f28e31)
@@ -9,11 +9,11 @@
 to imply that init is sending these signals to all the currently running
 processes. To avoid this confusion, the init.c file can be modified, so
-that the sentence reads "Sending processes started by init the TERM
-signal".</para>
+that the sentence reads "Sending the TERM signal to processes started by
+init".</para>
 
 <para>Edit the halt message:</para>
 
 <para><screen><userinput>cp src/init.c{,.backup}
-sed 's/Sending processes/Sending processes started by init/g' \
+sed 's/Sending processes/Sending the TERM signal to processes started by init/g' \
 &nbsp;&nbsp;&nbsp;&nbsp;src/init.c.backup &gt; src/init.c</userinput></screen></para>
 
Index: chapter06/vim.xml
===================================================================
--- chapter06/vim.xml	(revision f57e3d1ad9e6bfe96ebf823be19da0e07d81d52b)
+++ chapter06/vim.xml	(revision f861982929d526b7628fc1a6f19386c665f28e31)
@@ -10,5 +10,5 @@
 
 <para>If you prefer another editor -- like Emacs, Joe, or Nano -- to Vim,
-have a look at <ulink url="&blfs-root;view/cvs/postlfs/editors.html"/> for
+have a look at <ulink url="&blfs-root;view/stable/postlfs/editors.html"/> for
 suggested installation instructions.</para>
 
