summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-06-13 22:37:25 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-06-13 22:37:25 (GMT)
commitf6a899fe6d39b5447abc5966a3dfe386b9d6656e (patch)
tree60a12f24d8a5575421bc252e24a04526e31d8fee
parent9994b096d162c49a0f950e9942b8642ffa2d0fc1 (diff)
parent27b130e7026843de85954c4c976ec96c0e226987 (diff)
downloadcpython-f6a899fe6d39b5447abc5966a3dfe386b9d6656e.zip
cpython-f6a899fe6d39b5447abc5966a3dfe386b9d6656e.tar.gz
cpython-f6a899fe6d39b5447abc5966a3dfe386b9d6656e.tar.bz2
Issue #15060: merge with 3.2
-rw-r--r--Doc/library/socket.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 4bae00e..02af9ca 100644
--- 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``