diff options
| author | Georg Brandl <georg@python.org> | 2010-05-21 21:01:43 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-05-21 21:01:43 (GMT) |
| commit | 1bb061d0a5e90a8d4a4b697b1ccf6d9943d6ed87 (patch) | |
| tree | 2679216d5384ad845e4add8732ba2de70e6967f8 | |
| parent | ced2f2d9f938908e5f96016bfa703a5f8fe80d8f (diff) | |
| download | cpython-1bb061d0a5e90a8d4a4b697b1ccf6d9943d6ed87.zip cpython-1bb061d0a5e90a8d4a4b697b1ccf6d9943d6ed87.tar.gz cpython-1bb061d0a5e90a8d4a4b697b1ccf6d9943d6ed87.tar.bz2 | |
Merged revisions 81418 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r81418 | georg.brandl | 2010-05-21 22:57:33 +0200 (Fr, 21 Mai 2010) | 9 lines
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
........
................
| -rw-r--r-- | Doc/library/urllib.request.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst index 53b9c2e..07d1daa 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). |