Merged revisions 77992 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77992 | barry.warsaw | 2010-02-05 13:45:25 -0500 (Fri, 05 Feb 2010) | 4 lines
Resolve bug 7847 by including documentation for -J, -U, and -X under "Options
you shouldn't use".
........
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index bb9ae87..ae9c88f 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -276,8 +276,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
@@ -353,9 +351,6 @@
.. 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
@@ -373,7 +368,30 @@
.. 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: