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|CONTINUE|QUEUE|NFQUEUE[/queuenumber]|NFQUEUE[(queuenumber)]|NONE}[:{default-action-or-macro|None}] 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[]|LOG|QUEUE[]|NFQUEUE[/queuenumber]NFQUEUE[(queuenumber)]|COMMENT|action|macro[/target]}(target)]}[:{log-level|none}[!][macro. If the macro accepts an action parameter (Look at the macro source to see if it has PARAM in the TARGET column) then the - macro name is followed by "/" and the - target (macro name is followed by the + parenthesized target (ACCEPT, DROP, REJECT, ...) to be substituted for the parameter. - Example: FTP/ACCEPT. + Example: FTP(ACCEPT). + + 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. 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 @@ + + + OPTIONS — {-|classify} + + + 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 shorewall-tcrules(5). + +