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

1 files changed, 24 insertions, 50 deletions

diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml
index 25e7e81be..bfc25331a 100644
--- a/chapter08/iproute2.xml
+++ b/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
-    LFS. However, a directory for <command>arpd</command> and a man page will still
-    be installed. Prevent this by running the commands below.
-    If the <command>arpd</command> binary is needed,
-    instructions for compiling Berkeley DB can be found in the BLFS Book at
-    <ulink url="&blfs-book;server/db.html"/>.
+    be built since it depends on Berkeley DB, which is not installed in
+    LFS. However, a directory and a man page for <command>arpd</command> will still
+    be installed. Prevent this by running the commands shown below.
+    (If the <command>arpd</command> program is needed,
+    instructions for compiling Berkeley DB can be found in the BLFS book at
+    <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,
-        nstat, routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
+        <seg>bridge, ctstat (link to lnstat), genl, ifstat, ip, lnstat,
+        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
-          transmitted and received packets by interface</para>
+          <para>Shows interface statistics, including the number of
+          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>
@@ -298,23 +274,21 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
       <varlistentry id="tc">
         <term><command>tc</command></term>
         <listitem>
-          <para>Traffic Controlling Executable; this is for Quality Of Service
-          (QOS) and Class Of Service (COS) implementations</para>
+          <para>Traffic control for Quality of Service
+          (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>
-
-          <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
-          policies</para>
+        
+          <para><command>tc monitor</command> can be used to view changes
+          made to Traffic Control in the kernel.</para>
+          
           <indexterm zone="ch-system-iproute2 ss">
             <primary sortas="b-tc">tc</primary>
           </indexterm>