Merge 3.5

c545f1ce · Yury Selivanov · 977afe5a · a88cd646 · c545f1ce · c545f1ce
Commit c545f1ce authored Sep 10, 2015 by Yury Selivanov
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 106 additions and 92 deletions

Doc/library/types.rst Doc/library/types.rst +4 -4

Doc/whatsnew/3.5.rst Doc/whatsnew/3.5.rst +102 -88

No files found.
--- a/Doc/library/types.rst
+++ b/Doc/library/types.rst
@@ -86,14 +86,14 @@ Standard names are defined for the following types:

 .. data:: GeneratorType

-   The type of :term:`generator`-iterator objects, produced by calling a
-   generator function.
+   The type of :term:`generator`-iterator objects, created by
+   generator functions.


 .. data:: CoroutineType

-   The type of :term:`coroutine` objects, produced by calling a
-   function defined with an :keyword:`async def` statement.
+   The type of :term:`coroutine` objects, created by
+   :keyword:`async def` functions.

   .. versionadded:: 3.5


--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst