13 files changed, 41 insertions, 35 deletions
diff --git a/chapter03/creatingfs.xml b/chapter03/creatingfs.xml
index 541869158..132de727a 100644
--- a/chapter03/creatingfs.xml
+++ b/chapter03/creatingfs.xml
@@ -7,7 +7,7 @@ Most widely used in the Linux world is the second extended file system (ext2),
 but with the high-capacity hard disks of today the so-called journaling file
 systems are becoming increasingly popular. Here we will create an ext2 file
 system, but build instructions for other file systems can be found at <ulink
-url="http://www.linuxfromscratch.org/blfs/view/cvs/postlfs/filesystems.html"/>.</para>
+url="&blfs-root;view/stable/postlfs/filesystems.html"/>.</para>
 
 <para>To create an ext2 file system on the LFS partition run the following:</para>
 
diff --git a/chapter05/gcc-pass2-inst.xml b/chapter05/gcc-pass2-inst.xml
index 59ad50285..5ed463704 100644
--- a/chapter05/gcc-pass2-inst.xml
+++ b/chapter05/gcc-pass2-inst.xml
@@ -153,9 +153,10 @@ to continue on.</para>
 <para><screen><userinput>make install</userinput></screen></para>
 
 <note><para>At this point it is strongly recommended to repeat the sanity check
-we performed earlier in the chapter. Refer back to the "Locking in" Glibc section
-and repeat the check. If the results are wrong then most likely, you forgot to
-apply the above mentioned GCC Specs patch.</para></note>
+we performed earlier in the chapter. Refer back to
+<xref linkend="ch05-locking-glibc"/> and repeat the check. If the results are
+wrong then most likely, you forgot to apply the above mentioned GCC Specs
+patch.</para></note>
 
 </sect2>
 
diff --git a/chapter05/glibc-inst.xml b/chapter05/glibc-inst.xml
index 492e5e762..a6f9340fd 100644
--- a/chapter05/glibc-inst.xml
+++ b/chapter05/glibc-inst.xml
@@ -5,8 +5,8 @@
 
 <para>Before starting to install Glibc, you must <userinput>cd</userinput>
 into the <filename>glibc-&glibc-version;</filename> directory and unpack
-Glibc-linuxthreads in that directory, not in <filename>/usr/src</filename> as
-you would normally do.</para>
+Glibc-linuxthreads in that directory, not in <filename>$LFS/tools/src</filename>
+as you would normally do.</para>
 
 <note><para>We are going to run the test suite for Glibc in this chapter.
 However, it's worth pointing out that the Glibc test suite we run in this
diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml
index 1da69e4a2..d91b0f284 100644
--- a/chapter06/binutils-inst.xml
+++ b/chapter06/binutils-inst.xml
@@ -55,9 +55,9 @@ generates code that can be executed on PowerPC machines).</para>
 
 <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>
 
diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml
index 6e28571f7..665caa7c6 100644
--- a/chapter06/coreutils-inst.xml
+++ b/chapter06/coreutils-inst.xml
@@ -23,6 +23,13 @@ provided by Net-tools. Prevent its installation by applying a patch:</para>
 
 <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
 some assumptions that aren't quite valid at this early stage of Chapter 6. We
@@ -35,12 +42,6 @@ and a dummy user name:</para>
 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>
 
 <para><screen><userinput>make check-root</userinput></screen></para>
diff --git a/chapter06/gcc-2953-inst.xml b/chapter06/gcc-2953-inst.xml
index a5e5c229f..e6531b560 100644
--- a/chapter06/gcc-2953-inst.xml
+++ b/chapter06/gcc-2953-inst.xml
@@ -18,7 +18,7 @@ developer's advice and using the version here to compile your kernel.</para>
 
 <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
 <filename class="directory">/opt</filename> so as to avoid interfering with
diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml
index a070808ea..14add7a8a 100644
--- a/chapter06/gcc-inst.xml
+++ b/chapter06/gcc-inst.xml
@@ -18,7 +18,7 @@ to unpack the GCC-core <emphasis>and</emphasis> the GCC-g++ tarball -- they
 will unfold into the same directory. You should likewise extract the
 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
 patch -Np1 -i ../gcc-&gcc-suppress-libiberty-patch-version;.patch</userinput></screen></para>
@@ -54,6 +54,10 @@ known ones):</para>
 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-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>
 
 <para><screen><userinput>make install</userinput></screen></para>
@@ -70,8 +74,9 @@ compiler. To satisfy those packages, create a symlink:</para>
 <para><screen><userinput>ln -s gcc /usr/bin/cc</userinput></screen></para>
 
 <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>
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index 76e595bcc..95e6db1e4 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -58,9 +58,8 @@ kernel headers into <filename>/usr/include</filename>.</para></listitem>
 
 <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>
 
diff --git a/chapter06/grub-inst.xml b/chapter06/grub-inst.xml
index f8680e2ae..650b76c0b 100644
--- a/chapter06/grub-inst.xml
+++ b/chapter06/grub-inst.xml
@@ -9,8 +9,7 @@ have defined any environment variables that override default optimizations,
 such as CFLAGS and CXXFLAGS, we recommend unsetting them when building
 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>
 
diff --git a/chapter06/inetutils-inst.xml b/chapter06/inetutils-inst.xml
index 8d1bd72c9..6a51c70d0 100644
--- a/chapter06/inetutils-inst.xml
+++ b/chapter06/inetutils-inst.xml
@@ -32,7 +32,7 @@ installation of the various network servers included as part of the Inetutils
 package. These servers are deemed not appropriate in a basic LFS system. Some
 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>
 
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index 9acb3c947..a02bdce02 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -5,11 +5,12 @@
 <para>From now on when you exit the chroot environment and wish to re-enter
 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 \
 &nbsp;&nbsp;&nbsp;&nbsp;HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml
index a0af97a88..bdebf5e5b 100644
--- a/chapter06/sysvinit-inst.xml
+++ b/chapter06/sysvinit-inst.xml
@@ -8,13 +8,13 @@ init sends the TERM and KILL signals to the processes which it started.
 Init prints "Sending processes the TERM signal" to the screen. This seems
 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>
 
 <para>Compile Sysvinit:</para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 3c2737e62..a35b54f8c 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -9,7 +9,7 @@ Estimated required disk space:  &vim-compsize;</screen>
 <title>Alternatives to Vim</title>
 
 <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>
 
 </sect2>