summaryrefslogtreecommitdiffstats
path: root/Doc/library/concurrent.futures.rst
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-10-19 08:06:26 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-10-19 08:06:26 (GMT)
commitf10644983e88c73437703a863151593cc37a657f (patch)
treeb3cf3ffcc4d27cf9f81c90efbedbc10a856db857 /Doc/library/concurrent.futures.rst
parent318909b297241f9c46f25815e12d05136da57fa9 (diff)
parente130a52d8a60229f53c8bc2ea7a1f51ee592bbd7 (diff)
downloadcpython-f10644983e88c73437703a863151593cc37a657f.zip
cpython-f10644983e88c73437703a863151593cc37a657f.tar.gz
cpython-f10644983e88c73437703a863151593cc37a657f.tar.bz2
Merge with 3.2.
Diffstat (limited to 'Doc/library/concurrent.futures.rst')
-rw-r--r--Doc/library/concurrent.futures.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst
index f401f93..a88f10c 100644
--- a/Doc/library/concurrent.futures.rst
+++ b/Doc/library/concurrent.futures.rst
@@ -14,7 +14,7 @@ and :source:`Lib/concurrent/futures/process.py`
The :mod:`concurrent.futures` module provides a high-level interface for
asynchronously executing callables.
-The asynchronous execution can be be performed with threads, using
+The asynchronous execution can be performed with threads, using
:class:`ThreadPoolExecutor`, or separate processes, using
:class:`ProcessPoolExecutor`. Both implement the same interface, which is
defined by the abstract :class:`Executor` class.