diff options
| author | Martin Panter <vadmium> | 2015-09-09 06:28:08 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium> | 2015-09-09 06:28:08 (GMT) |
| commit | 3f560c16e54aae0a1873a551e097e6e41e6aed54 (patch) | |
| tree | 321af9620f256f996a10c2c80f9d00c997284261 /Doc | |
| parent | 29bdbd0270b64b6625be2c94240d2b0a233f8ea5 (diff) | |
| parent | 6088b7bd492aed4524a34156a1ecfd5facc17faa (diff) | |
| download | cpython-3f560c16e54aae0a1873a551e097e6e41e6aed54.zip cpython-3f560c16e54aae0a1873a551e097e6e41e6aed54.tar.gz cpython-3f560c16e54aae0a1873a551e097e6e41e6aed54.tar.bz2 | |
Merge 3.5 into 3.6
Diffstat (limited to 'Doc')
| -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 40d65ad..1e4bcb8 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*. |