upstream: Change description of TCPKeepAlive from "inactive" to

"unresponsive" to clarify what it checks for.  Patch from jblaine at
kickflop.net via github pr#129, ok djm@.

OpenBSD-Commit-ID: 3682f8ec7227f5697945daa25d11ce2d933899e9

diff --git a/ssh_config.5 b/ssh_config.5
index 03321432f96003579df093a9d491ab7a06168c1b..53cb5abfee4c5ca872ac7a60e67b7ffa630ba429 100644 (file)
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.297 2019/08/02 01:23:19 djm Exp $
-.Dd $Mdocdate: August 2 2019 $
+.\" $OpenBSD: ssh_config.5,v 1.298 2019/08/09 04:24:03 dtucker Exp $
+.Dd $Mdocdate: August 9 2019 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1460,7 +1460,7 @@ The TCP keepalive option enabled by
 .Cm TCPKeepAlive
 is spoofable.
 The server alive mechanism is valuable when the client or
-server depend on knowing when a connection has become inactive.
+server depend on knowing when a connection has become unresponsive.
 .Pp
 The default value is 3.
 If, for example,

diff --git a/sshd_config.5 b/sshd_config.5
index 9b155f6c1d39cae2a9b5af029e404ae379458d91..e6ae8714507e975e09032243c313e169a7fb0a6b 100644 (file)
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.287 2019/07/23 23:06:57 dtucker Exp $
-.Dd $Mdocdate: July 23 2019 $
+.\" $OpenBSD: sshd_config.5,v 1.288 2019/08/09 04:24:03 dtucker Exp $
+.Dd $Mdocdate: August 9 2019 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -512,7 +512,7 @@ The TCP keepalive option enabled by
 .Cm TCPKeepAlive
 is spoofable.
 The client alive mechanism is valuable when the client or
-server depend on knowing when a connection has become inactive.
+server depend on knowing when a connection has become unresponsive.
 .Pp
 The default value is 3.
 If