Bring alphabetical branch up-to-speed with trunk

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

32 files changed, 174 insertions, 147 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ccf6c47c8..6f91b8b84 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -27,7 +27,7 @@ First a summary, then a detailed log.</para>
 <itemizedlist>
 <!-- <listitem><para>Autoconf &autoconf-version;</para></listitem> -->
 <listitem><para>Automake &automake-version;</para></listitem>
-<!-- <listitem><para>Bash &bash-version;</para></listitem> -->
+<listitem><para>Bash &bash-version;</para></listitem>
 <listitem><para>Binutils &binutils-version;</para></listitem>
 <listitem><para>Bison &bison-version;</para></listitem>
 <!-- <listitem><para>Bzip2 &bzip2-version;</para></listitem> -->
@@ -52,7 +52,7 @@ First a summary, then a detailed log.</para>
 <!-- <listitem><para>Inetutils &inetutils-version;</para></listitem> -->
 <!-- <listitem><para>IPRoute2 &iproute2-version;</para></listitem> -->
 <!-- <listitem><para>Kbd &kbd-version;</para></listitem> -->
-<!-- <listitem><para>Less &less-version;</para></listitem> -->
+<listitem><para>Less &less-version;</para></listitem>
 <!-- <listitem><para>LFS-Bootscripts &lfs-bootscripts-version;</para></listitem> -->
 <listitem><para>Libtool &libtool-version;</para></listitem>
 <listitem><para>Linux &linux-version;</para></listitem>
@@ -68,7 +68,7 @@ First a summary, then a detailed log.</para>
 <listitem><para>Perl &perl-version;</para></listitem>
 <listitem><para>Procps &procps-version;</para></listitem>
 <listitem><para>Psmisc &psmisc-version;</para></listitem>
-<!-- <listitem><para>Readline &readline-version;</para></listitem> -->
+<listitem><para>Readline &readline-version;</para></listitem>
 <!-- <listitem><para>Sed &sed-version;</para></listitem> -->
 <listitem><para>Shadow &shadow-version;</para></listitem>
 <!-- <listitem><para>Sysklogd &sysklogd-version;</para></listitem> -->
@@ -114,6 +114,78 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>December 13, 2005 [jhuntwork]: Install Tcl's internal headers to /tools/include,
+allowing us to drop its source directory right away. Origin is Greg Schafer, and thanks to
+Dan Nicholson for the report (fixes bug 1670).</para>
+</listitem>
+
+<listitem><para>December 12, 2005 [jhuntwork]: Updated texinfo patch. Fixes segfault issues with
+texindex. Thanks to Randy McMurchy for the report and Bruce Dubbs and Joe Ciccone for the fix.</para>
+</listitem>
+
+<listitem><para>December 11, 2005 [jhuntwork]: Upgrade to tcl-8.4.12</para>
+</listitem>
+
+<listitem><para>December 11, 2005 [jhuntwork]: Upgrade to less-394.</para>
+</listitem>
+
+<listitem><para>December 11, 2005 [jhuntwork]: Upgrade to readline-5.1. Also removed bash-3.0
+and readline-5.0 specific patches.</para>
+</listitem>
+  
+<listitem><para>December 11, 2005 [jhuntwork]: Upgrade to bash-3.1. Also fixed Tcl to
+work with the new bash version. Thanks to Alexander Patrakov and ultimately, Greg Schafer
+for the fix.</para>
+</listitem>
+
+<listitem><para>December 11, 2005 [jhuntwork]: Changed variable used in readline for linking
+in ncurses. Thanks to Alexander Patrakov for the fix.</para>
+</listitem>
+
+<listitem><para>December 9, 2005 [matt]: Upgrade to man-pages-2.16</para>
+</listitem>
+
+<listitem><para>December 9, 2005 [matt]: Upgrade to module-init-tools-3.2.2
+</para></listitem>
+
+<listitem><para>December 9, 2005 [matt]: Upgrade to findutils-4.2.27</para>
+</listitem>
+
+<listitem><para>December 7, 2005 [matt]: Mention the testsuites (or lack of
+them) for all packages (fixes bug 1664).  Thanks to Chris Staub for the
+report and analysis of affected packages.</para></listitem>
+
+<listitem><para>November 26, 2005 [matt]: Don't install the Linuxthreads man
+pages, the POSIX threading API is documented in the man3p section provided by
+the man-pages package (fixes bug 1660).</para></listitem>
+
+<listitem><para>November 26, 2005 [matt]: Remove the incorrect note about not
+having to dump/check a journalled filesystem (fixes bug 1662).</para>
+</listitem>
+
+<listitem><para>November 26, 2005 [matt]: Upgrade to module-init-tools 3.2.1.
+</para></listitem>
+
+<listitem><para>November 26, 2005 [matt]: Prevent installing the
+internationalized man pages for Shadow's <command>groups</command> binary
+(thanks to Randy McMurchy for the report).</para></listitem>
+
+<listitem><para>November 26, 2005 [matt]: Upgrade to man-pages 2.14.</para>
+</listitem>
+
+<listitem><para>November 26, 2005 [matt]: Upgrade to findutils-4.2.26</para>
+</listitem>
+
+<listitem><para>November 26, 2005 [manuel]: Changed --strip-path to
+--strip-components in the unpack of module-init-tools-testsuite
+package.</para></listitem>
+
+<listitem><para>November 23, 2005 [gerard]: Corrected reference to 'man page' to
+'HTML documentation' in chapter 6/sec</para></listitem>
+
+<listitem><para>November 18, 2005 [manuel]: Fixed the unpack of the
+module-init-tools-testsuite package.</para></listitem>
+
 <listitem><para>November 16, 2005 [jhuntwork]: Textual correction concerning
 gettext in chapter 5 and the use of --disable-shared</para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index ff4fa4032..30f28c9cc 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -109,7 +109,7 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Findutils (&findutils-version;) - 836 KB:</term>
+<term>Findutils (&findutils-version;) - 887 KB:</term>
 <listitem>
 <para><ulink url="&gnu;findutils/"/></para>
 </listitem>
@@ -151,13 +151,6 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Glibc-Linuxthreads (&glibc-version;) - 236 KB: </term>
-<listitem>
-<para><ulink url="&gnu;glibc/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
 <term>Grep (&grep-version;) - 520 KB:</term>
 <listitem>
 <para><ulink url="&gnu;grep/"/></para>
@@ -223,7 +216,8 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note>
 <varlistentry>
 <term>Less (&less-version;) - 216 KB:</term>
 <listitem>
-<para><ulink url="&gnu;less/"/></para>
+<!-- <para><ulink url="&gnu;less/"/></para> -->
+<para><ulink url="http://www.greenwoodsoftware.com/less/"/></para>
 </listitem>
 </varlistentry>
 
@@ -277,7 +271,7 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Man-pages (&man-pages-version;) - 1,671 KB:</term>
+<term>Man-pages (&man-pages-version;) - 1,682 KB:</term>
 <listitem>
 <para><ulink url="&kernel;linux/docs/manpages/"/></para>
 </listitem>
@@ -291,14 +285,7 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Module-Init-Tools (&module-init-tools-version;) - 128 KB:</term>
-<listitem>
-<para><ulink url="&kernel;linux/utils/kernel/module-init-tools/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Module-Init-Tools-Testsuite (&module-init-tools-version;) - 34 KB:</term>
+<term>Module-Init-Tools (&module-init-tools-version;) - 165 KB:</term>
 <listitem>
 <para><ulink url="&kernel;linux/utils/kernel/module-init-tools/"/></para>
 </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index c942f5672..85a728d11 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -16,20 +16,6 @@ needed to build an LFS system:</para>
 <variablelist role="materials">
 
 <varlistentry>
-<term>Bash Avoid Wcontinued Patch - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;&bash-avoid_WCONTINUED-patch;"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Bash Various Fixes - 23 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;&bash-fixes-patch;"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
 <term>Bzip2 Bzgrep Security Fixes Patch - 1 KB:</term>
 <listitem>
 <para><ulink url="&patches-root;&bzip2-bzgrep-patch;"/></para>
@@ -127,13 +113,6 @@ needed to build an LFS system:</para>
 </varlistentry>
 
 <varlistentry>
-<term>Readline Fixes Patch - 7 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;&readline-fixes-patch;"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
 <term>Shadow Configure Script Patch - 1KB:</term>
 <listitem>
 <para><ulink url="&patches-root;&shadow-configure-patch;"/></para>
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index a7f42de9c..c8b72eae0 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -28,11 +28,6 @@
 <title>Installation of Bash</title>
 
 <!-- Edit Me -->
-<para>Bash has a problem when compiled against newer versions of Glibc, causing
-it to hang inappropriately.  This patch fixes the problem:</para>
-
-<screen><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen>
-
 <para>Prepare Bash for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools --without-bash-malloc</userinput></screen>
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index c2c6a0057..b185c3365 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -36,6 +36,8 @@ GCC, Glibc, Grep, Make, and Sed</seg></seglistitem>
 
 <screen><userinput>make install</userinput></screen>
 
+<para>To test the results, issue: <userinput>make check</userinput>.</para>
+
 </sect2>
 
 
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 7ba3c7119..32662380c 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -37,7 +37,7 @@ suite run:</para>
 <para>Now prepare Expect for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
-   --with-tclinclude=$TCLPATH --with-x=no</userinput></screen>
+   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
@@ -50,11 +50,10 @@ one on the host system.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><parameter>--with-tclinclude=$TCLPATH</parameter></term>
-<listitem><para>This explicitly tells Expect where to find Tcl's source
-directory and internal headers. Using this option avoids conditions
-where <command>configure</command> fails because it cannot automatically
-discover the location of the Tcl source directory.</para></listitem>
+<term><parameter>--with-tclinclude=/tools/include</parameter></term>
+<listitem><para>This explicitly tells Expect where to find Tcl's internal headers.
+Using this option avoids conditions where <command>configure</command> fails because
+it cannot automatically discover the location of Tcl's headers.</para></listitem>
 </varlistentry>
 
 <varlistentry>
@@ -90,12 +89,6 @@ scripts, which are not needed.</para></listitem>
 </varlistentry>
 </variablelist>
 
-<para>Now remove the <envar>TCLPATH</envar> variable:</para>
-
-<screen><userinput>unset TCLPATH</userinput></screen>
-
-<para>The source directories of both Tcl and Expect can now be removed.</para>
-
 </sect2>
 
 <sect2 id="contents-expect" role="content"><title>Contents of Expect</title>
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 1b7a21a35..030c9c2c3 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -27,7 +27,7 @@
 <sect2 role="installation">
 <title>Installation of Gettext</title>
 
-<para>For our temporary set of tools, we only need to build and install one binary from gettext.</para>
+<para>For our temporary set of tools, we only need to build and install one binary from Gettext.</para>
 
 <para>Prepare Gettext for compilation:</para>
 
@@ -39,8 +39,8 @@
 <variablelist>
 <varlistentry>
 <term><parameter>--disable-shared</parameter></term>
-<listitem><para>We do not need to install any of the shared gettext libraries at this
-time, therefore, no need to build them.</para></listitem>
+<listitem><para>We do not need to install any of the shared gettext libraries at
+this time, therefore there is no need to build them.</para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -49,6 +49,11 @@ time, therefore, no need to build them.</para></listitem>
 <screen><userinput>make -C lib
 make -C src msgfmt</userinput></screen>
 
+<para>As only one binary has been compiled, it is not possible to run the
+testsuite without compiling additional support libraries from the Gettext
+package.  It is therefore not recommended to attempt to run the testsuite at
+this stage.</para>
+
 <para>Install the <command>msgfmt</command> binary:</para>
 
 <screen><userinput>cp -v src/msgfmt /tools/bin</userinput></screen>
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 981117d24..3787a3d95 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -38,10 +38,14 @@ run in this chapter (they are not mandatory), these packages
 are required to run the test suites in <xref
 linkend="chapter-building-system"/>.</para>
 
+<para>Tcl's configure script has a syntax error:</para>
+<screen><userinput>cd unix
+cp -v configure{,.orig}
+sed "s/relid'/relid/" configure.orig &gt; configure</userinput></screen>
+
 <para>Prepare Tcl for compilation:</para>
 
-<screen><userinput>cd unix
-./configure --prefix=/tools</userinput></screen>
+<screen><userinput>./configure --prefix=/tools</userinput></screen>
 
 <para>Build the package:</para>
 
@@ -62,15 +66,9 @@ Details on the <envar>TZ</envar> environment variable are provided in
 
 <screen><userinput>make install</userinput></screen>
 
-<warning><para><emphasis>Do not</emphasis> remove the
-<filename class="directory">tcl&tcl-version;</filename> source directory yet, as the next package
-will need its internal headers.</para></warning>
-
-<para>Set a variable containing the full path of the current directory.
-The next package, Expect, will use this variable to find Tcl's headers.</para>
+<para>Install Tcl's headers. The next package, Expect, requires them to build.</para>
 
-<screen><userinput>cd ..
-export TCLPATH=`pwd`</userinput></screen>
+<screen><userinput>make install-private-headers</userinput></screen>
 
 <para>Now make a necessary symbolic link:</para>
 
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 0f49320c6..3010805b7 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -35,16 +35,6 @@ documentation, issue the following commands:</para>
 sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
     Makefile.in</userinput></screen>
 
-<para>The following patch fixes various issues, including a problem where Bash
-will sometimes only show 33 characters on a line, then wrap to the next:</para>
-
-<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
-
-<para>Bash also has issues when compiled against newer versions of Glibc.  The
-following patch resolves this problem:</para>
-
-<screen><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen>
-
 <para>Prepare Bash for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin \
diff --git a/chapter06/file.xml b/chapter06/file.xml
index 5f3948bf2..f89f7674b 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -37,6 +37,8 @@ GCC, Glibc, Grep, Make, Sed, and Zlib</seg></seglistitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 2c1d59519..5cca20be0 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -47,12 +47,6 @@ and linker cannot be adjusted before the Glibc install because the
 Glibc autoconf tests would give false results and defeat the goal
 of achieving a clean build.</para>
 
-<para>The linuxthreads tarball contains the man pages for the
-threading libraries installed by Glibc.  Unpack the tarball from
-within the Glibc source directory:</para>
-
-<screen><userinput>tar -xvf ../glibc-linuxthreads-&glibc-version;.tar.bz2</userinput></screen>
-
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
 
@@ -176,15 +170,6 @@ GCC and Gettext tests to pass, and the <command>watch</command> program
 attempts to circumvent these restrictions are documented in
 internationalization-related hints.</para>
 
-<para>Build the linuxthreads man pages, which are a great reference
-on the threading API (applicable to NPTL as well):</para>
-
-<screen><userinput>make -C ../glibc-&glibc-version;/linuxthreads/man</userinput></screen>
-
-<para>Install these pages:</para>
-
-<screen><userinput>make -C ../glibc-&glibc-version;/linuxthreads/man install</userinput></screen>
-
 </sect2>
 
 <sect2 id="conf-glibc" role="configuration"><title>Configuring Glibc</title>
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 59dd8c90d..a2d8cb7e2 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -41,6 +41,8 @@ to contain the default paper size. For users in the United States,
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 1730df998..74d7d7bf9 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -49,6 +49,8 @@ that the new location gets placed into the script:</para>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml
index 8e6cd6368..bbc9cfe95 100644
--- a/chapter06/hotplug.xml
+++ b/chapter06/hotplug.xml
@@ -32,6 +32,8 @@ running kernel.</para>
 <sect2 role="installation">
 <title>Installation of Hotplug</title>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the Hotplug package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/iana-etc.xml b/chapter06/iana-etc.xml
index 54b653bd2..38ac0b8de 100644
--- a/chapter06/iana-etc.xml
+++ b/chapter06/iana-etc.xml
@@ -33,6 +33,8 @@ correct formats for the <filename>/etc/protocols</filename> and
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index abba0f217..dabe959d6 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -88,6 +88,8 @@ servers.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 1aea0339d..66d1ea86c 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -63,6 +63,8 @@
     </varlistentry>
     </variablelist>
 
+    <para>This package does not come with a test suite.</para>
+
     <para>Install the package:</para>
 
     <screen><userinput>make SBINDIR=/sbin install</userinput></screen>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 4e28dba9c..52e8a734c 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -41,6 +41,8 @@ when compiling with GCC-&gcc-version;:</para>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/less.xml b/chapter06/less.xml
index a47709ee4..817a6c67e 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -46,6 +46,8 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/man.xml b/chapter06/man.xml
index efc322f64..371985d2e 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -62,6 +62,8 @@ class="directory">/etc</filename> directory.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml
index 7dcd5d1f5..ee47463e6 100644
--- a/chapter06/mktemp.xml
+++ b/chapter06/mktemp.xml
@@ -54,6 +54,8 @@ functions from the system C library.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install
diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml
index 699f1a85b..947957465 100644
--- a/chapter06/module-init-tools.xml
+++ b/chapter06/module-init-tools.xml
@@ -16,7 +16,7 @@ modules in Linux kernels greater than or equal to version 2.5.47.</para>
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
 <segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>4.9 MB</seg></seglistitem>
+<seglistitem><seg>0.3 SBU</seg><seg>3.3 MB</seg></seglistitem>
 </segmentedlist>
 
 <segmentedlist>
@@ -29,32 +29,28 @@ Coreutils, Diffutils, Flex, GCC, Glibc, Grep, M4, Make, and Sed</seg></seglistit
 <sect2 role="installation">
 <title>Installation of Module-Init-Tools</title>
 
-<para>Module-Init-Tools attempts to rewrite its
-<filename>modprobe.conf</filename> man page during the build process. This is
-unnecessary and also relies on <command>docbook2man</command> &mdash; which is not
-installed in LFS. Run the following command to avoid this:</para>
+<para>Issue the following commands to perform the tests (note that the
+<command>make distclean</command> command is required to clean up the source
+tree, as the source gets recompiled as part of the testing process):</para>
 
-<screen><userinput>touch modprobe.conf.5</userinput></screen>
-
-<para>If you wish to run the test suite for Module-Init-Tools, you will need to
-download the separate testsuite tarball.  Issue the following commands to
-perform the tests (note that the <command>make distclean</command> command is
-required to clean up the source tree, as the source gets recompiled as part of
-the testing process):</para>
-
-<screen><userinput>tar -xvf ../module-init-tools-testsuite-&module-init-tools-version;.tar.bz2 &amp;&amp;
-./configure &amp;&amp;
+<screen><userinput>./configure &amp;&amp;
 make check &amp;&amp;
 make distclean</userinput></screen>
 
 <para>Prepare Module-Init-Tools for compilation:</para>
 
-<screen><userinput>./configure --prefix="" --enable-zlib</userinput></screen>
+<screen><userinput>./configure --prefix="" --mandir=/usr/share/man \
+  --enable-zlib</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
 <variablelist>
 <varlistentry>
+<term><parameter>--mandir=/usr/share/man</parameter></term>
+<listitem><para>This ensures the man pages are installed in the correct
+location.</para></listitem>
+</varlistentry>
+<varlistentry>
 <term><parameter>--enable-zlib</parameter></term>
 <listitem><para>This allows the Module-Init-Tools package to handle compressed
 kernel modules.</para></listitem>
@@ -76,9 +72,8 @@ kernel modules.</para></listitem>
 
 <segmentedlist>
 <segtitle>Installed programs</segtitle>
-<seglistitem><seg>depmod, insmod,
-insmod.static, lsmod (link to insmod), modinfo, modprobe (link to
-insmod), and rmmod (link to insmod)</seg></seglistitem>
+<seglistitem><seg>depmod, generate-modprobe.conf, insmod,
+insmod.static, lsmod, modinfo, modprobe, and rmmod</seg></seglistitem>
 </segmentedlist>
 
 <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -95,6 +90,14 @@ automatically load the required modules</para>
 </listitem>
 </varlistentry>
 
+<varlistentry id="generate-modprobe.conf">
+<term><command>generate-modprobe.conf</command></term>
+<listitem>
+<para>Creates a modprobe.conf file from an existing 2.2 or 2.4 module setup</para>
+<indexterm zone="ch-system-module-init-tools generate-modprobe.conf"><primary sortas="b-generate-modprobe.conf">generate-modprobe.conf</primary></indexterm>
+</listitem>
+</varlistentry>
+
 <varlistentry id="insmod">
 <term><command>insmod</command></term>
 <listitem>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 7969900f0..4973a7955 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -32,6 +32,8 @@ Make, and Ncurses</seg></seglistitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index f09f726b1..ae50c7575 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -50,6 +50,8 @@ package.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 53ca9dbd0..5d4e08c29 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -29,30 +29,26 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Readline</title>
 
-<para>The following patch includes a fix for a problem where Readline sometimes
-only shows 33 characters on a line and then wraps to the next line. It also
-includes other fixes recommended by the Readline author.</para>
-
-<screen><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
-
 <para>Prepare Readline for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
 
 <para>Compile the package:</para>
 
-<screen><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
+<screen><userinput>make SHLIB_LIBS=-lncurses</userinput></screen>
 
 <para>The meaning of the make option:</para>
 
 <variablelist>
 <varlistentry>
-<term><parameter>SHLIB_XLDFLAGS=-lncurses</parameter></term>
+<term><parameter>SHLIB_LIBS=-lncurses</parameter></term>
 <listitem><para>This option forces Readline to link against the
 <filename class="libraryfile">libncurses</filename> library.</para></listitem>
 </varlistentry>
 </variablelist>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index 5102dd3e8..01c2a6d45 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -28,7 +28,7 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Texinfo</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Sed</title>
 
-<para>By default, Sed installs its man page in
+<para>By default, Sed installs its HTML documentation in
 <filename class="directory">/usr/share/doc</filename>.  Alter this to
 <filename class="directory">/usr/share/doc/sed-&sed-version;</filename> by
 applying the following <command>sed</command>:</para>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 2a4d39693..810c90c19 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -46,12 +46,14 @@ prior to building Shadow. Then add <parameter>--with-libcrack</parameter> to the
 <para>Disable the installation of the <command>groups</command> program and its man page, as Coreutils provides a better version:</para>
 
 <screen><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
-sed -i '/groups/d' man/Makefile</userinput></screen>
+find man -name Makefile -exec sed -i '/groups/d' {} \;</userinput></screen>
 
 <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 8c3db5c12..fb422e1c8 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -37,6 +37,8 @@ Sysklogd with Linux 2.6 series kernels</para>
 
 <screen><userinput>make</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 5e0accc4d..a322e69ec 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -46,6 +46,8 @@ instead:</para>
 
 <screen><userinput>make -C src</userinput></screen>
 
+<para>This package does not come with a test suite.</para>
+
 <para>Install the package:</para>
 
 <screen><userinput>make -C src install</userinput></screen>
diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml
index 128b13ccf..60322d2da 100644
--- a/chapter08/fstab.xml
+++ b/chapter08/fstab.xml
@@ -37,11 +37,6 @@ class="partition">hda5</filename>, and <systemitem
 class="filesystem">ext2</systemitem>. For details on the six
 fields in this file, see <command>man 5 fstab</command>.</para>
 
-<para>When using a journalling file system, the <parameter>1
-1</parameter> at the end of the line should be replaced with
-<parameter>0 0</parameter> because such a partition does not need to
-be dumped or checked.</para>
-
 <para>The <filename class="directory">/dev/shm</filename> mount point
 for <systemitem class="filesystem">tmpfs</systemitem> is included to
 allow enabling POSIX-shared memory. The kernel must have the required
diff --git a/general.ent b/general.ent
index dd7b8f81d..6bf0441dc 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "ALPHABETICAL-20051116">
-<!ENTITY releasedate "November 16, 2005">
+<!ENTITY version "ALPHABETICAL-20051216">
+<!ENTITY releasedate "December 16, 2005">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
@@ -28,8 +28,8 @@
 
 <!ENTITY autoconf-version "2.59">
 <!ENTITY automake-version "1.9.6">
-<!ENTITY bash-version "3.0">
-<!ENTITY bash-doc-version "3.0">
+<!ENTITY bash-version "3.1">
+<!ENTITY bash-doc-version "3.1">
 <!ENTITY binutils-version "2.16.1">
 <!ENTITY bison-version "2.1">
 <!ENTITY bzip2-version "1.0.3">
@@ -40,7 +40,7 @@
 <!ENTITY expect-version "5.43.0">
 <!ENTITY expect-lib-version "5.43">
 <!ENTITY file-version "4.16">
-<!ENTITY findutils-version "4.2.25">
+<!ENTITY findutils-version "4.2.27">
 <!ENTITY flex-version "2.5.31">
 <!ENTITY gawk-version "3.1.5">
 <!ENTITY gcc-version "4.0.2">
@@ -55,7 +55,7 @@
 <!ENTITY inetutils-version "1.4.2">
 <!ENTITY iproute2-version "051007">
 <!ENTITY kbd-version "1.12">
-<!ENTITY less-version "382">
+<!ENTITY less-version "394">
 <!ENTITY lfs-bootscripts-version "3.2.1">
 <!ENTITY libtool-version "1.5.20">
 <!ENTITY linux-version "2.6.12.5">
@@ -64,21 +64,21 @@
 <!ENTITY m4-version "1.4.4">
 <!ENTITY make-version "3.80">
 <!ENTITY man-version "1.6b">
-<!ENTITY man-pages-version "2.13">
+<!ENTITY man-pages-version "2.16">
 <!ENTITY mktemp-version "1.5">
-<!ENTITY module-init-tools-version "3.1">
+<!ENTITY module-init-tools-version "3.2.2">
 <!ENTITY ncurses-version "5.5">
 <!ENTITY patch-version "2.5.4">
 <!ENTITY perl-version "5.8.7">
 <!ENTITY procps-version "3.2.6">
 <!ENTITY psmisc-version "21.8">
-<!ENTITY readline-version "5.0">
+<!ENTITY readline-version "5.1">
 <!ENTITY sed-version "4.1.4">
 <!ENTITY shadow-version "4.0.13">
 <!ENTITY sysklogd-version "1.4.1">
 <!ENTITY sysvinit-version "2.86">
 <!ENTITY tar-version "1.15.1">
-<!ENTITY tcl-version "8.4.11">
+<!ENTITY tcl-version "8.4.12">
 <!ENTITY texinfo-version "4.8">
 <!ENTITY udev-version "071">
 <!ENTITY udev-config-file "udev-config-5.rules">
diff --git a/patches.ent b/patches.ent
index 70788e454..4d1331cd2 100644
--- a/patches.ent
+++ b/patches.ent
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch">
-<!ENTITY bash-avoid_WCONTINUED-patch "bash-&bash-version;-avoid_WCONTINUED-1.patch">
-
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
 
@@ -29,8 +26,6 @@
 
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
 
-<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-1.patch">
-
 <!ENTITY shadow-configure-patch "shadow-&shadow-version;-configure_fix-1.patch">
 
 <!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch">
@@ -38,6 +33,6 @@
 <!ENTITY tar-sparse_fix-patch "tar-&tar-version;-sparse_fix-1.patch">
 <!ENTITY tar-gcc4_fix-patch "tar-&tar-version;-gcc4_fix_tests-1.patch">
 
-<!ENTITY texinfo-tempfile_fix-patch "texinfo-&texinfo-version;-tempfile_fix-1.patch">
+<!ENTITY texinfo-tempfile_fix-patch "texinfo-&texinfo-version;-tempfile_fix-2.patch">
 
 <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">