2 files changed, 16 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d84abf79..c4323d337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
      [clientloop.c]
      set stdin/out/err to nonblocking in SSH proto 1, too. suggested by ho@
      should fix some of the blocking problems for rsync over SSH-1
+   - stevesk@cvs.openbsd.org 2001/04/15 19:41:21
+     [sshd.8]
+     some ClientAlive cleanup; ok markus@
  - (djm) Convert mandoc manpages to man automatically. Patch from Mark D.
    Roth <roth+openssh@feep.net>
 
@@ -5100,4 +5103,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1121 2001/04/16 02:01:25 mouring Exp $
+$Id: ChangeLog,v 1.1122 2001/04/16 02:03:49 mouring Exp $
diff --git a/sshd.8 b/sshd.8
index 887cc3ba3..e8af65a8c 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.115 2001/04/13 22:46:54 beck Exp $
+.\" $OpenBSD: sshd.8,v 1.116 2001/04/15 19:41:21 stevesk Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -368,9 +368,10 @@ Sets a timeout interval in seconds after which if no data has been received
 from the client, 
 .Nm
 will send a message through the encrypted
-channel to request a response from the client. This may only be
-used on a server supporting only protocol version 2. The default
+channel to request a response from the client.
+The default
 is 0, indicating that these messages will not be sent to the client.
+This option applies to protocol version 2 only.
 .It Cm ClientAliveCountMax
 Sets the number of client alive messages (see above) which may be
 sent without
@@ -380,12 +381,17 @@ reached while client alive messages are being sent,
 .Nm
 will disconnect the client, terminating the session. It is important
 to note that the use of client alive messages is very different from 
-Keepalive (below). The client alive messages are sent through the
+.Cm Keepalive
+(below). The client alive messages are sent through the
 encrypted channel and therefore will not be spoofable. The TCP keepalive
-option enable by Keepalive is spoofable. You want to use the client
+option enabled by
+.Cm Keepalive
+is spoofable. You want to use the client
 alive mechanism when you are basing something important on
 clients having an active connection to the server.
- The default is value is 3. If you set ClientAliveInterval
+.Pp
+The default value is 3. If you set
+.Cm ClientAliveInterval
 (above) to 15, and leave this value at the default, unresponsive ssh clients
 will be disconnected after approximately 45 seconds. 
 .It Cm DenyGroups