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

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 7c9b511ad6697f8bac99b0e2966534795e5baafa..540e4d7b0f929291427b7a66ff0484ca72bb1454 100644 (file)
--- 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 9b72293af6b0f41a0642781888f9de2fbf8062e1..badfbadeddf62597c4757217a8cc63ee1b00080c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -378,6 +378,9 @@ Build
 Documentation
 -------------
 
+- Updating `Using Python` documentation to include description of CPython's
+  -J and -X options.
+
 - Issue #6556: Fixed the Distutils configuration files location explanation
   for Windows.