Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

13 files changed, 149 insertions, 125 deletions

diff --git a/chapter08/aboutdebug.xml b/chapter08/aboutdebug.xml
index d646b797e..e9b90d64b 100644
--- a/chapter08/aboutdebug.xml
+++ b/chapter08/aboutdebug.xml
@@ -17,8 +17,8 @@
   the debugger can provide not only memory addresses, but also
   the names of the routines and variables.</para>
 
-  <para>However, the inclusion of these debugging symbols enlarges a
-  program or library significantly. The following is an example of the
+  <para>The inclusion of these debugging symbols enlarges a
+  program or library significantly. Here are two examples of the
   amount of space these symbols occupy:</para>
 
   <itemizedlist>
@@ -28,7 +28,7 @@
     </listitem>
     <listitem>
       <para>A <command>bash</command> binary without debugging symbols:
-      480 KB</para>
+      480 KB (60% smaller)</para>
     </listitem>
     <listitem>
       <para>Glibc and GCC files (<filename class="directory">/lib</filename>
@@ -36,15 +36,14 @@
       symbols: 87 MB</para>
     </listitem>
     <listitem>
-      <para>Glibc and GCC files without debugging symbols: 16 MB</para>
+      <para>Glibc and GCC files without debugging symbols: 16 MB (82% smaller)</para>
     </listitem>
   </itemizedlist>
 
-  <para>Sizes may vary depending on which compiler and C library were used,
-  but when comparing programs with and without debugging symbols, the
-  difference will usually be a factor between two and five.</para>
-
-  <para>Because most users will never use a debugger on their system software,
+  <para>Sizes will vary depending on which compiler and C library were used,
+  but a program that has been stripped of debugging symbols is usually some
+  50% to 80% smaller than its unstripped counterpart.
+  Because most users will never use a debugger on their system software,
   a lot of disk space can be regained by removing these symbols. The next
   section shows how to strip all debugging symbols from the programs and
   libraries.</para>
diff --git a/chapter08/cleanup.xml b/chapter08/cleanup.xml
index c55b7af2f..daa38f597 100644
--- a/chapter08/cleanup.xml
+++ b/chapter08/cleanup.xml
@@ -10,16 +10,16 @@
 
   <title>Cleaning Up</title>
 
-  <para>Finally, clean up some extra files left around from running tests:</para>
+  <para>Finally, clean up some extra files left over from running tests:</para>
 
 <screen><userinput>rm -rf /tmp/*</userinput></screen>
 
-  <para>There are also several files installed in the /usr/lib and /usr/libexec
+  <para>There are also several files in the /usr/lib and /usr/libexec
   directories with a file name extension of .la. These are "libtool archive"
-  files. As already said, on a modern Linux system the libtool .la files are
+  files. On a modern Linux system the libtool .la files are
   only useful for libltdl.  No libraries in LFS are expected to be loaded
-  by libltdl, and it's known that some .la files can cause BLFS packages
-  fail to build.  Remove those files now:</para>
+  by libltdl, and it's known that some .la files can break BLFS package
+  builds.  Remove those files now:</para>
 
 <screen><userinput>find /usr/lib /usr/libexec -name \*.la -delete</userinput></screen>
 
diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml
index 79fdc5f1f..bccf33227 100644
--- a/chapter08/e2fsprogs.xml
+++ b/chapter08/e2fsprogs.xml
@@ -23,7 +23,7 @@
   <sect2 role="package">
     <title/>
 
-    <para>The e2fsprogs package contains the utilities for handling the
+    <para>The E2fsprogs package contains the utilities for handling the
     <systemitem class="filesystem">ext2</systemitem> file system. It also
     supports the <systemitem class="filesystem">ext3</systemitem> and
     <systemitem class="filesystem">ext4</systemitem> journaling
@@ -44,13 +44,13 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
 
-    <para>The e2fsprogs documentation recommends that the package be built in
+    <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
 
 <screen><userinput remap="pre">mkdir -v build
 cd       build</userinput></screen>
 
-    <para>Prepare e2fsprogs for compilation:</para>
+    <para>Prepare E2fsprogs for compilation:</para>
 
 <screen><userinput remap="configure">../configure --prefix=/usr           \
              --sysconfdir=/etc       \
@@ -74,11 +74,11 @@ cd       build</userinput></screen>
       <varlistentry>
         <term><parameter>--disable-*</parameter></term>
         <listitem>
-          <para>This prevents e2fsprogs from building and installing the
+          <para>These prevent building and installing the
           <systemitem class="library">libuuid</systemitem> and
           <systemitem class="library">libblkid</systemitem> libraries, the
           <systemitem class="daemon">uuidd</systemitem> daemon, and the
-          <command>fsck</command> wrapper, as util-linux installs more
+          <command>fsck</command> wrapper; util-linux installs more
           recent versions.</para>
         </listitem>
       </varlistentry>
@@ -175,11 +175,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="chattr">
         <term><command>chattr</command></term>
         <listitem>
-          <para>Changes the attributes of files on an <systemitem
-          class="filesystem">ext2</systemitem> file system; it also
-          changes <systemitem class="filesystem">ext3</systemitem>
-          file systems, the journaling version of <systemitem
-          class="filesystem">ext2</systemitem> file systems</para>
+          <para>Changes the attributes of files on <systemitem
+          class="filesystem">ext{234}</systemitem> file systems</para>
           <indexterm zone="ch-system-e2fsprogs chattr">
             <primary sortas="b-chattr">chattr</primary>
           </indexterm>
@@ -202,8 +199,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <term><command>debugfs</command></term>
         <listitem>
           <para>A file system debugger; it can be used to examine and change
-          the state of an <systemitem class="filesystem">ext2</systemitem>
-          file system</para>
+          the state of <systemitem class="filesystem">ext{234}</systemitem>
+          file systems</para>
           <indexterm zone="ch-system-e2fsprogs debugfs">
             <primary sortas="b-debugfs">debugfs</primary>
           </indexterm>
@@ -234,9 +231,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="e2fsck">
         <term><command>e2fsck</command></term>
         <listitem>
-          <para>Is used to check, and optionally repair <systemitem
-          class="filesystem">ext2</systemitem> file systems and <systemitem
-          class="filesystem">ext3</systemitem> file systems</para>
+          <para>Is used to check and optionally repair <systemitem
+          class="filesystem">ext{234}</systemitem> file systems</para>
           <indexterm zone="ch-system-e2fsprogs e2fsck">
             <primary sortas="b-e2fsck">e2fsck</primary>
           </indexterm>
@@ -247,7 +243,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <term><command>e2image</command></term>
         <listitem>
           <para>Is used to save critical <systemitem
-          class="filesystem">ext2</systemitem> file system data to a file</para>
+          class="filesystem">ext{234}</systemitem> file system data to a file</para>
           <indexterm zone="ch-system-e2fsprogs e2image">
             <primary sortas="b-e2image">e2image</primary>
           </indexterm>
@@ -258,7 +254,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
         <term><command>e2label</command></term>
         <listitem>
           <para>Displays or changes the file system label on the <systemitem
-          class="filesystem">ext2</systemitem> file system present on a given
+          class="filesystem">ext{234}</systemitem> file system on a given
           device</para>
           <indexterm zone="ch-system-e2fsprogs e2label">
             <primary sortas="b-e2label">e2label</primary>
@@ -269,7 +265,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="e2mmpstatus">
         <term><command>e2mmpstatus</command></term>
         <listitem>
-          <para>Checks MMP status of an ext4 filesystem</para>
+          <para>Checks MMP (Multiple Mount Protection) status of an <systemitem
+          class="filesystem">ext4</systemitem> file system</para>
           <indexterm zone="ch-system-e2fsprogs e2mmpstatus">
             <primary sortas="b-e2mmpstatus">e2mmpstatus</primary>
           </indexterm>
@@ -279,7 +276,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="e2scrub">
         <term><command>e2scrub</command></term>
         <listitem>
-          <para>Checks the contents of a mounted ext[234] filesystem</para>
+          <para>Checks the contents of a mounted <systemitem
+              class="filesystem">ext{234}</systemitem> file system</para>
           <indexterm zone="ch-system-e2fsprogs e2scrub">
             <primary sortas="b-e2scrub">e2scrub</primary>
           </indexterm>
@@ -289,7 +287,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="e2scrub_all">
         <term><command>e2scrub_all</command></term>
         <listitem>
-          <para>Checks all mounted ext[234] filesystems for errors</para>
+          <para>Checks all mounted <systemitem class="filesystem">ext{234}</systemitem>
+          file systems for errors</para>
           <indexterm zone="ch-system-e2fsprogs e2scrub_all">
             <primary sortas="b-e2scrub_all">e2scrub_all</primary>
           </indexterm>
@@ -299,9 +298,10 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="e2undo">
         <term><command>e2undo</command></term>
         <listitem>
-          <para>Replays the undo log undo_log for an ext2/ext3/ext4 filesystem
-          found on a device [This can be used to undo a failed operation by an
-          e2fsprogs program.]</para>
+          <para>Replays the undo log for an <systemitem
+          class="filesystem">ext{234}</systemitem> file system
+          found on a device. [This can be used to undo a failed operation by an
+          E2fsprogs program.]</para>
           <indexterm zone="ch-system-e2fsprogs e2undo">
             <primary sortas="b-e2undo">e2undo</primary>
           </indexterm>
@@ -311,7 +311,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="e4crypt">
         <term><command>e4crypt</command></term>
         <listitem>
-          <para>Ext4 filesystem encryption utility</para>
+          <para><systemitem class="filesystem">Ext4</systemitem>
+          file system encryption utility</para>
           <indexterm zone="ch-system-e2fsprogs e4crypt">
             <primary sortas="b-e4crypt">e4crypt</primary>
           </indexterm>
@@ -321,7 +322,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="e4defrag">
         <term><command>e4defrag</command></term>
         <listitem>
-          <para>Online defragmenter for ext4 filesystems</para>
+          <para>Online defragmenter for <systemitem
+          class="filesystem">ext4</systemitem> file systems</para>
           <indexterm zone="ch-system-e2fsprogs e4defrag">
             <primary sortas="b-e4defrag">e4defrag</primary>
           </indexterm>
@@ -407,9 +409,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="mke2fs">
         <term><command>mke2fs</command></term>
         <listitem>
-          <para>Creates an <systemitem class="filesystem">ext2</systemitem>
-          or <systemitem class="filesystem">ext3</systemitem> file system on
-          the given device</para>
+          <para>Creates an <systemitem class="filesystem">ext{234}</systemitem>
+          file system on the given device</para>
           <indexterm zone="ch-system-e2fsprogs mke2fs">
             <primary sortas="b-mke2fs">mke2fs</primary>
           </indexterm>
@@ -452,8 +453,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="mklost-found">
         <term><command>mklost+found</command></term>
         <listitem>
-          <para>Used to create a <filename class="directory">lost+found</filename>
-          directory on an <systemitem class="filesystem">ext2</systemitem> file
+          <para>Creates a <filename class="directory">lost+found</filename>
+          directory on an <systemitem class="filesystem">ext{234}</systemitem> file
           system; it pre-allocates disk blocks to this directory to lighten the
           task of <command>e2fsck</command></para>
           <indexterm zone="ch-system-e2fsprogs mklost-found">
@@ -465,8 +466,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="resize2fs">
         <term><command>resize2fs</command></term>
         <listitem>
-          <para>Can be used to enlarge or shrink an <systemitem
-          class="filesystem">ext2</systemitem> file system</para>
+          <para>Can be used to enlarge or shrink <systemitem
+          class="filesystem">ext{234}</systemitem> file systems</para>
           <indexterm zone="ch-system-e2fsprogs resize2fs">
             <primary sortas="b-resize2fs">resize2fs</primary>
           </indexterm>
@@ -476,8 +477,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="tune2fs">
         <term><command>tune2fs</command></term>
         <listitem>
-          <para>Adjusts tunable file system parameters on an <systemitem
-          class="filesystem">ext2</systemitem> file system</para>
+          <para>Adjusts tunable file system parameters on <systemitem
+          class="filesystem">ext{234}</systemitem> file systems</para>
           <indexterm zone="ch-system-e2fsprogs tune2fs">
             <primary sortas="b-tune2fs">tune2fs</primary>
           </indexterm>
@@ -508,8 +509,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       <varlistentry id="libext2fs">
         <term><filename class="libraryfile">libext2fs</filename></term>
         <listitem>
-          <para>Contains routines to enable user-level programs to manipulate an
-          <systemitem class="filesystem">ext2</systemitem> file system</para>
+          <para>Contains routines to enable user-level programs to manipulate
+          <systemitem class="filesystem">ext{234}</systemitem> file systems</para>
           <indexterm zone="ch-system-e2fsprogs libext2fs">
             <primary sortas="c-libext2fs">libext2fs</primary>
           </indexterm>
diff --git a/chapter08/gawk.xml b/chapter08/gawk.xml
index 45a7444bf..192cc9f32 100644
--- a/chapter08/gawk.xml
+++ b/chapter08/gawk.xml
@@ -61,7 +61,7 @@
 <screen><userinput remap="install">make LN='ln -f' install</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the make environment variable:</title>
+      <title>The meaning of the overridden make variable:</title>
 
       <varlistentry>
         <term><envar>LN='ln -f'</envar></term>
@@ -88,7 +88,7 @@ cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>awk (link to gawk), gawk, and awk-&gawk-version;</seg>
+        <seg>awk (link to gawk), gawk, and gawk-&gawk-version;</seg>
         <seg>filefuncs.so, fnmatch.so, fork.so, inplace.so, intdiv.so, ordchr.so,
         readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so,
         and time.so (all in /usr/lib/gawk)</seg>
diff --git a/chapter08/libcap.xml b/chapter08/libcap.xml
index 89348db88..367e05c3f 100644
--- a/chapter08/libcap.xml
+++ b/chapter08/libcap.xml
@@ -23,7 +23,7 @@
   <sect2 role="package">
     <title/>
 
-    <para>The Libcap package implements the user-space interface to the POSIX
+    <para>The Libcap package implements the userspace interface to the POSIX
     1003.1e capabilities available in Linux kernels. These capabilities
     partition the all-powerful root privilege into a set of distinct
     privileges.</para>
diff --git a/chapter08/man-db.xml b/chapter08/man-db.xml
index 523962c9a..55559b1fa 100644
--- a/chapter08/man-db.xml
+++ b/chapter08/man-db.xml
@@ -77,7 +77,7 @@
       <varlistentry>
         <term><parameter>--enable-cache-owner=bin</parameter></term>
         <listitem>
-          <para>This makes the system-wide cache files be owned by user
+          <para>This changes ownership of the system-wide cache files to user
           <systemitem class="username">bin</systemitem>.</para>
         </listitem>
       </varlistentry>
diff --git a/chapter08/pkgmgt.xml b/chapter08/pkgmgt.xml
index d4b616bc7..8bf8dfdaa 100644
--- a/chapter08/pkgmgt.xml
+++ b/chapter08/pkgmgt.xml
@@ -55,7 +55,7 @@
         <para>If the Linux kernel needs to be upgraded (for example, from
         5.10.17 to 5.10.18 or 5.11.1), nothing else needs to be rebuilt.
         The system will keep working fine thanks to the well-defined interface
-        between the kernel and user space.  Specifically, Linux API headers
+        between the kernel and userspace.  Specifically, Linux API headers
         need not be (and should not be, see the next item) upgraded
         along with the kernel.  You will merely need to reboot your system to use the
         upgraded kernel.</para>
diff --git a/chapter08/procps.xml b/chapter08/procps.xml
index dbc78213c..e17d199ca 100644
--- a/chapter08/procps.xml
+++ b/chapter08/procps.xml
@@ -40,7 +40,7 @@
   <sect2 role="installation">
     <title>Installation of Procps-ng</title>
 
-    <para>Prepare procps-ng for compilation:</para>
+    <para>Prepare Procps-ng for compilation:</para>
 
 <screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr                           \
             --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
@@ -60,7 +60,7 @@
         <term><parameter>--disable-kill</parameter></term>
         <listitem>
           <para>This switch disables building the <command>kill</command>
-          command that will be installed by the Util-linux package.</para>
+          command; it will be installed from the Util-linux package.</para>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -181,7 +181,7 @@ make check</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="pwait">
+      <!-- <varlistentry id="pwait">
         <term><command>pwait</command></term>
         <listitem>
           <para>Waits for a process to finish before executing.</para>
@@ -189,7 +189,8 @@ make check</userinput></screen>
             <primary sortas="b-pwait">pwait</primary>
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> This program no longer exists; 
+      it's already been removed from the Installed programs list. -->
 
       <varlistentry id="pwdx">
         <term><command>pwdx</command></term>
diff --git a/chapter08/stripping.xml b/chapter08/stripping.xml
index d82b72ac1..eaabab5b7 100644
--- a/chapter08/stripping.xml
+++ b/chapter08/stripping.xml
@@ -12,39 +12,39 @@
 
   <para>This section is optional.  If the intended user is not a
   programmer and does not plan to do
-  any debugging on the system software, the system size can be decreased
-  by about 2 GB by removing the debugging symbols and unneeded symbol table
-  entries from binaries and libraries. This causes no inconvenience other
-  than not being able to debug the software fully anymore.</para>
+  any debugging of the system software, the system's size can be decreased
+  by some 2 GB by removing the debugging symbols, and some unnecessary symbol table
+  entries, from binaries and libraries. This causes no real inconvenience for
+  a typical Linux user.</para>
 
   <para>Most people who use the commands mentioned below do not
-  experience any difficulties. However, it is easy to make a typo and
-  render the new system unusable, so before running the
+  experience any difficulties. However, it is easy to make a mistake and
+  render the new system unusable. So before running the
   <command>strip</command> commands, it is a good idea to make a
   backup of the LFS system in its current state.</para>
 
-  <para>A <command>strip</command> command with
+  <para>A <command>strip</command> command with the
   <parameter>--strip-unneeded</parameter> option removes all debug symbols
-  from a binary or library.  And, it removes all symbol table entries not
+  from a binary or library.  It also removes all symbol table entries not
   needed by the linker (for static libraries) or dynamic linker (for
-  dynamic-linked binaries and shared libraries).</para>
+  dynamically linked binaries and shared libraries).</para>
 
-  <para>The debugging symbols for selected libraries are placed
-  in separate files.  This debugging information is needed if running
-  regression tests that use <ulink
+  <para>The debugging symbols from selected libraries are preserved
+  in separate files.  That debugging information is needed to run
+  regression tests with <ulink
   url='&blfs-book;/general/valgrind.html'>valgrind</ulink> or <ulink
-  url='&blfs-book;/general/gdb.html'>gdb</ulink> later in BLFS.
+  url='&blfs-book;/general/gdb.html'>gdb</ulink> later, in BLFS.
   </para>
 
   <para>Note that <command>strip</command> will overwrite the binary or library
   file it is processing.  This can crash the processes using code or data from
-  the file.  If the process running <command>strip</command> itself is
-  affected, the binary or library being stripped can be destroyed and can
-  make the system completely unusable.  To avoid it, we'll copy some libraries
+  the file.  If the process running <command>strip</command> is
+  affected, the binary or library being stripped can be destroyed; this can
+  make the system completely unusable.  To avoid this problem we copy some libraries
   and binaries into <filename class="directory">/tmp</filename>, strip them
-  there, and install them back with the <command>install</command> command.
-  Read the related entry in <xref linkend="pkgmgmt-upgrade-issues"/> for the
-  rationale to use the <command>install</command> command here.</para>
+  there, then reinstall them with the <command>install</command> command.
+  (The related entry in <xref linkend="pkgmgmt-upgrade-issues"/> gives the
+  rationale for using the <command>install</command> command here.)</para>
 
   <note><para>The ELF loader's name is ld-linux-x86-64.so.2 on 64-bit systems
   and ld-linux.so.2 on 32-bit systems.  The construct below selects the
@@ -111,8 +111,8 @@ done
 unset BIN LIB save_usrlib online_usrbin online_usrlib
 </userinput></screen>
 
-  <para>A large number of files will be reported as having their file
-  format not recognized. These warnings can be safely ignored. They
-  indicate that those files are scripts instead of binaries.</para>
+  <para>A large number of files will be flagged as errors because their file
+  format is not recognized. These warnings can be safely ignored. They
+  indicate that those files are scripts, not binaries.</para>
 
 </sect1>
diff --git a/chapter08/sysklogd.xml b/chapter08/sysklogd.xml
index 9aec7ba9b..89fc314ed 100644
--- a/chapter08/sysklogd.xml
+++ b/chapter08/sysklogd.xml
@@ -23,8 +23,8 @@
   <sect2 role="package">
     <title/>
 
-    <para>The sysklogd package contains programs for logging system messages,
-    such as those given by the kernel when unusual things happen.</para>
+    <para>The Sysklogd package contains programs for logging system messages,
+    such as those emitted by the kernel when unusual things happen.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -41,8 +41,8 @@
   <sect2 role="installation">
     <title>Installation of Sysklogd</title>
 
-    <para>First, fix problems that causes a segmentation fault under
-    some conditions in klogd and fix an obsolete program construct:</para>
+    <para>First, fix a problem that causes a segmentation fault in klogd
+    under some conditions, and fix an obsolete program construct:</para>
 
 <screen><userinput remap="pre">sed -i '/Error loading kernel symbols/{n;n;d}' ksym_mod.c
 sed -i 's/union wait/int/' syslogd.c</userinput></screen>
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 4548056ea..2c5c0e11b 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -40,11 +40,11 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
 
-<!--
-    <para>First, fix an issue introduced by glibc-2.36.</para>
+
+    <para>First, fix a security issue in systemd-coredump:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
--->
+
 
     <para>Remove two unneeded groups,
     <systemitem class="groupname">render</systemitem> and
diff --git a/chapter08/sysvinit.xml b/chapter08/sysvinit.xml
index 0d6914a45..7b31ec007 100644
--- a/chapter08/sysvinit.xml
+++ b/chapter08/sysvinit.xml
@@ -115,7 +115,7 @@
       <varlistentry id="fstab-decode">
         <term><command>fstab-decode</command></term>
         <listitem>
-          <para>Run a command with fstab-encoded arguments</para>
+          <para>Runs a command with fstab-encoded arguments</para>
           <indexterm zone="ch-system-sysvinit fstab-decode">
             <primary sortas="b-fstab-decode">fstab-decode</primary>
           </indexterm>
@@ -126,10 +126,10 @@
         <term><command>halt</command></term>
         <listitem>
           <para>Normally invokes <command>shutdown</command> with the
-          <parameter>-h</parameter> option, except when already in run-level 0,
-          then it tells the kernel to halt the system; it notes in the
-          file <filename>/var/log/wtmp</filename> that the system is being
-          brought down</para>
+          <parameter>-h</parameter> option, but when already in run-level 0,
+          it tells the kernel to halt the system; it notes in the
+          file <filename>/var/log/wtmp</filename> that the system is 
+          going down</para>
           <indexterm zone="ch-system-sysvinit halt-sysv">
             <primary sortas="b-halt">halt</primary>
           </indexterm>
@@ -140,8 +140,8 @@
         <term><command>init</command></term>
         <listitem>
           <para>The first process to be started when the kernel has initialized
-          the hardware which takes over the boot process and starts all the
-          proceses specified in its configuration file</para>
+          the hardware; it takes over the boot process and starts all the
+          processes specified in its configuration file</para>
           <indexterm zone="ch-system-sysvinit init-sysv">
             <primary sortas="b-init">init</primary>
           </indexterm>
@@ -152,7 +152,7 @@
         <term><command>killall5</command></term>
         <listitem>
           <para>Sends a signal to all processes, except the processes in its own
-          session so it will not kill its parent shell</para>
+          session; it will not kill its parent shell</para>
           <indexterm zone="ch-system-sysvinit killall5">
             <primary sortas="b-killall5">killall5</primary>
           </indexterm>
diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index 7648d2a7f..221743d3d 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -77,7 +77,7 @@
             --docdir=/usr/share/doc/util-linux-&util-linux-version;</userinput></screen>
 
     <para>The --disable and --without options prevent warnings about
-    building components that require packages not in LFS or are
+    building components that either require packages not in LFS, or are
     inconsistent with programs installed by other packages.</para>
 
     <para>Compile the package:</para>
@@ -92,7 +92,7 @@
     be available in the currently running system and must be built as a
     module.  Building it into the kernel will prevent booting.  For complete
     coverage, other BLFS packages must be installed.  If desired, this test can
-    be run after rebooting into the completed LFS system and running:</para>
+    be run by booting into the completed LFS system and running:</para>
 
 <screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen>
     </warning>
@@ -125,16 +125,17 @@ su tester -c "make -k check"</userinput></screen>
         <seg>addpart, agetty, blkdiscard, blkid, blkzone, blockdev, cal, cfdisk, chcpu,
         chmem, choom, chrt, col, colcrt, colrm, column, ctrlaltdel, delpart, dmesg,
         eject, fallocate, fdisk, fincore, findfs, findmnt, flock, fsck,
-        fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock,
-        i386, ionice, ipcmk, ipcrm, ipcs, irqtop, isosize, kill, last, lastb (link to
-        last), ldattach, linux32, linux64, logger, look, losetup, lsblk, lscpu,
-        lsipc, lsirq, lslocks, lslogins, lsmem, lsns, mcookie, mesg, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
+        fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hardlink, hexdump, hwclock,
+        i386 (link to setarch), ionice, ipcmk, ipcrm, ipcs, irqtop, isosize, kill, last, 
+        lastb (link to last), ldattach, linux32 (link to setarch), linux64 (link to setarch),
+        logger, look, losetup, lsblk, lscpu, lsipc, lsirq, lsfd, lslocks, lslogins,
+        lsmem, lsns, mcookie, mesg, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
         more, mount, mountpoint, namei, nsenter, partx, pivot_root, prlimit,
         readprofile, rename, renice, resizepart, rev, rfkill, rtcwake, script,
         scriptlive, scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
-        swapoff (link to swapon), swapon, switch_root, taskset, uclampset, ul,
-        umount, uname26, unshare, utmpdump, uuidd, uuidgen, uuidparse, wall, wdctl, whereis,
-        wipefs, x86_64, and zramctl</seg>
+        swapoff, swapon, switch_root, taskset, uclampset, ul,
+        umount, uname26 (link to setarch), unshare, utmpdump, uuidd, uuidgen, uuidparse,
+        wall, wdctl, whereis, wipefs, x86_64 (link to setarch), and zramctl</seg>
         <seg>libblkid.so, libfdisk.so, libmount.so,
         libsmartcols.so, and libuuid.so</seg>
         <seg>/usr/include/blkid,
@@ -197,7 +198,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="blkzone">
         <term><command>blkzone</command></term>
         <listitem>
-          <para>Runs zone command on the given block device</para>
+          <para>Is used to manage zoned storage block devices</para>
           <indexterm zone="ch-system-util-linux blkzone">
             <primary sortas="b-blkzone">blkzone</primary>
           </indexterm>
@@ -258,7 +259,8 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="choom">
         <term><command>choom</command></term>
         <listitem>
-          <para>Displays and adjusts OOM-killer score</para>
+          <para>Displays and adjusts OOM-killer scores, used to determine
+          which process to kill first when Linux is Out Of Memory</para>
           <indexterm zone="ch-system-util-linux choom">
             <primary sortas="b-choom">choom</primary>
           </indexterm>
@@ -390,7 +392,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="findfs">
         <term><command>findfs</command></term>
         <listitem>
-          <para>Finds a file system by label or Universally Unique Identifier
+          <para>Finds a file system, either by label or Universally Unique Identifier
           (UUID)</para>
           <indexterm zone="ch-system-util-linux findfs">
             <primary sortas="b-findfs">findfs</primary>
@@ -402,7 +404,7 @@ su tester -c "make -k check"</userinput></screen>
         <term><command>findmnt</command></term>
         <listitem>
           <para>Is a command line interface to the libmount library
-          for work with mountinfo, fstab and mtab files</para>
+          for working with mountinfo, fstab and mtab files</para>
           <indexterm zone="ch-system-util-linux findmnt">
             <primary sortas="b-findmnt">findmnt</primary>
           </indexterm>
@@ -482,12 +484,22 @@ su tester -c "make -k check"</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
+      
+      <varlistentry id="hardlink">
+        <term><command>hardlink</command></term>
+        <listitem>
+          <para>Consolidates duplicate files by creating hard links</para>
+          <indexterm zone="ch-system-util-linux hardlink">
+            <primary sortas="b-hardlink">hardlink</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="hexdump">
         <term><command>hexdump</command></term>
         <listitem>
-          <para>Dumps the given file in hexadecimal or in another given
-          format</para>
+          <para>Dumps the given file in hexadecimal, decimal, octal,
+          or ascii</para>
           <indexterm zone="ch-system-util-linux hexdump">
             <primary sortas="b-hexdump">hexdump</primary>
           </indexterm>
@@ -690,6 +702,16 @@ su tester -c "make -k check"</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
+      
+      <varlistentry id="lsfd">
+        <term><command>lsfd</command></term>
+        <listitem>
+          <para>Displays information about open files; replaces <command>lsof</command></para>
+          <indexterm zone="ch-system-util-linux lsfd">
+            <primary sortas="b-lsfd">lsfd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="lsipc">
         <term><command>lsipc</command></term>
@@ -861,7 +883,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="namei">
         <term><command>namei</command></term>
         <listitem>
-          <para>Shows the symbolic links in the given pathnames</para>
+          <para>Shows the symbolic links in the given paths</para>
           <indexterm zone="ch-system-util-linux namei">
             <primary sortas="b-namei">namei</primary>
           </indexterm>
@@ -903,7 +925,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="prlimit">
         <term><command>prlimit</command></term>
         <listitem>
-          <para>Get and set a process' resource limits</para>
+          <para>Gets and sets a process's resource limits</para>
           <indexterm zone="ch-system-util-linux prlimit">
             <primary sortas="b-prlimit">prlimit</primary>
           </indexterm>
@@ -974,7 +996,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="rtcwake">
         <term><command>rtcwake</command></term>
         <listitem>
-          <para>Used to enter a system sleep state until specified wakeup
+          <para>Used to enter a system sleep state until the specified wakeup
           time</para>
           <indexterm zone="ch-system-util-linux rtcwake">
             <primary sortas="b-rtcwake">rtcwake</primary>
@@ -995,7 +1017,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="scriptlive">
         <term><command>scriptlive</command></term>
         <listitem>
-          <para>Re-run session typescripts using timing information</para>
+          <para>Re-runs session typescripts using timing information</para>
           <indexterm zone="ch-system-util-linux scriptlive">
             <primary sortas="b-scriptlive">scriptlive</primary>
           </indexterm>
@@ -1015,7 +1037,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="setarch">
         <term><command>setarch</command></term>
         <listitem>
-          <para>Changes reported architecture in a new program environment and
+          <para>Changes reported architecture in a new program environment, and
           sets personality flags</para>
           <indexterm zone="ch-system-util-linux setarch">
             <primary sortas="b-setarch">setarch</primary>
@@ -1068,7 +1090,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="swaplabel">
         <term><command>swaplabel</command></term>
         <listitem>
-          <para>Allows to change swaparea UUID and label</para>
+          <para>Makes changes to the swap area's UUID and label</para>
           <indexterm zone="ch-system-util-linux swaplabel">
             <primary sortas="b-swaplabel">swaplabel</primary>
           </indexterm>
@@ -1088,7 +1110,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="swapon">
         <term><command>swapon</command></term>
         <listitem>
-          <para>Enables devices and files for paging and swapping and
+          <para>Enables devices and files for paging and swapping, and
           lists the devices and files currently in use</para>
           <indexterm zone="ch-system-util-linux swapon">
             <primary sortas="b-swapon">swapon</primary>
@@ -1109,7 +1131,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="taskset">
         <term><command>taskset</command></term>
         <listitem>
-          <para>Retrieves or sets a process' CPU affinity</para>
+          <para>Retrieves or sets a process's CPU affinity</para>
           <indexterm zone="ch-system-util-linux taskset">
             <primary sortas="b-taskset">taskset</primary>
           </indexterm>
@@ -1119,7 +1141,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="uclampset">
         <term><command>uclampset</command></term>
         <listitem>
-          <para>Manipulate the utilization clamping attributes of the
+          <para>Manipulates the utilization clamping attributes of the
           system or a process</para>
           <indexterm zone="ch-system-util-linux uclampset">
             <primary sortas="b-uclampset">uclampset</primary>
@@ -1171,7 +1193,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="utmpdump">
         <term><command>utmpdump</command></term>
         <listitem>
-          <para>Displays the content of the given login file in a more
+          <para>Displays the content of the given login file in a
           user-friendly format</para>
           <indexterm zone="ch-system-util-linux utmpdump">
             <primary sortas="b-utmpdump">utmpdump</primary>
@@ -1193,9 +1215,10 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="uuidgen">
         <term><command>uuidgen</command></term>
         <listitem>
-          <para>Creates new UUIDs. Each new UUID can reasonably be considered
+          <para>Creates new UUIDs. Each new UUID is a random number likely to be
           unique among all UUIDs created, on the local system and on other
-          systems, in the past and in the future</para>
+          systems, in the past and in the future, with extremely high
+          probability (~340 trillion trillion trillion unique UUIDs are possible)</para>
           <indexterm zone="ch-system-util-linux uuidgen">
             <primary sortas="b-uuidgen">uuidgen</primary>
           </indexterm>
@@ -1205,7 +1228,7 @@ su tester -c "make -k check"</userinput></screen>
       <varlistentry id="uuidparse">
         <term><command>uuidparse</command></term>
         <listitem>
-          <para>An utility to parse unique identifiers</para>
+          <para>A utility to parse unique identifiers</para>
           <indexterm zone="ch-system-util-linux uuidparse">
             <primary sortas="b-uuidparse">uuidparse</primary>
           </indexterm>
@@ -1237,7 +1260,7 @@ su tester -c "make -k check"</userinput></screen>
         <term><command>whereis</command></term>
         <listitem>
           <para>Reports the location of the binary, source, and man page
-          for the given command</para>
+          files for the given command</para>
           <indexterm zone="ch-system-util-linux whereis">
             <primary sortas="b-whereis">whereis</primary>
           </indexterm>