[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

[benjamin.peterson]

https://hg.python.org/cpython/rev/dbb4fb46fc1d
changeset:   96752:dbb4fb46fc1d
parent:      96749:67ae0fd72370
parent:      96751:00d706bebc7b
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Jul 01 22:36:37 2015 -0500
summary:
  merge 3.5

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


diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -1123,7 +1123,7 @@
 .. _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

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