Merge from 3.6
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index eee4849..07b9771 100644
--- 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