From f1fa573d470246a7806f76d85c6e22fc537987e1 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 27 Jun 2007 14:47:58 +0000
Subject: [PATCH] Update manpages

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6689 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 manpages-lite/shorewall-lite.xml | 20 ++++++++++----------
 manpages/shorewall.xml           | 10 +++++++++-
 web/Documentation.html           |  5 ++---
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/manpages-lite/shorewall-lite.xml b/manpages-lite/shorewall-lite.xml
index f91349fa1..5f6ff41a6 100644
--- a/manpages-lite/shorewall-lite.xml
+++ b/manpages-lite/shorewall-lite.xml
@@ -326,11 +326,15 @@
           defined in the <ulink
           url="shorewall-interfaces.html">shorewall-interfaces</ulink>(5)
           file. A <emphasis>host-list</emphasis> is comma-separated list whose
-          elements are:</para>
-
-          <programlisting>        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</programlisting>
+          elements are a host or network address.<caution>
+              <para>The <command>add</command> command is not very robust. If
+              there are errors in the <replaceable>host-list</replaceable>,
+              you may see a large number of error messages yet a subsequent
+              <command>shorewall show zones</command> command will indicate
+              that all hosts were added. If this happens, replace
+              <command>add</command> by <command>delete</command> and run the
+              same command again. Then enter the correct command.</para>
+            </caution></para>
         </listitem>
       </varlistentry>
 
@@ -368,11 +372,7 @@
           defined in the <ulink
           url="shorewall-interfaces.html">shorewall-interfaces</ulink>(5)
           file. A <emphasis>host-list</emphasis> is comma-separated list whose
-          elements are:</para>
-
-          <programlisting>        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</programlisting>
+          elements are a host or network address.</para>
         </listitem>
       </varlistentry>
 
diff --git a/manpages/shorewall.xml b/manpages/shorewall.xml
index 5d62f3d09..13ea85320 100644
--- a/manpages/shorewall.xml
+++ b/manpages/shorewall.xml
@@ -507,7 +507,15 @@
           defined in the <ulink
           url="shorewall-interfaces.html">shorewall-interfaces</ulink>(5)
           file. A <emphasis>host-list</emphasis> is comma-separated list whose
-          elements are a host or network address.</para>
+          elements are a host or network address.<caution>
+              <para>The <command>add</command> command is not very robust. If
+              there are errors in the <replaceable>host-list</replaceable>,
+              you may see a large number of error messages yet a subsequent
+              <command>shorewall show zones</command> command will indicate
+              that all hosts were added. If this happens, replace
+              <command>add</command> by <command>delete</command> and run the
+              same command again. Then enter the correct command.</para>
+            </caution></para>
         </listitem>
       </varlistentry>
 
diff --git a/web/Documentation.html b/web/Documentation.html
index 20bfd6b17..e8634c5b8 100644
--- a/web/Documentation.html
+++ b/web/Documentation.html
@@ -67,10 +67,9 @@ License</a></span>”.<br>
 
 
 <div style="margin-left: 40px;">
-<a href="2.0/">Shorewall 2.x Documentation</a>
+<a href="2.0/">Shorewall 2.x Documentation</a> 
 
-<p><a href="4.0/index.html">Shorewall 4.0 Documentation</a> (under
-construction)</p>
+<p><a href="4.0/index.html">Shorewall 4.0 Documentation</a></p>
 </div>
 <br>
 </body>