From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Tue, 23 Oct 2012 13:19:26 +0000 (+0300)
Subject: Issue #16241: document -X faulthandler command line option.
X-Git-Tag: v3.3.1rc1~755
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=950d5fdc7f3b3d7b08a4c8c21f6d95c332d76888;p=python

Issue #16241: document -X faulthandler command line option.

Patch by Marek Šuppa.
---

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index dbe6c4727b..2703684f12 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -358,7 +358,8 @@ Miscellaneous options
 .. cmdoption:: -X
 
    Reserved for various implementation-specific options.  CPython currently
-   defines none of them, but allows to pass arbitrary values and retrieve
+   defines just one, you can use ``-X faulthander`` to enable
+   :data:`faulthandler`. It also allows to pass arbitrary values and retrieve
    them through the :data:`sys._xoptions` dictionary.
 
    .. versionchanged:: 3.2
diff --git a/Misc/ACKS b/Misc/ACKS
index 808d1ba3fe..f01619eee9 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1133,6 +1133,7 @@ Pal Subbiah
 Nathan Sullivan
 Mark Summerfield
 Reuben Sumner
+Marek Å uppa
 Hisao Suzuki
 Kalle Svensson
 Andrew Svetlov