3 files changed, 8 insertions, 1 deletions

diff --git a/src/mailman/bin/mailman.py b/src/mailman/bin/mailman.py
index a1ebccc8e..2bec7a1d4 100644
--- a/src/mailman/bin/mailman.py
+++ b/src/mailman/bin/mailman.py
@@ -39,6 +39,7 @@ from mailman.version import MAILMAN_VERSION_FULL
 
 
 def main():
+    """bin/mailman"""
     # Create the basic parser and add all globally common options.
     parser = argparse.ArgumentParser(
         description=_("""\
@@ -68,6 +69,7 @@ def main():
     # --help should display the subcommands by alphabetical order, except that
     # 'mailman help' should be first.
     def sort_function(command, other):
+        """Sorting helper."""
         if command.name == 'help':
             return -1
         elif other.name == 'help':
diff --git a/src/mailman/bin/qrunner.py b/src/mailman/bin/qrunner.py
index 3998b73a0..7f5f321f5 100644
--- a/src/mailman/bin/qrunner.py
+++ b/src/mailman/bin/qrunner.py
@@ -41,7 +41,9 @@ log = None
 
 
 
+# pylint: disable-msg=W0613
 def r_callback(option, opt, value, parser):
+    """Callback for -r/--runner option."""
     dest = getattr(parser.values, option.dest)
     parts = value.split(':')
     if len(parts) == 1:
@@ -65,7 +67,7 @@ def r_callback(option, opt, value, parser):
 
 
 class ScriptOptions(Options):
-
+    """Options for bin/qrunner."""
     usage = _("""\
 Run one or more queue runners, once or repeatedly.
 
@@ -85,6 +87,7 @@ separately or with -o is generally useful only for debugging.
 """)
 
     def add_options(self):
+        """See `Options`."""
         self.parser.add_option(
             '-r', '--runner',
             metavar='runner[:slice:range]', dest='runners',
@@ -124,6 +127,7 @@ This should only be used when running the queue runner as a subprocess of the
 behavior to work better with that framework."""))
 
     def sanity_check(self):
+        """See `Options`."""
         if self.arguments:
             self.parser.error(_('Unexpected arguments'))
         if not self.options.runners and not self.options.list:
diff --git a/src/mailman/docs/NEWS.txt b/src/mailman/docs/NEWS.txt
index 8b3075676..59b6cd936 100644
--- a/src/mailman/docs/NEWS.txt
+++ b/src/mailman/docs/NEWS.txt
@@ -7,6 +7,7 @@ Copyright (C) 1998-2010 by the Free Software Foundation, Inc.
 
 Here is a history of user visible changes to Mailman.
 
+
 3.0 alpha 6 -- "Cut to the Chase"
 =================================
 (2010-XX-XX)