1 files changed, 25 insertions, 26 deletions

diff --git a/sshd_config.0 b/sshd_config.0
index 643db2640..981e91042 100644
--- a/sshd_config.0
+++ b/sshd_config.0
@@ -81,12 +81,12 @@ DESCRIPTION
              If this threshold is reached while client alive messages are be-
              ing sent, sshd will disconnect the client, terminating the ses-
              sion.  It is important to note that the use of client alive mes-
-             sages is very different from KeepAlive (below).  The client alive
-             messages are sent through the encrypted channel and therefore
-             will not be spoofable.  The TCP keepalive option enabled by
-             KeepAlive is spoofable.  The client alive mechanism is valuable
-             when the client or server depend on knowing when a connection has
-             become inactive.
+             sages is very different from TCPKeepAlive (below).  The client
+             alive messages are sent through the encrypted channel and there-
+             fore will not be spoofable.  The TCP keepalive option enabled by
+             TCPKeepAlive is spoofable.  The client alive mechanism is valu-
+             able when the client or server depend on knowing when a connec-
+             tion has become inactive.
 
              The default value is 3.  If ClientAliveInterval (above) is set to
              15, and ClientAliveCountMax is left at the default, unresponsive
@@ -162,21 +162,6 @@ DESCRIPTION
              $HOME/.ssh/known_hosts during RhostsRSAAuthentication or
              HostbasedAuthentication.  The default is ``no''.
 
-     KeepAlive
-             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.  However,
-             this means that connections will die if the route is down tem-
-             porarily, and some people find it annoying.  On the other hand,
-             if keepalives are not sent, sessions may hang indefinitely on the
-             server, leaving ``ghost'' users and consuming server resources.
-
-             The default is ``yes'' (to send keepalives), and the server will
-             notice if the network goes down or the client host crashes.  This
-             avoids infinitely hanging sessions.
-
-             To disable keepalives, the value should be set to ``no''.
-
      KerberosAuthentication
              Specifies whether the password provided by the user for
              PasswordAuthentication will be validated through the Kerberos
@@ -308,10 +293,7 @@ DESCRIPTION
      PubkeyAuthentication
              Specifies whether public key authentication is allowed.  The de-
              fault is ``yes''.  Note that this option applies to protocol ver-
-             sion 2 only.  RhostsRSAAuthentication should be used instead, be-
-             cause it performs RSA-based host authentication in addition to
-             normal rhosts or /etc/hosts.equiv authentication.  The default is
-             ``no''.  This option applies to protocol version 1 only.
+             sion 2 only.
 
      RhostsRSAAuthentication
              Specifies whether rhosts or /etc/hosts.equiv authentication to-
@@ -349,6 +331,23 @@ DESCRIPTION
              CAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.  The de-
              fault is AUTH.
 
+     TCPKeepAlive
+             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.  However,
+             this means that connections will die if the route is down tem-
+             porarily, and some people find it annoying.  On the other hand,
+             if TCP keepalives are not sent, sessions may hang indefinitely on
+             the server, leaving ``ghost'' users and consuming server re-
+             sources.
+
+             The default is ``yes'' (to send TCP keepalive messages), and the
+             server will notice if the network goes down or the client host
+             crashes.  This avoids infinitely hanging sessions.
+
+             To disable TCP keepalive messages, the value should be set to
+             ``no''.
+
      UseDNS  Specifies whether sshd should lookup the remote host name and
              check that the resolved host name for the remote IP address maps
              back to the very same IP address.  The default is ``yes''.
@@ -364,7 +363,7 @@ DESCRIPTION
      UsePAM  Enables PAM authentication (via challenge-response) and session
              set up.  If you enable this, you should probably disable
              PasswordAuthentication.  If you enable then you will not be able
-             to run sshd as a non-root user.
+             to run sshd as a non-root user.  The default is ``no''.
 
      UsePrivilegeSeparation
              Specifies whether sshd separates privileges by creating an un-