Automatic merge of trunk into multilib

bootscripts/ChangeLog

@@ -1135,7 +1135,7 @@ n/a - January 30, 2004:
 
    * Changed the loadkeys script to run "loadkeys -d" and removed the need
      for the /etc/sysconfig/keyboard file. The kbd patch fixes the
-     "loadkeys -d" behaviour.
+     "loadkeys -d" behavior.
 
 1.6 - February 26th, 2002:
 

chapter08/iproute2.xml

@@ -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>
@@ -136,19 +136,6 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
         </listitem>
       </varlistentry>
 
-      <varlistentry id="ifcfg">
-        <term><command>ifcfg</command></term>
-        <listitem>
-          <para>A shell script wrapper for the <command>ip</command> command
-          (Note that this script 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>
@@ -220,17 +207,6 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
         </listitem>
       </varlistentry>
 
-      <varlistentry id="routef">
-        <term><command>routef</command></term>
-        <listitem>
-          <para>A component of <command>ip route</command>, 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>
@@ -295,7 +271,6 @@ 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>
@@ -308,14 +283,12 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;</userinput></sc
           <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
-          data flow through a network</para>
-
           <para><command>tc filter</command> allows users to set up the QoS/CoS
           packet filtering</para>
-
+        
-          <para><command>tc policy</command> allows users to set up the QoS/CoS
+          <para><command>tc monitor</command> can be used to view changes
-          policies</para>
+          made to Traffic Control in the kernel.</para>
+          
           <indexterm zone="ch-system-iproute2 ss">
             <primary sortas="b-tc">tc</primary>
           </indexterm>

chapter08/kbd.xml

@@ -41,7 +41,7 @@
   <sect2 role="installation">
     <title>Installation of Kbd</title>
 
-    <para>The behaviour of the backspace and delete keys is not consistent
+    <para>The behavior of the backspace and delete keys is not consistent
     across the keymaps in the Kbd package. The following patch fixes this
     issue for i386 keymaps:</para>