summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-04-17 04:34:31 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-04-17 04:34:31 (GMT)
commit5aa7685a1cdd396489ae7e91cb86fc61fb506b01 (patch)
treec4f551030eebbaca752f4ab40601cf864561afc1
parentabe46fd8108e64b1ae224678025b0256d4705884 (diff)
parenta68c1ab5711b5bd0219d46f61ff85d4770708490 (diff)
downloadcpython-5aa7685a1cdd396489ae7e91cb86fc61fb506b01.zip
cpython-5aa7685a1cdd396489ae7e91cb86fc61fb506b01.tar.gz
cpython-5aa7685a1cdd396489ae7e91cb86fc61fb506b01.tar.bz2
#17771: merge with 3.3.
-rw-r--r--Doc/library/concurrency.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/concurrency.rst b/Doc/library/concurrency.rst
index fd2dae2..f2a512f 100644
--- a/Doc/library/concurrency.rst
+++ b/Doc/library/concurrency.rst
@@ -8,7 +8,7 @@ The modules described in this chapter provide support for concurrent
execution of code. The appropriate choice of tool will depend on the
task to be executed (CPU bound vs IO bound) and preferred style of
development (event driven cooperative multitasking vs preemptive
-multitasking) Here's an overview:
+multitasking). Here's an overview:
.. toctree::