From 079d862bb3f44f0e2e00999e8bc75583dd93963a Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 6 Feb 2017 10:51:57 -0800
Subject: [PATCH] Document default-action lists

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

diff --git a/Shorewall/manpages/shorewall-policy.xml b/Shorewall/manpages/shorewall-policy.xml
index 217f11427..39d634703 100644
--- a/Shorewall/manpages/shorewall-policy.xml
+++ b/Shorewall/manpages/shorewall-policy.xml
@@ -120,7 +120,7 @@
         role="bold">QUEUE</emphasis>|<emphasis
         role="bold">NFQUEUE</emphasis>[(<emphasis>queuenumber1</emphasis>[:<replaceable>queuenumber2</replaceable>])]|<emphasis
         role="bold">NONE</emphasis>}[<emphasis
-        role="bold">:</emphasis>{<emphasis>default-action-or-macro</emphasis>[:level]|<emphasis
+        role="bold">:</emphasis>{<emphasis>default-action</emphasis>[:level][,...]|<emphasis
         role="bold">None</emphasis>}]</term>
 
         <listitem>
@@ -138,8 +138,9 @@
             </listitem>
 
             <listitem>
-              <para>The name of an action. The action will be invoked before
-              the policy is enforced.</para>
+              <para>The name of an action with optional parameters enclosed in
+              parentheses. The action will be invoked before the policy is
+              enforced. </para>
             </listitem>
           </orderedlist>
 
@@ -150,6 +151,10 @@
           applied to each rule in the action or body that does not already
           have a log level.</para>
 
+          <para>Beginning with Shorewall 5.1.2, multiple
+          <replaceable>action</replaceable>[:<replaceable>level</replaceable>]
+          pairs may be specified, separated by commas.</para>
+
           <para>Possible actions are:</para>
 
           <variablelist>
diff --git a/Shorewall6/manpages/shorewall6-policy.xml b/Shorewall6/manpages/shorewall6-policy.xml
index 5f00560c4..f2aee61ce 100644
--- a/Shorewall6/manpages/shorewall6-policy.xml
+++ b/Shorewall6/manpages/shorewall6-policy.xml
@@ -119,7 +119,7 @@
         role="bold">QUEUE</emphasis>|<emphasis
         role="bold">NFQUEUE</emphasis>[(<emphasis>queuenumber1</emphasis>[:<replaceable>queuenumber2</replaceable>])]|<emphasis
         role="bold">NONE</emphasis>}[<emphasis
-        role="bold">:</emphasis>{<emphasis>default-action-or-macro</emphasis>[:level]|<emphasis
+        role="bold">:</emphasis>{<emphasis>default-action</emphasis>[:level][,...]|<emphasis
         role="bold">None</emphasis>}]</term>
 
         <listitem>
@@ -149,6 +149,10 @@
           applied to each rule in the action or body that does not already
           have a log level.</para>
 
+          <para>Beginning with Shorewall 5.1.2, multiple
+          <replaceable>action</replaceable>[:<replaceable>level</replaceable>]
+          pairs may be specified, separated by commas.</para>
+
           <para>Possible actions are:</para>
 
           <variablelist>