From: Georg Brandl <georg@python.org>
Date: Fri, 21 May 2010 20:57:33 +0000 (+0000)
Subject: Recorded merge of revisions 81415 via svnmerge from
X-Git-Tag: v3.2a1~725
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=325524e96753a8e54551b2e86ef0428f68595679;p=python

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 a394cdd13a..dac7ef759a 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).