22 files changed, 123 insertions, 51 deletions
diff --git a/appendixa/coreutils-desc.xml b/appendixa/coreutils-desc.xml
index 3381ca2ff..27d89d8c9 100644
--- a/appendixa/coreutils-desc.xml
+++ b/appendixa/coreutils-desc.xml
@@ -2,8 +2,6 @@
 
 <sect2><title>Descriptions</title>
 
-<para>Not yet fully checked.</para>
-
 <sect3><title>Program file descriptions</title>
 
 <sect4><title>basename</title>
@@ -123,6 +121,9 @@ standard output.</para></sect4>
 <para>hostid prints the numeric identifier (in hexadecimal) for the current 
 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
 user or a given user.</para></sect4>
@@ -134,6 +135,9 @@ their owner and group.</para></sect4>
 <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>
 <para>ln makes hard or soft (symbolic) links between files.</para></sect4>
 
@@ -210,6 +214,9 @@ function).</para></sect4>
 <para>seq prints numbers in a certain range with a certain 
 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 
 contents can't be recovered.</para></sect4>
diff --git a/appendixa/coreutils-shortdesc.xml b/appendixa/coreutils-shortdesc.xml
index 711786ba9..6cdb62a88 100644
--- a/appendixa/coreutils-shortdesc.xml
+++ b/appendixa/coreutils-shortdesc.xml
@@ -1,7 +1,5 @@
 <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>
 
 <para>Coreutils installs the following:</para>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c990e4a38..27cbb1735 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -82,6 +82,22 @@
 </itemizedlist>
 </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
 libraries plus references to the installation pages.</para></listitem>
diff --git a/chapter04/binutils.xml b/chapter04/binutils.xml
index ed8926d11..00454c451 100644
--- a/chapter04/binutils.xml
+++ b/chapter04/binutils.xml
@@ -1,3 +1,2 @@
 Binutils (&binutils-version;) - &binutils-size;:
 <ulink url="http://freshmeat.net/projects/binutils/"/>
-
diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml
index e54f7f7c0..694d26a6c 100644
--- a/chapter04/gcc.xml
+++ b/chapter04/gcc.xml
@@ -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/"/>
diff --git a/chapter04/introduction.xml b/chapter04/introduction.xml
index 859b5dbc0..3e82c190f 100644
--- a/chapter04/introduction.xml
+++ b/chapter04/introduction.xml
@@ -9,16 +9,18 @@ them. Feel free to try out newer versions, but if you experience problems
 with those versions, please try the recommended version first before
 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>
 program. Using this file and the <userinput>wget</userinput> program will
 make it easy to download all the files at once, rather than downloading each
 and every individual file manually.</para>
+]]>
 
 </sect1>
 
diff --git a/chapter05/binutils-pass2-inst.xml b/chapter05/binutils-pass2-inst.xml
index 9c0db80e6..939e83460 100644
--- a/chapter05/binutils-pass2-inst.xml
+++ b/chapter05/binutils-pass2-inst.xml
@@ -1,7 +1,7 @@
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
-<title>Installation of Binutils</title>
+<title>Re-installation of Binutils</title>
 
 <para>First create a separate build directory again:</para>
 
@@ -13,11 +13,14 @@ cd ../binutils-build</userinput></screen></para>
 <para><screen><userinput>../binutils-&binutils-version;/configure --prefix=/stage1 \
 &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>
 
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 8cfcb96cc..e443af968 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -5,8 +5,6 @@
 <screen>Estimated build time:           &binutils-pass1-time-stage1;
 Estimated required disk space:  &binutils-pass1-compsize-stage1;</screen>
 
-&aa-binutils-shortdesc;
-&aa-binutils-dep;
 &c5-binutils-pass2-inst;
 
 </sect1>
diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml
index de0ee1c43..bdfb951ab 100644
--- a/chapter05/bzip2-inst.xml
+++ b/chapter05/bzip2-inst.xml
@@ -3,13 +3,10 @@
 <sect2>
 <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>
 
diff --git a/chapter05/coreutils-inst.xml b/chapter05/coreutils-inst.xml
index 40d5f823e..455185064 100644
--- a/chapter05/coreutils-inst.xml
+++ b/chapter05/coreutils-inst.xml
@@ -3,10 +3,21 @@
 <sect2>
 <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>
 
 
 </sect2>
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index 7ccfe6e1a..43180b86f 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -2,6 +2,11 @@
 <title>Installing Coreutils-&coreutils-version;</title>
 <?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;
 
 </sect1>
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index cbfbb0264..edaf67440 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -5,9 +5,15 @@
 
 <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>
 
diff --git a/chapter05/expect-inst.xml b/chapter05/expect-inst.xml
index f4f24687b..243e078f7 100644
--- a/chapter05/expect-inst.xml
+++ b/chapter05/expect-inst.xml
@@ -23,7 +23,7 @@ make install</userinput></screen></para>
 <para>Note that also here some of the tests might fail, and that this is not a
 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>
 
diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml
index f654dc521..650a7caf8 100644
--- a/chapter05/findutils-inst.xml
+++ b/chapter05/findutils-inst.xml
@@ -5,9 +5,18 @@
 
 <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>
diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
index 203aec063..b60048eb1 100644
--- a/chapter05/gawk-inst.xml
+++ b/chapter05/gawk-inst.xml
@@ -7,11 +7,11 @@
 
 <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>
 
diff --git a/chapter05/gcc-pass1-inst.xml b/chapter05/gcc-pass1-inst.xml
index e9a649776..d7f98aa0a 100644
--- a/chapter05/gcc-pass1-inst.xml
+++ b/chapter05/gcc-pass1-inst.xml
@@ -3,8 +3,8 @@
 <sect2>
 <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
 default optimization flags (including the -march and -mcpu options).
@@ -42,13 +42,13 @@ seem counter-intuitive at first. But using it allows the building of
 <filename>libgcc_s.so.1</filename> and <filename>libgcc_eh.a</filename>, and
 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>
 
 <para>Continue with compiling the package:</para>
diff --git a/chapter05/gcc-pass2-inst.xml b/chapter05/gcc-pass2-inst.xml
index e21cda452..ce88c062a 100644
--- a/chapter05/gcc-pass2-inst.xml
+++ b/chapter05/gcc-pass2-inst.xml
@@ -1,7 +1,11 @@
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <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>
 
@@ -21,6 +25,9 @@ binaries created during the build will link against the new Glibc.</para>
 <para><screen><userinput>mkdir ../gcc-build
 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>
 
 <para><screen><userinput>../gcc-&gcc-version;/configure --prefix=/stage1 \
@@ -36,7 +43,7 @@ cd ../gcc-build</userinput></screen></para>
 as the compiler we're using to compile this GCC has been built from the exact
 same sources.</para>
 
-<para>Test the package:</para>
+<para>Test the results:</para>
 
 <para><screen><userinput>make -k check</userinput></screen></para>
 
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index b55c5e5d6..58d6b7672 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -5,8 +5,6 @@
 <screen>Estimated build time:           &gcc-time-pass1-stage1;
 Estimated required disk space:  &gcc-compsize-pass1-stage1;</screen>
 
-&aa-gcc-shortdesc;
-&aa-gcc-dep;
 &c5-gcc-pass2-inst;
 
 </sect1>
diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml
index bd81361f5..bd0c4964e 100644
--- a/chapter05/gzip-inst.xml
+++ b/chapter05/gzip-inst.xml
@@ -3,9 +3,17 @@
 <sect2>
 <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>
 
diff --git a/chapter05/lockingglibc.xml b/chapter05/lockingglibc.xml
index 45a4fe5fb..2ba8db0e2 100644
--- a/chapter05/lockingglibc.xml
+++ b/chapter05/lockingglibc.xml
@@ -16,7 +16,7 @@ scripts now contain no mention of <filename>/lib</filename>,
 From this point onwards everything will link <emphasis>only</emphasis>
 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>
 
diff --git a/chapter05/tcl-inst.xml b/chapter05/tcl-inst.xml
index e2e5da3a5..5aa7a53ef 100644
--- a/chapter05/tcl-inst.xml
+++ b/chapter05/tcl-inst.xml
@@ -26,9 +26,9 @@ suites.</para>
 <para>Make a link:</para>
 <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>
 
diff --git a/entities/gcc.ent b/entities/gcc.ent
index 4702610db..2678ac9ed 100644
--- a/entities/gcc.ent
+++ b/entities/gcc.ent
@@ -21,11 +21,13 @@
 <!ENTITY gcc-depversion "2.95.3">
 <!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;">
 
 <!ENTITY gcc-compsize-pass1-stage1 "326 MB">