Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code

This commit is contained in:
Tom Eastep 2014-01-11 09:58:59 -08:00
commit d3af4264c7
2 changed files with 9 additions and 1 deletions

View File

@ -77,7 +77,11 @@
<member><ulink
url="manpages/shorewall-blacklist.html">blacklist</ulink> - Static
blacklisting.</member>
blacklisting (deprecated)</member>
<member><ulink
url="manpages/shorewall-blrules.html">blrules</ulink> - shorewall
Blacklist file.</member>
<member><ulink
url="manpages/shorewall-conntrack.html">conntrack</ulink> - Specify

View File

@ -70,6 +70,10 @@
url="manpages6/shorewall6-blacklist.html">blacklist</ulink> - Static
blacklisting (deprecated)</member>
<member><ulink
url="manpages6/shorewall6-blrules.html">blrules</ulink> - shorewall6
Blacklist file.</member>
<member><ulink
url="manpages6/shorewall6-conntrack.html">conntrack</ulink> - Specify
helpers for connections or exempt certain traffic from netfilter