summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-05-21 20:57:33 (GMT)
committerGeorg Brandl <georg@python.org>2010-05-21 20:57:33 (GMT)
commit325524e96753a8e54551b2e86ef0428f68595679 (patch)
treede4ac079f22869c8eb5b7cb85c17885b3b39c2a8 /Doc
parent4ad6bd5482514631680cebea3cdf06c56b87bac8 (diff)
downloadcpython-325524e96753a8e54551b2e86ef0428f68595679.zip
cpython-325524e96753a8e54551b2e86ef0428f68595679.tar.gz
cpython-325524e96753a8e54551b2e86ef0428f68595679.tar.bz2
Recorded merge of revisions 81415 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81415 | georg.brandl | 2010-05-21 22:52:46 +0200 (Fr, 21 Mai 2010) | 1 line typo ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/urllib.request.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index a394cdd..dac7ef7 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -604,7 +604,7 @@ OpenerDirector Objects
method on the currently installed global :class:`OpenerDirector`). 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 usedi). The timeout feature actually works only for
+ timeout setting will be used). The timeout feature actually works only for
HTTP, HTTPS, FTP and FTPS connections).