[Python-checkins] cpython (merge 3.3 -> default): Issue #15818: Merge.

richard.oudkerk python-checkins at python.org
Mon Jun 24 16:44:44 CEST 2013


http://hg.python.org/cpython/rev/4f08d4647f75
changeset:   84312:4f08d4647f75
parent:      84309:06b1447becdc
parent:      84311:3a5e2f1dce5c
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Mon Jun 24 15:43:35 2013 +0100
summary:
  Issue #15818: Merge.

files:
  Doc/library/multiprocessing.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -443,7 +443,7 @@
          cause other processes to deadlock.
 
    Note that the :meth:`start`, :meth:`join`, :meth:`is_alive`,
-   :meth:`terminate` and :attr:`exit_code` methods should only be called by
+   :meth:`terminate` and :attr:`exitcode` methods should only be called by
    the process that created the process object.
 
    Example usage of some of the methods of :class:`Process`:

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list