diff -r 0273d0734593 Doc/ACKS.txt
--- a/Doc/ACKS.txt	Sun Aug 14 01:51:52 2011 +0200
+++ b/Doc/ACKS.txt	Sat Aug 13 22:51:01 2011 -0500
@@ -79,6 +79,7 @@
    * Travis B. Hartwell
    * Tim Hatch
    * Janko Hauser
+   * Ben Hayden
    * Thomas Heller
    * Bernhard Herzog
    * Magnus L. Hetland
diff -r 0273d0734593 Doc/library/socket.rst
--- a/Doc/library/socket.rst	Sun Aug 14 01:51:52 2011 +0200
+++ b/Doc/library/socket.rst	Sat Aug 13 22:51:01 2011 -0500
@@ -513,14 +513,14 @@
 
 .. function:: getdefaulttimeout()
 
-   Return the default timeout in floating seconds for new socket objects. A value
+   Return the default timeout in seconds (float) for new socket objects. A value
    of ``None`` indicates that new socket objects have no timeout. When the socket
    module is first imported, the default is ``None``.
 
 
 .. function:: setdefaulttimeout(timeout)
 
-   Set the default timeout in floating seconds for new socket objects.  When
+   Set the default timeout in seconds (float) for new socket objects.  When
    the socket module is first imported, the default is ``None``.  See
    :meth:`~socket.settimeout` for possible values and their respective
    meanings.
@@ -675,7 +675,7 @@
 
 .. method:: socket.gettimeout()
 
-   Return the timeout in floating seconds associated with socket operations,
+   Return the timeout in seconds (float) associated with socket operations,
    or ``None`` if no timeout is set.  This reflects the last call to
    :meth:`setblocking` or :meth:`settimeout`.
 
diff -r 0273d0734593 Modules/socketmodule.c
--- a/Modules/socketmodule.c	Sun Aug 14 01:51:52 2011 +0200
+++ b/Modules/socketmodule.c	Sat Aug 13 22:51:01 2011 -0500
@@ -1822,7 +1822,7 @@
 PyDoc_STRVAR(gettimeout_doc,
 "gettimeout() -> timeout\n\
 \n\
-Returns the timeout in floating seconds associated with socket \n\
+Returns the timeout in seconds (float) associated with socket \n\
 operations. A timeout of None indicates that timeouts on socket \n\
 operations are disabled.");
 
@@ -4247,7 +4247,7 @@
 PyDoc_STRVAR(getdefaulttimeout_doc,
 "getdefaulttimeout() -> timeout\n\
 \n\
-Returns the default timeout in floating seconds for new socket objects.\n\
+Returns the default timeout in seconds (float) for new socket objects.\n\
 A value of None indicates that new socket objects have no timeout.\n\
 When the socket module is first imported, the default is None.");
 
@@ -4277,7 +4277,7 @@
 PyDoc_STRVAR(setdefaulttimeout_doc,
 "setdefaulttimeout(timeout)\n\
 \n\
-Set the default timeout in floating seconds for new socket objects.\n\
+Set the default timeout in seconds (float) for new socket objects.\n\
 A value of None indicates that new socket objects have no timeout.\n\
 When the socket module is first imported, the default is None.");