From 4739329853525151fec21dc3896f46eced743aed Mon Sep 17 00:00:00 2001
From: Nuno Santos <nsantos@apache.org>
Date: Thu, 8 Sep 2011 20:45:33 +0000
Subject: QPID-3437: qpid-config address option confusing in help

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1166897 13f79535-47bb-0310-9956-ffa450edef68
---
 tools/src/py/qpid-config | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/src/py/qpid-config b/tools/src/py/qpid-config
index 63fe66da67..cd80e26a1e 100755
--- a/tools/src/py/qpid-config
+++ b/tools/src/py/qpid-config
@@ -39,11 +39,6 @@ Usage:  qpid-config [OPTIONS]
         qpid-config [OPTIONS] unbind <exchange-name> <queue-name> [binding-key]"""
 
 description = """
-ADDRESS syntax:
-
-      [username/password@] hostname [:<port>]
-      [username/password@] ip-address [:<port>]
-
 Examples:
 
 $ qpid-config add queue q
@@ -160,7 +155,7 @@ def OptionsAndArguments(argv):
     group1 = OptionGroup(parser, "General Options")
     group1.add_option("-t", "--timeout", action="store", type="int", default=10, metavar="<secs>", help="Maximum time to wait for broker connection (in seconds)")
     group1.add_option("-b", "--bindings", action="store_true", help="Show bindings in queue or exchange list")
-    group1.add_option("-a", "--broker-addr", action="store", type="string", default="localhost:5672", metavar="<address>", help="Address of qpidd broker")
+    group1.add_option("-a", "--broker-addr", action="store", type="string", default="localhost:5672", metavar="<address>", help="Address of qpidd broker with syntax: [username/password@] hostname | ip-address [:<port>]")
     group1.add_option("--sasl-mechanism", action="store", type="string", metavar="<mech>", help="SASL mechanism for authentication (e.g. EXTERNAL, ANONYMOUS, PLAIN, CRAM-MD, DIGEST-MD5, GSSAPI). SASL automatically picks the most secure available mechanism - use this option to override.")
     parser.add_option_group(group1)
 
-- 
cgit v1.2.1