Index: appendixa/coreutils-desc.xml
===================================================================
--- appendixa/coreutils-desc.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ appendixa/coreutils-desc.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -2,6 +2,4 @@
 
 <sect2><title>Descriptions</title>
-
-<para>Not yet fully checked.</para>
 
 <sect3><title>Program file descriptions</title>
@@ -124,4 +122,7 @@
 host.</para></sect4>
 
+<sect4><title>hostname</title>
+<para>hostname reports or sets the name of the current host.</para></sect4>
+
 <sect4><title>id</title>
 <para>id prints the effective user and group IDs of the current
@@ -134,4 +135,7 @@
 <sect4><title>join</title>
 <para>join joins lines of two files on a common field.</para></sect4>
+
+<sect4><title>kill</title>
+<para>kill terminates the given process.</para></sect4>
 
 <sect4><title>ln</title>
@@ -211,4 +215,7 @@
 increment.</para></sect4>
 
+<sect4><title>sha1sum</title>
+<para>sha1sum prints or checks 160-bit SHA1checksums.</para></sect4>
+
 <sect4><title>shred</title>
 <para>shred deletes a file securely, overwriting it first so that its 
Index: appendixa/coreutils-shortdesc.xml
===================================================================
--- appendixa/coreutils-shortdesc.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ appendixa/coreutils-shortdesc.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -1,5 +1,3 @@
 <sect2><title>Contents of Coreutils</title>
-
-<para>Not yet fully checked.</para>
 
 <para>The Coreutils package contains a whole series of basic shell utilities.</para>
Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter01/changelog.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -83,4 +83,20 @@
 </para></listitem>
 
+<listitem><para>August 11th, 2003 [alex]: Chapter 05 - From Binutils Pass 1 to
+Findutils: several small textual adjustments. For the second passes not giving
+the contents and dependencies.</para></listitem>
+
+<listitem><para>August 11th, 2003 [alex]: Chapter 04 - Listing for GCC separate
+core, g++, and testsuite tarballs.</para></listitem>
+
+<listitem><para>August 11th, 2003 [alex]: Chapter 04 - Suppressed the
+mention of a wget script.</para></listitem>
+
+<listitem><para>August 9th, 2003 [alex]: Chapter 05 - Binutils Pass2 and GCC
+Pass 2: integrated some text from the pure-lfs hint.</para></listitem>
+
+<listitem><para>August 8th, 2003 [alex]: Chapter 05 - Tcl, Expect, and DejaGNU:
+added some text.</para></listitem>
+
 <listitem><para>August 6th, 2003 [gerard]: Applied Alex Groenewoud's patch
 that adds Appendix B, providing a list of all installed programs and
Index: chapter04/binutils.xml
===================================================================
--- chapter04/binutils.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter04/binutils.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -1,3 +1,2 @@
 Binutils (&binutils-version;) - &binutils-size;:
 <ulink url="http://freshmeat.net/projects/binutils/"/>
-
Index: chapter04/gcc.xml
===================================================================
--- chapter04/gcc.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter04/gcc.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -1,2 +1,8 @@
-GCC (&gcc-version;) - &gcc-core-size;:
+GCC-core (&gcc-version;) - &gcc-core-size;:
 <ulink url="http://freshmeat.net/projects/gcc/"/>
+
+GCC-g++ (&gcc-version;) - &gcc-gpp-size;:
+<ulink url="http://freshmeat.net/projects/gcc/"/>
+
+GCC-testsuite (&gcc-version;) - &gcc-testsuite-size;:
+<ulink url="http://freshmeat.net/projects/gcc/"/>
Index: chapter04/introduction.xml
===================================================================
--- chapter04/introduction.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter04/introduction.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -10,9 +10,10 @@
 sending bug reports.</para>
 
-<para>All the URL's, when possible, refer to the project's page at
+<para>All the URLs, when possible, refer to the project's page at
 <ulink url="http://www.freshmeat.net">Freshmeat.net</ulink>. The Freshmeat
 pages will give you easy access to the official download sites as well as
-project websites, mailinglists, FAQ's, Changelogs and more.</para>
+project websites, mailinglists, FAQs, Changelogs and more.</para>
 
+<![IGNORE[
 <para>For your convenience the top of the list contains a link to a file
 you can use with the <ulink url="http://wget.sunsite.dk">wget</ulink>
@@ -20,4 +21,5 @@
 make it easy to download all the files at once, rather than downloading each
 and every individual file manually.</para>
+]]>
 
 </sect1>
Index: chapter05/binutils-pass2-inst.xml
===================================================================
--- chapter05/binutils-pass2-inst.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/binutils-pass2-inst.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -2,5 +2,5 @@
 
 <sect2>
-<title>Installation of Binutils</title>
+<title>Re-installation of Binutils</title>
 
 <para>First create a separate build directory again:</para>
@@ -14,9 +14,12 @@
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --with-lib-path=/stage1/lib</userinput></screen></para>
 
+<para>Before starting to build Binutils, remember to unset any environment
+variables that override the default optimization flags.</para>
+
 <para>Compile the package:</para>
 
 <para><screen><userinput>make </userinput></screen></para>
 
-<para>Test the package (nothing should fail here):</para>
+<para>Test the results (nothing should fail here):</para>
 
 <para><screen><userinput>make check</userinput></screen></para>
Index: chapter05/binutils-pass2.xml
===================================================================
--- chapter05/binutils-pass2.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/binutils-pass2.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -6,6 +6,4 @@
 Estimated required disk space:  &binutils-pass1-compsize-stage1;</screen>
 
-&aa-binutils-shortdesc;
-&aa-binutils-dep;
 &c5-binutils-pass2-inst;
 
Index: chapter05/bzip2-inst.xml
===================================================================
--- chapter05/bzip2-inst.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/bzip2-inst.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -4,11 +4,8 @@
 <title>Installation of Bzip2</title>
 
-<para>Since the Bzip2 package has no configure script we can't prepare it
-for compilation. Instead we just run the <userinput>make</userinput>
-program and start compiling, with a few variables changed to suit our
-environment:</para>
+<para>The Bzip2 package doesn't contain a <userinput>configure</userinput>
+script. Compile and install it with a straightforward:</para>
 
-<para><screen><userinput>make
-make PREFIX=/stage1 install</userinput></screen></para>
+<para><screen><userinput>make PREFIX=/stage1 install</userinput></screen></para>
 
 </sect2>
Index: chapter05/coreutils-inst.xml
===================================================================
--- chapter05/coreutils-inst.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/coreutils-inst.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -4,8 +4,19 @@
 <title>Installation of Coreutils</title>
 
-<para><screen><userinput>./configure --prefix=/stage1
-make
-make RUN_EXPENSIVE_TESTS=yes check
-make install</userinput></screen></para>
+<para>Prepare Coreutils to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para>
+
+<para>Compile the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>Test the results thoroughly:</para>
+
+<para><screen><userinput>make RUN_EXPENSIVE_TESTS=yes check</userinput></screen></para>
+
+<para>And install the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
 
Index: chapter05/coreutils.xml
===================================================================
--- chapter05/coreutils.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/coreutils.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -3,4 +3,9 @@
 <?dbhtml filename="coreutils.html" dir="chapter05"?>
 
+<screen>Estimated build time:           &coreutils-time;
+Estimated required disk space:  &coreutils-compsize;</screen>
+
+&aa-coreutils-shortdesc;
+&aa-coreutils-dep;
 &c5-coreutils-inst;
 
Index: chapter05/diffutils-inst.xml
===================================================================
--- chapter05/diffutils-inst.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/diffutils-inst.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -6,7 +6,13 @@
 <para>Prepare Diffutils to be compiled:</para>
 
-<para><screen><userinput>./configure --prefix=/stage1
-make
-make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para>
+
+<para>Compile the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And install it:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
Index: chapter05/expect-inst.xml
===================================================================
--- chapter05/expect-inst.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/expect-inst.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -24,5 +24,5 @@
 problem here either.</para>
 
-<para>You can now remove the build directories of both Tcl and Expect.</para>
+<para>You can now remove the source directories of both Tcl and Expect.</para>
 
 </sect2>
Index: chapter05/findutils-inst.xml
===================================================================
--- chapter05/findutils-inst.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/findutils-inst.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -6,8 +6,17 @@
 <para>Prepare Findutils to be compiled:</para>
 
-<para><screen><userinput>./configure --prefix=/stage1
-make 
-make check
-make install</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para>
+
+<para>Compile the package:</para>
+
+<para><screen><userinput>make </userinput></screen></para>
+
+<para>Test the results:</para>
+
+<para><screen><userinput>make check</userinput></screen></para>
+
+<para>And install the package:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
Index: chapter05/gawk-inst.xml
===================================================================
--- chapter05/gawk-inst.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/gawk-inst.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -8,9 +8,9 @@
 <para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para>
 
-<para>Continue with compiling the package:</para>
+<para>Compile the package:</para>
 
 <para><screen><userinput>make</userinput></screen></para>
 
-<para>And finish off installing the package:</para>
+<para>And install it:</para>
 
 <para><screen><userinput>make install</userinput></screen></para>
Index: chapter05/gcc-pass1-inst.xml
===================================================================
--- chapter05/gcc-pass1-inst.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/gcc-pass1-inst.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -4,6 +4,6 @@
 <title>Installation of GCC</title>
 
-<para>We won't be needing a C++ compiler until the next chapter. So, only
-the gcc-core tarball needs to be unpacked at this time.</para>
+<para>Unpack only the GCC-core tarball, as we won't be needing a C++ compiler
+for the moment.</para>
 
 <para>This package is known to behave badly when you have changed its
@@ -43,11 +43,11 @@
 having <filename>libgcc_eh.a</filename> available ensures that the configure
 script for Glibc (the next package we compile) produces the proper results.
-Please note that the <userinput>gcc</userinput> binaries will still be linked
+Note that the <userinput>gcc</userinput> binaries will still be linked
 statically, as this is controlled by the <userinput>-static</userinput>
 value of BOOT_LDFLAGS further on.</para></listitem>
 
-<listitem><para><userinput>--enable-languages=c</userinput>: This will build
-only the C compiler from the GCC package. We won't be needing anything else
-during this chapter.</para></listitem>
+<listitem><para><userinput>--enable-languages=c</userinput>: This option
+ensures that only the C compiler is built. The option is only needed when you
+have downloaded and unpacked the full GCC tarball.</para></listitem>
 </itemizedlist>
 
Index: chapter05/gcc-pass2-inst.xml
===================================================================
--- chapter05/gcc-pass2-inst.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/gcc-pass2-inst.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -2,5 +2,9 @@
 
 <sect2>
-<title>Installation of GCC</title>
+<title>Re-installation of GCC</title>
+
+<para>Unpack all three GCC tarballs in one and the same working directory.
+They will all unfold into a single <filename>gcc-&gcc-version;/</filename>
+subdir.</para>
 
 <para>First correct two problems and make an essential adjustment:</para>
@@ -22,4 +26,7 @@
 cd ../gcc-build</userinput></screen></para>
 
+<para>Before starting to build GCC, remember to unset any environment
+variables that override the default optimization flags.</para>
+
 <para>Now prepare GCC to be compiled:</para>
 
@@ -37,5 +44,5 @@
 same sources.</para>
 
-<para>Test the package:</para>
+<para>Test the results:</para>
 
 <para><screen><userinput>make -k check</userinput></screen></para>
Index: chapter05/gcc-pass2.xml
===================================================================
--- chapter05/gcc-pass2.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/gcc-pass2.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -6,6 +6,4 @@
 Estimated required disk space:  &gcc-compsize-pass1-stage1;</screen>
 
-&aa-gcc-shortdesc;
-&aa-gcc-dep;
 &c5-gcc-pass2-inst;
 
Index: chapter05/gzip-inst.xml
===================================================================
--- chapter05/gzip-inst.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/gzip-inst.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -4,7 +4,15 @@
 <title>Installation of Gzip</title>
 
-<para><screen><userinput>./configure --prefix=/stage1
-make
-make install</userinput></screen></para>
+<para>Prepare Gzip to be compiled:</para>
+
+<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para>
+
+<para>Compile the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And install it:</para>
+
+<para><screen><userinput>make install</userinput></screen></para>
 
 </sect2>
Index: chapter05/lockingglibc.xml
===================================================================
--- chapter05/lockingglibc.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/lockingglibc.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -17,5 +17,5 @@
 against the libraries in <filename>/stage1/lib</filename>.</para>
 
-<para>You can now remove the binutils-* directories.</para>
+<para>You can now remove Binutils' build and source directories.</para>
 
 </sect2>
Index: chapter05/tcl-inst.xml
===================================================================
--- chapter05/tcl-inst.xml	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ chapter05/tcl-inst.xml	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -27,7 +27,7 @@
 <para><screen><userinput>ln -s tclsh8.4 /stage1/bin/tclsh</userinput></screen></para>
 
-<para>Do <emphasis>not remove</emphasis> the
-<filename>tcl&tcl-version;</filename> directory yet, as the next package will
-need its internal headers.</para>
+<para><emphasis>Do not remove</emphasis> the
+<filename>tcl&tcl-version;</filename> source directory yet, as the next package
+will need its internal headers.</para>
 
 </sect2>
Index: entities/gcc.ent
===================================================================
--- entities/gcc.ent	(revision 775a2682d0633c2777b93207bd495708f9724258)
+++ entities/gcc.ent	(revision ab6f1859dd20771fcf1a6b62ecd2fd8819666c26)
@@ -22,9 +22,11 @@
 <!ENTITY gcc-contversion "3.1">
 <!ENTITY gcc-core-size "13,140 KB">
-<!ENTITY gcc-g-size "2520 KB">
+<!ENTITY gcc-gpp-size "2564 KB">
+<!ENTITY gcc-testsuite-size "1180 KB">
 <!ENTITY gcc-patch-version "3.2.1">
 <!ENTITY gcc-patch-size "4 KB">
 <!ENTITY gcc-core-package "gcc-core-&gcc-version;.tar.bz2">
-<!ENTITY gcc-g-package "gcc-g++-&gcc-version;.tar.bz2">
+<!ENTITY gcc-gpp-package "gcc-g++-&gcc-version;.tar.bz2">
+<!ENTITY gcc-testsuite-package "gcc-testsuite-&gcc-version;.tar.bz2">
 <!ENTITY gcc-dir "gcc-&gcc-version;">
 
