Update manpages for 4.1

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7875 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-12-08 21:55:44 +00:00
parent c2bbfe3aca
commit e6049baeeb
3 changed files with 26 additions and 6 deletions

View File

@ -85,7 +85,7 @@
role="bold">REJECT</emphasis>|<emphasis role="bold">REJECT</emphasis>|<emphasis
role="bold">CONTINUE</emphasis>|<emphasis role="bold">CONTINUE</emphasis>|<emphasis
role="bold">QUEUE</emphasis>|<emphasis role="bold">QUEUE</emphasis>|<emphasis
role="bold">NFQUEUE</emphasis>[/<emphasis>queuenumber</emphasis>]|<emphasis role="bold">NFQUEUE</emphasis>[(<emphasis>queuenumber</emphasis>)]|<emphasis
role="bold">NONE</emphasis>}[<emphasis role="bold">NONE</emphasis>}[<emphasis
role="bold">:</emphasis>{<emphasis>default-action-or-macro</emphasis>|<emphasis role="bold">:</emphasis>{<emphasis>default-action-or-macro</emphasis>|<emphasis
role="bold">None</emphasis>}]</term> role="bold">None</emphasis>}]</term>

View File

@ -143,9 +143,12 @@
role="bold">CONTINUE</emphasis>[<option>!</option>]|<emphasis role="bold">CONTINUE</emphasis>[<option>!</option>]|<emphasis
role="bold">LOG</emphasis>|<emphasis role="bold">LOG</emphasis>|<emphasis
role="bold">QUEUE</emphasis>[<option>!</option>]|<emphasis role="bold">QUEUE</emphasis>[<option>!</option>]|<emphasis
role="bold">NFQUEUE</emphasis>[/<emphasis>queuenumber</emphasis>]<emphasis role="bold">NFQUEUE</emphasis>[<emphasis
role="bold">(</emphasis><emphasis>queuenumber</emphasis><emphasis
role="bold">)</emphasis>]<emphasis
role="bold">|COMMENT</emphasis>|<emphasis>action</emphasis>|<emphasis>macro</emphasis>[<emphasis role="bold">|COMMENT</emphasis>|<emphasis>action</emphasis>|<emphasis>macro</emphasis>[<emphasis
role="bold">/</emphasis><emphasis>target</emphasis>]}<emphasis role="bold">(</emphasis><emphasis>target</emphasis><emphasis
role="bold">)</emphasis>]}<emphasis
role="bold">[:</emphasis>{<emphasis>log-level</emphasis>|<emphasis role="bold">[:</emphasis>{<emphasis>log-level</emphasis>|<emphasis
role="bold">none</emphasis>}[<emphasis role="bold"><emphasis role="bold">none</emphasis>}[<emphasis role="bold"><emphasis
role="bold">!</emphasis></emphasis>][<emphasis role="bold">!</emphasis></emphasis>][<emphasis
@ -417,14 +420,18 @@
macro.<emphasis>macro</emphasis>. If the macro accepts an macro.<emphasis>macro</emphasis>. If the macro accepts an
action parameter (Look at the macro source to see if it has action parameter (Look at the macro source to see if it has
PARAM in the TARGET column) then the PARAM in the TARGET column) then the
<emphasis>macro</emphasis> name is followed by "/" and the <emphasis>macro</emphasis> name is followed by the
<emphasis>target</emphasis> (<emphasis parenthesized <emphasis>target</emphasis> (<emphasis
role="bold">ACCEPT</emphasis>, <emphasis role="bold">ACCEPT</emphasis>, <emphasis
role="bold">DROP</emphasis>, <emphasis role="bold">DROP</emphasis>, <emphasis
role="bold">REJECT</emphasis>, ...) to be substituted for the role="bold">REJECT</emphasis>, ...) to be substituted for the
parameter.</para> parameter.</para>
<para>Example: FTP/ACCEPT.</para> <para>Example: FTP(ACCEPT).</para>
<para>The older syntax where the macro name and the target are
separated by a slash (e.g. FTP/ACCEPT) is still allowed but is
deprecated.</para>
<programlisting></programlisting> <programlisting></programlisting>
</listitem> </listitem>

View File

@ -144,6 +144,19 @@
<para></para> <para></para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><emphasis role="bold">OPTIONS</emphasis> — {<emphasis
role="bold">-</emphasis>|<emphasis
role="bold">classify</emphasis>}</term>
<listitem>
<para>classify ― When specified, Shorewall will not generate tc or
Netfilter rules to classify traffic based on packet marks. You must
do all classification using CLASSIFY rules in <ulink
url="shorewall-tcrules.html">shorewall-tcrules</ulink>(5).</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
<warning> <warning>