[Python-checkins] r81230 - in python/branches/release26-maint: Doc/library/ssl.rst

[antoine.pitrou]

Author: antoine.pitrou
Date: Sun May 16 16:17:51 2010
New Revision: 81230

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/ssl.rst

Modified: python/branches/release26-maint/Doc/library/ssl.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/ssl.rst	(original)
+++ python/branches/release26-maint/Doc/library/ssl.rst	Sun May 16 16:17:51 2010
@@ -222,6 +222,10 @@
 
    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