From 629717f7cc216d68b4df3c635d853ea3e8931704 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 25 Nov 2012 09:33:46 -0800
Subject: [PATCH] Correct policy manpages.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/manpages/shorewall-policy.xml   | 23 +++++++++++++++++------
 Shorewall6/manpages/shorewall6-policy.xml | 18 +++++++++++++++---
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/Shorewall/manpages/shorewall-policy.xml b/Shorewall/manpages/shorewall-policy.xml
index 43cba98de..9662e4ac7 100644
--- a/Shorewall/manpages/shorewall-policy.xml
+++ b/Shorewall/manpages/shorewall-policy.xml
@@ -109,15 +109,26 @@
             </listitem>
 
             <listitem>
-              <para>The name of a macro. The rules in that macro will be
-              applied before the policy is enforced. This does not require
-              USE_ACTIONS=Yes.</para>
+              <para>The name of an action. The action will be invoked before
+              the policy is enforced.</para>
+            </listitem>
+
+            <listitem>
+              <para>The name of a macro (Shorewall 4.5.10 or later). The rules
+              in that macro will be applied before the policy is enforced. If
+              you wish to 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>
             </listitem>
           </orderedlist>
 
-          <blockquote>
-            <para>Possible policies are:</para>
-          </blockquote>
+          <para>Both actions and macros can have parameters specified. In the
+          case of a macro, only one parameter is allowed and specifies the log
+          level to be applied to each rule in the action; not recommended for
+          use.</para>
+
+          <para>Possible actions are:</para>
 
           <variablelist>
             <varlistentry>
diff --git a/Shorewall6/manpages/shorewall6-policy.xml b/Shorewall6/manpages/shorewall6-policy.xml
index 6428ed7c0..0d7e6184e 100644
--- a/Shorewall6/manpages/shorewall6-policy.xml
+++ b/Shorewall6/manpages/shorewall6-policy.xml
@@ -112,11 +112,23 @@
               <para>The name of an action. That action will be invoked before
               the policy is enforced.</para>
             </listitem>
+
+            <listitem>
+              <para>The name of a macro (Shorewall 4.5.10 or later). The rules
+              in that macro will be applied before the policy is enforced. If
+              you wish to 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>
+            </listitem>
           </orderedlist>
 
-          <blockquote>
-            <para>Possible policies are:</para>
-          </blockquote>
+          <para>Both actions and macros can have parameters specified. In the
+          case of a macro, only one parameter is allowed and specifies the log
+          level to be applied to each rule in the action; not recommended for
+          use.</para>
+
+          <para>Possible actions are:</para>
 
           <variablelist>
             <varlistentry>