diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 49877c044..3d009389e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,10 +42,10 @@ First a summary, then a detailed log.
-October 19, 2005 [manuel]: Updated the acknowledgements
-to current trunk version. Ported also some redaction changes in preface
-and chapter01 pages. Moved chapter02 to part II. Added -v
-switches.
+October 19, 2005 [manuel]: Updated the acknowledgements to
+current trunk version. Ported some redaction changes in preface and chapter01
+pages. Moved chapter02 to part II. Added -v switches. Ported several typos
+and redaction fixes from trunk
October 19, 2005 [manuel]: Updated the stylesheets, Makefile
and related files to current trunk versions.
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index b950a7e38..d5a044b4d 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -38,9 +38,9 @@ unset them when building Glibc.
the method suggested in this book puts the stability of the system at
risk.
-Glibc has two tests which fail when the running kernel is 2.6.11.x The
-problem has been determined to be with the tests themselves, not with the libc
-nor the kernel. If you plan to run the testsuite apply this patch:
+Glibc has two tests which fail when the running kernel is 2.6.11 or later.
+The problem has been determined to be with the tests themselves, not with the C
+library or the kernel. If you plan to run the testsuite apply this patch:
patch -Np1 -i ../&glibc-testfix-patch;
diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml
index 4438bd7a6..6f82905a1 100644
--- a/chapter05/introduction.xml
+++ b/chapter05/introduction.xml
@@ -25,10 +25,10 @@ host production directories. Since the packages compiled here are
temporary, we do not want them to pollute the soon-to-be LFS
system.
-Before issuing the build instructions for a package, the package
+Before issuing the build instructions for a package, the package
should be unpacked as user lfs, and a
cd into the created directory should be performed. The build
-instructions assume that the bash shell is in use.
+instructions assume that the bash shell is in use.
Several of the packages are patched before compilation, but only
when the patch is needed to circumvent a problem. A patch is often
@@ -46,13 +46,12 @@ deprecated, but not invalid, use of the C or C++ syntax. C standards
change fairly often, and some packages still use the older standard.
This is not a problem, but does prompt the warning.
-After installing each package, delete its source and build
+After installing each package, delete its source and build
directories, unless specifically instructed otherwise. Deleting the
-sources saves space and prevents mis-configuration when the same
-package is reinstalled later. Only three of the packages need to
-retain the source and build directories in order for their contents to
-be used by later commands. Pay special attention to these
-reminders.
+sources prevents mis-configuration when the same package is reinstalled later.
+Only three of the packages need to retain the source and build directories in
+order for their contents to be used by later commands. Pay special attention to
+these reminders.
Check one last time that the LFS environment
variable is set up properly:
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 07534395a..e70c37d63 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -49,7 +49,7 @@ following patch resolves this problem:
--with-installed-readline
-This options tells Bash to use the
+This option tells Bash to use the
readline library that is already installed
on the system rather than using its own readline version.
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index cf6f5a982..28c55e376 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -80,17 +80,19 @@ groups:
make install
-Move programs to the proper locations:
+Move programs to the locations specified by the FHS:
-mv -v /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin
-mv -v /usr/bin/{date,echo,false,head,hostname,install,ln} /bin
-mv -v /usr/bin/{ls,mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin
-mv -v /usr/bin/{sleep,stty,test,touch,true,uname} /bin
+mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin
+mv -v /usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,rm} /bin
+mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
mv -v /usr/bin/chroot /usr/sbin
-Finally, create a symlink to be FHS-compliant:
+Some of the scripts in the LFS-Bootscripts package depend on
+head and sleep. As
+/usr may not be available during the
+early stages of booting, those binaries need to be on the root partition:
-ln -sv ../../bin/install /usr/bin
+mv -v /usr/bin/{head,sleep} /bin
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 2290d4f3c..875111922 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -36,9 +36,16 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make and Sed
./configure --prefix=/usr --libexecdir=/usr/lib/locate \
--localstatedir=/var/lib/locate
-The localstatedir option above changes the
-location of the locate database to be in /var/lib/locate, which is FHS-compliant.
+The meaning of the configure options:
+
+
+
+--localstatedir
+This option changes the location of the locate
+database to be in /var/lib/locate, which
+is FHS-compliant.
+
+
Compile the package:
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index b1b94ee65..7d4b30796 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -85,7 +85,7 @@ chmod -v 755 /usr/bin/lex
Installed programs
Installed library
-flex, lex
+flex and lex
libfl.a
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 2dd8f475c..1730df998 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -123,7 +123,7 @@ zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew
zcat
-Uncompresses the given gzipped files to standard output
+Decompresses the given gzipped files to standard output
zcat
diff --git a/chapter06/linux-libc-headers.xml b/chapter06/linux-libc-headers.xml
index 06029e08b..4d5344cc3 100644
--- a/chapter06/linux-libc-headers.xml
+++ b/chapter06/linux-libc-headers.xml
@@ -70,7 +70,7 @@ find /usr/include/{asm,linux} -type f -exec chmod -v 644 {} \;
-The Linux headers API
+The Linux API headers
/usr/include/{asm,linux}/*.h
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 33f28574d..dc7b2158a 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -40,8 +40,9 @@ prepare Perl for compilation with:
-Dpager="/bin/less -isR"
-This corrects an error in the way that the perldoc
-command invokes the less program.
+This corrects an error in the way that
+perldoc invokes the less program.
+
diff --git a/chapter06/pwdgroup.xml b/chapter06/pwdgroup.xml
index 1390081e8..0975324c5 100644
--- a/chapter06/pwdgroup.xml
+++ b/chapter06/pwdgroup.xml
@@ -52,8 +52,8 @@ cdrom:x:15:
EOF
The created groups are not part of any standard—they are groups
-decided on in part by the requirements of the Udev configuration in the next
-section, and in part by common convention employed by a number of existing Linux
+decided on in part by the requirements of the Udev configuration in this
+chapter, and in part by common convention employed by a number of existing Linux
distributions. The Linux Standard Base (LSB, available at ) recommends only that, besides the group
root
with a Group ID (GID) of 0, a group bin
with
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index eaf6591a5..9dbac598e 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -33,8 +33,8 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed
./configure --libdir=/lib --enable-shared
-Remove the installation of the groups program, and its man page as
-Coreutils provides a better version:
+Disable the installation of the groups program and
+its man page, as Coreutils provides a better version:
sed -i 's/groups$(EXEEXT) //' src/Makefile
sed -i '/groups/d' man/Makefile
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 9fc61bde0..23fe0cdf3 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -144,7 +144,8 @@ device-independent file that can be printed
texi2pdf
-Create a PDF file from a Texinfo file.
+Used to format the given Texinfo document into a
+Portable Document Format (PDF) file
texi2pdf
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 74f7be6e3..0e25d6013 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -38,16 +38,14 @@ for suggested installation instructions.
First, unpack both
vim-&vim-version;.tar.bz2 and (optionally)
vim-&vim-version;-lang.tar.gz archives into the
-same directory. Then, change the default locations of the
-vimrc and gvimrc
-configuration files to vimrc configuration file to /etc:
-echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
-echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h
+echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
-Vim has a security vulnerability already addressed upstream. The
-following patch fixes the problem:
+Vim has two known security vulnerabilities that have already been
+addressed upstream. The following patch fixes the problems:
patch -Np1 -i ../&vim-security_fix-patch;
@@ -55,13 +53,19 @@ following patch fixes the problem:
./configure --prefix=/usr --enable-multibyte
-The optional but highly recommended
---enable-multibyte switch includes support for
-editing files in multibyte character encodings into
-vim. This is needed if using a locale with
-a multibyte character set. This switch is also helpful to be able to
-edit text files initially created in Linux distributions like Fedora
-Core that use UTF-8 as a default character set.
+The meaning of the configure options:
+
+
+
+--enable-multibyte
+This optional but highly recommended switch enables support for
+editing files in multibyte character encodings. This is needed if using a
+locale with a multibyte character set. This switch is also helpful to be able to
+edit text files initially created in Linux distributions like Fedora Core that
+use UTF-8 as a default character set.
+
+
+
Compile the package:
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 3b4b6acb5..fa35e20fc 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -92,7 +92,7 @@ make
libz
-Contains compression and un-compression
+Contains compression and decompression
functions used by some programs
libz
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index e785f4c02..62ccf9a5d 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -72,7 +72,7 @@ we do not recommend this option. It is often better to explore all the
configuration menus and create the kernel configuration from
scratch.
-NPTL requires the kernel to be compiled with GCC-3.x, in this case
+NPTL requires the kernel to be compiled with GCC-3.x or later, in this case
&gcc-version;. It is not recommended to compile the kernel with GCC-2.95.x, as
this causes failures in the Glibc test suite. Normally, this wouldn't be
mentioned as LFS doesn't build GCC-2.95.x. Unfortunately, the kernel