summaryrefslogtreecommitdiffstats
path: root/Doc/using
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2010-02-05 19:21:12 (GMT)
committerBarry Warsaw <barry@python.org>2010-02-05 19:21:12 (GMT)
commita1bd445e6cc22718559ade054f9403f43f2ea319 (patch)
treefd953848a2a6e59d7ea48f2e2c402c1612c20f79 /Doc/using
parent2c4f8d12f0d44c926ddd62f4e84c3fae1ffd7c44 (diff)
downloadcpython-a1bd445e6cc22718559ade054f9403f43f2ea319.zip
cpython-a1bd445e6cc22718559ade054f9403f43f2ea319.tar.gz
cpython-a1bd445e6cc22718559ade054f9403f43f2ea319.tar.bz2
Merged revisions 77995 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r77995 | barry.warsaw | 2010-02-05 14:12:30 -0500 (Fri, 05 Feb 2010) | 3 lines Document the -J and -X options for CPython. Note that unlike for py2k, we don't need to document -U becuase it's gone in py3k. ........
Diffstat (limited to 'Doc/using')
-rw-r--r--Doc/using/cmdline.rst16
1 files changed, 14 insertions, 2 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 7c9b511..540e4d7 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -238,8 +238,6 @@ Miscellaneous options
See also :envvar:`PYTHONUNBUFFERED`.
-.. XXX should the -U option be documented?
-
.. cmdoption:: -v
Print a message each time a module is initialized, showing the place
@@ -315,6 +313,20 @@ Miscellaneous options
.. note:: The line numbers in error messages will be off by one.
+Options you shouldn't use
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. cmdoption:: -J
+
+ Reserved for use by Jython_.
+
+.. _Jython: http://jython.org
+
+.. cmdoption:: -X
+
+ Reserved for alternative implementations of Python to use for their own
+ purposes.
+
.. _using-on-envvars:
Environment variables