From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 26 Mar 2013 00:38:40 +0000 (+0200)
Subject: Merge versionadded addition and typo fix from 3.3.
X-Git-Tag: v3.4.0a1~1087
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=711c37076a954bb9a6109f0a150da369749ae0e8;p=python

Merge versionadded addition and typo fix from 3.3.
---

711c37076a954bb9a6109f0a150da369749ae0e8
diff --cc Doc/using/cmdline.rst
index adb3739368,e0c80f6bcb..185852a84b
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@@ -358,21 -358,16 +358,24 @@@ Miscellaneous option
  .. cmdoption:: -X
  
     Reserved for various implementation-specific options.  CPython currently
 -   defines just one, you can use ``-X faulthandler`` to enable
 -   :mod:`faulthandler`. It also allows to pass arbitrary values and retrieve
 -   them through the :data:`sys._xoptions` dictionary.
 +   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);
 +
 +   It also allows to pass arbitrary values and retrieve them through the
 +   :data:`sys._xoptions` dictionary.
  
     .. 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.
 +
  
  Options you shouldn't use
  ~~~~~~~~~~~~~~~~~~~~~~~~~