Issue #22369: Change "context manager protocol" to "context management protocol".

diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
index bd218e1bd3ddb7e735de4dea981ba61a20782c1b..32ec2301fd1c85b5b5361dc0a67071529e1be960 100644 (file)
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -247,7 +247,7 @@ be finalized; only the internally used file object will be closed. See the
 :ref:`tar-examples` section for a use case.
 
 .. versionadded:: 2.7
-   Added support for the context manager protocol.
+   Added support for the context management protocol.
 
 .. class:: TarFile(name=None, mode='r', fileobj=None, format=DEFAULT_FORMAT, tarinfo=TarInfo, dereference=False, ignore_zeros=False, encoding=ENCODING, errors=None, pax_headers=None, debug=0, errorlevel=0)
 

diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 5e9171bed75cebba39a8829ddb0aeac739b94b72..99e2ff4d5d2fafabf6767aa3de840deca338f77d 100644 (file)
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -1612,7 +1612,7 @@ changes, or look through the Subversion logs for all the details.
   resulting archive.  This is more powerful than the existing
   *exclude* argument, which has therefore been deprecated.
   (Added by Lars Gustäbel; :issue:`6856`.)
-  The :class:`~tarfile.TarFile` class also now supports the context manager protocol.
+  The :class:`~tarfile.TarFile` class also now supports the context management protocol.
   (Added by Lars Gustäbel; :issue:`7232`.)
 
 * The :meth:`~threading.Event.wait` method of the :class:`threading.Event` class

diff --git a/Misc/NEWS b/Misc/NEWS
index 2db7d5a8895dfac08793e4cc084b8cb53cda2d09..caaa6933ce60de9cb4a452faf979d1a4a1c0ea10 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -5120,7 +5120,7 @@ Library
 - Issue #7494: Fix a crash in ``_lsprof`` (cProfile) after clearing the profiler,
   reset also the pointer to the current pointer context.
 
-- Issue #7232: Add support for the context manager protocol to the
+- Issue #7232: Add support for the context management protocol to the
   ``tarfile.TarFile`` class.
 
 - Issue #7250: Fix info leak of os.environ across multi-run uses of
@@ -6870,7 +6870,7 @@ Library
 
 - Issue #1696199: Add collections.Counter() for rapid and convenient counting.
 
-- Issue #3860: GzipFile and BZ2File now support the context manager protocol.
+- Issue #3860: GzipFile and BZ2File now support the context management protocol.
 
 - Issue #4272: Add an optional argument to the GzipFile constructor to override
   the timestamp in the gzip stream.  The default value remains the current time.
@@ -10039,7 +10039,7 @@ Extension Modules
   parameter.
 
 - _winreg's HKEY object has gained __enter__ and __exit__ methods to
-  support the context manager protocol.  The _winreg module also
+  support the context management protocol.  The _winreg module also
   gained a new function ``ExpandEnvironmentStrings`` to expand
   REG_EXPAND_SZ keys.