From b1e66ee6510b939ddf8e3f474eabc6284cc27e9d Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Fri, 5 Feb 2010 18:45:25 +0000
Subject: [PATCH] Resolve bug 7847 by including documentation for -J, -U, and
 -X under "Options you shouldn't use".

---
 Doc/using/cmdline.rst | 28 +++++++++++++++++++++++-----
 Misc/NEWS             |  7 +++++--
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 03163cef578..cd5b8b5e3c1 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -285,8 +285,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
@@ -362,9 +360,6 @@ Miscellaneous options
 
    .. note:: The line numbers in error messages will be off by one.
 
-.. XXX document -X?
-
-
 .. cmdoption:: -3
 
    Warn about Python 3.x incompatibilities which cannot be fixed trivially by
@@ -382,7 +377,30 @@ Miscellaneous options
 
    .. versionadded:: 2.6
 
+Options you shouldn't use
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. cmdoption:: -J
+
+   Reserved for use by Jython_.
+
+.. _Jython: http://jython.org
+
+.. cmdoption:: -U
+
+   Turns all string literals into unicodes globally.  Do not be tempted to use
+   this option as it will probably break your world.  It also produces
+   ``.pyc`` files with a different magic number than normal.  Instead, you can
+   enable unicode literals on a per-module basis by using::
+
+        from __future__ import unicode_literals
+
+   at the top of the file.  See :mod:`__future__` for details.
+
+.. cmdoption:: -X
+
+    Reserved for alternative implementations of Python to use for their own
+    purposes.
 
 .. _using-on-envvars:
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 66748ef63b6..c1c1f88d1f2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,8 +17,8 @@ Core and Builtins
   library would return a bogus result; on Solaris, it was possible to crash
   the interpreter.  Patch by Stefan Krah.
 
-- Issue #7853: Normalize exceptions before they are passed to a context managers
-  __exit__ method.
+- Issue #7853: Normalize exceptions before they are passed to a context
+  managers __exit__ method.
 
 - Issue #7385: Fix a crash in `MemoryView_FromObject` when
   `PyObject_GetBuffer` fails.  Patch by Florent Xicluna.
@@ -153,6 +153,9 @@ Tools/Demos
 Documentation
 -------------
  
+- Updating `Using Python` documentation to include description of CPython's
+  -J, -U and -X options.
+
 - Update python manual page (options -B, -O0, -s, environment variables
   PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE).