From 9749c0c97288c2fa92882754f5069ba7c741af1a Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 5 Feb 2002 12:23:58 +1100
Subject: [PATCH]    - stevesk@cvs.openbsd.org 2002/02/03 22:35:57      [ssh.1
 sshd.8]      some KeepAlive cleanup/clarify; ok markus@

---
 ChangeLog | 5 ++++-
 ssh.1     | 7 +++----
 sshd.8    | 9 ++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 43b69475a..19ab35642 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,9 @@
    - markus@cvs.openbsd.org 2002/02/03 17:59:23
      [sshconnect2.c]
      more cross checking if announced vs. used key type; ok stevesk@
+   - stevesk@cvs.openbsd.org 2002/02/03 22:35:57
+     [ssh.1 sshd.8]
+     some KeepAlive cleanup/clarify; ok markus@
 
 20020130
  - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@
@@ -7474,4 +7477,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1818 2002/02/05 01:23:32 djm Exp $
+$Id: ChangeLog,v 1.1819 2002/02/05 01:23:58 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 08f0c6ce8..c44f4ae2c 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (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.1,v 1.145 2002/01/29 23:50:37 markus Exp $
+.\" $OpenBSD: ssh.1,v 1.146 2002/02/03 22:35:57 stevesk Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -935,7 +935,7 @@ It is possible to have
 multiple identity files specified in configuration files; all these
 identities will be tried in sequence.
 .It Cm KeepAlive
-Specifies whether the system should send keepalive messages to the
+Specifies whether the system should send TCP keepalive messages to the
 other side.
 If they are sent, death of the connection or crash of one
 of the machines will be properly noticed.
@@ -950,8 +950,7 @@ if the network goes down or the remote host dies.
 This is important in scripts, and many users want it too.
 .Pp
 To disable keepalives, the value should be set to
-.Dq no
-in both the server and the client configuration files.
+.Dq no .
 .It Cm KerberosAuthentication
 Specifies whether Kerberos authentication will be used.
 The argument to this keyword must be
diff --git a/sshd.8 b/sshd.8
index 9a8d59fd1..ea5dd03e2 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
 .\" (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.8,v 1.165 2002/01/29 14:32:03 markus Exp $
+.\" $OpenBSD: sshd.8,v 1.166 2002/02/03 22:35:57 stevesk Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -533,7 +533,7 @@ or
 The default is
 .Dq no .
 .It Cm KeepAlive
-Specifies whether the system should send keepalive messages to the
+Specifies whether the system should send TCP keepalive messages to the
 other side.
 If they are sent, death of the connection or crash of one
 of the machines will be properly noticed.
@@ -548,12 +548,11 @@ users and consuming server resources.
 The default is
 .Dq yes
 (to send keepalives), and the server will notice
-if the network goes down or the client host reboots.
+if the network goes down or the client host crashes.
 This avoids infinitely hanging sessions.
 .Pp
 To disable keepalives, the value should be set to
-.Dq no
-in both the server and the client configuration files.
+.Dq no .
 .It Cm KerberosAuthentication
 Specifies whether Kerberos authentication is allowed.
 This can be in the form of a Kerberos ticket, or if