diff options
| author | Yury Selivanov <yselivanov@sprymix.com> | 2015-12-17 02:31:15 (GMT) |
|---|---|---|
| committer | Yury Selivanov <yselivanov@sprymix.com> | 2015-12-17 02:31:15 (GMT) |
| commit | 90791ce2204da07210b0953880e813a1055f2ee3 (patch) | |
| tree | 1f93e778a61e0b9ac023346c50ca62bbf549ad62 /Doc | |
| parent | d4222dba184c8bf41a2c5051c351757dcbb08f01 (diff) | |
| parent | 9920e293c3160cc2da4b33b4b83c6a6f3f43d19e (diff) | |
| download | cpython-90791ce2204da07210b0953880e813a1055f2ee3.zip cpython-90791ce2204da07210b0953880e813a1055f2ee3.tar.gz cpython-90791ce2204da07210b0953880e813a1055f2ee3.tar.bz2 | |
Merge 3.5
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/asyncio-protocol.rst | 6 | ||||
| -rw-r--r-- | 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 index fffd3e8..23d34d0 100644 --- 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 index 171fd86..52b93f9 100644 --- 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 ================ |