From 3d541f50c82e648d0cd5d775570c23185dc51f07 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Fri, 11 May 2012 12:42:04 -0700
Subject: [PATCH] Use "(S)" consistently in column headings.

- add synonyms so both the singular and plural forms are accepted.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Misc.pm           |  2 +-
 Shorewall/Perl/Shorewall/Tunnels.pm        |  2 +-
 Shorewall/Perl/Shorewall/Zones.pm          |  2 +-
 Shorewall/configfiles/tunnels              |  4 ++--
 Shorewall/manpages/shorewall-tunnels.xml   | 10 +++++-----
 Shorewall6/configfiles/tunnels             |  4 ++--
 Shorewall6/manpages/shorewall6-tunnels.xml | 10 +++++-----
 docs/configuration_file_basics.xml         | 10 +++++++---
 8 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Misc.pm b/Shorewall/Perl/Shorewall/Misc.pm
index 84d8a4cf0..963a9d687 100644
--- a/Shorewall/Perl/Shorewall/Misc.pm
+++ b/Shorewall/Perl/Shorewall/Misc.pm
@@ -151,7 +151,7 @@ sub setup_ecn()
 
 	while ( read_a_line( NORMAL_READ ) ) {
 
-	    my ($interface, $hosts ) = split_line 'ecn file entry', { interface => 0, hosts => 1 };
+	    my ($interface, $hosts ) = split_line1 'ecn file entry', { interface => 0, host => 1, hosts => 1 }, {}, 2;
 
 	    fatal_error 'INTERFACE must be specified' if $interface eq '-';
 	    fatal_error "Unknown interface ($interface)" unless known_interface $interface;
diff --git a/Shorewall/Perl/Shorewall/Tunnels.pm b/Shorewall/Perl/Shorewall/Tunnels.pm
index efb6e2ac3..218bbca61 100644
--- a/Shorewall/Perl/Shorewall/Tunnels.pm
+++ b/Shorewall/Perl/Shorewall/Tunnels.pm
@@ -292,7 +292,7 @@ sub setup_tunnels() {
 
 	while ( read_a_line( NORMAL_READ ) ) {
 
-	    my ( $kind, $zone, $gateway, $gatewayzones ) = split_line1 'tunnels file', { type => 0, zone => 1, gateway => 2, gateways => 2, gateway_zone => 3 }, undef, 4;
+	    my ( $kind, $zone, $gateway, $gatewayzones ) = split_line1 'tunnels file', { type => 0, zone => 1, gateway => 2, gateways => 2, gateway_zone => 3 , gateway_zones => 3 }, undef, 4;
 
 	    fatal_error 'TYPE must be specified' if $kind eq '-';
 
diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm
index 6ff384e99..09d9195c7 100644
--- a/Shorewall/Perl/Shorewall/Zones.pm
+++ b/Shorewall/Perl/Shorewall/Zones.pm
@@ -1808,7 +1808,7 @@ sub compile_updown() {
 #
 sub process_host( ) {
     my $ipsec = 0;
-    my ($zone, $hosts, $options ) = split_line 'hosts file', { zone => 0, hosts => 1, options => 2 };
+    my ($zone, $hosts, $options ) = split_line1 'hosts file', { zone => 0, host => 1, hosts => 1, options => 2 }, {}, 3;
 
     fatal_error 'ZONE must be specified'  if $zone eq '-';
     fatal_error 'HOSTS must be specified' if $hosts eq '-';
diff --git a/Shorewall/configfiles/tunnels b/Shorewall/configfiles/tunnels
index 8082fa61e..4b8bb0a4c 100644
--- a/Shorewall/configfiles/tunnels
+++ b/Shorewall/configfiles/tunnels
@@ -7,5 +7,5 @@
 # http://www.shorewall.net/manpages/shorewall-tunnels.html
 #
 ###############################################################################
-#TYPE			ZONE	GATEWAYS			GATEWAY
-#								ZONES
+#TYPE			ZONE	GATEWAY(S)			GATEWAY
+#								ZONE(S)
diff --git a/Shorewall/manpages/shorewall-tunnels.xml b/Shorewall/manpages/shorewall-tunnels.xml
index becfa57bc..8af5cd32d 100644
--- a/Shorewall/manpages/shorewall-tunnels.xml
+++ b/Shorewall/manpages/shorewall-tunnels.xml
@@ -125,9 +125,9 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">GATEWAY</emphasis>S -
-        <emphasis>address-or-range</emphasis> <emphasis role="bold">[ , ...
-        ]</emphasis></term>
+        <term><emphasis role="bold">GATEWAY</emphasis>(S) (gateway or
+        gateways) - <emphasis>address-or-range</emphasis> <emphasis
+        role="bold">[ , ... ]</emphasis></term>
 
         <listitem>
           <para>The IP address of the remote tunnel gateway. If the remote
@@ -144,8 +144,8 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">GATEWAY ZONES</emphasis> (gateway_zone) -
-        [<emphasis>zone</emphasis>[<emphasis
+        <term><emphasis role="bold">GATEWAY ZONES</emphasis> (gateway_zone or
+        gateway_zones) - [<emphasis>zone</emphasis>[<emphasis
         role="bold">,</emphasis><emphasis>zone</emphasis>]...]</term>
 
         <listitem>
diff --git a/Shorewall6/configfiles/tunnels b/Shorewall6/configfiles/tunnels
index 4f5e1ed17..013725ee6 100644
--- a/Shorewall6/configfiles/tunnels
+++ b/Shorewall6/configfiles/tunnels
@@ -7,5 +7,5 @@
 # http://www.shorewall.net/manpages6/shorewall6-tunnels.html
 #
 ###############################################################################
-#TYPE			ZONE	GATEWAYS			GATEWAY
-#								ZONES
+#TYPE			ZONE	GATEWAY(S)			GATEWAY
+#								ZONE(S)
diff --git a/Shorewall6/manpages/shorewall6-tunnels.xml b/Shorewall6/manpages/shorewall6-tunnels.xml
index 028ae2667..2ac953ac5 100644
--- a/Shorewall6/manpages/shorewall6-tunnels.xml
+++ b/Shorewall6/manpages/shorewall6-tunnels.xml
@@ -120,9 +120,9 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">GATEWAY</emphasis>S -
-        <emphasis>address-or-range</emphasis> <emphasis role="bold">[ , ...
-        ]</emphasis></term>
+        <term><emphasis role="bold">GATEWAY</emphasis>(S) (gateway or
+        gateways) - <emphasis>address-or-range</emphasis> <emphasis
+        role="bold">[ , ... ]</emphasis></term>
 
         <listitem>
           <para>The IP address of the remote tunnel gateway. If the remote
@@ -139,8 +139,8 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">GATEWAY ZONES</emphasis> (gateway_zone) -
-        [<emphasis>zone</emphasis>[<emphasis
+        <term><emphasis role="bold">GATEWAY ZONE(S)</emphasis> (gateway_zone
+        or gateway_zones) - [<emphasis>zone</emphasis>[<emphasis
         role="bold">,</emphasis><emphasis>zone</emphasis>]...]</term>
 
         <listitem>
diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml
index ec5a85b2e..8269cfefa 100644
--- a/docs/configuration_file_basics.xml
+++ b/docs/configuration_file_basics.xml
@@ -579,13 +579,15 @@ ACCEPT      net:\
           <row>
             <entry>ecn</entry>
 
-            <entry>interface,hosts</entry>
+            <entry>interface,hosts. Beginning with Shorewall 4.5.4, 'host' is
+            a synonym for 'hosts'.</entry>
           </row>
 
           <row>
             <entry>hosts</entry>
 
-            <entry>zone,hosts,options</entry>
+            <entry>zone,hosts,options. Beginning with Shorewall 4.5.4, 'host'
+            is a synonym for 'hosts'.</entry>
           </row>
 
           <row>
@@ -720,7 +722,9 @@ ACCEPT      net:\
             <entry>tunnels</entry>
 
             <entry>type,zone,gateway,gateway_zone. Beginning with Shorewall
-            4.5.3, 'gateways' is a synonym for 'gateway'.</entry>
+            4.5.3, 'gateways' is a synonym for 'gateway'. Beginning with
+            Shorewall 4.5.4, 'gateway_zones' is a synonym for
+            'gateway_zone'.</entry>
           </row>
 
           <row>