From: Ask Solem <askh@opera.com>
Date: Tue, 9 Nov 2010 21:52:33 +0000 (+0000)
Subject: Issue #8028:  multiprocessing: Documented that ``Process.terminate``
X-Git-Tag: v3.2a4~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff7ffdd752a84395e1b10a9d2fa848d80f85c400;p=thirdparty%2FPython%2Fcpython.git

Issue #8028:  multiprocessing: Documented that ``Process.terminate``
is only intented for use by the parent process.
---

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index d6112787005c..d7a37c3f1ae4 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 365b9cb99443..9e3b4580b95a 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.