Changeset dc606d8 for chapter08

Timestamp:

12/12/2022 11:30:12 PM (17 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

b094e3f

Parents:

28a0e48 (diff), 4ecb5ad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Location:

chapter08

Files:

• iproute2.xml (modified) (5 diffs)
• kbd.xml (modified) (1 diff)

chapter08/iproute2.xml

@@ -94 +94 @@
 
       <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;
@@ -137 +137 @@
       </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>
@@ -221 +208 @@
       </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>
@@ -296 +272 @@
       </varlistentry>
 
-      <!-- FixMe These options don't match tc -help screen -->
       <varlistentry id="tc">
         <term><command>tc</command></term>
@@ -309 +284 @@
           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
-          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>

chapter08/kbd.xml

@@ -42 +42 @@
     <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>