extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-03 03:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Manpages for Shorewall5

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2015-10-03 08:50:49 -07:00
parent 141440147c
commit fed6e7c352
3 changed files with 25 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
docs/Manpages.xml
View File

@ -5,7 +5,7 @@
<!--$Id: template.xml 5908 2007-04-12 23:04:36Z teastep $-->
<articleinfo>
<title>Shorewall 4.4-4.6 Manpages</title>
<title>Shorewall 5.0 Manpages</title>
<authorgroup>
<author>
@ -18,7 +18,7 @@
<pubdate><?dbtimestamp format="Y/m/d"?></pubdate>
<copyright>
<year>2007-2014</year>
<year>2007-2015</year>
<holder>Thomas M. Eastep</holder>
</copyright>
@ -35,8 +35,10 @@
</articleinfo>
<warning>
<para>These manpages are for Shorewall 4.4 and later only. They describe
features and options not available on earlier releases.</para>
<para>These manpages are for Shorewall 5.0 and later only. They describe
features and options not available on earlier releases. The manpages for
Shorewall 4.4-4.6 are available<ulink url="/Manpages4/Manpages.html">
here</ulink>.</para>
</warning>
<section id="Section5">
@ -54,10 +56,6 @@
<member><ulink url="manpages/shorewall-arprules.html">arprules</ulink>
- (Added in Shorewall 4.5.12) Define arpfilter rules.</member>
<member><ulink
url="manpages/shorewall-blacklist.html">blacklist</ulink> - Static
blacklisting (deprecated)</member>
<member><ulink url="manpages/shorewall-blrules.html">blrules</ulink> -
shorewall Blacklist file.</member>
@ -106,9 +104,6 @@
<member><ulink url="manpages/shorewall-netmap.html">netmap</ulink> -
How to map addresses from one net to another.</member>
<member><ulink url="manpages/shorewall-notrack.html">notrack</ulink> -
Exclude certain traffic from Netfilter connection tracking</member>
<member><ulink url="manpages/shorewall-params.html">params</ulink> -
Assign values to shell variables used in other files.</member>
@ -129,13 +124,6 @@
(Added in Shorewall 4.4.15) Add additional routes to provider routing
tables.</member>
<member><ulink
url="manpages/shorewall-routestopped.html">routestopped</ulink> -
Specify connections to be permitted when Shorewall is in the stopped
state (deprecated in Shorewall 4.5.8 in favor of the <ulink
url="manpages/shorewall-stoppedrules.html">stoppedrules</ulink>
file).</member>
<member><ulink url="manpages/shorewall-rules.html">rules</ulink> -
Specify exceptions to policies, including DNAT and REDIRECT.</member>
@ -162,18 +150,6 @@
<member><ulink url="manpages/shorewall-tcpri.html">tcpri</ulink> -
Classify traffic for simplified traffic shaping.</member>
<member><ulink
url="manpages/shorewall-stoppedrules.html">stoppedrules</ulink> -
Specify connections to be permitted when Shorewall is in the stopped
state (added in Shorewall 4.5.8).</member>
<member><ulink url="manpages/shorewall-tcrules.html">tcrules</ulink> -
Define packet marking rules, usually for traffic shaping. Superseded
by mangle (above) in Shorewall 4.6.0.</member>
<member><ulink url="manpages/shorewall-tos.html">tos</ulink> - Define
TOS field manipulation.</member>
<member><ulink url="manpages/shorewall-tunnels.html">tunnels</ulink> -
Define VPN connections with endpoints on the firewall.</member>

29
docs/Manpages6.xml
View File

@ -5,7 +5,7 @@
<!--$Id: template.xml 5908 2007-04-12 23:04:36Z teastep $-->
<articleinfo>
<title>Shorewall6 4.4-4.6 Manpages</title>
<title>Shorewall6 5.0 Manpages</title>
<authorgroup>
<author>
@ -35,8 +35,10 @@
</articleinfo>
<warning>
<para>These manpages are for Shorewall6 4.4 and later only. They describe
features and options not available on earlier releases.</para>
<para>These manpages are for Shorewall6 5.0 and later only. They describe
features and options not available on earlier releases.The manpages for
Shorewall 4.4-4.6 are available <ulink
url="/Manpages4/Manpages.html">here</ulink>.</para>
</warning>
<section id="Section5">
@ -51,10 +53,6 @@
<member><ulink url="manpages6/shorewall6-actions.html">actions</ulink>
- Declare user-defined actions.</member>
<member><ulink
url="manpages6/shorewall6-blacklist.html">blacklist</ulink> - Static
blacklisting (deprecated)</member>
<member><ulink url="manpages6/shorewall6-blrules.html">blrules</ulink>
- shorewall6 Blacklist file.</member>
@ -93,11 +91,6 @@
<member><ulink url="manpages6/shorewall6-nesting.html">nesting</ulink>
- How to define nested zones.</member>
<member><ulink url="manpages6/shorewall6-notrack.html">notrack</ulink>
- Exclude certain traffic from Netfilter6 connection tracking (renamed
<ulink url="manpages6/shorewall6-conntrack.html">conntrack</ulink> in
Shorewall 4.5.7)</member>
<member><ulink url="manpages6/shorewall6-params.html">params</ulink> -
Assign values to shell variables used in other files.</member>
@ -119,11 +112,6 @@
(Added in Shorewall 4.4.15) Add additional routes to provider routing
tables.</member>
<member><ulink
url="manpages6/shorewall6-routestopped.html">routestopped</ulink> -
Specify connections to be permitted when Shorewall6 is in the stopped
state (Deprecated in Shoreall 4.5.8).</member>
<member><ulink url="manpages6/shorewall6-rules.html">rules</ulink> -
Specify exceptions to policies, including DNAT and REDIRECT.</member>
@ -151,13 +139,6 @@
<member><ulink url="manpages6/shorewall6-tcpri.html">tcpri</ulink> -
Classify traffic for simplified traffic shaping.</member>
<member><ulink url="manpages6/shorewall6-tcrules.html">tcrules</ulink>
- Define packet marking rules, usually for traffic shaping. Superseded
by mangle (above) in Shorewall 4.6.0.</member>
<member><ulink url="manpages6/shorewall6-tos.html">tos</ulink> -
Define TOS field manipulation.</member>
<member><ulink url="manpages6/shorewall6-tunnels.html">tunnels</ulink>
- Define VPN connections with endpoints on the firewall.</member>

20
docs/configuration_file_basics.xml
View File

@ -133,7 +133,9 @@
<listitem>
<para><filename>/etc/shorewall/routestopped</filename> - defines
hosts accessible when Shorewall is stopped.</para>
hosts accessible when Shorewall is stopped. Superseded in Shorewall
4.6.8 by /etc/shorewall/stoppedrules. Not supported in Shorewall
5.0.0 and later versions.</para>
</listitem>
<listitem>
@ -141,13 +143,17 @@
rather unfortunate name because it is used to define marking of
packets for later use by both traffic control/shaping and policy
routing. This file is superseded by
<filename>/etc/shorewall/mangle</filename> in Shorewall
4.6.0.</para>
<filename>/etc/shorewall/mangle</filename> in Shorewall 4.6.0. Not
supported in Shorewall 5.0.0 and later releases.</para>
</listitem>
<listitem>
<para><filename>/etc/shorewall/tos</filename> - defines rules for
setting the TOS field in packet headers.</para>
setting the TOS field in packet headers. Superseded in Shorewall
4.5.1 by the TOS target in
<filename>/etc/shorewall/tcrules</filename> (which file has since
been superseded by
<filename>/etc/shorewall/mangle</filename>).</para>
</listitem>
<listitem>
@ -158,7 +164,8 @@
<listitem>
<para><filename>/etc/shorewall/blacklist</filename> - Deprecated in
favor of <filename>/etc/shorewall/blrules</filename>. Lists
blacklisted IP/subnet/MAC addresses.</para>
blacklisted IP/subnet/MAC addresses. Not supported in Shorewall
5.0.0 and later releases.</para>
</listitem>
<listitem>
@ -235,7 +242,8 @@
<para><filename>/etc/shorewall/tcrules</filename> - Mark or classify
traffic for traffic shaping or multiple providers. Deprecated in
Shorewall 4.6.0 in favor of
<filename>/etc/shorewall/mangle</filename>.</para>
<filename>/etc/shorewall/mangle</filename>. Not supported in
Shorewall 5.0.0 and later releases.</para>
</listitem>
<listitem>