Merge lp:~sumanah/mailman/commafix into lp:mailman

Proposed by Sumana Harihareswara on 2015-04-20
Status: Merged
Merged at revision: 7333
Proposed branch: lp:~sumanah/mailman/commafix
Merge into: lp:mailman
Diff against target: 21 lines (+2/-2)
1 file modified
src/mailman/commands/cli_control.py (+2/-2)
To merge this branch: bzr merge lp:~sumanah/mailman/commafix
Reviewer Review Type Date Requested Status
Barry Warsaw 2015-04-20 Pending
Review via email: mp+256764@code.launchpad.net

Description of the change

Two tiny typofixes for the command line options & help.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/mailman/commands/cli_control.py'
2--- src/mailman/commands/cli_control.py 2015-01-20 19:53:16 +0000
3+++ src/mailman/commands/cli_control.py 2015-04-20 01:39:24 +0000
4@@ -56,7 +56,7 @@
5 default=False, action='store_true',
6 help=_("""\
7 If the master watcher finds an existing master lock, it will
8- normally exit with an error message. With this option,the master
9+ normally exit with an error message. With this option, the master
10 will perform an extra level of checking. If a process matching
11 the host/pid described in the lock file is running, the master
12 will still exit, requiring you to manually clean up the lock. But
13@@ -78,7 +78,7 @@
14 This flag is not recommended for normal production environments.
15
16 Note though, that if you run with -u and are not in the mailman
17- group, you may have permission problems, such as begin unable to
18+ group, you may have permission problems, such as being unable to
19 delete a list's archives through the web. Tough luck!"""))
20 command_parser.add_argument(
21 '-q', '--quiet',