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
  ........
................

diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 53b9c2e275a5faf40e4d1f3c67668b40c357301f..07d1daa2425d3f66266f3d59415ce818a785eab7 100644 (file)
--- 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).