Index: Doc/using/cmdline.rst
===================================================================
--- Doc/using/cmdline.rst	(revision 77958)
+++ Doc/using/cmdline.rst	(working copy)
@@ -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,8 +368,25 @@
 
    .. versionadded:: 2.6
 
+Options you shouldn't use
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. 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:
 
 Environment variables