summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-04-19 08:23:59 (GMT)
committerGeorg Brandl <georg@python.org>2008-04-19 08:23:59 (GMT)
commit734de68dd5caa64353a72143cd68deae27e7070b (patch)
treefdb2adc2b37279ee32d57974d65eeb9731efca49
parente74c8f2879159367eded0933c9f89b9315f07df8 (diff)
downloadcpython-734de68dd5caa64353a72143cd68deae27e7070b.zip
cpython-734de68dd5caa64353a72143cd68deae27e7070b.tar.gz
cpython-734de68dd5caa64353a72143cd68deae27e7070b.tar.bz2
Fix-up docs for revision 62386.
-rw-r--r--Doc/library/subprocess.rst10
1 files changed, 8 insertions, 2 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 09dbbd1..d1471f1 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -215,7 +215,9 @@ Instances of the :class:`Popen` class have the following methods:
.. note::
On Windows only SIGTERM is supported so far. It's an alias for
- *terminate*.
+ :meth:`terminate`.
+
+ .. versionadded:: 2.6
.. method:: Popen.terminate()
@@ -224,11 +226,15 @@ Instances of the :class:`Popen` class have the following methods:
child. On Windows the Win32 API function TerminateProcess is called
to stop the child.
+ .. versionadded:: 2.6
+
.. method:: Popen.kill()
Kills the child. On Posix OSs the function sends SIGKILL to the child.
- On Windows *kill* is an alias for *terminate*.
+ On Windows :meth:`kill` is an alias for :meth:`terminate`.
+
+ .. versionadded:: 2.6
The following attributes are also available: