From: Brett Cannon <bcannon@gmail.com>
Date: Fri, 1 Jan 2010 01:47:00 +0000 (+0000)
Subject: Merged revisions 77198 via svnmerge from
X-Git-Tag: v2.6.5rc1~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1264f1effb670c95adc7e25685d35c674a3a1cde;p=python

Merged revisions 77198 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77198 | brett.cannon | 2009-12-31 17:44:57 -0800 (Thu, 31 Dec 2009) | 3 lines

  Add some missing command-line options to the main list. All but -V were already
  documented. Left -V undocumented for now (and -U was already undocumented).
........
---

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 403b7b7318..bb9ae87b2c 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -21,7 +21,7 @@ Command line
 
 When invoking Python, you may specify any of these options::
 
-    python [-dEiOQsStuUvxX3?] [-c command | -m module-name | script | - ] [args]
+    python [-BdEiOQsStuUvVWxX3?] [-c command | -m module-name | script | - ] [args]
 
 The most common use case is, of course, a simple invocation of a script::
 
@@ -307,7 +307,7 @@ Miscellaneous options
    :mod:`warnings` module.
 
    The simplest form of argument is one of the following action strings (or a
-   unique abbreviation):
+   unique abbreviation) by themselves:
 
    ``ignore``
       Ignore all warnings.
@@ -353,6 +353,8 @@ Miscellaneous options
 
    .. note:: The line numbers in error messages will be off by one.
 
+.. XXX document -X?
+
 
 .. cmdoption:: -3