diff options
| -rw-r--r-- | Doc/glossary.rst | 2 | ||||
| -rw-r--r-- | Doc/library/warnings.rst | 4 |
2 files changed, 3 insertions, 3 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`. diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst index 9a10385..c3c0309 100644 --- a/Doc/library/warnings.rst +++ b/Doc/library/warnings.rst @@ -198,8 +198,8 @@ Available Functions *module_globals*, if supplied, should be the global namespace in use by the code for which the warning is issued. (This argument is used to support displaying - source for modules found in zipfiles or other non-filesystem import sources, and - was added in Python 2.5.) + source for modules found in zipfiles or other non-filesystem import + sources). .. function:: showwarning(message, category, filename, lineno[, file]) |