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

[georg.brandl]

https://hg.python.org/cpython/rev/27cd1fd05000
changeset:   93201:27cd1fd05000
parent:      93199:fb6ea21245cd
parent:      93200:5611c7c20460
user:        Georg Brandl <georg at python.org>
date:        Tue Oct 28 22:45:36 2014 +0100
summary:
  merge with 3.4

files:
  Doc/library/socket.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -466,7 +466,7 @@
    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))]
 

-- 
Repository URL: https://hg.python.org/cpython