From c90913850afba28c4a030555f8aff52754f975d9 Mon Sep 17 00:00:00 2001 From: Zev Benjamin Date: Mon, 3 Mar 2014 00:52:00 -0500 Subject: [PATCH] jabber_mirror: Clean up help text (imported from commit bd9a4682c754423047a993b8914d965c2e12fdf4) --- bots/jabber_mirror.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bots/jabber_mirror.py b/bots/jabber_mirror.py index ecf1582..7270cde 100755 --- a/bots/jabber_mirror.py +++ b/bots/jabber_mirror.py @@ -293,10 +293,6 @@ user and mirrors messages sent to Jabber rooms to Zulip.'''.replace("\n", " ")) default=logging.INFO) jabber_group = optparse.OptionGroup(parser, "Jabber configuration") - jabber_group.add_option('--openfire', - default=False, - action='store_true', - help="Set if Jabber server is an OpenFire server") jabber_group.add_option('--jabber-username', default=None, action='store', @@ -309,14 +305,18 @@ user and mirrors messages sent to Jabber rooms to Zulip.'''.replace("\n", " ")) default=None, action='store', help="Your Jabber server") - jabber_group.add_option('--no-use-tls', - default=False, - action='store_true') jabber_group.add_option('--conference-domain', default=None, action='store', help="Your Jabber conference domain (E.g. conference.jabber.example.com). " - + "Only required when running in \"public\" mode.") + + "Required when running in \"public\" mode.") + jabber_group.add_option('--openfire', + default=None, + action='store_true', + help="Set if Jabber server is an OpenFire server") + jabber_group.add_option('--no-use-tls', + default=None, + action='store_true') parser.add_option_group(jabber_group) parser.add_option_group(zulip.generate_option_group(parser, "zulip-"))