From 1ce5eb524b36209e1114c374caf19dbf6e06cea7 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 13 Dec 2004 18:51:00 +0000
Subject: [PATCH] Clarify add/delete syntax in help summary

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

diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index 6a23c4029..9a3e2c2d9 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -179,3 +179,5 @@ Changes since 2.0.3
 
 88) Allow list of hosts in add and delete commands. Fix ipsec problem
     with "add" and "delete"
+
+89) Clarify add/delete syntax in /sbin/shorewall usage summary.
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index 35f739a98..e7abe37df 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -1,4 +1,4 @@
-Shorewall 2.2.0-Beta8
+Shorewall 2.2.0-RC1
 
 ----------------------------------------------------------------------
 Problems Corrected since 2.0.3
@@ -187,6 +187,11 @@ Problems corrected since 2.2.0 Beta 7:
 2) The "add" and "delete" commands were generating incorrect policy 
    matches when policy match support was available.
 
+Problems corrected since 2.2.0 Beta 8:
+
+1) The syntax of the add and delete command has been clarified in the
+   help summary produced by /sbin/shorewall.
+
 -----------------------------------------------------------------------
 Issues when migrating from Shorewall 2.0 to Shorewall 2.1:
 
diff --git a/Shorewall2/shorewall b/Shorewall2/shorewall
index 2043cd9d2..266d8be17 100755
--- a/Shorewall2/shorewall
+++ b/Shorewall2/shorewall
@@ -590,11 +590,11 @@ usage() # $1 = exit status
 {
     echo "Usage: $(basename $0) [debug|trace] [nolock] [-c <directory>] [ -x ] [ -q ] [ -f ] <command>"
     echo "where <command> is one of:"
-    echo "   add <interface>[:<host>] <zone>"
+    echo "   add <interface>[:{<bridge-port>[:<host>]|<host>}[,...]] ... <zone>"
     echo "   allow <address> ..."
     echo "   check [ <directory> ]"
     echo "   clear"
-    echo "   delete <interface>[:<host>] <zone>"
+    echo "   delete <interface>[:{<bridge-port>[:<host>]|<host>}[,...]] ... <zone>"
     echo "   drop <address> ..."
     echo "   forget [ <file name> ]"
     echo "   help [ <command > | host | address ]"