summaryrefslogtreecommitdiffstats
path: root/Doc/library/socket.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-28 21:40:53 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-28 21:40:53 (GMT)
commit96d836833e4a5dc02d304d1e05df4741bdf38037 (patch)
treed99125940ca8366cff0c87001490103101ab00c6 /Doc/library/socket.rst
parent587bac1a0a6cf56afc6c6181cf5fc2e8366b9a31 (diff)
parentc943e793849ad909408358362ddbebacae54ebee (diff)
downloadcpython-96d836833e4a5dc02d304d1e05df4741bdf38037.zip
cpython-96d836833e4a5dc02d304d1e05df4741bdf38037.tar.gz
cpython-96d836833e4a5dc02d304d1e05df4741bdf38037.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc/library/socket.rst')
-rw-r--r--Doc/library/socket.rst3
1 files changed, 0 insertions, 3 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 0897441..4fc222e 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -90,9 +90,6 @@ created. Socket addresses are represented as follows:
If *addr_type* is :const:`TIPC_ADDR_ID`, then *v1* is the node, *v2* is the
reference, and *v3* should be set to 0.
- If *addr_type* is :const:`TIPC_ADDR_ID`, then *v1* is the node, *v2* is the
- reference, and *v3* should be set to 0.
-
- A tuple ``(interface, )`` is used for the :const:`AF_CAN` address family,
where *interface* is a string representing a network interface name like
``'can0'``. The network interface name ``''`` can be used to receive packets