Mention Macros as default actions in the Actions and Macros docs.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-11-25 12:09:41 -08:00
parent 7b0578fa84
commit dd0f42c462
2 changed files with 10 additions and 1 deletions

View File

@ -287,6 +287,12 @@ ACCEPT - - tcp 135,139,445
POLICY column of <ulink POLICY column of <ulink
url="manpages/shorewall-policy.html">shorewall-policy</ulink>(5) (e.g., url="manpages/shorewall-policy.html">shorewall-policy</ulink>(5) (e.g.,
DROP:<emphasis role="bold">Drop(audit)</emphasis>:audit).</para> DROP:<emphasis role="bold">Drop(audit)</emphasis>:audit).</para>
<note>
<para>Beginning with Shorewall 4.5.10, a <ulink
url="Macros.html">macro</ulink> may also be specified as a default
action.</para>
</note>
</section> </section>
<section id="Defining"> <section id="Defining">
@ -389,7 +395,7 @@ REDIRECT net - tcp 80 - 1.2.3.4</programlisting>
<para>The DEFAULTS directive also determines the maximum number of <para>The DEFAULTS directive also determines the maximum number of
parameters that an action may have. If more parameters are passed than parameters that an action may have. If more parameters are passed than
have default values, an error message is issued. </para> have default values, an error message is issued.</para>
</section> </section>
<section> <section>

View File

@ -288,6 +288,9 @@ ACCEPT fw loc tcp 135,139,445</programlisting>
<para>There are no restrictions regarding the ACTIONs that can be <para>There are no restrictions regarding the ACTIONs that can be
performed in a macro.</para> performed in a macro.</para>
<para>Beginning with Shorewall 4.5.10, macros may also be used as <ulink
url="Actions.html#Default">default actions</ulink>.</para>
</section> </section>
<section> <section>