[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

Tue Oct 28 22:41:15 CET 2014

https://hg.python.org/cpython/rev/fb6ea21245cd
changeset: 93199:fb6ea21245cd
parent: 93197:df2f6fb6b9e9
parent: 93198:94b3efc716f0
user: Georg Brandl <georg at python.org>
date: Tue Oct 28 22:40:53 2014 +0100
summary:
 merge with 3.4
files:
 Doc/library/socket.rst | 3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -90,9 +90,6 @@
 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
-- 
Repository URL: https://hg.python.org/cpython
