[Python-checkins] cpython (merge 3.3 -> default): Merge versionadded addition and typo fix from 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/3c437e591499
changeset:   82961:3c437e591499
parent:      82959:9dba3bc7c2a6
parent:      82960:2fa791f36ec5
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Mar 26 02:38:40 2013 +0200
summary:
  Merge versionadded addition and typo fix from 3.3.

files:
  Doc/using/cmdline.rst |  5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -360,7 +360,7 @@
    Reserved for various implementation-specific options.  CPython currently
    defines two possible values:
 
-   * ``-X faulthander`` to enable :mod:`faulthandler`;
+   * ``-X faulthandler`` to enable :mod:`faulthandler`;
    * ``-X showrefcount`` to enable the output of the total reference count
      and memory blocks (only works on debug builds);
 
@@ -370,6 +370,9 @@
    .. versionchanged:: 3.2
       It is now allowed to pass :option:`-X` with CPython.
 
+   .. versionadded:: 3.3
+      The ``-X faulthandler`` option.
+
    .. versionadded:: 3.4
       The ``-X showrefcount`` option.
 

-- 
Repository URL: http://hg.python.org/cpython