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 a4f911f5f54929e1734622ec30596ad9c2ac96d0..5c76df9f2711f38ef25376c770fba1529e136e83 100644 (file)
--- 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