Merged revisions 83745 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83745 | brian.curtin | 2010-08-05 13:56:00 -0500 (Thu, 05 Aug 2010) | 4 lines

  Issue #9524: Document that two CTRL* signals are meant for use only
  with os.kill.
........

diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst
index 8ac7bee0f0c080fb2243d6433047967d080e00fb..0f84537988f7479d8b896b4f8c6f3915d5dd32d4 100644 (file)
--- a/Doc/library/signal.rst
+++ b/Doc/library/signal.rst
@@ -77,7 +77,9 @@ The variables defined in the :mod:`signal` module are:
 
 .. data:: CTRL_C_EVENT
 
-   The signal corresponding to the CTRL+C keystroke event.
+   The signal corresponding to the CTRL+C keystroke event. This signal can
+   only be used with :func:`os.kill`.
+
    Availability: Windows.
 
    .. versionadded:: 2.7
@@ -85,7 +87,9 @@ The variables defined in the :mod:`signal` module are:
 
 .. data:: CTRL_BREAK_EVENT
 
-   The signal corresponding to the CTRL+BREAK keystroke event.
+   The signal corresponding to the CTRL+BREAK keystroke event. This signal can
+   only be used with :func:`os.kill`.
+
    Availability: Windows.
 
    .. versionadded:: 2.7

diff --git a/Misc/NEWS b/Misc/NEWS
index 3876b4aa588d0c9d7d99e51d07323a63ac5086f9..c844ebff77c5bff1396c28c4206e5d2894da3b39 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -193,6 +193,9 @@ Tests
 Documentation
 -------------
 
+- Issue #9524: Document that two CTRL* signals are meant for use only
+  with os.kill.
+
 - Issue #9255: Document that the 'test' package is for internal Python use
   only.