- stevesk@cvs.openbsd.org 2002/02/03 22:35:57

     [ssh.1 sshd.8]
     some KeepAlive cleanup/clarify; ok markus@

diff --git a/ChangeLog b/ChangeLog
index 46b3906dea19e9a42c599b02770444d75fd74245..1115997a24650170e76cedb4593a6df289a7e8c3 100644 (file)
--- 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@

diff --git a/ssh.1 b/ssh.1
index 08f0c6ce88d5569e078c93f93897fbc3225e739a..c44f4ae2c961f75fba8d3a1b722f8a250992668c 100644 (file)
--- 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 9a8d59fd1797b0a7d674815c4ca44a68a23b098c..ea5dd03e2f52fb873805c3f610a9f2ea08ad3f39 100644 (file)
--- 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