summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-06-13 21:59:21 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-06-13 21:59:21 (GMT)
commit9994b096d162c49a0f950e9942b8642ffa2d0fc1 (patch)
treef50354d674546a8563e77817741f2312c23ccb10
parent6222d76952c42ec6b7134b51bf242d41a0b972bd (diff)
parent56692f572231be88ea95d9165156d2b2d6033a56 (diff)
downloadcpython-9994b096d162c49a0f950e9942b8642ffa2d0fc1.zip
cpython-9994b096d162c49a0f950e9942b8642ffa2d0fc1.tar.gz
cpython-9994b096d162c49a0f950e9942b8642ffa2d0fc1.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 0315507..4bae00e 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 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``