summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2010-04-20 15:28:06 (GMT)
committerBrian Curtin <brian.curtin@gmail.com>2010-04-20 15:28:06 (GMT)
commit904bd39afb75dc60a4edadc8874e14869bd8d9e9 (patch)
tree5227f0433bb75fdf9cee8e91418e4b5310555680
parent6cf3e616e4f0cbf78870b6907af8a256f8d2eee7 (diff)
downloadcpython-904bd39afb75dc60a4edadc8874e14869bd8d9e9.zip
cpython-904bd39afb75dc60a4edadc8874e14869bd8d9e9.tar.gz
cpython-904bd39afb75dc60a4edadc8874e14869bd8d9e9.tar.bz2
Updated version numbers from 2.7 to 3.2
Merged revisions 80265 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80265 | brian.curtin | 2010-04-20 10:23:18 -0500 (Tue, 20 Apr 2010) | 2 lines Add version info for os.kill and signal changes from #1220212. ........
-rw-r--r--Doc/library/os.rst2
-rw-r--r--Doc/library/signal.rst6
2 files changed, 6 insertions, 2 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index e328399..c41ee1b 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -1500,6 +1500,8 @@ written in Python, such as a mail server's external command delivery program.
will be set to *sig*. The Windows version of :func:`kill` additionally takes
process handles to be killed.
+ .. versionadded:: 3.2 Windows support
+
.. function:: killpg(pgid, sig)
diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst
index 45b78a2..7b40e8e 100644
--- a/Doc/library/signal.rst
+++ b/Doc/library/signal.rst
@@ -77,16 +77,18 @@ The variables defined in the :mod:`signal` module are:
.. data:: CTRL_C_EVENT
The signal corresponding to the CTRL+C keystroke event.
-
Availability: Windows.
+ .. versionadded:: 3.2
+
.. data:: CTRL_BREAK_EVENT
The signal corresponding to the CTRL+BREAK keystroke event.
-
Availability: Windows.
+ .. versionadded:: 3.2
+
.. data:: NSIG