[Python-checkins] cpython (merge 3.3 -> default): #16978: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/e1118ff088be
changeset:   81579:e1118ff088be
parent:      81575:c5508c706293
parent:      81578:ad0af795c345
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Jan 18 19:59:13 2013 +0200
summary:
  #16978: merge with 3.3.

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


diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -308,10 +308,10 @@
 
 .. 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

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