Merged revisions 81229 via svnmerge from

pitrou · pitrou · commit 8eac60d9af6e · 2010-05-16T14:19:41.000Z
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
@@ -231,6 +231,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
