From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 16 May 2010 14:17:51 +0000 (+0000)
Subject: Merged revisions 81229 via svnmerge from
X-Git-Tag: v2.6.6rc1~319
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec0a3886cac040166dfd144f3e36142f6492b829;p=python

Merged revisions 81229 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81229 | antoine.pitrou | 2010-05-16 16:16:56 +0200 (dim., 16 mai 2010) | 3 lines

  Document that SSL v2 is insecure.
........
---

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index a4f911f5f5..5c76df9f27 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -222,6 +222,10 @@ Functions, Constants, and Exceptions
 
    Selects SSL version 2 as the channel encryption protocol.
 
+   .. warning::
+
+      SSL version 2 is insecure.  Its use is highly discouraged.
+
 .. data:: PROTOCOL_SSLv23
 
    Selects SSL version 2 or 3 as the channel encryption protocol.  This is a