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).
........
This commit is contained in:
Brett Cannon 2010-01-01 01:47:00 +00:00
parent caa44c057a
commit 1264f1effb
1 changed files with 4 additions and 2 deletions

View File

@ -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