More TC manpage updates

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-09-14 08:01:08 -07:00
parent a581958042
commit 0400cedc6c
6 changed files with 66 additions and 33 deletions

View File

@ -249,15 +249,30 @@
</blockquote>
<para>For both HTB and HFSC, the <emphasis>priority</emphasis> is
used to calculate the priority of Shorewall-generated classification
filters that refer to the class. The rules for classes with lower
numeric priorities will appear before those with higher numeric
priorities.</para>
used to calculate the priority of following Shorewall-generated
classification filters that refer to the class:</para>
<para>Beginning with Shorewall 4.5.8, the PRIORITY may be omitted,
providing that a priority is specified in the MARK column and with
the <emphasis role="bold">tcp-ack</emphasis> and <emphasis
role="bold">tos</emphasis> options.</para>
<itemizedlist>
<listitem>
<para>Packet MARK</para>
</listitem>
<listitem>
<para><emphasis role="bold">tcp-ack</emphasis> and the <emphasis
role="bold">tos</emphasis> options (see below)</para>
</listitem>
</itemizedlist>
<para> The rules for classes with lower numeric priorities will
appear before those with higher numeric priorities. </para>
<para>Beginning with Shorewall 4.5.8, the PRIORITY may be omitted
from an HFSC class if you do not use the MARK column or the
<emphasis role="bold">tcp-ack</emphasis> or <emphasis
role="bold">tos</emphasis> options. If you use any of those features
and omit the PRIORITY, then you must specify a
<replaceable>priority</replaceable> along with the MARK or
option.</para>
</listitem>
</varlistentry>

View File

@ -180,7 +180,7 @@
<term><emphasis role="bold">OPTIONS</emphasis> - {<emphasis
role="bold">-</emphasis>|<emphasis
role="bold">{classify</emphasis>|<emphasis
role="bold">hfsc</emphasis>|<emphasis
role="bold">htb|hfsc</emphasis>|<emphasis
role="bold">linklayer</emphasis>={<emphasis
role="bold">ethernet</emphasis>|<emphasis
role="bold">atm</emphasis>|<emphasis
@ -197,11 +197,14 @@
marks. You must do all classification using CLASSIFY rules in <ulink
url="shorewall-tcrules.html">shorewall-tcrules</ulink>(5).</para>
<para><option>htb</option> - Use the <firstterm>Hierarchical Token
Bucket</firstterm> queuing discipline. This is the default.</para>
<para><option>hfsc</option> - Shorewall normally uses the
<firstterm>Hierarchical Token Bucket</firstterm> queuing discipline.
When <option>hfsc</option> is specified, the <firstterm>Hierarchical
Fair Service Curves</firstterm> discipline is used instead (see
tc-hfsc (7)).</para>
Hierarchical Token Bucket queuing discipline. When
<option>hfsc</option> is specified, the <firstterm>Hierarchical Fair
Service Curves</firstterm> discipline is used instead (see tc-hfsc
(7)).</para>
<para><emphasis role="bold">linklayer</emphasis> - Added in
Shorewall 4.5.6. Type of link (ethernet, atm, adsl). When specified,

View File

@ -196,8 +196,7 @@
<listitem>
<para>Added in Shorewall 4.5.8. Specifies the rule
<replaceable>priority</replaceable>. If not given,
<replaceable>priority</replaceable> 10 is assumed. The
<replaceable>priority</replaceable>. The
<replaceable>priority</replaceable> value must be &gt; 0 and &lt;=
65535.</para>

View File

@ -246,16 +246,30 @@
</blockquote>
<para>For both HTB and HFSC, the <emphasis>priority</emphasis> is
used to calculate the priority of Shorewall-generated classification
filters that refer to the class. The rules for classes with lower
numeric priorities will appear before those with higher numeric
priorities.</para>
used to calculate the priority of following Shorewall-generated
classification filters that refer to the class:</para>
<para>Beginning with Shorewall 4.5.8, the PRIORITY may be omitted,
providing that a <replaceable>priority</replaceable> is specified in
the MARK column and with the <emphasis
role="bold">tcp-ack</emphasis> and <emphasis
role="bold">tos</emphasis> options.</para>
<itemizedlist>
<listitem>
<para>Packet MARK</para>
</listitem>
<listitem>
<para><emphasis role="bold">tcp-ack</emphasis> and the <emphasis
role="bold">tos</emphasis> options (see below)</para>
</listitem>
</itemizedlist>
<para>The rules for classes with lower numeric priorities will
appear before those with higher numeric priorities.</para>
<para>Beginning with Shorewall 4.5.8, the PRIORITY may be omitted
from an HFSC class if you do not use the MARK column or the
<emphasis role="bold">tcp-ack</emphasis> or <emphasis
role="bold">tos</emphasis> options. If you use those features and
omit the PRIORITY, then you must specify a
<replaceable>priority</replaceable> along with the MARK or
option.</para>
</listitem>
</varlistentry>

View File

@ -180,7 +180,7 @@
<varlistentry>
<term><emphasis role="bold">OPTIONS</emphasis> - {<emphasis
role="bold">-</emphasis>|<emphasis
role="bold">{classify</emphasis>|<emphasis
role="bold">{classify</emphasis>|htb|<emphasis
role="bold">hfsc</emphasis>|<emphasis
role="bold">linklayer</emphasis>={<emphasis
role="bold">ethernet</emphasis>|<emphasis
@ -198,11 +198,14 @@
marks. You must do all classification using CLASSIFY rules in <ulink
url="shorewall-tcrules.html">shorewall-tcrules</ulink>(5).</para>
<para><option>htb</option> - Use the <firstterm>Hierarchical Token
Bucket</firstterm> queuing discipline. This is the default.</para>
<para><option>hfsc</option> - Shorewall normally uses the
<firstterm>Hierarchical Token Bucket</firstterm> queuing discipline.
When <option>hfsc</option> is specified, the <firstterm>Hierarchical
Fair Service Curves</firstterm> discipline is used instead(see
tc-hfsc (7)).</para>
Hierarchical Token Bucket queuing discipline. When
<option>hfsc</option> is specified, the <firstterm>Hierarchical Fair
Service Curves</firstterm> discipline is used instead(see tc-hfsc
(7)).</para>
<para><emphasis role="bold">linklayer</emphasis> - Added in
Shorewall 4.5.6. Type of link (ethernet, atm, adsl). When specified,

View File

@ -191,9 +191,8 @@
role="bold">-</emphasis>|<emphasis>number</emphasis>]</term>
<listitem>
<para>Added in Shorewall 4.5.8. Specifies the rule priority. If not
given, priority 11 is assumed. The priority value must be &gt; 0 and
&lt;= 65535.</para>
<para>Added in Shorewall 4.5.8. Specifies the rule priority. The
priority value must be &gt; 0 and &lt;= 65535.</para>
<para>When a <replaceable>priority</replaceable> is not
given:</para>