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

[terry.reedy]

http://hg.python.org/cpython/rev/d3777a16840b
changeset:   91815:d3777a16840b
parent:      91813:79c27bdeb045
parent:      91814:61380b00a0a2
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Thu Jul 24 02:59:17 2014 -0400
summary:
  Merge with 3.4

files:
  Doc/library/asyncio-eventloop.rst |  4 +---
  Doc/library/asyncio.rst           |  4 ++--
  2 files changed, 3 insertions(+), 5 deletions(-)


diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -58,13 +58,11 @@
 
 .. method:: BaseEventLoop.close()
 
-   Close the event loop. The loop should not be running.
+   Close the event loop. The loop must not be running.
 
    This clears the queues and shuts down the executor, but does not wait for
    the executor to finish.
 
-   The event loop must not be running.
-
    This is idempotent and irreversible. No other methods should be called after
    this one.
 
diff --git a/Doc/library/asyncio.rst b/Doc/library/asyncio.rst
--- a/Doc/library/asyncio.rst
+++ b/Doc/library/asyncio.rst
@@ -39,7 +39,7 @@
   you absolutely, positively have to use a library that makes blocking
   I/O calls.
 
-Table of content:
+Table of contents:
 
 .. toctree::
    :maxdepth: 3
@@ -55,6 +55,6 @@
 
 .. seealso::
 
-   The :mod:`asyncio` module was designed in the :PEP:`3156`. For a
+   The :mod:`asyncio` module was designed in :PEP:`3156`. For a
    motivational primer on transports and protocols, see :PEP:`3153`.
 

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