changeset:   106286:ffb2534fcbf1
branch:      3.6
parent:      106283:fcb19fb42058
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Mon Jan 23 12:30:00 2017 +0100
files:       Doc/library/socket.rst Doc/whatsnew/3.6.rst Misc/NEWS
description:
Issue #26273: Document TCP_USER_TIMEOUT and TCP_CONGESTION


diff -r fcb19fb42058 -r ffb2534fcbf1 Doc/library/socket.rst
--- a/Doc/library/socket.rst	Mon Jan 23 12:30:35 2017 +0200
+++ b/Doc/library/socket.rst	Mon Jan 23 12:30:00 2017 +0100
@@ -300,8 +300,8 @@
    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
diff -r fcb19fb42058 -r ffb2534fcbf1 Doc/whatsnew/3.6.rst
--- a/Doc/whatsnew/3.6.rst	Mon Jan 23 12:30:35 2017 +0200
+++ b/Doc/whatsnew/3.6.rst	Mon Jan 23 12:30:00 2017 +0100
@@ -1371,6 +1371,9 @@
 (Contributed by Christian Heimes in :issue:`27744` with support from
 Victor Stinner.)
 
+New Linux constants ``TCP_USER_TIMEOUT`` and ``TCP_CONGESTION`` were added.
+(Contributed by Omar Sandoval, issue:`26273`).
+
 
 socketserver
 ------------
diff -r fcb19fb42058 -r ffb2534fcbf1 Misc/NEWS
--- a/Misc/NEWS	Mon Jan 23 12:30:35 2017 +0200
+++ b/Misc/NEWS	Mon Jan 23 12:30:00 2017 +0100
@@ -256,6 +256,10 @@
   may be revisited again after the Python 2.7 branch is no longer officially
   supported.
 
+- Issue #26273: Add new :data:`socket.TCP_CONGESTION` (Linux 2.6.13) and
+  :data:`socket.TCP_USER_TIMEOUT` (Linux 2.6.37) constants. Patch written by
+  Omar Sandoval.
+
 - Issue #24142: Reading a corrupt config file left configparser in an
   invalid state.  Original patch by Florian Höch.
 
@@ -323,10 +327,6 @@
 Library
 -------
 
-- Issue #26273: Add new :data:`socket.TCP_CONGESTION` (Linux 2.6.13) and
-  :data:`socket.TCP_USER_TIMEOUT` (Linux 2.6.37) constants. Patch written by
-  Omar Sandoval.
-
 - Issue #28752: Restored the __reduce__() methods of datetime objects.
 
 - Issue #28727: Regular expression patterns, _sre.SRE_Pattern objects created