+ "context manager"

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index c8347431e1d2b62d5ba66887bdbd6ba27ad48d33..1ab8a8c0b468fde4c699b414559abb3d51a8fb4f 100644 (file)
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -68,6 +68,11 @@ Glossary
       advanced mathematical feature.  If you're not aware of a need for them,
       it's almost certain you can safely ignore them.
     
+   context manager
+      Objects which control the environment seen in a :keyword:`with`
+      statement by defining :meth:`__enter__` and :meth:`__exit__` methods.
+      See :pep:`343`.
+
    decorator
       A function returning another function, usually applied as a function
       transformation using the ``@wrapper`` syntax.  Common examples for