[Python-checkins] cpython (merge 3.2 -> default): Issue #15060: merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/29fb36928433
changeset:   77419:29fb36928433
parent:      77416:26e2ee402a0b
parent:      77418:4d755a711823
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Wed Jun 13 23:59:21 2012 +0200
summary:
  Issue #15060: merge with 3.2

files:
  Doc/library/socket.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -61,7 +61,7 @@
 - A pair ``(host, port)`` is used for the :const:`AF_INET` address family,
   where *host* is a string representing either a hostname in Internet domain
   notation like ``'daring.cwi.nl'`` or an IPv4 address like ``'100.50.200.5'``,
-  and *port* is an integral port number.
+  and *port* is an integer port number.
 
 - For :const:`AF_INET6` address family, a four-tuple ``(host, port, flowinfo,
   scopeid)`` is used, where *flowinfo* and *scopeid* represent the ``sin6_flowinfo``

-- 
Repository URL: http://hg.python.org/cpython