Merge 3.4

9920e293 · Yury Selivanov · c4e27e27 · cba0053b · 9920e293 · 9920e293
Kaydet (Commit) 9920e293 authored Ara 17, 2015 tarafından Yury Selivanov
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

asyncio-protocol.rst Doc/library/asyncio-protocol.rst +3 -3

asyncio-stream.rst Doc/library/asyncio-stream.rst +3 -3

No files found.
--- a/Doc/library/asyncio-protocol.rst
+++ b/Doc/library/asyncio-protocol.rst
 .. currentmodule:: asyncio

-+++++++++++++++++++++++++++++++++++++++++
-Transports  and protocols (low-level API)
-+++++++++++++++++++++++++++++++++++++++++
++++++++++++++++++++++++++++++++++++++++++++++
+Transports  and protocols (callback based API)
++++++++++++++++++++++++++++++++++++++++++++++

 .. _asyncio-transport:


--- 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
 ================