Revised dependencies info and typo fixes.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7544 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

3 files changed, 178 insertions, 113 deletions

diff --git a/appendixc/dependencies.xml b/appendixc/dependencies.xml
index b0eac21f3..e5642295c 100644
--- a/appendixc/dependencies.xml
+++ b/appendixc/dependencies.xml
@@ -20,8 +20,8 @@
 
   <para>For each package we build, we have listed three types of dependencies.
   The first lists what other packages need to be available in order to compile
-  and install the package in question. The second lists what packages in
-  addition to the first list need to be available in order to run the
+  and install the package in question. The second lists what packages, in
+  addition to those on the first list, need to be available in order to run the
   testsuites. The last list of dependencies are packages that require this
   package to be built and installed in its final location before they are built
   and installed. In most cases, this is because these packages will hardcode
@@ -37,7 +37,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-          <seg>Bash, Coreutils, M4, Make, Perl, Sed and Texinfo</seg>
+          <seg>Bash, Coreutils, Grep, M4, Make, Perl, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -45,7 +45,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Automake, Diffutils, Findutils, GCC and Libtool</seg>
+          <seg>Automake, Diffutils, Findutils, GCC, and Libtool</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -65,7 +65,7 @@
 
         <seglistitem>
           <seg>Autoconf, Bash, Coreutils, Gettext, Grep, M4, Make, Perl,
-          Sed and Texinfo</seg>
+          Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -74,10 +74,8 @@
 
         <seglistitem>
           <seg>Binutils, Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,
-          Flex, GCC, Gettext, Gzip, Libtool and Tar. Also note that the "destdir"
-          test will always be skipped, because it only works for non-root users,
-          and several other tests will be skipped as they depend on packages
-          not installed in LFS</seg>
+          Flex, GCC, Gettext, Gzip, Libtool, and Tar. Can also use several
+          other packages that are not installed in LFS.</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -97,7 +95,7 @@
 
         <seglistitem>
           <seg>Bash, Bison, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-	  Ncurses, Patch, Readline, Sed and Texinfo</seg>
+	  Ncurses, Patch, Readline, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -125,7 +123,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-	 Make and Sed</seg>
+         Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -133,7 +131,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Not run. Requires TCL installed on the final system</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -152,8 +150,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Coreutils, Diffutils, Expect, GCC, Gettext, Glibc, Grep,
-         Make, Perl, Sed, Tcl and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
+         Make, Perl, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -180,8 +178,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc,
-         Grep, M4, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc,
+         Grep, M4, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -197,7 +195,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Flex, Kbd and Tar</seg>
+          <seg>Flex, Kbd, and Tar</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -208,7 +206,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Make and Patch</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Make,
+         and Patch</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -236,7 +235,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
-	 Patch, Perl, Sed and Texinfo</seg>
+         Patch, Perl, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -252,7 +251,34 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Bash, Diffutils, Findutils, Man-DB and Udev</seg>
+          <seg>Bash, Diffutils, Findutils, Man-DB, and Udev</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin DejaGNU dependency info -->
+  <bridgehead renderas="sect2" id="dejagnu-dep">DejaGNU</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make, and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -264,7 +290,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
-	 Make, Patch, Sed and Texinfo</seg>
+	 Make, Patch, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -272,7 +298,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -292,7 +318,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-	 Patch, Sed and Tcl</seg>
+         Patch, Sed, and Tcl</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -320,7 +346,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Gawk, GCC, Gettext, Glibc, Grep, Gzip,
-	 Make, Sed and Texinfo</seg>
+         Make, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -348,7 +374,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-	 Make, Sed and Zlib</seg>
+	 Make, Sed, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -356,7 +382,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -376,7 +402,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
-	 Sed and Texinfo</seg>
+         Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -384,7 +410,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>DejaGNU, Diffutils and Expect</seg>
+          <seg>DejaGNU, Diffutils, and Expect</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -404,7 +430,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
-	 Patch, Sed and Texinfo</seg>
+         Patch, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -420,7 +446,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>IPRoute2, Kbd and Man-DB</seg>
+          <seg>IPRoute2, Kbd, and Man-DB</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -432,7 +458,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
-	 Patch, Sed and Texinfo</seg>
+         Patch, Sed and, Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -460,7 +486,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-	 Gettext, Glibc, Grep, Make, Patch, Perl, Sed, Tar and Texinfo</seg>
+         Gettext, Glibc, Grep, Make, Patch, Perl, Sed, Tar, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -488,7 +514,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
-	 Sed and Texinfo</seg>
+         Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -496,7 +522,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils, Perl and Tcl</seg>
+          <seg>Diffutils, Perl, and Tcl</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -508,6 +534,34 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Glibc dependency info -->
+  <bridgehead renderas="sect2" id="glibc-dep">Glibc</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Gettext,
+         Grep, Gzip, Make, Perl, Sed, and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Grep dependency info -->
   <bridgehead renderas="sect2" id="grep-dep">Grep</bridgehead>
 
@@ -516,7 +570,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Make,
-	 Patch, Sed and Texinfo</seg>
+         Patch, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -544,7 +598,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Bison, Coreutils,  Gawk, GCC, Glibc, Grep, Make,
-	 Patch, Sed and Texinfo</seg>
+         Patch, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -552,7 +606,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -572,7 +626,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-	 Ncurses, Sed and Texinfo</seg>
+         Ncurses, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -600,7 +654,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-	 Patch, Sed and Texinfo</seg>
+         Patch, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -608,7 +662,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -627,7 +681,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Coreutils, Gawk and Make</seg>
+         <seg>Coreutils, Gawk, and Make</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -635,7 +689,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -655,7 +709,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
-	 Patch, Sed and Texinfo</seg>
+         Patch, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -663,7 +717,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -682,8 +736,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Berkeley DB, Bison, Coreutils, Flex, GCC, Glibc, Make
-	 and Linux-Libc-Headers</seg>
+         <seg>Bash, Berkeley DB, Bison, Coreutils, Flex, GCC, Glibc, Make,
+         and Linux-Libc-Headers</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -691,7 +745,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -711,7 +765,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
-	 Gzip, Make, Patch and Sed</seg>
+         Gzip, Make, Patch, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -719,7 +773,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -739,7 +793,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-	 Ncurses and Sed</seg>
+         Ncurses, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -747,7 +801,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -767,7 +821,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-	 Make, Sed and Texinfo</seg>
+         Make, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -795,7 +849,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc, Grep,
-	 Gzip, Make, Module-Init-Tools, Ncurses and Sed</seg>
+         Gzip, Make, Module-Init-Tools, Ncurses, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -803,7 +857,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -822,7 +876,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -850,7 +904,7 @@
 
         <seglistitem>
          <seg>Bash, Berkeley DB, Binutils, Bzip2, Coreutils, Flex, GCC, Gettext,
-	 Glibc, Grep, Groff, Gzip, Less, Make and Sed</seg>
+         Glibc, Grep, Groff, Gzip, Less, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -858,7 +912,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils</seg>
+          <seg>Not run. Requires Man-DB testsuite package</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -866,7 +920,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Autoconf and Bison</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -878,7 +932,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
-	 Make, Sed and Texinfo</seg>
+         Make, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -905,7 +959,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Patch and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Patch, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -913,7 +967,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -932,7 +986,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed and Zlib</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed,
+         and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -940,7 +995,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>File, Findutils and Gawk</seg>
+          <seg>File, Findutils, and Gawk</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -960,7 +1015,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-	 Make, Patch and Sed</seg>
+         Make, Patch, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -968,7 +1023,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -977,7 +1032,7 @@
 
         <seglistitem>
           <seg>Bash, GRUB, Inetutils, Less, Procps, Psmisc, Readline, Texinfo,
-	  Util-Linux and Vim</seg>
+          Util-Linux, and Vim</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -988,7 +1043,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -996,7 +1051,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1016,7 +1071,7 @@
 
         <seglistitem>
          <seg>Bash, Berkeley DB, Binutils, Coreutils, Gawk, GCC, Glibc, Grep,
-	 Groff, Make and Sed</seg>
+         Groff, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1043,7 +1098,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make and Ncurses</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make, and Ncurses</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1051,7 +1106,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1070,8 +1125,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Coreutils, GCC, Gettext, Glibc, Grep, Make, Ncurses
-	 and Sed</seg>
+         <seg>Bash, Coreutils, GCC, Gettext, Glibc, Grep, Make, Ncurses,
+         and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1079,7 +1134,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1099,7 +1154,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
-         Patch, Sed and Texinfo</seg>
+         Patch, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1107,7 +1162,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1127,7 +1182,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
-	 Sed and Texinfo</seg>
+         Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1143,7 +1198,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>E2fsprogs, File, Libtool and Shadow</seg>
+          <seg>E2fsprogs, File, Libtool, and Shadow</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1155,7 +1210,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-	 Gettext, Glibc, Grep, Make and Sed</seg>
+         Gettext, Glibc, Grep, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1163,7 +1218,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1182,7 +1237,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Glibc, Make and Patch</seg>
+         <seg>Binutils, Coreutils, GCC, Glibc, Make, and Patch</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1190,7 +1245,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1209,7 +1264,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Glibc, Make and Sed</seg>
+         <seg>Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1217,7 +1272,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1236,8 +1291,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Bzip2, Coreutils, GCC, Gettext, Glibc,
-	 Grep, Gzip, Inetutils, Make, Patch, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
+         Grep, Inetutils, Make, Patch, Sed, and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1245,7 +1300,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils, Findutils and Gawk</seg>
+          <seg>Diffutils, Findutils, and Gawk</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1265,7 +1320,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
-	 Make and Sed</seg>
+         Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1293,7 +1348,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
-	 Ncurses, Patch and Sed</seg>
+         Ncurses, Patch, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1320,7 +1375,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Glibc and Make</seg>
+         <seg>Binutils, Coreutils, GCC, Glibc, and Make</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1328,7 +1383,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Findutils, Perl, Sed and Tree</seg>
+          <seg>Findutils, Perl, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1348,7 +1403,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, E2fprogs, GCC, Gettext, Glibc, Grep,
-	 Make, Ncurses, Patch, Sed and Zlib</seg>
+         Make, Ncurses, Patch, Sed, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1356,7 +1411,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>No testsuite available</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1376,7 +1431,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-	 Ncurses and Sed</seg>
+         Ncurses, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1403,7 +1458,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1419,7 +1474,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>File, Module-Init-Tools and Util-Linux</seg>
+          <seg>File, Module-Init-Tools, and Util-Linux</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4ec0ab404..cf8088585 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,13 +37,23 @@
 -->
 
     <listitem>
+      <para>April 20, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[manuel] - Revised dependencies info. Thanks to Chris Staub
+          for the patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 19, 2006</para>
       <itemizedlist>
         <listitem>
           <para>[jhuntwork] - Added a more detailed list of minimum
-	  software requirements. Thanks to Chris Staub for researching these
-	  and Alexander Patrakov for suggesting the enhancement.
-	  Resolves Ticket 1598.</para>
+          software requirements. Thanks to Chris Staub for researching these
+          and Alexander Patrakov for suggesting the enhancement.
+          Resolves Ticket 1598.</para>
         </listitem>
       </itemizedlist>
     </listitem>
@@ -53,11 +63,11 @@
       <itemizedlist>
         <listitem>
           <para>[jhuntwork] - Moved all dependency information to a new page,
-	  Appendix C. Appendix C also contains information concerning the
-	  build order. While there might need to be a few tweaks yet, this
-	  information is complete enough at this point to close out the
-	  long-standing ticket #684. Many thanks to Chris Staub, Dan Nicholson
-	  and Manuel Canales Esparcia for helping get this finished.</para>
+          Appendix C. Appendix C also contains information concerning the
+          build order. While there might need to be a few tweaks yet, this
+          information is complete enough at this point to close out the
+          long-standing ticket #684. Many thanks to Chris Staub, Dan Nicholson
+          and Manuel Canales Esparcia for helping get this finished.</para>
         </listitem>
       </itemizedlist>
     </listitem>
@@ -78,9 +88,9 @@
     <listitem>
       <para>April 14, 2006</para>
       <itemizedlist>
-	<listitem>
-	  <para>[ken] - Add security patch for tar to address CVE-2006-0300.</para>
-	</listitem>
+        <listitem>
+          <para>[ken] - Add security patch for tar to address CVE-2006-0300.</para>
+        </listitem>
         <listitem>
           <para>[archaic] - Upgraded to man-pages-2.29 and linux-2.6.16.5. No
           command changes.</para>
@@ -149,10 +159,10 @@
       <itemizedlist>
         <listitem>
           <para>[jhuntwork] - Added a command to create an empty /etc/mtab file early
-	  in chapter 6. This avoids testsuite failures in e2fsprogs and possibly other
-	  programs that expect /etc/mtab to be present. Explanation from Dan Nicholson,
-	  slightly modified. Also merged the 'Creating Essential Symlinks' section with
-	  'Creating passwd, group and log Files'.</para>
+          in chapter 6. This avoids testsuite failures in e2fsprogs and possibly other
+          programs that expect /etc/mtab to be present. Explanation from Dan Nicholson,
+          slightly modified. Also merged the 'Creating Essential Symlinks' section with
+          'Creating passwd, group and log Files'.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/general.ent b/general.ent
index a5b9b0680..d9fa670d9 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20060419">
-<!ENTITY releasedate "April 19, 2006">
+<!ENTITY version "SVN-20060420">
+<!ENTITY releasedate "April 20, 2006">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->