diff options
| author | Nuno Santos <nsantos@apache.org> | 2011-09-08 20:45:33 +0000 |
|---|---|---|
| committer | Nuno Santos <nsantos@apache.org> | 2011-09-08 20:45:33 +0000 |
| commit | 3ee5b3a8b77426987bff6b65f147b27a99b027c3 (patch) | |
| tree | ee2c65d850ba7f4e7398eef1e2ccf730499ecf10 /qpid/tools/src/py | |
| parent | 7d5bce20c5ca6bc3869cbe2f6a73f1968c7a5abb (diff) | |
| download | qpid-python-3ee5b3a8b77426987bff6b65f147b27a99b027c3.tar.gz | |
QPID-3437: qpid-config address option confusing in help
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1166897 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/tools/src/py')
| -rwxr-xr-x | qpid/tools/src/py/qpid-config | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/qpid/tools/src/py/qpid-config b/qpid/tools/src/py/qpid-config index 63fe66da67..cd80e26a1e 100755 --- a/qpid/tools/src/py/qpid-config +++ b/qpid/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) |