[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/83e956f309c8
changeset:   101885:83e956f309c8
parent:      101883:05110cde7417
parent:      101884:0e6cd59b038c
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Sat Jun 11 22:41:03 2016 +0300
summary:
  Merge from 3.5

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


diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -76,7 +76,7 @@
 
    asynchronous iterable
       An object, that can be used in an :keyword:`async for` statement.
-      Must return an :term:`asyncronous iterator` from its
+      Must return an :term:`asynchronous iterator` from its
       :meth:`__aiter__` method.  Introduced by :pep:`492`.
 
    asynchronous iterator

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