From d4db69739c073cb37097f313b76378bf7b2f9c19 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 12 Jan 2008 01:47:58 +0000
Subject: [PATCH] Update man pages based on previous fix

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8049 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 manpages/shorewall-hosts.xml      | 5 +++--
 manpages/shorewall-interfaces.xml | 5 +++--
 manpages/shorewall-nesting.xml    | 5 +++--
 manpages/shorewall-rules.xml      | 7 ++++---
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/manpages/shorewall-hosts.xml b/manpages/shorewall-hosts.xml
index c8e97aacc..de48c046f 100644
--- a/manpages/shorewall-hosts.xml
+++ b/manpages/shorewall-hosts.xml
@@ -206,8 +206,9 @@
           network 192.168.3.0/24 and in a zone named 'vpn'.<programlisting>#ZONE       HOST(S)               OPTIONS
 vpn         ppp+:192.168.3.0/24</programlisting></para>
 
-          <para>It is especially recommended to define such a zone using this
-          file rather than <ulink
+          <para>If you are running a Shorewall version prior to 4.1.4, it is
+          especially recommended to define such a zone using this file rather
+          than <ulink
           url="shorewall-interfaces.html">shorewall-interfaces</ulink>(8) if
           there is another zone that uses a fixed PPP interface (for example,
           if the 'net' zone always interfaces through ppp0).</para>
diff --git a/manpages/shorewall-interfaces.xml b/manpages/shorewall-interfaces.xml
index f4674079f..da362476a 100644
--- a/manpages/shorewall-interfaces.xml
+++ b/manpages/shorewall-interfaces.xml
@@ -71,8 +71,9 @@ loc     eth2            -</programlisting>
           applies to all PPP interfaces, use 'ppp+'; that would match ppp0,
           ppp1, ppp2, …</para>
 
-          <para>Care must be exercised when using wildcards where there is
-          another zone that uses a matching specific interface. See <ulink
+          <para>When using Shorewall versions before 4.1.4, care must be
+          exercised when using wildcards where there is another zone that uses
+          a matching specific interface. See <ulink
           url="shorewall-nesting.html">shorewall-nesting</ulink>(8) for a
           discussion of this problem.</para>
 
diff --git a/manpages/shorewall-nesting.xml b/manpages/shorewall-nesting.xml
index 891b57904..17e980b02 100644
--- a/manpages/shorewall-nesting.xml
+++ b/manpages/shorewall-nesting.xml
@@ -104,8 +104,9 @@
     multiple ACCEPT+ rules. This technique also may be used when the ACTION is
     REDIRECT.</para>
 
-    <para>Care must be taken when nesting occurs as a result of the use of
-    wildcard interfaces (interface names ends in '+').</para>
+    <para>When using Shorewall versions before 4.1.4, care must be taken when
+    nesting occurs as a result of the use of wildcard interfaces (interface
+    names ends in '+').</para>
 
     <para>Here's an example.
     <filename>/etc/shorewall/zones</filename>:<programlisting>        #ZONE    TYPE        OPTION
diff --git a/manpages/shorewall-rules.xml b/manpages/shorewall-rules.xml
index 340adee95..f25a12c88 100644
--- a/manpages/shorewall-rules.xml
+++ b/manpages/shorewall-rules.xml
@@ -1158,9 +1158,10 @@
         <listitem>
           <para>Shorewall does not impose as much structure on the Netfilter
           rules in the 'nat' table as it does on those in the filter table. As
-          a consequence, care must be exercised when using DNAT and REDIRECT
-          rules with zones defined with wildcard interfaces (those ending with
-          '+'. Here is an example:</para>
+          a consequence, when using Shorewall versions before 4.1.4, care must
+          be exercised when using DNAT and REDIRECT rules with zones defined
+          with wildcard interfaces (those ending with '+'. Here is an
+          example:</para>
 
           <para><ulink
           url="shorewall-zones.html">shorewall-zones</ulink>(8):<programlisting>        #ZONE       TYPE    OPTIONS