Merge with 3.2.
diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 8dba9c9..be5990c 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -187,19 +187,24 @@
regression tests.
-:mod:`test.support` --- Utility functions for tests
-===================================================
+:mod:`test.support` --- Utilities for the Python test suite
+===========================================================
.. module:: test.support
- :synopsis: Support for Python regression tests.
+ :synopsis: Support for Python's regression test suite.
The :mod:`test.support` module provides support for Python's regression
-tests.
+test suite.
+
+.. note::
+ :mod:`test.support` is not a public module. It is documented here to help
+ Python developers write tests. The API of this module is subject to change
+ without backwards compatibility concerns between releases.
+
This module defines the following exceptions:
-
.. exception:: TestFailed
Exception to be raised when a test fails. This is deprecated in favor of
@@ -213,8 +218,8 @@
network connection) is not available. Raised by the :func:`requires`
function.
-The :mod:`test.support` module defines the following constants:
+The :mod:`test.support` module defines the following constants:
.. data:: verbose
@@ -236,7 +241,6 @@
The :mod:`test.support` module defines the following functions:
-
.. function:: forget(module_name)
Remove the module named *module_name* from ``sys.modules`` and delete any