summaryrefslogtreecommitdiffstats
path: root/Doc/glossary.rst
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-12-09 15:58:13 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-12-09 15:58:13 (GMT)
commit3279b5df3c41f5a6a431e60dcca57cdcdb7808e3 (patch)
treed3a14980fa14f836a27056764369954c0b5f1473 /Doc/glossary.rst
parentcc595bd5462a31f42af58eb76aa961f827c34153 (diff)
downloadcpython-3279b5df3c41f5a6a431e60dcca57cdcdb7808e3.zip
cpython-3279b5df3c41f5a6a431e60dcca57cdcdb7808e3.tar.gz
cpython-3279b5df3c41f5a6a431e60dcca57cdcdb7808e3.tar.bz2
Merged revisions 59423-59440 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r59427 | georg.brandl | 2007-12-08 18:56:07 +0100 (Sat, 08 Dec 2007) | 2 lines Adapt style. ........ r59435 | brett.cannon | 2007-12-09 06:09:37 +0100 (Sun, 09 Dec 2007) | 2 lines Use a versionchanged directive. ........ r59436 | georg.brandl | 2007-12-09 09:54:02 +0100 (Sun, 09 Dec 2007) | 2 lines #1575: the Mac readme is now one level up. ........ r59437 | georg.brandl | 2007-12-09 09:59:45 +0100 (Sun, 09 Dec 2007) | 2 lines Remove all tabs in that file. ........
Diffstat (limited to 'Doc/glossary.rst')
-rw-r--r--Doc/glossary.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index b9d8424..6d12d0f 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -56,7 +56,7 @@ Glossary
it's almost certain you can safely ignore them.
context manager
- Objects which control the environment seen in a :keyword:`with`
+ An objects that controls the environment seen in a :keyword:`with`
statement by defining :meth:`__enter__` and :meth:`__exit__` methods.
See :pep:`343`.