cpython (merge 3.5 -> default): Merge 3.5
https://hg.python.org/cpython/rev/2bd893405c62 changeset: 99603:2bd893405c62 parent: 99600:deb62ffe8e51 parent: 99602:580e32ac1359 user: Yury Selivanov <yselivanov@sprymix.com> date: Wed Dec 16 21:31:15 2015 -0500 summary: Merge 3.5 files: Doc/library/asyncio-protocol.rst | 6 +++--- Doc/library/asyncio-stream.rst | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst --- a/Doc/library/asyncio-protocol.rst +++ b/Doc/library/asyncio-protocol.rst @@ -1,8 +1,8 @@ .. currentmodule:: asyncio -+++++++++++++++++++++++++++++++++++++++++ -Transports and protocols (low-level API) -+++++++++++++++++++++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++++++++++++++ +Transports and protocols (callback based API) +++++++++++++++++++++++++++++++++++++++++++++++ .. _asyncio-transport: diff --git a/Doc/library/asyncio-stream.rst b/Doc/library/asyncio-stream.rst --- a/Doc/library/asyncio-stream.rst +++ b/Doc/library/asyncio-stream.rst @@ -2,9 +2,9 @@ .. _asyncio-streams: -++++++++++++++++++++++++ -Streams (high-level API) -++++++++++++++++++++++++ ++++++++++++++++++++++++++++++ +Streams (coroutine based API) ++++++++++++++++++++++++++++++ Stream functions ================ -- Repository URL: https://hg.python.org/cpython
participants (1)
-
yury.selivanov