[Python-checkins] r81282 - in python/branches/release31-maint: Doc/library/test.rst

[senthil.kumaran]

Author: senthil.kumaran
Date: Tue May 18 05:28:44 2010
New Revision: 81282

Log:
Merged revisions 81281 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81281 | senthil.kumaran | 2010-05-18 08:56:11 +0530 (Tue, 18 May 2010) | 9 lines
  
  Merged revisions 81279 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r81279 | senthil.kumaran | 2010-05-18 08:50:43 +0530 (Tue, 18 May 2010) | 3 lines
    
    Fix minor typo.
  ........
................


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

Modified: python/branches/release31-maint/Doc/library/test.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/test.rst	(original)
+++ python/branches/release31-maint/Doc/library/test.rst	Tue May 18 05:28:44 2010
@@ -310,7 +310,7 @@
 
 .. function:: captured_stdout()
 
-   This is a context manager than runs the :keyword:`with` statement body using
+   This is a context manager that runs the :keyword:`with` statement body using
    a :class:`StringIO.StringIO` object as sys.stdout.  That object can be
    retrieved using the ``as`` clause of the :keyword:`with` statement.