Issue #15060: merge with 3.2

sandrotosi · sandrotosi · commit f6a899fe6d39 · 2012-06-14T00:37:25.000+02:00
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
@@ -61,7 +61,7 @@ created.  Socket addresses are represented as follows:
 - 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 integer port number.
+  and *port* is an integer.
 
 - For :const:`AF_INET6` address family, a four-tuple ``(host, port, flowinfo,
   scopeid)`` is used, where *flowinfo* and *scopeid* represent the ``sin6_flowinfo``
