From 7bfbf522bc1c29239ed5441ce59dfd6079fa9f6f Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Wed, 21 Nov 2012 11:12:55 -0800
Subject: [PATCH] Document that parameters are allowed in default actions.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/manpages/shorewall.conf.xml   | 7 ++++++-
 Shorewall6/manpages/shorewall6.conf.xml | 7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml
index e8952bc0e..b848f9563 100644
--- a/Shorewall/manpages/shorewall.conf.xml
+++ b/Shorewall/manpages/shorewall.conf.xml
@@ -159,7 +159,7 @@
             parameters (e.g., 'Drop(audit)').</member>
 
             <member>b) The name of a <replaceable>macro</replaceable>
-            (Shorewall 4.5.10 and Laater)</member>
+            (Shorewall 4.5.10 and Later)</member>
 
             <member>c) <emphasis role="bold">None</emphasis> or <emphasis
             role="bold">none</emphasis></member>
@@ -189,6 +189,11 @@
           use a macro with the same name as an existing action, you may
           specify the name of the macro file (e.g., <emphasis
           role="bold">macro.</emphasis><replaceable>macro-name</replaceable>).</para>
+
+          <para>You can pass parameters to the specified action or macro
+          (e.g., <emphasis>myaction(audit,DROP)</emphasis>). In the case of a
+          macro, only a single parameter may be passed; that parameter is
+          interpreted as the log level for rules in the macro body.</para>
         </listitem>
       </varlistentry>
 
diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml
index c3f8d59dc..13a6c156a 100644
--- a/Shorewall6/manpages/shorewall6.conf.xml
+++ b/Shorewall6/manpages/shorewall6.conf.xml
@@ -162,13 +162,16 @@
           specified in <ulink
           url="shorewall6-policy.html">shorewall6-policy</ulink>(5).</para>
 
-          <para></para>
-
           <para>Beginning with Shorewall 4.5.10,
           <replaceable>action</replaceable> may name a macro. If you wish to
           use a macro with the same name as an existing action, you may
           specify the name of the macro file here (e.g., <emphasis
           role="bold">macro.</emphasis><replaceable>macro-name</replaceable>).</para>
+
+          <para>You can pass parameters to the specified action or macro
+          (e.g., <emphasis>myaction(audit,DROP)</emphasis>). In the case of a
+          macro, only a single parameter may be passed; that parameter is
+          interpreted as the log level for rules in the macro body.</para>
         </listitem>
       </varlistentry>