holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Correct policy manpages.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-11-25 09:33:46 -08:00
parent 8e239c90c1
commit 629717f7cc
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Shorewall/manpages/shorewall-policy.xml
View File

@ -109,15 +109,26 @@
</listitem> </listitem>
<listitem> <listitem>
<para>The name of a macro. The rules in that macro will be <para>The name of an action. The action will be invoked before
applied before the policy is enforced. This does not require the policy is enforced.</para>
USE_ACTIONS=Yes.</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> </listitem>
</orderedlist> </orderedlist>
<blockquote> <para>Both actions and macros can have parameters specified. In the
<para>Possible policies are:</para> case of a macro, only one parameter is allowed and specifies the log
</blockquote> level to be applied to each rule in the action; not recommended for
use.</para>
<para>Possible actions are:</para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>

18
Shorewall6/manpages/shorewall6-policy.xml
View File

@ -112,11 +112,23 @@
<para>The name of an action. That action will be invoked before <para>The name of an action. That action will be invoked before
the policy is enforced.</para> the policy is enforced.</para>
</listitem> </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> </orderedlist>
<blockquote> <para>Both actions and macros can have parameters specified. In the
<para>Possible policies are:</para> case of a macro, only one parameter is allowed and specifies the log
</blockquote> level to be applied to each rule in the action; not recommended for
use.</para>
<para>Possible actions are:</para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>