diff --git a/docs/Anatomy.xml b/docs/Anatomy.xml index 9c92bb091..a41f60a4a 100644 --- a/docs/Anatomy.xml +++ b/docs/Anatomy.xml @@ -5,7 +5,7 @@ - Anatomy of Shorewall + Anatomy of Shorewall 4.0 diff --git a/docs/bridge-Shorewall-perl.xml b/docs/bridge-Shorewall-perl.xml index 5e1ebe713..c6b1d3f11 100644 --- a/docs/bridge-Shorewall-perl.xml +++ b/docs/bridge-Shorewall-perl.xml @@ -551,7 +551,8 @@ rc-update add bridge boot In /etc/shorewall/zones, BP zones are specified using the bport (or bport4) - keyword. + keyword. Shorewall perl requires that BRIDGING=No in + shorewall.conf. In the scenario pictured above, there would probably be two BP zones defined -- one for the internet and one for the local LAN so in diff --git a/docs/starting_and_stopping_shorewall.xml b/docs/starting_and_stopping_shorewall.xml index 5370e4700..c0b70493e 100644 --- a/docs/starting_and_stopping_shorewall.xml +++ b/docs/starting_and_stopping_shorewall.xml @@ -105,6 +105,10 @@ The program /sbin/shorewall-lite performs a similar role with Shorewall-lite. + + For a more complete description of the files and directories + involved in Shorewall and Shorewall-lite, see the Shorewall Anatomy article.
diff --git a/manpages/shorewall.xml b/manpages/shorewall.xml index ea3e04b4c..5d62f3d09 100644 --- a/manpages/shorewall.xml +++ b/manpages/shorewall.xml @@ -507,11 +507,7 @@ defined in the shorewall-interfaces(5) file. A host-list is comma-separated list whose - elements are: - - A host or network address - The name of a bridge port - The name of a bridge port followed by a colon (:) and a host or network address + elements are a host or network address. @@ -614,11 +610,7 @@ defined in the shorewall-interfaces(5) file. A host-list is comma-separated list whose - elements are: - - A host or network address - The name of a bridge port - The name of a bridge port followed by a colon (:) and a host or network address + elements are a host or network address. @@ -1202,7 +1194,7 @@ Displays Shorewall's version. If the option is included, the versions of Shorewall-shell and/or - Shorewall-perl will also be displayed. + Shorewall-perl will also be displayed.