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

[eric.araujo]

http://hg.python.org/cpython/rev/c7d1768d4fac
changeset:   73572:c7d1768d4fac
parent:      73570:69fb7933434a
parent:      73571:a00bb30cf775
user:        Éric Araujo <merwok at netwok.org>
date:        Tue Nov 15 16:13:16 2011 +0100
summary:
  Merge 3.2

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


diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -234,8 +234,8 @@
 namespace, *concurrent*.  Its first member is a *futures* package which provides
 a uniform high-level interface for managing threads and processes.
 
-The design for :mod:`concurrent.futures` was inspired by
-*java.util.concurrent.package*.  In that model, a running call and its result
+The design for :mod:`concurrent.futures` was inspired by the
+*java.util.concurrent* package.  In that model, a running call and its result
 are represented by a :class:`~concurrent.futures.Future` object that abstracts
 features common to threads, processes, and remote procedure calls.  That object
 supports status checks (running or done), timeouts, cancellations, adding

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