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/socket.rst
===================================================================
--- Doc/library/socket.rst	(revision 87331)
+++ Doc/library/socket.rst	(working copy)
@@ -647,6 +647,10 @@
    remaining references to the socket.  The socket must be in blocking mode
    (it can not have a timeout).
 
+   .. note::
+      On Windows, the :term:`file object` created from :meth:`makefile` cannot
+      be used in functions that rely on a file descriptor such as
+      :meth:`subprocess.Popen` or :meth:`select.select`.
 
 .. method:: socket.recv(bufsize[, flags])