Index: Doc/ACKS.txt
===================================================================
--- Doc/ACKS.txt	(revision 87331)
+++ Doc/ACKS.txt	(working copy)
@@ -111,6 +111,7 @@
    * Andrew M. Kuchling
    * Dave Kuhlman
    * Erno Kuusela
+   * Ross Lagerwall
    * Thomas Lamb
    * Detlef Lannert
    * Piers Lauder
Index: Doc/library/subprocess.rst
===================================================================
--- Doc/library/subprocess.rst	(revision 87331)
+++ Doc/library/subprocess.rst	(working copy)
@@ -132,6 +132,11 @@
    *stderr* can be :data:`STDOUT`, which indicates that the stderr data from the
    applications should be captured into the same file handle as for stdout.
 
+   .. note::
+      On Windows, a :term:`file object` created from :meth:`socket.socket.makefile`
+      cannot be used as *stdin*, *stdout* or *stderr*. If one of *stdin*, *stdout*
+      or *stderr* is not valid, an IOError will be thrown.
+
    If *preexec_fn* is set to a callable object, this object will be called in the
    child process just before the child is executed.
    (Unix only)