From 5c3840c831d7f3310143257eb4612bbd21f4d29b Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 21 May 2010 20:54:17 +0000 Subject: [PATCH] Merged 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 ........ --- Doc/library/urllib2.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst index cf889cc63f7..fb3383dec9c 100644 --- a/Doc/library/urllib2.rst +++ b/Doc/library/urllib2.rst @@ -427,7 +427,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). .. versionchanged:: 2.6