summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-07-02 03:36:29 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-07-02 03:36:29 (GMT)
commit44f323cb42418e6e2b83b7655146de66a7289dd4 (patch)
tree4b1ca04068043c6651aad668c0317f6415cb78cf
parent6aeda91941f754c1413d4b23a47b9d14f5911ab3 (diff)
parent3ef80587f01af27427fc1fcc05d8fd1726edd23d (diff)
downloadcpython-44f323cb42418e6e2b83b7655146de66a7289dd4.zip
cpython-44f323cb42418e6e2b83b7655146de66a7289dd4.tar.gz
cpython-44f323cb42418e6e2b83b7655146de66a7289dd4.tar.bz2
Merge 3.4
-rw-r--r--Doc/whatsnew/3.4.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 08cd412..5176b9a 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -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