1 files changed, 88 insertions, 83 deletions

diff --git a/ssh.0 b/ssh.0
index 972ac45c7..50e6020d1 100644
--- a/ssh.0
+++ b/ssh.0
@@ -1,4 +1,4 @@
-SSH(1)                    BSD General Commands Manual                   SSH(1)
+SSH(1)                     OpenBSD Reference Manual                     SSH(1)
 
 NAME
      ssh - OpenSSH SSH client (remote login program)
@@ -14,19 +14,20 @@ SYNOPSIS
 DESCRIPTION
      ssh (SSH client) is a program for logging into a remote machine and for
      executing commands on a remote machine.  It is intended to replace rlogin
-     and rsh, and provide secure encrypted communications between two
-     untrusted hosts over an insecure network.  X11 connections and arbitrary
-     TCP/IP ports can also be forwarded over the secure channel.
+     and rsh, and provide secure encrypted communications between two untrust-
+     ed hosts over an insecure network.  X11 connections and arbitrary TCP/IP
+     ports can also be forwarded over the secure channel.
 
      ssh connects and logs into the specified hostname.  The user must prove
-     his/her identity to the remote machine using one of several methods
-     depending on the protocol version used:
+     his/her identity to the remote machine using one of several methods de-
+     pending on the protocol version used:
 
    SSH protocol version 1
+
      First, if the machine the user logs in from is listed in /etc/hosts.equiv
      or /etc/shosts.equiv on the remote machine, and the user names are the
      same on both sides, the user is immediately permitted to log in.  Second,
-     if .rhosts or .shosts exists in the userM-bM-^@M-^Ys home directory on the remote
+     if .rhosts or .shosts exists in the user's home directory on the remote
      machine and contains a line containing the name of the client machine and
      the name of the user on that machine, the user is permitted to log in.
      This form of authentication alone is normally not allowed by the server
@@ -35,7 +36,7 @@ DESCRIPTION
      The second authentication method is the rhosts or hosts.equiv method com-
      bined with RSA-based host authentication.  It means that if the login
      would be permitted by $HOME/.rhosts, $HOME/.shosts, /etc/hosts.equiv, or
-     /etc/shosts.equiv, and if additionally the server can verify the clientM-bM-^@M-^Ys
+     /etc/shosts.equiv, and if additionally the server can verify the client's
      host key (see /etc/ssh/ssh_known_hosts and $HOME/.ssh/known_hosts in the
      FILES section), only then login is permitted.  This authentication method
      closes security holes due to IP spoofing, DNS spoofing and routing spoof-
@@ -55,15 +56,15 @@ DESCRIPTION
      which key pair it would like to use for authentication.  The server
      checks if this key is permitted, and if so, sends the user (actually the
      ssh program running on behalf of the user) a challenge, a random number,
-     encrypted by the userM-bM-^@M-^Ys public key.  The challenge can only be decrypted
-     using the proper private key.  The userM-bM-^@M-^Ys client then decrypts the chal-
+     encrypted by the user's public key.  The challenge can only be decrypted
+     using the proper private key.  The user's client then decrypts the chal-
      lenge using the private key, proving that he/she knows the private key
      but without disclosing it to the server.
 
      ssh implements the RSA authentication protocol automatically.  The user
      creates his/her RSA key pair by running ssh-keygen(1).  This stores the
      private key in $HOME/.ssh/identity and the public key in
-     $HOME/.ssh/identity.pub in the userM-bM-^@M-^Ys home directory.  The user should
+     $HOME/.ssh/identity.pub in the user's home directory.  The user should
      then copy the identity.pub to $HOME/.ssh/authorized_keys in his/her home
      directory on the remote machine (the authorized_keys file corresponds to
      the conventional $HOME/.rhosts file, and has one key per line, though the
@@ -80,6 +81,7 @@ DESCRIPTION
      someone listening on the network.
 
    SSH protocol version 2
+
      When a user connects using protocol version 2 similar authentication
      methods are available.  Using the default values for
      PreferredAuthentications, the client will try to authenticate first using
@@ -94,11 +96,11 @@ DESCRIPTION
      server checks whether the matching public key is listed in
      $HOME/.ssh/authorized_keys and grants access if both the key is found and
      the signature is correct.  The session identifier is derived from a
-     shared Diffie-Hellman value and is only known to the client and the
-     server.
+     shared Diffie-Hellman value and is only known to the client and the serv-
+     er.
 
      If public key authentication fails or is not available a password can be
-     sent encrypted to the remote host for proving the userM-bM-^@M-^Ys identity.
+     sent encrypted to the remote host for proving the user's identity.
 
      Additionally, ssh supports hostbased or challenge response authentica-
      tion.
@@ -109,8 +111,9 @@ DESCRIPTION
      ensuring the integrity of the connection.
 
    Login session and remote execution
-     When the userM-bM-^@M-^Ys identity has been accepted by the server, the server
-     either executes the given command, or logs into the machine and gives the
+
+     When the user's identity has been accepted by the server, the server ei-
+     ther executes the given command, or logs into the machine and gives the
      user a normal shell on the remote machine.  All communication with the
      remote command or shell will be automatically encrypted.
 
@@ -119,14 +122,15 @@ DESCRIPTION
 
      If no pseudo tty has been allocated, the session is transparent and can
      be used to reliably transfer binary data.  On most systems, setting the
-     escape character to M-bM-^@M-^\noneM-bM-^@M-^] will also make the session transparent even if
-     a tty is used.
+     escape character to ``none'' will also make the session transparent even
+     if a tty is used.
 
      The session terminates when the command or shell on the remote machine
      exits and all X11 and TCP/IP connections have been closed.  The exit sta-
      tus of the remote program is returned as the exit status of ssh.
 
    Escape Characters
+
      When a pseudo terminal has been requested, ssh supports a number of func-
      tions through the use of an escape character.
 
@@ -136,7 +140,7 @@ DESCRIPTION
      ter can be changed in configuration files using the EscapeChar configura-
      tion directive or on the command line by the -e option.
 
-     The supported escapes (assuming the default M-bM-^@M-^X~M-bM-^@M-^Y) are:
+     The supported escapes (assuming the default `~') are:
 
      ~.      Disconnect
 
@@ -159,19 +163,20 @@ DESCRIPTION
              version 2 and if the peer supports it)
 
    X11 and TCP forwarding
-     If the ForwardX11 variable is set to M-bM-^@M-^\yesM-bM-^@M-^] (or, see the description of
+
+     If the ForwardX11 variable is set to ``yes'' (or, see the description of
      the -X and -x options described later) and the user is using X11 (the
      DISPLAY environment variable is set), the connection to the X11 display
      is automatically forwarded to the remote side in such a way that any X11
-     programs started from the shell (or command) will go through the
-     encrypted channel, and the connection to the real X server will be made
-     from the local machine.  The user should not manually set DISPLAY.  For-
-     warding of X11 connections can be configured on the command line or in
-     configuration files.
+     programs started from the shell (or command) will go through the encrypt-
+     ed channel, and the connection to the real X server will be made from the
+     local machine.  The user should not manually set DISPLAY.  Forwarding of
+     X11 connections can be configured on the command line or in configuration
+     files.
 
      The DISPLAY value set by ssh will point to the server machine, but with a
      display number greater than zero.  This is normal, and happens because
-     ssh creates a M-bM-^@M-^\proxyM-bM-^@M-^] X server on the server machine for forwarding the
+     ssh creates a ``proxy'' X server on the server machine for forwarding the
      connections over the encrypted channel.
 
      ssh will also automatically set up Xauthority data on the server machine.
@@ -181,10 +186,10 @@ DESCRIPTION
      is opened.  The real authentication cookie is never sent to the server
      machine (and no cookies are sent in the plain).
 
-     If the ForwardAgent variable is set to M-bM-^@M-^\yesM-bM-^@M-^] (or, see the description of
-     the -A and -a options described later) and the user is using an authenti-
-     cation agent, the connection to the agent is automatically forwarded to
-     the remote side.
+     If the ForwardAgent variable is set to ``yes'' (or, see the description
+     of the -A and -a options described later) and the user is using an au-
+     thentication agent, the connection to the agent is automatically forward-
+     ed to the remote side.
 
      Forwarding of arbitrary TCP/IP connections over the secure channel can be
      specified either on the command line or in a configuration file.  One
@@ -192,13 +197,14 @@ DESCRIPTION
      electronic purse; another is going through firewalls.
 
    Server authentication
+
      ssh automatically maintains and checks a database containing identifica-
      tions for all hosts it has ever been used with.  Host keys are stored in
-     $HOME/.ssh/known_hosts in the userM-bM-^@M-^Ys home directory.  Additionally, the
+     $HOME/.ssh/known_hosts in the user's home directory.  Additionally, the
      file /etc/ssh/ssh_known_hosts is automatically checked for known hosts.
-     Any new hosts are automatically added to the userM-bM-^@M-^Ys file.  If a hostM-bM-^@M-^Ys
+     Any new hosts are automatically added to the user's file.  If a host's
      identification ever changes, ssh warns about this and disables password
-     authentication to prevent a trojan horse from getting the userM-bM-^@M-^Ys pass-
+     authentication to prevent a trojan horse from getting the user's pass-
      word.  Another purpose of this mechanism is to prevent man-in-the-middle
      attacks which could otherwise be used to circumvent the encryption.  The
      StrictHostKeyChecking option can be used to prevent logins to machines
@@ -214,7 +220,7 @@ DESCRIPTION
 
              Agent forwarding should be enabled with caution.  Users with the
              ability to bypass file permissions on the remote host (for the
-             agentM-bM-^@M-^Ys Unix-domain socket) can access the local agent through
+             agent's Unix-domain socket) can access the local agent through
              the forwarded connection.  An attacker cannot obtain key material
              from the agent, however they can perform operations on the keys
              that enable them to authenticate using the identities loaded into
@@ -240,19 +246,19 @@ DESCRIPTION
              more information.
 
      -e ch|^ch|none
-             Sets the escape character for sessions with a pty (default: M-bM-^@M-^X~M-bM-^@M-^Y).
+             Sets the escape character for sessions with a pty (default: `~').
              The escape character is only recognized at the beginning of a
-             line.  The escape character followed by a dot (M-bM-^@M-^X.M-bM-^@M-^Y) closes the
+             line.  The escape character followed by a dot (`.') closes the
              connection, followed by control-Z suspends the connection, and
              followed by itself sends the escape character once.  Setting the
-             character to M-bM-^@M-^\noneM-bM-^@M-^] disables any escapes and makes the session
+             character to ``none'' disables any escapes and makes the session
              fully transparent.
 
      -f      Requests ssh to go to background just before command execution.
-             This is useful if ssh is going to ask for passwords or
-             passphrases, but the user wants it in the background.  This
-             implies -n.  The recommended way to start X11 programs at a
-             remote site is with something like ssh -f host xterm.
+             This is useful if ssh is going to ask for passwords or passphras-
+             es, but the user wants it in the background.  This implies -n.
+             The recommended way to start X11 programs at a remote site is
+             with something like ssh -f host xterm.
 
      -g      Allows remote hosts to connect to local forwarded ports.
 
@@ -260,15 +266,15 @@ DESCRIPTION
              Selects a file from which the identity (private key) for RSA or
              DSA authentication is read.  The default is $HOME/.ssh/identity
              for protocol version 1, and $HOME/.ssh/id_rsa and
-             $HOME/.ssh/id_dsa for protocol version 2.  Identity files may
-             also be specified on a per-host basis in the configuration file.
+             $HOME/.ssh/id_dsa for protocol version 2.  Identity files may al-
+             so be specified on a per-host basis in the configuration file.
              It is possible to have multiple -i options (and multiple identi-
              ties specified in configuration files).
 
      -I smartcard_device
-             Specifies which smartcard device to use.  The argument is the
-             device ssh should use to communicate with a smartcard used for
-             storing the userM-bM-^@M-^Ys private RSA key.
+             Specifies which smartcard device to use.  The argument is the de-
+             vice ssh should use to communicate with a smartcard used for
+             storing the user's private RSA key.
 
      -k      Disables forwarding of Kerberos tickets.  This may also be speci-
              fied on a per-host basis in the configuration file.
@@ -284,13 +290,12 @@ DESCRIPTION
 
      -n      Redirects stdin from /dev/null (actually, prevents reading from
              stdin).  This must be used when ssh is run in the background.  A
-             common trick is to use this to run X11 programs on a remote
-             machine.  For example, ssh -n shadows.cs.hut.fi emacs & will
-             start an emacs on shadows.cs.hut.fi, and the X11 connection will
-             be automatically forwarded over an encrypted channel.  The ssh
-             program will be put in the background.  (This does not work if
-             ssh needs to ask for a password or passphrase; see also the -f
-             option.)
+             common trick is to use this to run X11 programs on a remote ma-
+             chine.  For example, ssh -n shadows.cs.hut.fi emacs & will start
+             an emacs on shadows.cs.hut.fi, and the X11 connection will be au-
+             tomatically forwarded over an encrypted channel.  The ssh program
+             will be put in the background.  (This does not work if ssh needs
+             to ask for a password or passphrase; see also the -f option.)
 
      -N      Do not execute a remote command.  This is useful for just for-
              warding ports (protocol version 2 only).
@@ -308,10 +313,10 @@ DESCRIPTION
              suppressed.
 
      -s      May be used to request invocation of a subsystem on the remote
-             system.  Subsystems are a feature of the SSH2 protocol which
-             facilitate the use of SSH as a secure transport for other appli-
-             cations (eg. sftp).  The subsystem is specified as the remote
-             command.
+             system.  Subsystems are a feature of the SSH2 protocol which fa-
+             cilitate the use of SSH as a secure transport for other applica-
+             tions (eg. sftp).  The subsystem is specified as the remote com-
+             mand.
 
      -t      Force pseudo-tty allocation.  This can be used to execute arbi-
              trary screen-based programs on a remote machine, which can be
@@ -334,15 +339,15 @@ DESCRIPTION
 
              X11 forwarding should be enabled with caution.  Users with the
              ability to bypass file permissions on the remote host (for the
-             userM-bM-^@M-^Ys X authorization database) can access the local X11 display
+             user's X authorization database) can access the local X11 display
              through the forwarded connection.  An attacker may then be able
              to perform activities such as keystroke monitoring.
 
      -C      Requests compression of all data (including stdin, stdout,
              stderr, and data for forwarded X11 and TCP/IP connections).  The
              compression algorithm is the same used by gzip(1), and the
-             M-bM-^@M-^\levelM-bM-^@M-^] can be controlled by the CompressionLevel option for pro-
-             tocol version 1.  Compression is desirable on modem lines and
+             ``level'' can be controlled by the CompressionLevel option for
+             protocol version 1.  Compression is desirable on modem lines and
              other slow connections, but will only slow down things on fast
              networks.  The default value can be set on a host-by-host basis
              in the configuration files; see the Compression option.
@@ -377,7 +382,7 @@ DESCRIPTION
              syntax: port/host/hostport
 
      -D port
-             Specifies a local M-bM-^@M-^\dynamicM-bM-^@M-^] application-level port forwarding.
+             Specifies a local ``dynamic'' application-level port forwarding.
              This works by allocating a socket to listen to port on the local
              side, and whenever a connection is made to this port, the connec-
              tion is forwarded over the secure channel, and the application
@@ -406,20 +411,20 @@ ENVIRONMENT
      DISPLAY
              The DISPLAY variable indicates the location of the X11 server.
              It is automatically set by ssh to point to a value of the form
-             M-bM-^@M-^\hostname:nM-bM-^@M-^] where hostname indicates the host where the shell
+             ``hostname:n'' where hostname indicates the host where the shell
              runs, and n is an integer >= 1.  ssh uses this special value to
              forward X11 connections over the secure channel.  The user should
              normally not set DISPLAY explicitly, as that will render the X11
              connection insecure (and will require the user to manually copy
              any required authorization cookies).
 
-     HOME    Set to the path of the userM-bM-^@M-^Ys home directory.
+     HOME    Set to the path of the user's home directory.
 
      LOGNAME
              Synonym for USER; set for compatibility with systems that use
              this variable.
 
-     MAIL    Set to the path of the userM-bM-^@M-^Ys mailbox.
+     MAIL    Set to the path of the user's mailbox.
 
      PATH    Set to the default PATH, as specified when compiling ssh.
 
@@ -448,9 +453,9 @@ ENVIRONMENT
              ments.
 
      SSH_TTY
-             This is set to the name of the tty (path to the device) associ-
-             ated with the current shell or command.  If the current session
-             has no tty, this variable is not set.
+             This is set to the name of the tty (path to the device) associat-
+             ed with the current shell or command.  If the current session has
+             no tty, this variable is not set.
 
      TZ      The timezone variable is set to indicate the present timezone if
              it was set when the daemon was started (i.e., the daemon passes
@@ -459,9 +464,9 @@ ENVIRONMENT
      USER    Set to the name of the user logging in.
 
      Additionally, ssh reads $HOME/.ssh/environment, and adds lines of the
-     format M-bM-^@M-^\VARNAME=valueM-bM-^@M-^] to the environment if the file exists and if users
-     are allowed to change their environment.  See the PermitUserEnvironment
-     option in sshd_config(5).
+     format ``VARNAME=value'' to the environment if the file exists and if
+     users are allowed to change their environment.  See the
+     PermitUserEnvironment option in sshd_config(5).
 
 FILES
      $HOME/.ssh/known_hosts
@@ -519,8 +524,8 @@ FILES
              by sshd(8) to verify the client host when logging in; other names
              are needed because ssh does not convert the user-supplied name to
              a canonical name before checking the key, because someone with
-             access to the name servers would then be able to fool host
-             authentication.
+             access to the name servers would then be able to fool host au-
+             thentication.
 
      /etc/ssh/ssh_config
              Systemwide configuration file.  The file format and configuration
@@ -544,16 +549,16 @@ FILES
              Each line of the file contains a host name (in the canonical form
              returned by name servers), and then a user name on that host,
              separated by a space.  On some machines this file may need to be
-             world-readable if the userM-bM-^@M-^Ys home directory is on a NFS parti-
+             world-readable if the user's home directory is on a NFS parti-
              tion, because sshd(8) reads it as root.  Additionally, this file
              must be owned by the user, and must not have write permissions
              for anyone else.  The recommended permission for most machines is
              read/write for the user, and not accessible by others.
 
-             Note that by default sshd(8) will be installed so that it
-             requires successful RSA host authentication before permitting
+             Note that by default sshd(8) will be installed so that it re-
+             quires successful RSA host authentication before permitting
              .rhosts authentication.  If the server machine does not have the
-             clientM-bM-^@M-^Ys host key in /etc/ssh/ssh_known_hosts, it can be stored
+             client's host key in /etc/ssh/ssh_known_hosts, it can be stored
              in $HOME/.ssh/known_hosts.  The easiest way to do this is to con-
              nect back to the client from the server machine using ssh; this
              will automatically add the host key to $HOME/.ssh/known_hosts.
@@ -568,8 +573,8 @@ FILES
              canonical hosts names, one per line (the full format is described
              on the sshd(8) manual page).  If the client host is found in this
              file, login is automatically permitted provided client and server
-             user names are the same.  Additionally, successful RSA host
-             authentication is normally required.  This file should only be
+             user names are the same.  Additionally, successful RSA host au-
+             thentication is normally required.  This file should only be
              writable by root.
 
      /etc/shosts.equiv
@@ -579,12 +584,12 @@ FILES
 
      /etc/ssh/sshrc
              Commands in this file are executed by ssh when the user logs in
-             just before the userM-bM-^@M-^Ys shell (or command) is started.  See the
+             just before the user's shell (or command) is started.  See the
              sshd(8) manual page for more information.
 
      $HOME/.ssh/rc
              Commands in this file are executed by ssh when the user logs in
-             just before the userM-bM-^@M-^Ys shell (or command) is started.  See the
+             just before the user's shell (or command) is started.  See the
              sshd(8) manual page for more information.
 
      $HOME/.ssh/environment
@@ -606,8 +611,8 @@ SEE ALSO
 AUTHORS
      OpenSSH is a derivative of the original and free ssh 1.2.12 release by
      Tatu Ylonen.  Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, Theo
-     de Raadt and Dug Song removed many bugs, re-added newer features and cre-
-     ated OpenSSH.  Markus Friedl contributed the support for SSH protocol
+     de Raadt and Dug Song removed many bugs, re-added newer features and
+     created OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-BSD                           September 25, 1999                           BSD
+OpenBSD 3.4                   September 25, 1999                            10