From 317741efa6ef92034315ddc5124fa9974e3761fa Mon Sep 17 00:00:00 2001
From: kobelb <brandon.kobel@elastic.co>
Date: Tue, 28 Jul 2020 16:57:31 -0700
Subject: [PATCH 1/3] doc: add net.Socket#timeout

---
 doc/api/net.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/api/net.md b/doc/api/net.md
index 3bf9a68a8abf09..1eede088d7839d 100644
--- a/doc/api/net.md
+++ b/doc/api/net.md
@@ -914,6 +914,15 @@ If `timeout` is 0, then the existing idle timeout is disabled.
 The optional `callback` parameter will be added as a one-time listener for the
 [`'timeout'`][] event.
 
+### `socket.timeout`
+<!-- YAML
+added: v10.7.0
+-->
+
+* {number}
+
+Gets the read-only socket timeout in milliseconds.
+
 ### `socket.unref()`
 <!-- YAML
 added: v0.9.1

From 2841e707ed8cef708b9d76d82aa744ce2267eebf Mon Sep 17 00:00:00 2001
From: Brandon Kobel <brandon.kobel@gmail.com>
Date: Wed, 29 Jul 2020 08:10:45 -0700
Subject: [PATCH 2/3] doc: change net.Socket#timeout description

Co-authored-by: Harshitha K P <harshitha014@gmail.com>
---
 doc/api/net.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/net.md b/doc/api/net.md
index 1eede088d7839d..dba98062486cca 100644
--- a/doc/api/net.md
+++ b/doc/api/net.md
@@ -921,7 +921,7 @@ added: v10.7.0
 
 * {number}
 
-Gets the read-only socket timeout in milliseconds.
+Returns the read-only socket timeout in milliseconds.
 
 ### `socket.unref()`
 <!-- YAML

From 91666014d5f30e60414d0aff897c5815f0edf097 Mon Sep 17 00:00:00 2001
From: Brandon Kobel <brandon.kobel@gmail.com>
Date: Mon, 10 Aug 2020 18:54:49 -0700
Subject: [PATCH 3/3] doc: make it more obvious that net.Socket#timeout is
 potentially undefined

Co-authored-by: Rich Trott <rtrott@gmail.com>
---
 doc/api/net.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/api/net.md b/doc/api/net.md
index dba98062486cca..e4c758aeaf01a6 100644
--- a/doc/api/net.md
+++ b/doc/api/net.md
@@ -919,9 +919,10 @@ The optional `callback` parameter will be added as a one-time listener for the
 added: v10.7.0
 -->
 
-* {number}
+* {number|undefined}
 
-Returns the read-only socket timeout in milliseconds.
+The socket timeout in milliseconds as set by [`socket.setTimeout()`][].
+It is `undefined` if a timeout has not been set.
 
 ### `socket.unref()`
 <!-- YAML