From 4a014d48846eebff545faf6b1c5c3adeee428745 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 4 Nov 2013 10:50:38 -0800
Subject: [PATCH] Documentation cleanup

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 docs/Accounting.xml            |  2 +-
 docs/Dynamic.xml               | 16 +++++++++-------
 docs/bridge-Shorewall-perl.xml |  6 +++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/docs/Accounting.xml b/docs/Accounting.xml
index 04869ae51..7104e37ae 100644
--- a/docs/Accounting.xml
+++ b/docs/Accounting.xml
@@ -250,7 +250,7 @@
 
       <listitem>
         <para>At any time, the Netfilter team could begin generating errors
-        when loading those same rules.</para>
+        when loading those same rules (that has happened).</para>
       </listitem>
 
       <listitem>
diff --git a/docs/Dynamic.xml b/docs/Dynamic.xml
index c26ba57d3..807dd2029 100644
--- a/docs/Dynamic.xml
+++ b/docs/Dynamic.xml
@@ -20,6 +20,8 @@
     <copyright>
       <year>2009</year>
 
+      <year>2013</year>
+
       <holder>Thomas M. Eastep</holder>
     </copyright>
 
@@ -45,18 +47,18 @@
 
     <para>Shorewall provides basic support for defining such zones. This
     support is based on <ulink
-    url="http://ipset.netfilter.org/">ipset</ulink>. As of this writing, ipset
-    is not included in the standard kernel distribution; so to use dynamic
-    zones, you must be running kernel 2.6.20 or later and have installed the
-    <ulink
-    url="http://xtables-addons.sourceforge.net/">xtables-addons</ulink>.</para>
+    url="http://ipset.netfilter.org/">ipset</ulink>. Most current
+    distributions have ipset, but you may need to install the <ulink
+    url="http://xtables-addons.sourceforge.net/">xtables-addons</ulink>.
+    </para>
   </section>
 
   <section id="xtables-addons">
     <title>Installing xtables-addons</title>
 
-    <para>The xtables-addons are fairly easy to install. You do not need to
-    recompile your kernel.</para>
+    <para>If your distribution does not have an xtables-addons package, the
+    xtables-addons are fairly easy to install. You do not need to recompile
+    your kernel.</para>
 
     <para><trademark>Debian</trademark> users can find xtables-addons-common
     and xtables-addons-source packages in <firstterm>testing</firstterm>. The
diff --git a/docs/bridge-Shorewall-perl.xml b/docs/bridge-Shorewall-perl.xml
index 42690411c..386c6e6cb 100644
--- a/docs/bridge-Shorewall-perl.xml
+++ b/docs/bridge-Shorewall-perl.xml
@@ -860,9 +860,9 @@ iface veth0 inet static
       </listitem>
 
       <listitem>
-        <para>It allows up to 8 <replaceable>marked</replaceable> zones
-        (2**3). Zones are marked unless they have <option>nomark</option> in
-        the OPTIONS column of their entry in <ulink
+        <para>It allows up to 7 <replaceable>marked</replaceable> zones (2**3
+        - 1). Zones are marked unless they have <option>nomark</option> in the
+        OPTIONS column of their entry in <ulink
         url="manpages/shorewall-zones.html">shorewall-zones </ulink>(5).
         Packets originating in a marked zone have a mark assigned
         automatically by Shorewall.</para>