Index: chapter05/coreutils.xml
===================================================================
--- chapter05/coreutils.xml	(revision 51fe2150ea982ef1b9f20f4387a2c77313727b13)
+++ chapter05/coreutils.xml	(revision d0a6c4c212b7204aef7ee577cf897d6c0c792520)
@@ -16,5 +16,17 @@
 <title>Installation of Coreutils</title>
 
-<para>Prepare Coreutils for compilation:</para>
+<para>Coreutils has an issue when compiled against Glibc-&glibc-version;.
+Without the patch below, some of the Coreutils utilities (head, tail, sort etc)
+will reject their traditional syntax which has been in use for approximately 30
+years. The old syntax is so pervasive that compatibility must be preserved until
+the many places where it is used can be updated. More details are provided in
+the comments inside the patch itself. Use of this patch is by no means
+compulsory but opting not to use it means you'll have deal with the consequences
+yourself, i.e. patch the many software packages that use the old syntax. Apply
+the patch:</para>
+
+<screen><userinput>patch -Np1 -i ../&coreutils-posixver-patch;</userinput></screen>
+
+<para>Now prepare Coreutils for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
Index: chapter05/glibc.xml
===================================================================
--- chapter05/glibc.xml	(revision 51fe2150ea982ef1b9f20f4387a2c77313727b13)
+++ chapter05/glibc.xml	(revision d0a6c4c212b7204aef7ee577cf897d6c0c792520)
@@ -14,9 +14,4 @@
 <title>Installation of Glibc</title>
 
-<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 the directory where you usually
-unpack all the sources.</para>
-
 <para>This package is known to behave badly when you have changed its
 default optimization flags (including the -march and -mcpu options).
@@ -28,9 +23,4 @@
 is putting the stability of your system at risk.</para>
 
-<para>Glibc has a subtle problem when compiled with GCC &gcc-version;.
-Apply the following patch to fix this:</para>
-
-<screen><userinput>patch -Np1 -i ../&glibc-sscanf-patch;</userinput></screen>
-
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
@@ -41,9 +31,9 @@
 <para>Next, prepare Glibc for compilation:</para>
 
-<screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-profile --enable-add-ons \
+<screen><userinput>../&glibc-dir;/configure --prefix=/tools \
+&nbsp;&nbsp;&nbsp;&nbsp;--disable-profile --enable-add-ons=linuxthreads \
 &nbsp;&nbsp;&nbsp;&nbsp;--with-headers=/tools/include \
 &nbsp;&nbsp;&nbsp;&nbsp;--with-binutils=/tools/bin \
-&nbsp;&nbsp;&nbsp;&nbsp;--without-gd</userinput></screen>
+&nbsp;&nbsp;&nbsp;&nbsp;--without-gd --without-cvs</userinput></screen>
 
 <para>The meaning of the configure options:</para>
@@ -54,6 +44,7 @@
 plan to do profiling.</para></listitem>
 
-<listitem><para><userinput>--enable-add-ons</userinput>: This enables any
-add-ons that were installed with Glibc, in our case Linuxthreads.</para></listitem>
+<listitem><para><userinput>--enable-add-ons=linuxthreads</userinput>: This
+tells Glibc to use the Linuxthreads add-on as its threading
+library.</para></listitem>
 
 <listitem><para><userinput>--with-binutils=/tools/bin</userinput> and
@@ -63,8 +54,14 @@
 Glibc build.</para></listitem>
 
-<listitem><para><userinput> --without-gd</userinput>: This switch ensures
+<listitem><para><userinput>--without-gd</userinput>: This switch ensures
 that we don't build the <userinput>memusagestat</userinput> program, which
 strangely enough insists on linking against the host's libraries (libgd,
 libpng, libz, and so forth).</para></listitem>
+
+<listitem><para><userinput>--without-cvs</userinput>: This is meant to prevent
+the Makefiles from attempting automatic CVS commits when using a CVS snapshot.
+But it's not actually needed these days. We use it because it silences an
+annoying but harmless warning about a missing <filename>autoconf</filename>
+program.</para></listitem>
 </itemizedlist>
 
@@ -159,13 +156,13 @@
 <screen><userinput>make localedata/install-locales</userinput></screen>
 
-<para>An alternative to running the previous command is to install only
-those locales which you need or want. This can be achieved by using the
-<userinput>localedef</userinput> command. Information on this can be
-found in the <filename>INSTALL</filename> file in the
-<filename>glibc-&glibc-version;</filename> source. However, there are a number
-of locales that are essential for the tests of future packages to pass, in
-particular, the <emphasis>libstdc++</emphasis> tests from GCC.  The following
-instructions, instead of the install-locales target above, will install
-the minimum set of locales necessary for the tests to run successfully:</para>
+<para>An alternative to running the previous command is to install only those
+locales which you need or want. This can be achieved by using the
+<userinput>localedef</userinput> command. Information on this can be found in
+the <filename>INSTALL</filename> file in the Glibc source. However, there are
+a number of locales that are essential for the tests of future packages to
+pass, in particular, the <emphasis>libstdc++</emphasis> tests from GCC. The
+following instructions, instead of the install-locales target above, will
+install the minimum set of locales necessary for the tests to run
+successfully:</para>
 
 <screen><userinput>mkdir -p /tools/lib/locale
