gh-91435: docs review responses

Doc/library/warnings.rst

@@ -507,10 +507,18 @@ Available Context Managers
     protected. This argument exists primarily for testing the :mod:`warnings`
     module itself.
 
+    If the *action* argument is not None, the remaining arguments are passed
+    to :func:`simplefilter` as if it were called immediately on entering the
+    context.
+
     .. note::
 
         The :class:`catch_warnings` manager works by replacing and
         then later restoring the module's
         :func:`showwarning` function and internal list of filter
         specifications.  This means the context manager is modifying
         global state and therefore is not thread-safe.
+
+    .. versionchanged:: 3.11
+
+        Added the *action*, *category*, *lineno*, and *append* parameters.

Doc/whatsnew/3.11.rst

@@ -521,6 +521,13 @@ venv
   Third party code that also creates new virtual environments should do the same.
   (Contributed by Miro Hrončok in :issue:`45413`.)
 
+warnings
+--------
+
+* :func:`warnings.catch_warnings` now accepts arguments for :func:`warnings.simplefilter`,
+  providing a more concise way to locally ignore warnings or convert them to errors.
+  (Contributed by Zac Hatfield-Dodds in :issue:`47074`.)
+
 zipfile
 -------
 

Lib/warnings.py

@@ -433,11 +433,8 @@ class catch_warnings(object):
     when testing the warnings module itself.
 
     If the 'action' argument is not None, the remaining arguments are passed
-    to warnings.simplefilter() as if it that call was the first line of the
-    with-statement.
-
-    .. versionchanged:: 3.11
-       Added the action, category, lineno, and append arguments.
+    to warnings.simplefilter() as if it were called immediately on entering the
+    context.
     """
 
     def __init__(self, *, record=False, module=None,