summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-11-14 17:00:48 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-11-14 17:00:48 (GMT)
commit04e6909845795f310aaa6905675e8c63650c3f30 (patch)
tree1489a901b060bb3cc3fc672aafa6a3eb8409d618 /Doc
parentc2fe57762b6cfa8849908e1a0475036cd0b058ba (diff)
downloadcpython-04e6909845795f310aaa6905675e8c63650c3f30.zip
cpython-04e6909845795f310aaa6905675e8c63650c3f30.tar.gz
cpython-04e6909845795f310aaa6905675e8c63650c3f30.tar.bz2
Fix markup
Diffstat (limited to 'Doc')
-rw-r--r--Doc/whatsnew/3.2.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index 0bd2c51..0553ec3 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -234,8 +234,8 @@ Code for creating and managing concurrency is being collected in a new top-level
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