From: Georg Brandl Date: Sat, 19 Apr 2008 08:23:59 +0000 (+0000) Subject: Fix-up docs for revision 62386. X-Git-Tag: v2.6a3~161 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=734de68dd5caa64353a72143cd68deae27e7070b;p=python Fix-up docs for revision 62386. --- diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 09dbbd18c6..d1471f1ff8 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: