From 4e64c2c838ebab64f27958c9f03c8cde43ed7e99 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 6 Sep 2016 23:41:37 +0200 Subject: Fix ssl documentation and remove merge accident --- Doc/library/ssl.rst | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 5d254e7..5812af8 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() -- cgit v0.12