From 21c2963691e369017b0b301ffaf3af35b2df05d9 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 26 Nov 2012 07:48:43 -0800
Subject: [PATCH] Correct Format-3 syntax for the SOURCE column of the
 conntrack file.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/manpages/shorewall-conntrack.xml   | 14 ++------------
 Shorewall6/manpages/shorewall6-conntrack.xml | 14 ++------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/Shorewall/manpages/shorewall-conntrack.xml b/Shorewall/manpages/shorewall-conntrack.xml
index 67eb8cfd2..985eeea2d 100644
--- a/Shorewall/manpages/shorewall-conntrack.xml
+++ b/Shorewall/manpages/shorewall-conntrack.xml
@@ -307,22 +307,12 @@
           <para>Beginning with Shorewall 4.5.10, <option>all-</option> can be
           used as the <replaceable>zone</replaceable> name to mean all
           <firstterm>off-firewall zone</firstterm>s.</para>
-
-          <note>
-            <para>In 4.5.10, handling of <option>all</option> was changed.
-            <option>all</option> now causes the generated netfilter rule to be
-            appended to the raw table PREROUTING and OUTPUT chains directly.
-            <option>all-</option> rules are added directly to PREROUTING.
-            <option>all</option> and <option>all-</option> rules are processed
-            after the more specific rules that specify an individual
-            zone.</para>
-          </note>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>SOURCE (formats 3) ‒
-        {-|[:<emphasis>interface</emphasis>][:<emphasis>address-list</emphasis>}</term>
+        <term>SOURCE (format 3) ‒
+        {-|<emphasis>interface</emphasis>[:<emphasis>address-list</emphasis>]|<replaceable>address-list</replaceable>}</term>
 
         <listitem>
           <para>Where <replaceable>interface</replaceable> is an interface to
diff --git a/Shorewall6/manpages/shorewall6-conntrack.xml b/Shorewall6/manpages/shorewall6-conntrack.xml
index df5cb4d4c..a35ae0a79 100644
--- a/Shorewall6/manpages/shorewall6-conntrack.xml
+++ b/Shorewall6/manpages/shorewall6-conntrack.xml
@@ -203,22 +203,12 @@
           <para>Beginning with Shorewall 4.5.10, <option>all-</option> can be
           used as the <replaceable>zone</replaceable> name to mean all
           <firstterm>off-firewall zone</firstterm>s.</para>
-
-          <note>
-            <para>In 4.5.10, handling of <option>all</option> was changed.
-            <option>all</option> now causes the generated netfilter rule to be
-            appended to the raw table PREROUTING and OUTPUT chains directly.
-            <option>all-</option> rules are added directly to PREROUTING.
-            <option>all</option> and <option>all-</option> rules are processed
-            after the more specific rules that specify an individual
-            zone.</para>
-          </note>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>SOURCE (formats 3) ‒
-        {-|[:<emphasis>interface</emphasis>][:<emphasis>address-list</emphasis>}</term>
+        <term>SOURCE (format 3) ‒
+        {-|<emphasis>interface</emphasis>[:<emphasis>address-list</emphasis>]|<replaceable>address-list</replaceable>}</term>
 
         <listitem>
           <para>Where <replaceable>interface</replaceable> is an interface to