summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-05-18 03:26:11 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-05-18 03:26:11 (GMT)
commitaf1d434f8456d3231acfe4abc3923fff929f3a42 (patch)
tree901935562b0ae581054f35122f2c52505a061124 /Doc/library
parentc0983856c6814272a5e6004bd50b429afba3f3b4 (diff)
downloadcpython-af1d434f8456d3231acfe4abc3923fff929f3a42.zip
cpython-af1d434f8456d3231acfe4abc3923fff929f3a42.tar.gz
cpython-af1d434f8456d3231acfe4abc3923fff929f3a42.tar.bz2
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. ........
Diffstat (limited to 'Doc/library')
-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 cfd5b10..3b9ad10 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -340,7 +340,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.