[Python-checkins] cpython (merge 3.4 -> 3.5): Merge 3.4
yury.selivanov
python-checkins at python.org
Wed Dec 16 21:31:19 EST 2015
https://hg.python.org/cpython/rev/580e32ac1359
changeset: 99602:580e32ac1359
branch: 3.5
parent: 99599:448d5be62d46
parent: 99601:f02c61f08333
user: Yury Selivanov <yselivanov at sprymix.com>
date: Wed Dec 16 21:31:04 2015 -0500
summary:
Merge 3.4
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
More information about the Python-checkins
mailing list