diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-01-23 11:34:00 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2017-01-23 11:34:00 (GMT) |
| commit | 0e830455cbf5dc537b3d1bc1a513c5ba669390ae (patch) | |
| tree | a53ab7ed4539414422607052e7614645b6510ca9 /Doc/library/socket.rst | |
| parent | ccb5f3cee9ebb5f20e33f31432a46579f8e9bf8e (diff) | |
| parent | 01f5ae7b76236a19c670d107b06b68ccb69f532f (diff) | |
| download | cpython-0e830455cbf5dc537b3d1bc1a513c5ba669390ae.zip cpython-0e830455cbf5dc537b3d1bc1a513c5ba669390ae.tar.gz cpython-0e830455cbf5dc537b3d1bc1a513c5ba669390ae.tar.bz2 | |
Merge 3.6
Diffstat (limited to 'Doc/library/socket.rst')
| -rw-r--r-- | Doc/library/socket.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst index ef5eec3..d56caf0 100644 --- a/Doc/library/socket.rst +++ b/Doc/library/socket.rst @@ -300,8 +300,8 @@ Constants provided. .. versionchanged:: 3.6 - ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC`` - were added. + ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC``, + ``TCP_USER_TIMEOUT``, ``TCP_CONGESTION`` were added. .. data:: AF_CAN PF_CAN |