summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-10-05 18:35:41 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-10-05 18:35:41 (GMT)
commit242690f870234defac4a8c990cf7a7ea6723f6a7 (patch)
tree67031268142f49a855538d204e39b42c308b597b /Doc/library
parent2f92e783b82520eeaa5aa6f84d54a550c794a779 (diff)
downloadcpython-242690f870234defac4a8c990cf7a7ea6723f6a7.zip
cpython-242690f870234defac4a8c990cf7a7ea6723f6a7.tar.gz
cpython-242690f870234defac4a8c990cf7a7ea6723f6a7.tar.bz2
Remove the references of FTPS from the urllib Documentation. There is no support for it yet.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/urllib.request.rst7
1 files changed, 3 insertions, 4 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 84cb77b..bba034c 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -21,8 +21,7 @@ The :mod:`urllib.request` module defines the following functions:
:class:`Request` object.
.. warning::
- HTTPS (or FTPS) requests do not do any verification of the server's
- certificate.
+ 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
@@ -37,7 +36,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
@@ -611,7 +610,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)