From e2978f336a0f783e4bb2ff1fa6bf0c6c05df6dae Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 3 Mar 2004 23:52:26 +0000
Subject: [PATCH] Fixes to RC1

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1180 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall2/changelog.txt    | 2 ++
 Shorewall2/firewall         | 2 +-
 Shorewall2/help             | 4 ++--
 Shorewall2/releasenotes.txt | 4 +++-
 Shorewall2/rules            | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index bab5ae6dc..01ef9484b 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -54,3 +54,5 @@ Changes since 1.4.10
 26) Avoid superfluous --state NEW tests.
 
 27) Allow backrouting of 'routestopped' devices.
+
+28) Fix the help file.
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index e8da02f57..cf2eb60dc 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -586,7 +586,7 @@ validate_interfaces_file() {
 		detectnets)
 		    [ -n "$wildcard" ] && \
 			startup_error "The \"detectnets\" option may not be used with a wild-card interface"
-	    ;;
+		    ;;
 		routeback)
 		    [ -n "$z" ] || startup_error "The routeback option may not be specified on a multi-zone interface"
 		    ;;
diff --git a/Shorewall2/help b/Shorewall2/help
index c5c3fc489..4ed47f396 100644
--- a/Shorewall2/help
+++ b/Shorewall2/help
@@ -89,7 +89,7 @@ debug)
     The above command would trace the 'start' command and
     place the trace information in the file /tmp/trace.
 
-    The word 'trace' is a synonym for 'debug'.
+    The word 'trace' is a synonym for 'debug'."
 	;;
 
 delete)
@@ -240,7 +240,7 @@ trace)
     The above command would trace the 'start' command and
     place the trace information in the file /tmp/trace.
 
-    The word 'debug' is a synonym for 'trace'.
+    The word 'debug' is a synonym for 'trace'."
 	;;
 
 try)
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index a67fba027..7590c8f3f 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -1,4 +1,4 @@
-Shorewall 2.0.0-RC1
+Shorewall 2.0.0-RC2
 
 ----------------------------------------------------------------------
 Problems Corrected since 1.4.10
@@ -20,6 +20,8 @@ Problems Corrected since RC1
 1) After a "shorewall stop", traffic routed back to networks in
    the /etc/shorewall/routestopped file is accepted. This is required
    to allow traffic through a bridge while shorewall is stopped.
+
+2) The /usr/share/shorewall/help file has been corrected.
 -----------------------------------------------------------------------
 Issues when migrating from Shorewall 1.4.x to Shorewall 2.0.0:
 
diff --git a/Shorewall2/rules b/Shorewall2/rules
index ec95843bd..1ab64b347 100755
--- a/Shorewall2/rules
+++ b/Shorewall2/rules
@@ -53,7 +53,8 @@
 #					    application such as ftwall
 #					    (http://p2pwall.sf.net).
 #				<action> -- The name of an action defined in
-#					    /etc/shorewall/actions.
+#					    /etc/shorewall/actions or in 
+#					    /usr/share/shorewall/actions.std.
 #
 #			The ACTION may optionally be followed
 #			by ":" and a syslog log level (e.g, REJECT:info or