summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/library/multiprocessing.rst6
-rw-r--r--Misc/NEWS3
2 files changed, 6 insertions, 3 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index d611278..d7a37c3 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -422,9 +422,9 @@ The :mod:`multiprocessing` package mostly replicates the API of the
acquired a lock or semaphore etc. then terminating it is liable to
cause other processes to deadlock.
- Note that the :meth:`start`, :meth:`join`, :meth:`is_alive` and
- :attr:`exit_code` methods should only be called by the process that created
- the process object.
+ Note that the :meth:`start`, :meth:`join`, :meth:`is_alive`,
+ :meth:`terminate` and :attr:`exit_code` methods should only be called by
+ the process that created the process object.
Example usage of some of the methods of :class:`Process`:
diff --git a/Misc/NEWS b/Misc/NEWS
index 365b9cb..9e3b458 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2879,6 +2879,9 @@ Build
Documentation
-------------
+- Issue #8028: ``terminate()`` was missing from the list of
+ ``multiprocessing.Process`` methods only intended for use by the parent.
+
- Issue #7707: Document that ``multiprocessing.Queue`` operations during import
can lead to deadlocks.