summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2010-02-05 19:12:30 (GMT)
committerBarry Warsaw <barry@python.org>2010-02-05 19:12:30 (GMT)
commit615368fbfa75700d2d598f4b965ab2f7efbd8356 (patch)
tree4968b45e9e3ae6ca6da1ee403288a83064643c37
parentc78b05a9ea971135340825a1fb2fd54248949e11 (diff)
downloadcpython-615368fbfa75700d2d598f4b965ab2f7efbd8356.zip
cpython-615368fbfa75700d2d598f4b965ab2f7efbd8356.tar.gz
cpython-615368fbfa75700d2d598f4b965ab2f7efbd8356.tar.bz2
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.
-rw-r--r--Doc/using/cmdline.rst16
-rw-r--r--Misc/NEWS3
2 files changed, 17 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
diff --git a/Misc/NEWS b/Misc/NEWS
index 3dd680a..fe7e6f6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -701,6 +701,9 @@ Build
Documentation
------------
+- Updating `Using Python` documentation to include description of CPython's
+ -J and -X options.
+
- Document that importing a module that has None in sys.modules triggers an
ImportError.