Fix ssl documentation and remove merge accident

4e64c2c8 · Christian Heimes · 6663eb6b · 4e64c2c8
Commit 4e64c2c8 authored Sep 06, 2016 by Christian Heimes
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

Doc/library/ssl.rst Doc/library/ssl.rst +2 -6

No files found.
--- 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()