Merge remote-tracking branch 'origin/trunk' into xry111/clfs-ng

chapter08/coreutils.xml

@@ -368,7 +368,7 @@ sed -i 's/"1"/"8"/' /usr/share/man/man8/chroot.8</userinput></screen>
       <varlistentry id="date">
         <term><command>date</command></term>
         <listitem>
-          <para>Displays the current dae and time in the given format, or sets the
+          <para>Displays the current date and time in the given format, or sets the
           system date and time</para>
           <indexterm zone="ch-system-coreutils date">
             <primary sortas="b-date">date</primary>

chapter08/diffutils.xml

@@ -79,8 +79,7 @@
       <varlistentry id="cmp">
         <term><command>cmp</command></term>
         <listitem>
-          <para>Compares two files and reports whether or in which bytes they
+          <para>Compares two files and reports any differences byte by byte</para>
-          differ</para>
           <indexterm zone="ch-system-diffutils cmp">
             <primary sortas="b-cmp">cmp</primary>
           </indexterm>

chapter08/findutils.xml

@@ -23,10 +23,12 @@
   <sect2 role="package">
     <title/>
 
-    <para>The Findutils package contains programs to find files. These programs
+    <para>The Findutils package contains programs to find files. Programs
-    are provided to recursively search through a directory tree and to
+    are provided to search through all the files in a directory tree and to
     create, maintain, and search a database (often faster than the recursive
-    find, but is unreliable if the database has not been recently updated).</para>
+    find, but unreliable unless the database has been updated recently).
+    Findutils also supplies the <command>xargs</command> program, which
+    can be used to run a specified command on each file selected by a search.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -63,9 +65,9 @@ esac</userinput></screen>
       <varlistentry>
         <term><parameter>--localstatedir</parameter></term>
         <listitem>
-          <para>This option changes the location of the <command>locate</command>
+          <para>This option moves the <command>locate</command>
-          database to be in <filename class="directory">/var/lib/locate</filename>,
+          database to <filename class="directory">/var/lib/locate</filename>,
-          which is FHS-compliant.</para>
+          which is the FHS-compliant location.</para>
         </listitem>
       </varlistentry>
 

chapter08/groff.xml

@@ -24,7 +24,7 @@
     <title/>
 
     <para>The Groff package contains programs for processing and formatting
-    text.</para>
+    text and images.</para>
 
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
@@ -168,7 +168,7 @@
       <varlistentry id="gperl">
         <term><command>gperl</command></term>
         <listitem>
-          <para>Preprocesor for groff, allowing addition of perl code
+          <para>Preprocesor for groff, allowing the insertion of perl code
           into groff files</para>
           <indexterm zone="ch-system-groff gperl">
             <primary sortas="b-gperl">gperl</primary>
@@ -179,8 +179,8 @@
       <varlistentry id="gpinyin">
         <term><command>gpinyin</command></term>
         <listitem>
-          <para>Preprocesor for groff, allowing addition of Chinese
+          <para>Preprocesor for groff, allowing the insertion of Pinyin
-          European-like language Pinyin into groff files.</para>
+          (Mandarin Chinese spelled with the Roman alphabet) into groff files.</para>
           <indexterm zone="ch-system-groff gpinyin">
             <primary sortas="b-gpinyin">gpinyin</primary>
           </indexterm>
@@ -190,7 +190,8 @@
       <varlistentry id="grap2graph">
         <term><command>grap2graph</command></term>
         <listitem>
-          <para>Converts a grap diagram into a cropped bitmap image</para>
+          <para>Converts a grap program file into a cropped bitmap image
+          (grap is an old Unix programming language for creating diagrams)</para>
           <indexterm zone="ch-system-groff grap2graph">
             <primary sortas="b-grap2graph">grap2graph</primary>
           </indexterm>
@@ -211,7 +212,7 @@
         <term><command>grodvi</command></term>
         <listitem>
           <para>A driver for <command>groff</command> that produces TeX dvi
-          format</para>
+          format output files</para>
           <indexterm zone="ch-system-groff grodvi">
             <primary sortas="b-grodvi">grodvi</primary>
           </indexterm>
@@ -221,7 +222,7 @@
       <varlistentry id="groff">
         <term><command>groff</command></term>
         <listitem>
-          <para>A front-end to the groff document formatting system; normally, it
+          <para>A front end to the groff document formatting system; normally, it
           runs the <command>troff</command> program and a post-processor
           appropriate for the selected device</para>
           <indexterm zone="ch-system-groff groff">

chapter08/grub.xml

@@ -44,9 +44,9 @@
       <para>
         If your system has UEFI support and you wish to boot LFS with UEFI,
         you can skip this package in LFS,
-        and install GRUB with UEFI support (and its dependencies) following
+        and install GRUB with UEFI support (and its dependencies) by following
-        <ulink url="&blfs-book;postlfs/grub-efi.html">the BLFS page</ulink>
+        the instructions on
-        at the end of this chapter.
+        <ulink url="&blfs-book;postlfs/grub-efi.html">the BLFS page</ulink>.
       </para>
     </note>
 
@@ -56,9 +56,9 @@
       <screen><userinput remap='pre'>unset {C,CPP,CXX,LD}FLAGS</userinput></screen>
 
       <para>Don't try <quote>tuning</quote> this package with custom
-      compilation flags: this package is a bootloader, with low-level
+      compilation flags. This package is a bootloader. The low-level
-      operations in the source code which is likely to be broken by some
+      operations in the source code may be broken by
-      aggressive optimizations.</para>
+      aggressive optimization.</para>
     </warning>
 
     <para>Prepare GRUB for compilation:</para>
@@ -75,7 +75,7 @@
         <term><parameter>--disable-werror</parameter></term>
         <listitem>
           <para>This allows the build to complete with warnings introduced
-          by more recent Flex versions.</para>
+          by more recent versions of Flex.</para>
         </listitem>
       </varlistentry>
 
@@ -83,7 +83,7 @@
         <term><parameter>--disable-efiemu</parameter></term>
         <listitem>
           <para>This option minimizes what is built by disabling a feature and
-          testing programs not needed for LFS.</para>
+          eliminating some test programs not needed for LFS.</para>
         </listitem>
       </varlistentry>
 
@@ -102,7 +102,7 @@
 <screen><userinput remap="install">make install
 mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userinput></screen>
 
-  <para>Using GRUB to make your LFS system bootable will be discussed in
+  <para>Making your LFS system bootable with GRUB will be discussed in
   <xref linkend="ch-bootable-grub"/>.</para>
 
   </sect2>
@@ -138,7 +138,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-bios-setup">
         <term><command>grub-bios-setup</command></term>
         <listitem>
-          <para>Is a helper program for grub-install</para>
+          <para>Is a helper program for <command>grub-install</command></para>
           <indexterm zone="ch-system-grub grub-bios-setup">
             <primary sortas="b-grub-bios-setup">grub-bios-setup</primary>
           </indexterm>
@@ -148,7 +148,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-editenv">
         <term><command>grub-editenv</command></term>
         <listitem>
-          <para>A tool to edit the environment block</para>
+          <para>Is a tool to edit the environment block</para>
           <indexterm zone="ch-system-grub grub-editenv">
             <primary sortas="b-grub-editenv">grub-editenv</primary>
           </indexterm>
@@ -158,7 +158,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-file">
         <term><command>grub-file</command></term>
         <listitem>
-          <para>Checks if FILE is of the specified type.</para>
+          <para>Checks to see if the given file is of the specified type</para>
           <indexterm zone="ch-system-grub grub-file">
             <primary sortas="b-grub-file">grub-file</primary>
           </indexterm>
@@ -168,7 +168,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-fstest">
         <term><command>grub-fstest</command></term>
         <listitem>
-          <para>Tool to debug the filesystem driver</para>
+          <para>Is a tool to debug the filesystem driver</para>
           <indexterm zone="ch-system-grub grub-fstest">
             <primary sortas="b-grub-fstest">grub-fstest</primary>
           </indexterm>
@@ -178,7 +178,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-glue-efi">
         <term><command>grub-glue-efi</command></term>
         <listitem>
-          <para>Glue 32-bit and 64-bit binary into Apple universal one.</para>
+          <para>Glues 32-bit and 64-bit binaries into a single file (for Apple machines)</para>
           <indexterm zone="ch-system-grub grub-glue-efi">
             <primary sortas="b-grub-glue-efi">grub-glue-efi</primary>
           </indexterm>
@@ -188,7 +188,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-install">
         <term><command>grub-install</command></term>
         <listitem>
-          <para>Install GRUB on your drive</para>
+          <para>Installs GRUB on your drive</para>
           <indexterm zone="ch-system-grub grub-install">
             <primary sortas="b-grub-install">grub-install</primary>
           </indexterm>
@@ -198,7 +198,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-kbdcomp">
         <term><command>grub-kbdcomp</command></term>
         <listitem>
-          <para>Script that converts an xkb layout into one recognized by
+          <para>Is a script that converts an xkb layout into one recognized by
           GRUB</para>
           <indexterm zone="ch-system-grub grub-kbdcomp">
             <primary sortas="b-grub-kbdcomp">grub-kbdcomp</primary>
@@ -209,7 +209,8 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-macbless">
         <term><command>grub-macbless</command></term>
         <listitem>
-          <para>Mac-style bless on HFS or HFS+ files</para>
+          <para>Is the Mac-style bless for HFS or HFS+ file systems (<command>bless</command>
+          is peculiar to Apple machines; it makes a device bootable)</para>
           <indexterm zone="ch-system-grub grub-macbless">
             <primary sortas="b-grub-macbless">grub-macbless</primary>
           </indexterm>
@@ -230,7 +231,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-mkconfig">
         <term><command>grub-mkconfig</command></term>
         <listitem>
-          <para>Generate a grub config file</para>
+          <para>Generates a <filename>grub.cfg</filename> file</para>
           <indexterm zone="ch-system-grub grub-mkconfig">
             <primary sortas="b-grub-mkconfig">grub-mkconfig</primary>
           </indexterm>
@@ -240,7 +241,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-mkimage">
         <term><command>grub-mkimage</command></term>
         <listitem>
-          <para>Make a bootable image of GRUB</para>
+          <para>Makes a bootable image of GRUB</para>
           <indexterm zone="ch-system-grub grub-mkimage">
             <primary sortas="b-grub-mkimage">grub-mkimage</primary>
           </indexterm>
@@ -291,7 +292,8 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-mkrescue">
         <term><command>grub-mkrescue</command></term>
         <listitem>
-          <para>Make a bootable image of GRUB suitable for a floppy disk or CDROM/DVD</para>
+          <para>Makes a bootable image of GRUB suitable for a floppy disk,
+          CDROM/DVD, or a USB drive</para>
           <indexterm zone="ch-system-grub grub-mkrescue">
             <primary sortas="b-grub-mkrescue">grub-mkrescue</primary>
           </indexterm>
@@ -311,7 +313,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-ofpathname">
         <term><command>grub-ofpathname</command></term>
         <listitem>
-          <para>Is a helper program that prints the path of a GRUB device</para>
+          <para>Is a helper program that prints the path to a GRUB device</para>
           <indexterm zone="ch-system-grub grub-ofpathname">
             <primary sortas="b-grub-ofpathname">grub-ofpathname</primary>
           </indexterm>
@@ -321,7 +323,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-probe">
         <term><command>grub-probe</command></term>
         <listitem>
-          <para>Probe device information for a given path or device</para>
+          <para>Probes device information for a given path or device</para>
           <indexterm zone="ch-system-grub grub-probe">
             <primary sortas="b-grub-probe">grub-probe</primary>
           </indexterm>
@@ -341,7 +343,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-render-label">
         <term><command>grub-render-label</command></term>
         <listitem>
-          <para>Render Apple .disk_label for Apple Macs</para>
+          <para>Renders Apple .disk_label for Apple Macs</para>
           <indexterm zone="ch-system-grub grub-render-label">
             <primary sortas="b-grub-render-label">grub-render-label</primary>
           </indexterm>
@@ -351,7 +353,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-script-check">
         <term><command>grub-script-check</command></term>
         <listitem>
-          <para>Checks GRUB configuration script for syntax errors</para>
+          <para>Checks the GRUB configuration script for syntax errors</para>
           <indexterm zone="ch-system-grub grub-script-check">
             <primary sortas="b-grub-script-check">grub-script-check</primary>
           </indexterm>
@@ -381,7 +383,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-syslinux2cfg">
         <term><command>grub-syslinux2cfg</command></term>
         <listitem>
-          <para>Transform a syslinux config file into grub.cfg format</para>
+          <para>Transforms a syslinux config file into grub.cfg format</para>
           <indexterm zone="ch-system-grub grub-syslinux2cfg">
             <primary sortas="b-grub-syslinux2cfg">grub-syslinux2cfg</primary>
           </indexterm>

chapter08/iproute2.xml

@@ -42,12 +42,12 @@
     <title>Installation of IPRoute2</title>
 
     <para>The <command>arpd</command> program included in this package will not
-    be built since it is dependent on Berkeley DB, which is not installed in
+    be built since it depends on Berkeley DB, which is not installed in
-    LFS. However, a directory for <command>arpd</command> and a man page will still
+    LFS. However, a directory and a man page for <command>arpd</command> will still
-    be installed. Prevent this by running the commands below.
+    be installed. Prevent this by running the commands shown below.
-    If the <command>arpd</command> binary is needed,
+    (If the <command>arpd</command> program is needed,
-    instructions for compiling Berkeley DB can be found in the BLFS Book at
+    instructions for compiling Berkeley DB can be found in the BLFS book at
-    <ulink url="&blfs-book;server/db.html"/>.
+    <ulink url="&blfs-book;server/db.html"/>.)
     </para>
 
 <screen><userinput remap="pre">sed -i /ARPD/d Makefile
@@ -93,8 +93,8 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>bridge, ctstat (link to lnstat), genl, ifcfg, ifstat, ip, lnstat,
+        <seg>bridge, ctstat (link to lnstat), genl, ifstat, ip, lnstat,
-        nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
+        nstat, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
         and tc</seg>
         <seg>/etc/iproute2, /usr/lib/tc, and /usr/share/doc/iproute2-&iproute2-version;
         </seg>
@@ -129,31 +129,18 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
       <varlistentry id="genl">
         <term><command>genl</command></term>
         <listitem>
-          <para>Generic netlink utility frontend</para>
+          <para>Generic netlink utility front end</para>
           <indexterm zone="ch-system-iproute2 genl">
             <primary sortas="b-genl">genl</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="ifcfg">
-        <term><command>ifcfg</command></term>
-        <listitem>
-          <para>A shell script wrapper for the <command>ip</command> command
-          [Note that it requires the <command>arping</command> and
-          <command>rdisk</command> programs from the
-          iputils package found at <ulink url="http://www.skbuff.net/iputils/"/>.]</para>
-          <indexterm zone="ch-system-iproute2 ifcfg">
-            <primary sortas="b-ifcfg">ifcfg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="ifstat">
         <term><command>ifstat</command></term>
         <listitem>
-          <para>Shows the interface statistics, including the amount of
+          <para>Shows interface statistics, including the number of
-          transmitted and received packets by interface</para>
+          packets transmitted and received, by interface</para>
           <indexterm zone="ch-system-iproute2 ifstat">
             <primary sortas="b-ifstat">ifstat</primary>
           </indexterm>
@@ -163,7 +150,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
       <varlistentry id="ip">
         <term><command>ip</command></term>
         <listitem>
-          <para>The main executable. It has several different functions:</para>
+          <para>The main executable. It has several different functions, including these:</para>
 
           <para><command>ip link <replaceable>&lt;device&gt;</replaceable></command>
           allows users to look at the state of devices and to make changes</para>
@@ -213,28 +200,17 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
       <varlistentry id="nstat">
         <term><command>nstat</command></term>
         <listitem>
-          <para>Shows network statistics</para>
+          <para>Displays network statistics</para>
           <indexterm zone="ch-system-iproute2 nstat">
             <primary sortas="b-nstat">nstat</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="routef">
-        <term><command>routef</command></term>
-        <listitem>
-          <para>A component of <command>ip route</command>. This is for flushing
-          the routing tables</para>
-          <indexterm zone="ch-system-iproute2 routef">
-            <primary sortas="b-routef">routef</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="routel">
         <term><command>routel</command></term>
         <listitem>
-          <para>A component of <command>ip route</command>. This is for listing
+          <para>A component of <command>ip route</command>, for listing
           the routing tables</para>
           <indexterm zone="ch-system-iproute2 routel">
             <primary sortas="b-routel">routel</primary>
@@ -266,7 +242,7 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
       <varlistentry id="rtpr">
         <term><command>rtpr</command></term>
         <listitem>
-          <para>Converts the output of <command>ip -o</command> back into a
+          <para>Converts the output of <command>ip -o</command> into a
           readable form</para>
           <indexterm zone="ch-system-iproute2 rtpr">
             <primary sortas="b-rtpr">rtpr</primary>
@@ -295,25 +271,26 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
         </listitem>
       </varlistentry>
 
+      <!-- FixMe These options don't match tc -help screen -->
       <varlistentry id="tc">
         <term><command>tc</command></term>
         <listitem>
-          <para>Traffic Controlling Executable; this is for Quality Of Service
+          <para>Traffic control for Quality of Service
-          (QOS) and Class Of Service (COS) implementations</para>
+          (QoS) and Class of Service (CoS) implementations</para>
 
-          <para><command>tc qdisc</command> allows users to setup the queueing
+          <para><command>tc qdisc</command> allows users to set up the queueing
           discipline</para>
 
-          <para><command>tc class</command> allows users to setup classes based
+          <para><command>tc class</command> allows users to set up classes based
           on the queuing discipline scheduling</para>
 
           <para><command>tc estimator</command> allows users to estimate the
-          network flow into a network</para>
+          data flow through a network</para>
 
-          <para><command>tc filter</command> allows users to setup the QOS/COS
+          <para><command>tc filter</command> allows users to set up the QoS/CoS
           packet filtering</para>
 
-          <para><command>tc policy</command> allows users to setup the QOS/COS
+          <para><command>tc policy</command> allows users to set up the QoS/CoS
           policies</para>
           <indexterm zone="ch-system-iproute2 ss">
             <primary sortas="b-tc">tc</primary>

chapter08/m4.xml

@@ -89,7 +89,7 @@ echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
           <command>m4</command> has built-in functions for including named
           files, running Unix commands, performing integer arithmetic,
           manipulating text, recursion, etc. The <command>m4</command> program
-          can be used either as a front-end to a compiler or as a macro processor
+          can be used either as a front end to a compiler or as a macro processor
           in its own right</para>
           <indexterm zone="ch-system-m4 m4">
             <primary sortas="b-m4">m4</primary>