[Python-checkins] r77996 - in python/branches/release31-maint: Doc/using/cmdline.rst Misc/NEWS

[barry.warsaw]

Author: barry.warsaw
Date: Fri Feb  5 20:21:12 2010
New Revision: 77996

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/using/cmdline.rst
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Doc/using/cmdline.rst
==============================================================================
--- python/branches/release31-maint/Doc/using/cmdline.rst	(original)
+++ python/branches/release31-maint/Doc/using/cmdline.rst	Fri Feb  5 20:21:12 2010
@@ -238,8 +238,6 @@
    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 @@
 
    .. 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

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Fri Feb  5 20:21:12 2010
@@ -378,6 +378,9 @@
 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.