diff options
author | Martin Panter <vadmium> | 2015-09-09 06:27:43 (GMT) |
---|---|---|
committer | Martin Panter <vadmium> | 2015-09-09 06:27:43 (GMT) |
commit | 6088b7bd492aed4524a34156a1ecfd5facc17faa (patch) | |
tree | d831fee7798b5397ee742663b7c98f3bb3573ffe /Doc/library/os.rst | |
parent | 52ee2471b3e0a62db47e36f7f8fe7a2c24ac1ff9 (diff) | |
parent | 9499413508b7ff4e7806f8f8e59ba9176d98b39c (diff) | |
download | cpython-6088b7bd492aed4524a34156a1ecfd5facc17faa.zip cpython-6088b7bd492aed4524a34156a1ecfd5facc17faa.tar.gz cpython-6088b7bd492aed4524a34156a1ecfd5facc17faa.tar.bz2 |
Merge 3.4 into 3.5
Diffstat (limited to 'Doc/library/os.rst')
-rw-r--r-- | Doc/library/os.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 25888e4..13f83c6 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -1072,7 +1072,7 @@ or `the MSDN <http://msdn.microsoft.com/en-us/library/z0kc8e3z.aspx>`_ on Window .. function:: sendfile(out, in, offset, count) - sendfile(out, in, offset, count, headers=None, trailers=None, flags=0) + sendfile(out, in, offset, count, [headers], [trailers], flags=0) Copy *count* bytes from file descriptor *in* to file descriptor *out* starting at *offset*. |