merge 3.5

This commit is contained in:
Benjamin Peterson 2015-07-01 22:36:37 -05:00
commit 63d80b71b3
1 changed files with 1 additions and 1 deletions

View File

@ -1123,7 +1123,7 @@ multiprocessing
.. _whatsnew-multiprocessing-no-fork:
On Unix two new :ref:`start methods <multiprocessing-start-methods>`,
(``spawn`` and ``forkserver``, have been added for starting processes using
``spawn`` and ``forkserver``, have been added for starting processes using
:mod:`multiprocessing`. These make the mixing of processes with threads more
robust, and the ``spawn`` method matches the semantics that multiprocessing has
always used on Windows. New function