summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-05-18 03:28:44 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-05-18 03:28:44 (GMT)
commit5c3ef067ca89527afd1cd7a317e64e2b25326b39 (patch)
treebc18147718a11532ae3ef3225a1067f725416868
parent0cfc9f65ef6ee9511ad1e1f5778f8150c7eac347 (diff)
downloadcpython-5c3ef067ca89527afd1cd7a317e64e2b25326b39.zip
cpython-5c3ef067ca89527afd1cd7a317e64e2b25326b39.tar.gz
cpython-5c3ef067ca89527afd1cd7a317e64e2b25326b39.tar.bz2
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. ........ ................
-rw-r--r--Doc/library/test.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index cc7ff4d..974f71f 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -310,7 +310,7 @@ The :mod:`test.support` module defines the following functions:
.. 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.