Merge 3.4

This commit is contained in:
Yury Selivanov 2015-12-16 21:31:04 -05:00
commit 9920e293c3
2 changed files with 6 additions and 6 deletions

View file

@ -1,8 +1,8 @@
.. currentmodule:: asyncio
+++++++++++++++++++++++++++++++++++++++++
Transports and protocols (low-level API)
+++++++++++++++++++++++++++++++++++++++++
++++++++++++++++++++++++++++++++++++++++++++++
Transports and protocols (callback based API)
++++++++++++++++++++++++++++++++++++++++++++++
.. _asyncio-transport:

View file

@ -2,9 +2,9 @@
.. _asyncio-streams:
++++++++++++++++++++++++
Streams (high-level API)
++++++++++++++++++++++++
+++++++++++++++++++++++++++++
Streams (coroutine based API)
+++++++++++++++++++++++++++++
Stream functions
================