Author: brett.cannon Date: Fri Jan 1 02:47:00 2010 New Revision: 77199 Log: 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). ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Doc/using/cmdline.rst Modified: python/branches/release26-maint/Doc/using/cmdline.rst ============================================================================== --- python/branches/release26-maint/Doc/using/cmdline.rst (original) +++ python/branches/release26-maint/Doc/using/cmdline.rst Fri Jan 1 02:47:00 2010 @@ -21,7 +21,7 @@ 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 @@ :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 @@ .. note:: The line numbers in error messages will be off by one. +.. XXX document -X? + .. cmdoption:: -3