From e6049baeeb7a9e5f8495b594ced4464f45b3d1eb Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 8 Dec 2007 21:55:44 +0000
Subject: [PATCH] Update manpages for 4.1

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7875 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 manpages/shorewall-policy.xml    |  2 +-
 manpages/shorewall-rules.xml     | 17 ++++++++++++-----
 manpages/shorewall-tcdevices.xml | 13 +++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/manpages/shorewall-policy.xml b/manpages/shorewall-policy.xml
index 7fbc614ec..a583a5703 100644
--- a/manpages/shorewall-policy.xml
+++ b/manpages/shorewall-policy.xml
@@ -85,7 +85,7 @@
         role="bold">REJECT</emphasis>|<emphasis
         role="bold">CONTINUE</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">:</emphasis>{<emphasis>default-action-or-macro</emphasis>|<emphasis
         role="bold">None</emphasis>}]</term>
diff --git a/manpages/shorewall-rules.xml b/manpages/shorewall-rules.xml
index 170354c86..960706bab 100644
--- a/manpages/shorewall-rules.xml
+++ b/manpages/shorewall-rules.xml
@@ -143,9 +143,12 @@
         role="bold">CONTINUE</emphasis>[<option>!</option>]|<emphasis
         role="bold">LOG</emphasis>|<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">/</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">none</emphasis>}[<emphasis role="bold"><emphasis
         role="bold">!</emphasis></emphasis>][<emphasis
@@ -417,14 +420,18 @@
                 macro.<emphasis>macro</emphasis>. If the macro accepts an
                 action parameter (Look at the macro source to see if it has
                 PARAM in the TARGET column) then the
-                <emphasis>macro</emphasis> name is followed by "/" and the
-                <emphasis>target</emphasis> (<emphasis
+                <emphasis>macro</emphasis> name is followed by the
+                parenthesized <emphasis>target</emphasis> (<emphasis
                 role="bold">ACCEPT</emphasis>, <emphasis
                 role="bold">DROP</emphasis>, <emphasis
                 role="bold">REJECT</emphasis>, ...) to be substituted for the
                 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>
               </listitem>
diff --git a/manpages/shorewall-tcdevices.xml b/manpages/shorewall-tcdevices.xml
index 337052405..48b5ac11b 100644
--- a/manpages/shorewall-tcdevices.xml
+++ b/manpages/shorewall-tcdevices.xml
@@ -144,6 +144,19 @@
           <para></para>
         </listitem>
       </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>
 
     <warning>