summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-10-05 18:46:56 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-10-05 18:46:56 (GMT)
commitc08d9070dbcb2ec660a778e7f1286ac5c3b60b37 (patch)
tree96fa228c22e7cb7a3b4dd27309bc10f52ee42b74
parent242690f870234defac4a8c990cf7a7ea6723f6a7 (diff)
downloadcpython-c08d9070dbcb2ec660a778e7f1286ac5c3b60b37.zip
cpython-c08d9070dbcb2ec660a778e7f1286ac5c3b60b37.tar.gz
cpython-c08d9070dbcb2ec660a778e7f1286ac5c3b60b37.tar.bz2
fix a typo.
-rw-r--r--Doc/library/urllib.request.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index bba034c..a697bdd 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -36,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, and FTP 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
@@ -610,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, and FTP connections).
+ HTTP, HTTPS and FTP connections).
.. method:: OpenerDirector.error(proto, *args)