diff --git a/doc/source/man/keystone-all.rst b/doc/source/man/keystone-all.rst
index 8c09690137..9b0859d9ee 100644
--- a/doc/source/man/keystone-all.rst
+++ b/doc/source/man/keystone-all.rst
@@ -16,6 +16,8 @@ Keystone Startup Command
 SYNOPSIS
 ========
 
+::
+
   keystone-all [-h] [--version] [--pydev-debug-port PYDEV_DEBUG_PORT]
                     [--verbose] [--noverbose] [--config-dir DIR]
                     [--log-config PATH] [--log-date-format DATE_FORMAT]
@@ -38,44 +40,46 @@ OPTIONS
 
   -h, --help            show this help message and exit
   --version             show program's version number and exit
-  --pydev-debug-port PYDEV_DEBUG_PORT
+  --debug, -d           Print debugging output (set logging level to DEBUG
+                        instead of default WARNING level).
+  --nodebug             The inverse of --debug
   --verbose, -v         Print more verbose output (set logging level to INFO
                         instead of default WARNING level).
   --noverbose           The inverse of --verbose
-  --config-dir DIR      Path to a config directory to pull *.conf files from.
-                        This file set is sorted, so as to provide a
-                        predictable parse order if individual options are
-                        over-ridden. The set is parsed after the file(s), if
-                        any, specified via --config-file, hence over-ridden
-                        options in the directory take precedence.
+  --use-syslog          Use syslog for logging.
+  --nouse-syslog        The inverse of --use-syslog
+  --standard-threads    Do not monkey-patch threading system modules.
+  --nostandard-threads  The inverse of --standard-threads
+  --pydev-debug-port PYDEV_DEBUG_PORT
+                        Port to connect to for remote debugger.
+  --config-file PATH    Path to a config file to use. Multiple config files
+                        can be specified, with values in later files taking
+                        precedence. The default files used are:
+                        ['/etc/keystone/keystone.conf']
   --log-config PATH     If this option is specified, the logging configuration
                         file specified is used and overrides any other logging
                         options specified. Please see the Python logging
                         module documentation for details on logging
                         configuration files.
+  --log-format FORMAT   A logging.Formatter log message format string which
+                        may use any of the available logging.LogRecord
+                        attributes.
   --log-date-format DATE_FORMAT
                         Format string for %(asctime)s in log records.
-  --use-syslog          Use syslog for logging.
-  --nouse-syslog        The inverse of --use-syslog
+  --log-file PATH       Name of log file to output. If not set, logging will
+                        go to stdout.
   --log-dir LOG_DIR     The directory in which to store log files. (will be
                         prepended to --log-file)
   --syslog-log-facility SYSLOG_LOG_FACILITY
                         syslog facility to receive log lines.
-  --standard-threads
-  --nostandard-threads  The inverse of --standard-threads
-  --config-file PATH    Path to a config file to use. Multiple config files
-                        can be specified, with values in later files taking
-                        precedence. The default files used are:
-                        ['/etc/keystone/keystone.conf']
   --pydev-debug-host PYDEV_DEBUG_HOST
-  --debug, -d           Print debugging output (set logging level to DEBUG
-                        instead of default WARNING level).
-  --nodebug             The inverse of --debug
-  --log-format FORMAT   A logging.Formatter log message format string which
-                        may use any of the available logging.LogRecord
-                        attributes.
-  --log-file PATH       Name of log file to output. If not set, logging will
-                        go to stdout.
+                        Host to connect to for remote debugger.
+  --config-dir DIR      Path to a config directory to pull \*.conf files from.
+                        This file set is sorted, so as to provide a
+                        predictable parse order if individual options are
+                        over-ridden. The set is parsed after the file(s), if
+                        any, specified via --config-file, hence over-ridden
+                        options in the directory take precedence.
 
 FILES
 =====
diff --git a/keystone/common/config.py b/keystone/common/config.py
index 51fdab7209..c0bd34e6ba 100644
--- a/keystone/common/config.py
+++ b/keystone/common/config.py
@@ -179,10 +179,13 @@ def configure():
     CONF.register_cli_opts(COMMON_CLI_OPTS)
     CONF.register_cli_opts(LOGGING_CLI_OPTS)
 
-    register_cli_bool('standard-threads', default=False)
+    register_cli_bool('standard-threads', default=False,
+                      help='Do not monkey-patch threading system modules.')
 
-    register_cli_str('pydev-debug-host', default=None)
-    register_cli_int('pydev-debug-port', default=None)
+    register_cli_str('pydev-debug-host', default=None,
+                     help='Host to connect to for remote debugger.')
+    register_cli_int('pydev-debug-port', default=None,
+                     help='Port to connect to for remote debugger.')
 
     register_str('admin_token', secret=True, default='ADMIN')
     register_str('bind_host', default='0.0.0.0')