Merged revisions 80009 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80009 | brian.curtin | 2010-04-12 13:07:21 -0500 (Mon, 12 Apr 2010) | 2 lines

  Update the Windows FAQ's text about os.kill (#1220212).
........

diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index 5a5b7edf2e498ac6bb3d7adde7b972499d48d5d3..bfd03f764018aae27f51e569f5027c5cf36b14b0 100644 (file)
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -445,7 +445,7 @@ present, and ``getch()`` which gets one character without echoing it.
 How do I emulate os.kill() in Windows?
 --------------------------------------
 
-To terminate a process, you can use ctypes::
+Prior to Python 2.7 and 3.2, to terminate a process, you can use :mod:`ctypes`::
 
    import ctypes
 
@@ -455,6 +455,11 @@ To terminate a process, you can use ctypes::
        handle = kernel32.OpenProcess(1, 0, pid)
        return (0 != kernel32.TerminateProcess(handle, 0))
 
+In 2.7 and 3.2, :func:`os.kill` is implemented similar to the above function,
+with the additional feature of being able to send CTRL+C and CTRL+BREAK
+to console subprocesses which are designed to handle those signals. See
+:func:`os.kill` for further details.
+
 
 Why does os.path.isdir() fail on NT shared directories?
 -------------------------------------------------------