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

Merge branch 'master' into 4.5.7

Browse Source 
Conflicts:
	docs/Manpages6.xml
This commit is contained in:
Tom Eastep 2012-08-20 11:38:18 -07:00
commit 59524d0d64
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/Manpages6.xml
View File

@ -70,9 +70,10 @@
url="manpages6/shorewall6-blacklist.html">blacklist</ulink> - Static
blacklisting (deprecated)</member>
<member><ulink url="manpages-conntrack.html">conntrack</ulink> -
Specify helpers for connections or exempt certain traffic from
netfilter connection tracking.</member>
<member><ulink
url="manpages6/shorewall6-conntrack.html">conntrack</ulink> - Specify
helpers for connections or exempt certain traffic from netfilter
connection tracking.</member>
<member><ulink
url="manpages6/shorewall6-exclusion.html">exclusion</ulink> -
@ -96,8 +97,9 @@
- How to define nested zones.</member>
<member><ulink url="manpages6/shorewall6-notrack.html">notrack</ulink>
- Exclude certain traffic from Netfilter6 connection tracking
(deprecated)</member>
- 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>