Merged revisions 85232 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85232 | senthil.kumaran | 2010-10-06 00:05:41 +0530 (Wed, 06 Oct 2010) | 3 lines

  Remove the references of FTPS from the urllib Documentation. There is no support for it yet.
........

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 35ea28651c20d25be338811bd54b7e7fdadaa1ba..c4a8a792816ef372e0023885bfb4f27a38fe0fcb 100644 (file)
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -11,9 +11,6 @@ The :mod:`urllib.request` module defines functions and classes which help in
 opening URLs (mostly HTTP) in a complex world --- basic and digest
 authentication, redirections, cookies and more.
 
-.. warning:: When opening HTTPS (or FTPS) URLs, it is not attempted to
-   validate the server certificate.  Use at your own risk!
-
 
 The :mod:`urllib.request` module defines the following functions:
 
@@ -23,6 +20,9 @@ The :mod:`urllib.request` module defines the following functions:
    Open the URL *url*, which can be either a string or a
    :class:`Request` object.
 
+   .. warning::
+      HTTPS requests do not do any verification of the server's certificate.
+
    *data* may be a string specifying additional data to send to the
    server, or ``None`` if no such data is needed.  Currently HTTP
    requests are the only ones that use *data*; the HTTP request will
@@ -35,7 +35,7 @@ The :mod:`urllib.request` module defines the following functions:
    The optional *timeout* parameter specifies a timeout in seconds for
    blocking operations like the connection attempt (if not specified,
    the global default timeout setting will be used).  This actually
-   only works for HTTP, HTTPS, FTP and FTPS connections.
+   only works for HTTP, HTTPS and FTP connections.
 
    This function returns a file-like object with two additional methods from
    the :mod:`urllib.response` module
@@ -609,7 +609,7 @@ OpenerDirector Objects
    optional *timeout* parameter specifies a timeout in seconds for blocking
    operations like the connection attempt (if not specified, the global default
    timeout setting will be used). The timeout feature actually works only for
-   HTTP, HTTPS, FTP and FTPS connections).
+   HTTP, HTTPS and FTP connections).
 
 
 .. method:: OpenerDirector.error(proto, *args)