Fix HTML formatting on a couple of manpages

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5220 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-01-13 18:33:38 +00:00
parent b78d85f0cc
commit 6fb0666e78
4 changed files with 143 additions and 136 deletions

View File

@ -82,7 +82,10 @@
<itemizedlist>
<listitem>
<para>Shorewall generates rules for zones in the order that the zone
declarations appear in /etc/shorewall/zones.</para>
declarations appear in /etc/shorewall/zones unless you modify the
processing order using the explicit
<emphasis>child-zone</emphasis>:<emphasis>parent-zone</emphasis>
syntax, in which case the child zone rules are generated first.</para>
</listitem>
<listitem>
@ -196,11 +199,12 @@
<para><filename>/etc/shorewall/zones</filename></para>
<programlisting>#ZONE TYPE OPTIONS
loc1 ipv4
loc ipv4</programlisting>
loc ipv4
loc1:loc ipv4</programlisting>
<note>
<para>the sub-zone (loc1) is defined first!</para>
<para>the Parent zone (loc) is defined first then the sub-zone
(loc1) is defined using the special syntax shown.</para>
</note>
<para><filename>/etc/shorewall/interfaces</filename></para>

View File

@ -19,7 +19,7 @@
<arg>-options</arg>
<command>allow</command>
<arg choice="plain"><option>allow</option></arg>
<arg choice="plain">address</arg>
</cmdsynopsis>
@ -29,7 +29,7 @@
<arg>-options</arg>
<command>clear</command>
<arg choice="plain"><option>clear</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -37,7 +37,7 @@
<arg>-options</arg>
<command>drop</command>
<arg choice="plain"><option>drop</option></arg>
<arg choice="plain">address</arg>
</cmdsynopsis>
@ -47,7 +47,7 @@
<arg>-options</arg>
<command>dump</command>
<arg choice="plain"><option>dump</option></arg>
<arg><option>-x</option></arg>
@ -59,7 +59,7 @@
<arg>-options</arg>
<command>forget</command>
<arg choice="plain"><option>forget</option></arg>
<arg>filename</arg>
</cmdsynopsis>
@ -69,7 +69,7 @@
<arg>-options</arg>
<command>help</command>
<arg choice="plain"><option>help</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -77,7 +77,7 @@
<arg>-options</arg>
<command>hits</command>
<arg choice="plain"><option>hits</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -85,7 +85,7 @@
<arg>-options</arg>
<command>ipcalc</command>
<arg choice="plain"><option>ipcalc</option></arg>
<group choice="req">
<arg choice="plain">address mask</arg>
@ -99,9 +99,9 @@
<arg>-options</arg>
<command>iprange</command>
<arg choice="plain"><option>iprange</option></arg>
<arg choice="plain">address1-address2</arg>
<arg choice="plain">address1<option>-</option>address2</arg>
</cmdsynopsis>
<cmdsynopsis>
@ -109,7 +109,7 @@
<arg>-options</arg>
<command>logdrop</command>
<arg choice="plain"><option>logdrop</option></arg>
<arg choice="plain">address</arg>
</cmdsynopsis>
@ -119,7 +119,7 @@
<arg>-options</arg>
<command>logwatch</command>
<arg choice="plain"><option>logwatch</option></arg>
<arg><option>-m</option></arg>
@ -131,7 +131,7 @@
<arg>-options</arg>
<command>logreject</command>
<arg choice="plain"><option>logreject</option></arg>
<arg choice="plain">address</arg>
</cmdsynopsis>
@ -141,7 +141,7 @@
<arg>-options</arg>
<command>reject</command>
<arg choice="plain"><option>reject</option></arg>
<arg choice="plain">address</arg>
</cmdsynopsis>
@ -151,7 +151,7 @@
<arg>-options</arg>
<command>restart</command>
<arg choice="plain"><option>restart</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -159,7 +159,7 @@
<arg>-options</arg>
<command>restore</command>
<arg choice="plain"><option>restore</option></arg>
<arg>filename</arg>
</cmdsynopsis>
@ -169,7 +169,7 @@
<arg>-options</arg>
<command>save</command>
<arg choice="plain"><option>save</option></arg>
<arg choice="opt">filename</arg>
</cmdsynopsis>
@ -179,12 +179,12 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg><option>-x</option></arg>
<arg><option>-t</option>
{<option>filter</option>|<option>mangle</option>|<option>nat</option>}</arg>
{<option>filter</option>|<option>mangle</option>|<option>nat</option>|<option>raw</option>}</arg>
<arg rep="repeat">chain</arg>
</cmdsynopsis>
@ -194,11 +194,11 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg><option>-f</option></arg>
<command>capabilities</command>
<arg choice="plain"><option>capabilities</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -206,7 +206,7 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg
choice="req"><option>actions|classifiers|connections|config|macros|zones</option></arg>
@ -217,7 +217,7 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg><option>-x</option></arg>
@ -229,7 +229,7 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg choice="plain"><option>tc</option></arg>
</cmdsynopsis>
@ -239,11 +239,11 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg><option>-m</option></arg>
<command>log</command>
<arg choice="plain"><option>log</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -251,7 +251,7 @@
<arg>-options</arg>
<command>start</command>
<arg choice="plain"><option>start</option></arg>
<arg><option>-f</option></arg>
</cmdsynopsis>
@ -261,7 +261,7 @@
<arg>-options</arg>
<command>stop</command>
<arg choice="plain"><option>stop</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -269,7 +269,7 @@
<arg>-options</arg>
<command>status</command>
<arg choice="plain"><option>status</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -277,7 +277,7 @@
<arg>-options</arg>
<command>version</command>
<arg choice="plain"><option>version</option></arg>
</cmdsynopsis>
</refsynopsisdiv>

View File

@ -19,7 +19,7 @@
<arg rep="norepeat">-options</arg>
<command>add</command>
<arg choice="plain"><option>add</option></arg>
<arg choice="plain" rep="repeat">interface[:host-list]</arg>
@ -31,7 +31,7 @@
<arg>-options</arg>
<command>allow</command>
<arg choice="plain"><option>allow</option></arg>
<arg choice="plain">address</arg>
</cmdsynopsis>
@ -41,7 +41,7 @@
<arg>-options</arg>
<command>check</command>
<arg choice="plain"><option>check</option></arg>
<arg><option>-e</option></arg>
@ -53,7 +53,7 @@
<arg>-options</arg>
<command>clear</command>
<arg choice="plain"><option>clear</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -61,7 +61,7 @@
<arg>-options</arg>
<command>compile</command>
<arg choice="plain"><option>compile</option></arg>
<arg><option>-e</option></arg>
@ -75,7 +75,7 @@
<arg rep="norepeat">-options</arg>
<command>delete</command>
<arg choice="plain"><option>delete</option></arg>
<arg choice="plain" rep="repeat">interface[:host-list]</arg>
@ -87,7 +87,7 @@
<arg>-options</arg>
<command>drop</command>
<arg choice="plain"><option>drop</option></arg>
<arg choice="plain">address</arg>
</cmdsynopsis>
@ -97,7 +97,7 @@
<arg>-options</arg>
<command>dump</command>
<arg choice="plain"><option>dump</option></arg>
<arg><option>-x</option></arg>
@ -109,7 +109,7 @@
<arg>-options</arg>
<command>export</command>
<arg choice="plain"><option>export</option></arg>
<arg choice="opt">directory1</arg>
@ -121,7 +121,7 @@
<arg>-options</arg>
<command>forget</command>
<arg choice="plain"><option>forget</option></arg>
<arg>filename</arg>
</cmdsynopsis>
@ -131,7 +131,7 @@
<arg>-options</arg>
<command>help</command>
<arg choice="plain"><option>help</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -139,7 +139,7 @@
<arg>-options</arg>
<command>hits</command>
<arg choice="plain"><option>hits</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -147,7 +147,7 @@
<arg>-options</arg>
<command>ipcalc</command>
<arg choice="plain"><option>ipcalc</option></arg>
<group choice="req">
<arg choice="plain">address mask</arg>
@ -161,7 +161,7 @@
<arg>-options</arg>
<command>iprange</command>
<arg choice="plain"><option>iprange</option></arg>
<arg choice="plain">address1<option>-</option>address2</arg>
</cmdsynopsis>
@ -171,75 +171,7 @@
<arg>-options</arg>
<command>load</command>
<arg><option>-s</option></arg>
<arg><option>-c</option></arg>
<arg><option>-r</option> root-user-name </arg>
<arg>directory</arg>
<arg choice="plain">system</arg>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<command>logdrop</command>
<arg choice="plain">address</arg>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<command>logwatch</command>
<arg><option>-m</option></arg>
<arg>refresh-interval</arg>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<command>logreject</command>
<arg choice="plain">address</arg>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<command>refresh</command>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<command>reject</command>
<arg choice="plain">address</arg>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<command>reload</command>
<arg choice="plain"><option>load</option></arg>
<arg><option>-s</option></arg>
@ -257,7 +189,75 @@
<arg>-options</arg>
<command>restart</command>
<arg choice="plain"><option>logdrop</option></arg>
<arg choice="plain">address</arg>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<arg choice="plain"><option>logwatch</option></arg>
<arg><option>-m</option></arg>
<arg>refresh-interval</arg>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<arg choice="plain"><option>logreject</option></arg>
<arg choice="plain">address</arg>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<arg choice="plain"><option>refresh</option></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<arg choice="plain"><option>reject</option></arg>
<arg choice="plain">address</arg>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<arg choice="plain"><option>reload</option></arg>
<arg><option>-s</option></arg>
<arg><option>-c</option></arg>
<arg><option>-r</option> root-user-name</arg>
<arg>directory</arg>
<arg choice="plain">system</arg>
</cmdsynopsis>
<cmdsynopsis>
<command>shorewall</command>
<arg>-options</arg>
<arg choice="plain"><option>restart</option></arg>
<arg>directory</arg>
</cmdsynopsis>
@ -267,7 +267,7 @@
<arg>-options</arg>
<command>restore</command>
<arg choice="plain"><option>restore</option></arg>
<arg>filename</arg>
</cmdsynopsis>
@ -277,7 +277,7 @@
<arg>-options</arg>
<command>safe-restart</command>
<arg choice="plain"><option>safe-restart</option></arg>
<arg>directory</arg>
</cmdsynopsis>
@ -287,7 +287,7 @@
<arg>-options</arg>
<command>safe-start</command>
<arg choice="plain"><option>safe-start</option></arg>
<arg>directory</arg>
</cmdsynopsis>
@ -297,7 +297,7 @@
<arg>-options</arg>
<command>save</command>
<arg choice="plain"><option>save</option></arg>
<arg choice="opt">filename</arg>
</cmdsynopsis>
@ -307,7 +307,7 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg><option>-x</option></arg>
@ -322,11 +322,11 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg><option>-f</option></arg>
<command>capabilities</command>
<arg choice="plain"><option>capabilities</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -334,7 +334,7 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg
choice="req"><option>actions|classifiers|connections|config|macros|zones</option></arg>
@ -345,7 +345,7 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg><option>-x</option></arg>
@ -357,7 +357,7 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg choice="plain"><option>tc</option></arg>
</cmdsynopsis>
@ -367,11 +367,11 @@
<arg>-options</arg>
<command>show</command>
<arg choice="plain"><option>show</option></arg>
<arg><option>-m</option></arg>
<command>log</command>
<arg choice="plain"><option>log</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -379,7 +379,7 @@
<arg>-options</arg>
<command>start</command>
<arg choice="plain"><option>start</option></arg>
<arg><option>-f</option></arg>
@ -391,7 +391,7 @@
<arg>-options</arg>
<command>stop</command>
<arg choice="plain"><option>stop</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -399,7 +399,7 @@
<arg>-options</arg>
<command>status</command>
<arg choice="plain"><option>status</option></arg>
</cmdsynopsis>
<cmdsynopsis>
@ -407,7 +407,7 @@
<arg>-options</arg>
<command>try</command>
<arg choice="plain"><option>try</option></arg>
<arg choice="plain">directory</arg>
@ -419,7 +419,7 @@
<arg>-options</arg>
<command>version</command>
<arg choice="plain"><option>version</option></arg>
</cmdsynopsis>
</refsynopsisdiv>

View File

@ -22,7 +22,10 @@ Documentation License</a></span>”.<br>
</p>
<p>2007-01-13<br>
</p>
<hr style="width: 100%; height: 2px;"> <br>
<hr style="width: 100%; height: 2px;"> <span style="font-weight: bold;">Warning:
</span>These manpages are for Shorewall 3.4.0 only. The HTML formatting
is still a bit off so please bear with us while we try to correct the
problems.<br>
<h2>Section 5</h2>
<div style="margin-left: 40px;"><a href="shorewall-accounting.html">accounting</a><br>
</div>