[Python-checkins] cpython (merge 3.4 -> 3.5): Issue #24357: merge from 3.4

[ned.deily]

https://hg.python.org/cpython/rev/d751900d0406
changeset:   96467:d751900d0406
branch:      3.5
parent:      96463:5bfa78bf0607
parent:      96466:dbf3aa36bea7
user:        Ned Deily <nad at acm.org>
date:        Mon Jun 01 21:20:46 2015 -0700
summary:
  Issue #24357: merge from 3.4

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


diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -478,14 +478,14 @@
    method.
 
    The following example fetches address information for a hypothetical TCP
-   connection to ``google.com`` on port 80 (results may differ on your
+   connection to ``example.org`` on port 80 (results may differ on your
    system if IPv6 isn't enabled)::
 
-      >>> socket.getaddrinfo("google.com", 80, proto=socket.IPPROTO_TCP)
+      >>> socket.getaddrinfo("example.org", 80, proto=socket.IPPROTO_TCP)
       [(<AddressFamily.AF_INET6: 10>, <SocketType.SOCK_STREAM: 1>,
-       6, '', ('2607:f8b0:4005:803::200e', 80, 0, 0)),
+       6, '', ('2606:2800:220:1:248:1893:25c8:1946', 80, 0, 0)),
        (<AddressFamily.AF_INET: 2>, <SocketType.SOCK_STREAM: 1>,
-       6, '', ('216.58.192.46', 80))]
+       6, '', ('93.184.216.34', 80))]
 
    .. versionchanged:: 3.2
       parameters can now be passed using keyword arguments.

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