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

[yury.selivanov]

https://hg.python.org/cpython/rev/8dde150437cc
changeset:   96648:8dde150437cc
parent:      96646:34a315e05c57
parent:      96647:86e3dc70998d
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Tue Jun 23 15:10:21 2015 -0400
summary:
  Merge 3.5

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


diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -1109,5 +1109,5 @@
 
 * As part of :pep:`492` implementation, ``tp_reserved`` slot of
   :c:type:`PyTypeObject` was replaced with a
-  :c:member:`PyTypeObject.tp_as_async` slot.  Refer to :ref:`coro-objects` for
+  :c:member:`tp_as_async` slot.  Refer to :ref:`coro-objects` for
   new types, structures and functions.

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