[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/1bc0e1aad3dd
changeset:   95906:1bc0e1aad3dd
parent:      95902:5f2ae82157af
parent:      95905:c79fd57f86b6
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed May 06 21:31:07 2015 -0400
summary:
  merge 3.4

files:
  Doc/library/asyncio-sync.rst |  8 ++++----
  Doc/library/symtable.rst     |  2 +-
  2 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/asyncio-sync.rst b/Doc/library/asyncio-sync.rst
--- a/Doc/library/asyncio-sync.rst
+++ b/Doc/library/asyncio-sync.rst
@@ -196,9 +196,9 @@
 
    .. method:: notify_all()
 
-      Wake up all threads waiting on this condition. This method acts like
-      :meth:`notify`, but wakes up all waiting threads instead of one. If the
-      calling thread has not acquired the lock when this method is called, a
+      Wake up all coroutines waiting on this condition. This method acts like
+      :meth:`notify`, but wakes up all waiting coroutines instead of one. If the
+      calling coroutine has not acquired the lock when this method is called, a
       :exc:`RuntimeError` is raised.
 
    .. method:: release()
@@ -250,7 +250,7 @@
    A semaphore manages an internal counter which is decremented by each
    :meth:`acquire` call and incremented by each :meth:`release` call. The
    counter can never go below zero; when :meth:`acquire` finds that it is zero,
-   it blocks, waiting until some other thread calls :meth:`release`.
+   it blocks, waiting until some other coroutine calls :meth:`release`.
 
    Semaphores also support the context management protocol.
 
diff --git a/Doc/library/symtable.rst b/Doc/library/symtable.rst
--- a/Doc/library/symtable.rst
+++ b/Doc/library/symtable.rst
@@ -185,4 +185,4 @@
    .. method:: get_namespace()
 
       Return the namespace bound to this name.  If more than one namespace is
-      bound, a :exc:`ValueError` is raised.
+      bound, :exc:`ValueError` is raised.

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