summaryrefslogtreecommitdiff
path: root/tools/src
diff options
context:
space:
mode:
authorNuno Santos <nsantos@apache.org>2011-09-08 20:45:33 +0000
committerNuno Santos <nsantos@apache.org>2011-09-08 20:45:33 +0000
commit4739329853525151fec21dc3896f46eced743aed (patch)
tree09aeb9a4f9f688a24c84e7d343567d6e88a5f6c3 /tools/src
parent2d41f47988da7be69b5e0b007b1591d8ad66e41f (diff)
downloadqpid-python-4739329853525151fec21dc3896f46eced743aed.tar.gz
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
Diffstat (limited to 'tools/src')
-rwxr-xr-xtools/src/py/qpid-config7
1 files changed, 1 insertions, 6 deletions
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)