1 files changed, 27 insertions, 28 deletions

diff --git a/sshd.0 b/sshd.0
index 60be52888..339d872b9 100644
--- a/sshd.0
+++ b/sshd.0
@@ -4,7 +4,7 @@ NAME
      sshd - OpenSSH SSH daemon
 
 SYNOPSIS
-     sshd [-deiqtD46] [-b bits] [-f config_file] [-g login_grace_time]
+     sshd [-46Ddeiqt] [-b bits] [-f config_file] [-g login_grace_time]
           [-h host_key_file] [-k key_gen_time] [-o option] [-p port] [-u len]
 
 DESCRIPTION
@@ -21,7 +21,6 @@ DESCRIPTION
      sshd works as follows:
 
    SSH protocol version 1
-
      Each host has a host-specific RSA key (normally 1024 bits) used to iden-
      tify the host.  Additionally, when the daemon starts, it generates a
      server RSA key (normally 768 bits).  This key is normally regenerated ev-
@@ -30,7 +29,7 @@ DESCRIPTION
      Whenever a client connects, the daemon responds with its public host and
      server keys.  The client compares the RSA host key against its own
      database to verify that it has not changed.  The client then generates a
-     256 bit random number.  It encrypts this random number using both the
+     256-bit random number.  It encrypts this random number using both the
      host key and the server key, and sends the encrypted number to the serv-
      er.  Both sides then use this random number as a session key which is
      used to encrypt all further communications in the session.  The rest of
@@ -54,13 +53,12 @@ DESCRIPTION
      field should be set to something other than these values (eg `NP' or
      `*NP*' ).
 
-     Rhosts authentication is normally disabled because it is fundamentally
+     rhosts authentication is normally disabled because it is fundamentally
      insecure, but can be enabled in the server configuration file if desired.
      System security is not improved unless rshd, rlogind, and rexecd are dis-
      abled (thus completely disabling rlogin and rsh into the machine).
 
    SSH protocol version 2
-
      Version 2 works similarly: Each host has a host-specific key (RSA or DSA)
      used to identify the host.  However, when the daemon starts, it does not
      generate a server key.  Forward security is provided through a Diffie-
@@ -68,7 +66,7 @@ DESCRIPTION
      key.
 
      The rest of the session is encrypted using a symmetric cipher, currently
-     128 bit AES, Blowfish, 3DES, CAST128, Arcfour, 192 bit AES, or 256 bit
+     128-bit AES, Blowfish, 3DES, CAST128, Arcfour, 192-bit AES, or 256-bit
      AES.  The client selects the encryption algorithm to use from those of-
      fered by the server.  Additionally, session integrity is provided through
      a cryptographic message authentication code (hmac-sha1 or hmac-md5).
@@ -79,7 +77,6 @@ DESCRIPTION
      ods.
 
    Command execution and data forwarding
-
      If the client successfully authenticates itself, a dialog for preparing
      the session is entered.  At this time the client may request things like
      allocating a pseudo-tty, forwarding X11 connections, forwarding TCP/IP
@@ -95,9 +92,9 @@ DESCRIPTION
      tions have been closed, the server sends command exit status to the
      client, and both sides exit.
 
-     sshd can be configured using command-line options or a configuration
-     file.  Command-line options override values specified in the configura-
-     tion file.
+     sshd can be configured using command-line options or a configuration file
+     (by default sshd_config(5)).  Command-line options override values speci-
+     fied in the configuration file.
 
      sshd rereads its configuration file when it receives a hangup signal,
      SIGHUP, by executing itself with the name it was started as, i.e.,
@@ -105,10 +102,17 @@ DESCRIPTION
 
      The options are as follows:
 
+     -4      Forces sshd to use IPv4 addresses only.
+
+     -6      Forces sshd to use IPv6 addresses only.
+
      -b bits
              Specifies the number of bits in the ephemeral protocol version 1
              server key (default 768).
 
+     -D      When this option is specified, sshd will not detach and does not
+             become a daemon.  This allows easy monitoring of sshd.
+
      -d      Debug mode.  The server sends verbose debug output to the system
              log, and does not put itself in the background.  The server also
              will not fork and will only process one connection.  This option
@@ -149,15 +153,16 @@ DESCRIPTION
              Specifies how often the ephemeral protocol version 1 server key
              is regenerated (default 3600 seconds, or one hour).  The motiva-
              tion for regenerating the key fairly often is that the key is not
-             stored anywhere, and after about an hour, it becomes impossible
-             to recover the key for decrypting intercepted communications even
-             if the machine is cracked into or physically seized.  A value of
-             zero indicates that the key will never be regenerated.
+             stored anywhere, and after about an hour it becomes impossible to
+             recover the key for decrypting intercepted communications even if
+             the machine is cracked into or physically seized.  A value of ze-
+             ro indicates that the key will never be regenerated.
 
      -o option
              Can be used to give options in the format used in the configura-
              tion file.  This is useful for specifying options for which there
-             is no separate command-line flag.
+             is no separate command-line flag.  For full details of the op-
+             tions, and their values, see sshd_config(5).
 
      -p port
              Specifies the port on which the server listens for connections
@@ -187,13 +192,6 @@ DESCRIPTION
              tions that require DNS include using a USER@HOST pattern in
              AllowUsers or DenyUsers.
 
-     -D      When this option is specified sshd will not detach and does not
-             become a daemon.  This allows easy monitoring of sshd.
-
-     -4      Forces sshd to use IPv4 addresses only.
-
-     -6      Forces sshd to use IPv6 addresses only.
-
 CONFIGURATION FILE
      sshd reads configuration data from /etc/ssh/sshd_config (or the file
      specified with -f on the command line).  The file format and configura-
@@ -216,8 +214,8 @@ LOGIN PROCESS
 
            5.   Sets up basic environment.
 
-           6.   Reads $HOME/.ssh/environment if it exists and users are al-
-                lowed to change their environment.  See the
+           6.   Reads the file $HOME/.ssh/environment, if it exists, and users
+                are allowed to change their environment.  See the
                 PermitUserEnvironment option in sshd_config(5).
 
            7.   Changes to user's home directory.
@@ -420,7 +418,7 @@ FILES
              identity.pub, id_dsa.pub and/or id_rsa.pub files into this file,
              as described in ssh-keygen(1).
 
-     /etc/ssh/ssh_known_hosts and $HOME/.ssh/known_hosts
+     /etc/ssh/ssh_known_hosts, $HOME/.ssh/known_hosts
              These files are consulted when using rhosts with RSA host authen-
              tication or protocol version 2 hostbased authentication to check
              the public key of the host.  The key must be listed in one of
@@ -447,7 +445,7 @@ FILES
              and rshd.  The file must be writable only by the user; it is rec-
              ommended that it not be accessible by others.
 
-             If is also possible to use netgroups in the file.  Either host or
+             It is also possible to use netgroups in the file.  Either host or
              user name may be of the form +@groupname to specify all hosts or
              all users in the group.
 
@@ -457,7 +455,7 @@ FILES
              access using SSH only.
 
      /etc/hosts.equiv
-             This file is used during .rhosts authentication.  In the simplest
+             This file is used during rhosts authentication.  In the simplest
              form, this file contains host names, one per line.  Users on
              those hosts are permitted to log in without a password, provided
              they have the same user name on both machines.  The host name may
@@ -535,7 +533,8 @@ FILES
 
 SEE ALSO
      scp(1), sftp(1), ssh(1), ssh-add(1), ssh-agent(1), ssh-keygen(1),
-     login.conf(5), moduli(5), sshd_config(5), sftp-server(8)
+     chroot(2), hosts_access(5), login.conf(5), moduli(5), sshd_config(5),
+     inetd(8), sftp-server(8)
 
      T. Ylonen, T. Kivinen, M. Saarinen, T. Rinne, and S. Lehtinen, SSH
      Protocol Architecture, draft-ietf-secsh-architecture-12.txt, January