Merge branch '4.5.9'

Conflicts:
	docs/MultiISP.xml
	docs/images/Network2012a.dia
	docs/images/Network2012a.png
This commit is contained in:
Tom Eastep 2012-10-28 12:45:51 -07:00
commit d3c63a2d97

View File

@ -2643,8 +2643,6 @@ ZONE_BITS=0
<para>Here is <filename>/etc/shorewall6/zones</filename>:</para>
<programlisting/>
<programlisting>#ZONE TYPE OPTIONS
fw firewall
net ipv6