From: Christian Heimes <christian@python.org>
Date: Tue, 6 Sep 2016 21:41:37 +0000 (+0200)
Subject: Fix ssl documentation and remove merge accident
X-Git-Tag: v2.7.13rc1~168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e64c2c838ebab64f27958c9f03c8cde43ed7e99;p=python

Fix ssl documentation and remove merge accident
---

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 5d254e731e..5812af8f87 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -328,15 +328,11 @@ purposes.
 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()