From e482c3cf26dfba0442cf82d436f8bef28ba5ecd9 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 1 Dec 2004 21:23:59 +0000
Subject: [PATCH] Documentation Updates

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1794 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-docs2/Shorewall_and_Kazaa.xml       |  7 ++++-
 .../starting_and_stopping_shorewall.xml       | 28 ++++++++++---------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Shorewall-docs2/Shorewall_and_Kazaa.xml b/Shorewall-docs2/Shorewall_and_Kazaa.xml
index 1c715e2f9..bb65c8f85 100644
--- a/Shorewall-docs2/Shorewall_and_Kazaa.xml
+++ b/Shorewall-docs2/Shorewall_and_Kazaa.xml
@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>2004-09-16</pubdate>
+    <pubdate>2004-11-29</pubdate>
 
     <copyright>
       <year>2003-2004</year>
@@ -59,4 +59,9 @@
     <ulink
     url="http://shorewall.net/pub/shorewall/contrib/ftwall">http://shorewall.net/pub/shorewall/contrib/ftwall</ulink>.</para>
   </tip>
+
+  <para>Shorewall verions 2.2.0 and later also include support for the ipp2p
+  match facility which can be use to filter and/or control P2P traffic. See
+  the <ulink url="IPP2P.html">Shorewall IPP2P documentation</ulink> for
+  details.</para>
 </article>
\ No newline at end of file
diff --git a/Shorewall-docs2/starting_and_stopping_shorewall.xml b/Shorewall-docs2/starting_and_stopping_shorewall.xml
index d23d8d153..f1c03b66a 100644
--- a/Shorewall-docs2/starting_and_stopping_shorewall.xml
+++ b/Shorewall-docs2/starting_and_stopping_shorewall.xml
@@ -15,7 +15,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>2004-11-26</pubdate>
+    <pubdate>2004-11-27</pubdate>
 
     <copyright>
       <year>2004</year>
@@ -367,16 +367,17 @@
         <term>add</term>
 
         <listitem>
-          <para><command>shorewall add &lt;interface&gt;[:&lt;host&gt;]
-          &lt;zone&gt;</command></para>
+          <para><command>shorewall add &lt;interface&gt;[:&lt;bridge
+          port&gt;][:&lt;host&gt;] &lt;zone&gt;</command></para>
 
           <para>Adds a host or subnet to a dynamic zone usually used with
           VPN's.</para>
 
-          <para>Note that there is no provision in the syntax for specifying a
-          <ulink url="bridge.html">bridge</ulink> port and that the "shorewall
-          add" command is not supported for hosts connected to the firewall
-          through a bridge port.</para>
+          <para>Note that there was no provision in the syntax for specifying
+          a <ulink url="bridge.html">bridge</ulink> port prior to Shorewall
+          versions 2.0.12 and 2.2.0 Beta 7 and that the "shorewall add"
+          command was not supported for hosts connected to the firewall
+          through a bridge port prior to those releases.</para>
 
           <para>Example: <command>shorewall add ipsec0:192.0.2.24
           vpn1</command></para>
@@ -447,16 +448,17 @@
         <term>delete</term>
 
         <listitem>
-          <para><command>shorewall delete &lt;interface&gt;[:&lt;host&gt;]
-          &lt;zone&gt;</command></para>
+          <para><command>shorewall delete &lt;interface&gt;[:&lt;bridge
+          port&gt;][:&lt;host&gt;] &lt;zone&gt;</command></para>
 
           <para>Deletes the specified interface (and host if included) from
           the specified zone.</para>
 
-          <para>Note that there is no provision in the syntax for specifying a
-          <ulink url="bridge.html">bridge</ulink> port and that the "shorewall
-          delete" command is not supported for hosts connected to the firewall
-          through a bridge port.</para>
+          <para>Note that there was no provision in the syntax for specifying
+          a <ulink url="bridge.html">bridge</ulink> port prior to Shorewall
+          versions 2.0.12 and 2.2.0 Beta 7 and that the "shorewall delete"
+          command was not supported for hosts connected to the firewall
+          through a bridge port prior to those releases.</para>
 
           <para>Example:</para>