commit 53d3f8a89971bac3d2f454ff9f923066ecc3a6d9
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Feb 26 10:36:17 2018 -0800
committer GitHub <noreply@github.com> Mon Feb 26 10:36:17 2018 -0800
tree a11ec4ba01c26428bd107f8b14f4f0ae8d747f58
parent f8a3485dcd41a00c5e99c5be6adc67cb2638b366

bpo-32394: Remove some TCP options on old version Windows. (GH-5523)

(cherry picked from commit 19e7d48ce89422091f9af93038b9fee075d46e9e)

Co-authored-by: animalize <animalize@users.noreply.github.com>

Doc/library/socket.rst

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index 04042ff..4ce9669 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -320,9 +320,16 @@
       ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC``,
       ``TCP_USER_TIMEOUT``, ``TCP_CONGESTION`` were added.
 
+   .. versionchanged:: 3.6.5
+      On Windows, ``TCP_FASTOPEN``, ``TCP_KEEPCNT`` appear if run-time Windows
+      supports.
+
    .. versionchanged:: 3.7
       ``TCP_NOTSENT_LOWAT`` was added.
 
+      On Windows, ``TCP_KEEPIDLE``, ``TCP_KEEPINTVL`` appear if run-time Windows
+      supports.
+
 .. data:: AF_CAN
           PF_CAN
           SOL_CAN_*