[Python-checkins] cpython (2.7): Fix ssl documentation and remove merge accident

Tue Sep 6 17:41:49 EDT 2016

https://hg.python.org/cpython/rev/3e18c4dda388
changeset: 103152:3e18c4dda388
branch: 2.7
parent: 103148:74805fd9e734
user: Christian Heimes <christian at python.org>
date: Tue Sep 06 23:41:37 2016 +0200
summary:
 Fix ssl documentation and remove merge accident
files:
 Doc/library/ssl.rst | 8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -328,15 +328,11 @@
 Random generation
 ^^^^^^^^^^^^^^^^^
 
- .. deprecated::
+ .. deprecated:: 2.7.13
 
- 2.7.13 OpenSSL has deprecated :func:`ssl.RAND_pseudo_bytes`, use
+ OpenSSL has deprecated :func:`ssl.RAND_pseudo_bytes`, use
 :func:`ssl.RAND_bytes` instead.
 
- .. deprecated::
-
- 2.7.13 OpenSSL has deprecated :func:`ssl.RAND_pseudo_bytes`, use
- :func:`ssl.RAND_bytes` instead.
 
 .. function:: RAND_status()
 
-- 
Repository URL: https://hg.python.org/cpython
