merge with 3.4

birkenfeld · birkenfeld · commit 95517e4aeeb2 · 2014-10-28T22:45:36.000+01:00
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
@@ -466,7 +466,7 @@ The :mod:`socket` module also offers various network-related services:
    connection to ``www.python.org`` on port 80 (results may differ on your
    system if IPv6 isn't enabled)::
 
-      >>> socket.getaddrinfo("www.python.org", 80, proto=socket.SOL_TCP)
+      >>> socket.getaddrinfo("www.python.org", 80, proto=socket.IPPROTO_TCP)
       [(2, 1, 6, '', ('82.94.164.162', 80)),
        (10, 1, 6, '', ('2001:888:2000:d::a2', 80, 0, 0))]
 
