[Python-checkins] r81422 - in python/branches/release31-maint: Doc/library/urllib.request.rst

[georg.brandl]

Author: georg.brandl
Date: Fri May 21 23:01:43 2010
New Revision: 81422

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/urllib.request.rst

Modified: python/branches/release31-maint/Doc/library/urllib.request.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/urllib.request.rst	(original)
+++ python/branches/release31-maint/Doc/library/urllib.request.rst	Fri May 21 23:01:43 2010
@@ -604,7 +604,7 @@
    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).