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

[ned.deily]

https://hg.python.org/cpython/rev/5bfa78bf0607
changeset:   96463:5bfa78bf0607
branch:      3.5
parent:      96460:fcb415e5b40b
parent:      96462:fb12d742b70c
user:        Ned Deily <nad at acm.org>
date:        Mon Jun 01 19:38:25 2015 -0700
summary:
  Issue #24357: merge from 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
@@ -478,7 +478,7 @@
    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 ``google.com`` on port 80 (results may differ on your
    system if IPv6 isn't enabled)::
 
       >>> socket.getaddrinfo("google.com", 80, proto=socket.IPPROTO_TCP)

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