[Python-checkins] cpython (merge 3.6 -> default): Merge from 3.6

[berker.peksag]

https://hg.python.org/cpython/rev/f4cef2a3845e
changeset:   106445:f4cef2a3845e
parent:      106443:82d1c8d15e18
parent:      106444:764a9905588f
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Mon Feb 06 13:37:45 2017 +0300
summary:
  Merge from 3.6

files:
  Doc/library/ssl.rst |  10 +++++-----
  1 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -636,7 +636,7 @@
 
    .. deprecated:: 3.6
 
-      Use data:`PROTOCOL_TLS` instead.
+      Use :data:`PROTOCOL_TLS` instead.
 
 .. data:: PROTOCOL_SSLv2
 
@@ -667,7 +667,7 @@
    .. deprecated:: 3.6
 
       OpenSSL has deprecated all version specific protocols. Use the default
-      protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead.
+      protocol :data:`PROTOCOL_TLS` with flags like :data:`OP_NO_SSLv3` instead.
 
 .. data:: PROTOCOL_TLSv1
 
@@ -676,7 +676,7 @@
    .. deprecated:: 3.6
 
       OpenSSL has deprecated all version specific protocols. Use the default
-      protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead.
+      protocol :data:`PROTOCOL_TLS` with flags like :data:`OP_NO_SSLv3` instead.
 
 .. data:: PROTOCOL_TLSv1_1
 
@@ -688,7 +688,7 @@
    .. deprecated:: 3.6
 
       OpenSSL has deprecated all version specific protocols. Use the default
-      protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead.
+      protocol :data:`PROTOCOL_TLS` with flags like :data:`OP_NO_SSLv3` instead.
 
 .. data:: PROTOCOL_TLSv1_2
 
@@ -701,7 +701,7 @@
    .. deprecated:: 3.6
 
       OpenSSL has deprecated all version specific protocols. Use the default
-      protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead.
+      protocol :data:`PROTOCOL_TLS` with flags like :data:`OP_NO_SSLv3` instead.
 
 .. data:: OP_ALL
 

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