[Python-checkins] cpython (merge 3.5 -> 3.6): Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/7527ce67a3b1
changeset:   104525:7527ce67a3b1
branch:      3.6
parent:      104522:26249f82c15d
parent:      104524:14363cf42e15
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Tue Oct 18 00:35:09 2016 +0300
summary:
  Merge from 3.5

files:
  Doc/library/asyncio-stream.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


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
@@ -142,7 +142,7 @@
 
       This method is a :ref:`coroutine <coroutine>`.
 
-   .. coroutinemethod:: readuntil(separator=b'\n')
+   .. coroutinemethod:: readuntil(separator=b'\\n')
 
       Read data from the stream until ``separator`` is found.
 

-- 
Repository URL: https://hg.python.org/cpython