summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-10-23 16:20:11 +0300
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-10-23 16:20:11 +0300
commit3831bec20ddd55c436d03825eaee4356f0f322ff (patch)
tree36a07f936d45a25ad5e97dc3d1867ebecb58505d
parent4904e5a38b34d0736c3ad6d8e6ceb1535759332f (diff)
parent950d5fdc7f3b3d7b08a4c8c21f6d95c332d76888 (diff)
downloadcpython-git-3831bec20ddd55c436d03825eaee4356f0f322ff.tar.gz
Issue #16241: document -X faulthandler command line option.
Patch by Marek Šuppa.
-rw-r--r--Doc/using/cmdline.rst3
-rw-r--r--Misc/ACKS1
2 files changed, 3 insertions, 1 deletions
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