summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-01-18 17:58:47 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-01-18 17:58:47 (GMT)
commit6d043fc7813a4d15f1d801e692245b0c1b6759cf (patch)
treef3c7ff254756de626f52aca6a0f64cafdaec1498 /Doc/library
parent37bfa238da2b51d151da8a49f22dc60230494d4c (diff)
parentff12fae80e15ad29ae2557d23e70f6ff9365b31f (diff)
downloadcpython-6d043fc7813a4d15f1d801e692245b0c1b6759cf.zip
cpython-6d043fc7813a4d15f1d801e692245b0c1b6759cf.tar.gz
cpython-6d043fc7813a4d15f1d801e692245b0c1b6759cf.tar.bz2
#16978: merge with 3.2.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/threading.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 05863a0..ec23504 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -308,10 +308,10 @@ since it is impossible to detect the termination of alien threads.
.. impl-detail::
- Due to the :term:`Global Interpreter Lock`, in CPython only one thread
+ In CPython, due to the :term:`Global Interpreter Lock`, only one thread
can execute Python code at once (even though certain performance-oriented
libraries might overcome this limitation).
- If you want your application to make better of use of the computational
+ If you want your application to make better use of the computational
resources of multi-core machines, you are advised to use
:mod:`multiprocessing` or :class:`concurrent.futures.ProcessPoolExecutor`.
However, threading is still an appropriate model if you want to run