Ported several typos and redaction fixes from trunk.

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

12 files changed, 51 insertions, 36 deletions

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:</para>
 <variablelist>
 <varlistentry>
 <term><parameter>--with-installed-readline</parameter></term>
-<listitem><para>This options tells Bash to use the
+<listitem><para>This option tells Bash to use the
 <filename class="libraryfile">readline</filename> library that is already installed
 on the system rather than using its own readline version.</para></listitem>
 </varlistentry>
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:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Move programs to the proper locations:</para>
+<para>Move programs to the locations specified by the FHS:</para>
 
-<screen><userinput>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
+<screen><userinput>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</userinput></screen>
 
-<para>Finally, create a symlink to be FHS-compliant:</para>
+<para>Some of the scripts in the LFS-Bootscripts package depend on
+<command>head</command> and <command>sleep</command>.  As
+<filename class="directory">/usr</filename> may not be available during the
+early stages of booting, those binaries need to be on the root partition:</para>
 
-<screen><userinput>ln -sv ../../bin/install /usr/bin</userinput></screen>
+<screen><userinput>mv -v /usr/bin/{head,sleep} /bin</userinput></screen>
 
 </sect2>
 
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</seg></seglistitem>
 <screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \
     --localstatedir=/var/lib/locate</userinput></screen>
 
-<para>The <parameter>localstatedir</parameter> option above changes the
-location of the <command>locate</command> database to be in <filename
-class="directory">/var/lib/locate</filename>, which is FHS-compliant.</para>
+<para>The meaning of the configure options:</para>
+
+<variablelist>
+<varlistentry>
+<term><parameter>--localstatedir</parameter></term>
+<listitem><para>This option changes the location of the <command>locate</command>
+database to be in <filename class="directory">/var/lib/locate</filename>, which
+is FHS-compliant.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
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</userinput></screen>
 <segmentedlist>
 <segtitle>Installed programs</segtitle>
 <segtitle>Installed library</segtitle>
-<seglistitem><seg>flex, lex</seg>
+<seglistitem><seg>flex and lex</seg>
 <seg>libfl.a</seg></seglistitem>
 </segmentedlist>
 
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</seg></seglistitem>
 <varlistentry id="zcat">
 <term><command>zcat</command></term>
 <listitem>
-<para>Uncompresses the given gzipped files to standard output</para>
+<para>Decompresses the given gzipped files to standard output</para>
 <indexterm zone="ch-system-gzip zcat"><primary sortas="b-zcat">zcat</primary></indexterm>
 </listitem>
 </varlistentry>
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 {} \;</userinput></scre
 <varlistentry id="linux-libc-headers">
 <term><filename class="headerfile">/usr/include/{asm,linux}/*.h</filename></term>
 <listitem>
-<para>The Linux headers API</para>
+<para>The Linux API headers</para>
 <indexterm zone="ch-system-linux-libc-headers linux-libc-headers"><primary sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary></indexterm>
 </listitem>
 </varlistentry>
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:</para>
 <variablelist>
 <varlistentry>
 <term><parameter>-Dpager="/bin/less -isR"</parameter></term>
-<listitem><para>This corrects an error in the way that the <command>perldoc</command>
-command invokes the <command>less</command> program.</para></listitem>
+<listitem><para>This corrects an error in the way that
+<command>perldoc</command> invokes the <command>less</command> program.</para>
+</listitem>
 </varlistentry>
 </variablelist>
 
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:</literal>
 EOF</userinput></screen>
 
 <para>The created groups are not part of any standard&mdash;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 <ulink
 url="http://www.linuxbase.org"/>) recommends only that, besides the group
 <quote>root</quote> with a Group ID (GID) of 0, a group <quote>bin</quote> 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</seg></seglistitem>
 
 <screen><userinput>./configure --libdir=/lib --enable-shared</userinput></screen>
 
-<para>Remove the installation of the <command>groups</command> program, and its man page as
-Coreutils provides a better version:</para>
+<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>
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</para>
 <varlistentry id="texi2pdf">
 <term><command>texi2pdf</command></term>
 <listitem>
-<para>Create a PDF file from a Texinfo file.</para>
+<para>Used to format the given Texinfo document into a
+Portable Document Format (PDF) file</para>
 <indexterm zone="ch-system-texinfo texi2pdf"><primary sortas="b-texi2pdf">texi2pdf</primary></indexterm>
 </listitem>
 </varlistentry>
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.</para>
 <para>First, unpack both
 <filename>vim-&vim-version;.tar.bz2</filename> and (optionally)
 <filename>vim-&vim-version;-lang.tar.gz</filename> archives into the
-same directory. Then, change the default locations of the
-<filename>vimrc</filename> and <filename>gvimrc</filename>
-configuration files to <filename
+same directory. Then, change the default location of the
+<filename>vimrc</filename> configuration file to <filename
 class="directory">/etc</filename>:</para>
 
-<screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h
-echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' &gt;&gt; src/feature.h</userinput></screen>
+<screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
 
-<para>Vim has a security vulnerability already addressed upstream.  The
-following patch fixes the problem:</para>
+<para>Vim has two known security vulnerabilities that have already been
+addressed upstream.  The following patch fixes the problems:</para>
 
 <screen><userinput>patch -Np1 -i ../&vim-security_fix-patch;</userinput></screen>
 
@@ -55,13 +53,19 @@ following patch fixes the problem:</para>
 
 <screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
 
-<para>The optional but highly recommended
-<parameter>--enable-multibyte</parameter> switch includes support for
-editing files in multibyte character encodings into
-<command>vim</command>.  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.</para>
+<para>The meaning of the configure options:</para>
+
+<variablelist>
+<varlistentry>
+<term><parameter>--enable-multibyte</parameter></term>
+<listitem><para>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.</para>
+</listitem>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
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</userinput></screen>
 <varlistentry id="libz">
 <term><filename class="libraryfile">libz</filename></term>
 <listitem>
-<para>Contains compression and un-compression
+<para>Contains compression and decompression
 functions used by some programs</para>
 <indexterm zone="ch-system-zlib libz"><primary sortas="c-libz">libz</primary></indexterm>
 </listitem>