1 files changed, 186 insertions, 137 deletions

diff --git a/ssh_config.0 b/ssh_config.0
index 46a0543c3..2ca4ee31b 100644
--- a/ssh_config.0
+++ b/ssh_config.0
@@ -8,8 +8,9 @@ SYNOPSIS
      /etc/ssh/ssh_config
 
 DESCRIPTION
-     ssh obtains configuration data from the following sources in the follow-
-     ing order:
+     ssh(1) obtains configuration data from the following sources in the fol-
+     lowing order:
+
            1.   command-line options
            2.   user's configuration file (~/.ssh/config)
            3.   system-wide configuration file (/etc/ssh/ssh_config)
@@ -26,28 +27,29 @@ DESCRIPTION
 
      The configuration file has the following format:
 
-     Empty lines and lines starting with `#' are comments.
-
-     Otherwise a line is of the format ``keyword arguments''.  Configuration
-     options may be separated by whitespace or optional whitespace and exactly
-     one `='; the latter format is useful to avoid the need to quote whites-
-     pace when specifying configuration options using the ssh, scp and sftp -o
-     option.
+     Empty lines and lines starting with `#' are comments.  Otherwise a line
+     is of the format ``keyword arguments''.  Configuration options may be
+     separated by whitespace or optional whitespace and exactly one `='; the
+     latter format is useful to avoid the need to quote whitespace when speci-
+     fying configuration options using the ssh, scp, and sftp -o option.  Ar-
+     guments may optionally be enclosed in double quotes (") in order to rep-
+     resent arguments containing spaces.
 
      The possible keywords and their meanings are as follows (note that key-
      words are case-insensitive and arguments are case-sensitive):
 
      Host    Restricts the following declarations (up to the next Host key-
              word) to be only for those hosts that match one of the patterns
-             given after the keyword.  `*' and `?' can be used as wildcards in
-             the patterns.  A single `*' as a pattern can be used to provide
-             global defaults for all hosts.  The host is the hostname argument
-             given on the command line (i.e., the name is not converted to a
-             canonicalized host name before matching).
+             given after the keyword.  A single `*' as a pattern can be used
+             to provide global defaults for all hosts.  The host is the
+             hostname argument given on the command line (i.e. the name is not
+             converted to a canonicalized host name before matching).
+
+             See PATTERNS for more information on patterns.
 
      AddressFamily
              Specifies which address family to use when connecting.  Valid ar-
-             guments are ``any'', ``inet'' (use IPv4 only) or ``inet6'' (use
+             guments are ``any'', ``inet'' (use IPv4 only), or ``inet6'' (use
              IPv6 only).
 
      BatchMode
@@ -63,23 +65,23 @@ DESCRIPTION
              UsePrivilegedPort is set to ``yes''.
 
      ChallengeResponseAuthentication
-             Specifies whether to use challenge response authentication.  The
+             Specifies whether to use challenge-response authentication.  The
              argument to this keyword must be ``yes'' or ``no''.  The default
              is ``yes''.
 
      CheckHostIP
-             If this flag is set to ``yes'', ssh will additionally check the
-             host IP address in the known_hosts file.  This allows ssh to de-
-             tect if a host key changed due to DNS spoofing.  If the option is
-             set to ``no'', the check will not be executed.  The default is
+             If this flag is set to ``yes'', ssh(1) will additionally check
+             the host IP address in the known_hosts file.  This allows ssh to
+             detect if a host key changed due to DNS spoofing.  If the option
+             is set to ``no'', the check will not be executed.  The default is
              ``yes''.
 
      Cipher  Specifies the cipher to use for encrypting the session in proto-
              col version 1.  Currently, ``blowfish'', ``3des'', and ``des''
-             are supported.  des is only supported in the ssh client for in-
-             teroperability with legacy protocol 1 implementations that do not
-             support the 3des cipher.  Its use is strongly discouraged due to
-             cryptographic weaknesses.  The default is ``3des''.
+             are supported.  des is only supported in the ssh(1) client for
+             interoperability with legacy protocol 1 implementations that do
+             not support the 3des cipher.  Its use is strongly discouraged due
+             to cryptographic weaknesses.  The default is ``3des''.
 
      Ciphers
              Specifies the ciphers allowed for protocol version 2 in order of
@@ -87,19 +89,19 @@ DESCRIPTION
              ported ciphers are ``3des-cbc'', ``aes128-cbc'', ``aes192-cbc'',
              ``aes256-cbc'', ``aes128-ctr'', ``aes192-ctr'', ``aes256-ctr'',
              ``arcfour128'', ``arcfour256'', ``arcfour'', ``blowfish-cbc'',
-             and ``cast128-cbc''.  The default is
+             and ``cast128-cbc''.  The default is:
 
-               ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,
-                 arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,
-                 aes192-ctr,aes256-ctr''
+                aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,
+                arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,
+                aes192-ctr,aes256-ctr
 
      ClearAllForwardings
-             Specifies that all local, remote and dynamic port forwardings
+             Specifies that all local, remote, and dynamic port forwardings
              specified in the configuration files or on the command line be
-             cleared.  This option is primarily useful when used from the ssh
-             command line to clear port forwardings set in configuration
-             files, and is automatically set by scp(1) and sftp(1).  The argu-
-             ment must be ``yes'' or ``no''.  The default is ``no''.
+             cleared.  This option is primarily useful when used from the
+             ssh(1) command line to clear port forwardings set in configura-
+             tion files, and is automatically set by scp(1) and sftp(1).  The
+             argument must be ``yes'' or ``no''.  The default is ``no''.
 
      Compression
              Specifies whether to use compression.  The argument must be
@@ -119,16 +121,16 @@ DESCRIPTION
 
      ConnectTimeout
              Specifies the timeout (in seconds) used when connecting to the
-             ssh server, instead of using the default system TCP timeout.
+             SSH server, instead of using the default system TCP timeout.
              This value is used only when the target is down or really un-
              reachable, not when it refuses the connection.
 
      ControlMaster
              Enables the sharing of multiple sessions over a single network
-             connection.  When set to ``yes'' ssh will listen for connections
-             on a control socket specified using the ControlPath argument.
-             Additional sessions can connect to this socket using the same
-             ControlPath with ControlMaster set to ``no'' (the default).
+             connection.  When set to ``yes'', ssh(1) will listen for connec-
+             tions on a control socket specified using the ControlPath argu-
+             ment.  Additional sessions can connect to this socket using the
+             same ControlPath with ControlMaster set to ``no'' (the default).
              These sessions will try to reuse the master instance's network
              connection rather than initiating new ones, but will fall back to
              connecting normally if the control socket does not exist, or is
@@ -137,7 +139,7 @@ DESCRIPTION
              Setting this to ``ask'' will cause ssh to listen for control con-
              nections, but require confirmation using the SSH_ASKPASS program
              before they are accepted (see ssh-add(1) for details).  If the
-             ControlPath can not be opened, ssh will continue without connect-
+             ControlPath cannot be opened, ssh will continue without connect-
              ing to a master instance.
 
              X11 and ssh-agent(1) forwarding is supported over these multi-
@@ -154,12 +156,12 @@ DESCRIPTION
      ControlPath
              Specify the path to the control socket used for connection shar-
              ing as described in the ControlMaster section above or the string
-             ``none'' to disable connection sharing.  In the path, `%h' will
-             be substituted by the target host name, `%p' the port and `%r' by
-             the remote login username.  It is recommended that any
-             ControlPath used for opportunistic connection sharing include all
-             three of these escape sequences.  This ensures that shared con-
-             nections are uniquely identified.
+             ``none'' to disable connection sharing.  In the path, `%l' will
+             be substituted by the local host name, `%h' will be substituted
+             by the target host name, `%p' the port, and `%r' by the remote
+             login username.  It is recommended that any ControlPath used for
+             opportunistic connection sharing include at least %h, %p, and %r.
+             This ensures that shared connections are uniquely identified.
 
      DynamicForward
              Specifies that a TCP port on the local machine be forwarded over
@@ -176,9 +178,9 @@ DESCRIPTION
              while an empty address or `*' indicates that the port should be
              available from all interfaces.
 
-             Currently the SOCKS4 and SOCKS5 protocols are supported, and ssh
-             will act as a SOCKS server.  Multiple forwardings may be speci-
-             fied, and additional forwardings can be given on the command
+             Currently the SOCKS4 and SOCKS5 protocols are supported, and
+             ssh(1) will act as a SOCKS server.  Multiple forwardings may be
+             specified, and additional forwardings can be given on the command
              line.  Only the superuser can forward privileged ports.
 
      EnableSSHKeysign
@@ -196,6 +198,12 @@ DESCRIPTION
              able the escape character entirely (making the connection trans-
              parent for binary data).
 
+     ExitOnForwardFailure
+             Specifies whether ssh(1) should terminate the connection if it
+             cannot set up all requested dynamic, local, and remote port for-
+             wardings.  The argument must be ``yes'' or ``no''.  The default
+             is ``no''.
+
      ForwardAgent
              Specifies whether the connection to the authentication agent (if
              any) will be forwarded to the remote machine.  The argument must
@@ -222,15 +230,14 @@ DESCRIPTION
              ForwardX11Trusted option is also enabled.
 
      ForwardX11Trusted
-             If this option is set to ``yes'' then remote X11 clients will
-             have full access to the original X11 display.
+             If this option is set to ``yes'', remote X11 clients will have
+             full access to the original X11 display.
 
-             If this option is set to ``no'' then remote X11 clients will be
-             considered untrusted and prevented from stealing or tampering
-             with data belonging to trusted X11 clients.  Furthermore, the
-             xauth(1) token used for the session will be set to expire after
-             20 minutes.  Remote clients will be refused access after this
-             time.
+             If this option is set to ``no'', remote X11 clients will be con-
+             sidered untrusted and prevented from stealing or tampering with
+             data belonging to trusted X11 clients.  Furthermore, the xauth(1)
+             token used for the session will be set to expire after 20 min-
+             utes.  Remote clients will be refused access after this time.
 
              The default is ``no''.
 
@@ -239,12 +246,13 @@ DESCRIPTION
 
      GatewayPorts
              Specifies whether remote hosts are allowed to connect to local
-             forwarded ports.  By default, ssh binds local port forwardings to
-             the loopback address.  This prevents other remote hosts from con-
-             necting to forwarded ports.  GatewayPorts can be used to specify
-             that ssh should bind local port forwardings to the wildcard ad-
-             dress, thus allowing remote hosts to connect to forwarded ports.
-             The argument must be ``yes'' or ``no''.  The default is ``no''.
+             forwarded ports.  By default, ssh(1) binds local port forwardings
+             to the loopback address.  This prevents other remote hosts from
+             connecting to forwarded ports.  GatewayPorts can be used to spec-
+             ify that ssh should bind local port forwardings to the wildcard
+             address, thus allowing remote hosts to connect to forwarded
+             ports.  The argument must be ``yes'' or ``no''.  The default is
+             ``no''.
 
      GlobalKnownHostsFile
              Specifies a file to use for the global host key database instead
@@ -261,13 +269,13 @@ DESCRIPTION
              ly.
 
      HashKnownHosts
-             Indicates that ssh should hash host names and addresses when they
-             are added to ~/.ssh/known_hosts.  These hashed names may be used
-             normally by ssh and sshd, but they do not reveal identifying in-
-             formation should the file's contents be disclosed.  The default
-             is ``no''.  Note that hashing of names and addresses will not be
-             retrospectively applied to existing known hosts files, but these
-             may be manually hashed using ssh-keygen(1).
+             Indicates that ssh(1) should hash host names and addresses when
+             they are added to ~/.ssh/known_hosts.  These hashed names may be
+             used normally by ssh(1) and sshd(8), but they do not reveal iden-
+             tifying information should the file's contents be disclosed.  The
+             default is ``no''.  Note that existing names and addresses in
+             known hosts files will not be converted automatically, but may be
+             manually hashed using ssh-keygen(1).
 
      HostbasedAuthentication
              Specifies whether to try rhosts based authentication with public
@@ -283,19 +291,19 @@ DESCRIPTION
      HostKeyAlias
              Specifies an alias that should be used instead of the real host
              name when looking up or saving the host key in the host key
-             database files.  This option is useful for tunneling ssh connec-
+             database files.  This option is useful for tunneling SSH connec-
              tions or for multiple servers running on a single host.
 
      HostName
              Specifies the real host name to log into.  This can be used to
-             specify nicknames or abbreviations for hosts.  Default is the
+             specify nicknames or abbreviations for hosts.  The default is the
              name given on the command line.  Numeric IP addresses are also
              permitted (both on the command line and in HostName specifica-
              tions).
 
      IdentitiesOnly
-             Specifies that ssh should only use the authentication identity
-             files configured in the ssh_config files, even if the ssh-agent
+             Specifies that ssh(1) should only use the authentication identity
+             files configured in the ssh_config files, even if ssh-agent(1)
              offers more identities.  The argument to this keyword must be
              ``yes'' or ``no''.  This option is intended for situations where
              ssh-agent offers many different identities.  The default is
@@ -306,15 +314,23 @@ DESCRIPTION
              identity is read.  The default is ~/.ssh/identity for protocol
              version 1, and ~/.ssh/id_rsa and ~/.ssh/id_dsa for protocol ver-
              sion 2.  Additionally, any identities represented by the authen-
-             tication agent will be used for authentication.  The file name
-             may use the tilde syntax to refer to a user's home directory.  It
-             is possible to have multiple identity files specified in configu-
-             ration files; all these identities will be tried in sequence.
+             tication agent will be used for authentication.
+
+             The file name may use the tilde syntax to refer to a user's home
+             directory or one of the following escape characters: `%d' (local
+             user's home directory), `%u' (local user name), `%l' (local host
+             name), `%h' (remote host name) or `%r' (remote user name).
+
+             It is possible to have multiple identity files specified in con-
+             figuration files; all these identities will be tried in sequence.
 
      KbdInteractiveDevices
              Specifies the list of methods to use in keyboard-interactive au-
              thentication.  Multiple method names must be comma-separated.
-             The default is to use the server specified list.
+             The default is to use the server specified list.  The methods
+             available vary depending on what the server supports.  For an
+             OpenSSH server, it may be zero or more of: ``bsdauth'', ``pam'',
+             and ``skey''.
 
      LocalCommand
              Specifies a command to execute on the local machine after suc-
@@ -341,15 +357,15 @@ DESCRIPTION
 
      LogLevel
              Gives the verbosity level that is used when logging messages from
-             ssh.  The possible values are: QUIET, FATAL, ERROR, INFO, VER-
-             BOSE, DEBUG, DEBUG1, DEBUG2 and DEBUG3.  The default is INFO.
+             ssh(1).  The possible values are: QUIET, FATAL, ERROR, INFO, VER-
+             BOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3.  The default is INFO.
              DEBUG and DEBUG1 are equivalent.  DEBUG2 and DEBUG3 each specify
              higher levels of verbose output.
 
      MACs    Specifies the MAC (message authentication code) algorithms in or-
              der of preference.  The MAC algorithm is used in protocol version
              2 for data integrity protection.  Multiple algorithms must be
-             comma-separated.  The default is ``hmac-md5,hmac-sha1,hmac-
+             comma-separated.  The default is: ``hmac-md5,hmac-sha1,hmac-
              ripemd160,hmac-sha1-96,hmac-md5-96''.
 
      NoHostAuthenticationForLocalhost
@@ -363,7 +379,7 @@ DESCRIPTION
 
      NumberOfPasswordPrompts
              Specifies the number of password prompts before giving up.  The
-             argument to this keyword must be an integer.  Default is 3.
+             argument to this keyword must be an integer.  The default is 3.
 
      PasswordAuthentication
              Specifies whether to use password authentication.  The argument
@@ -375,20 +391,20 @@ DESCRIPTION
              ing the !command escape sequence in ssh(1).  The argument must be
              ``yes'' or ``no''.  The default is ``no''.
 
-     Port    Specifies the port number to connect on the remote host.  Default
-             is 22.
+     Port    Specifies the port number to connect on the remote host.  The de-
+             fault is 22.
 
      PreferredAuthentications
              Specifies the order in which the client should try protocol 2 au-
              thentication methods.  This allows a client to prefer one method
              (e.g. keyboard-interactive) over another method (e.g. password)
-             The default for this option is: ``hostbased,publickey,keyboard-
-             interactive,password''.
+             The default for this option is: ``gssapi-with-mic,hostbased,
+             publickey, keyboard-interactive, password''.
 
      Protocol
-             Specifies the protocol versions ssh should support in order of
-             preference.  The possible values are ``1'' and ``2''.  Multiple
-             versions must be comma-separated.  The default is ``2,1''.  This
+             Specifies the protocol versions ssh(1) should support in order of
+             preference.  The possible values are `1' and `2'.  Multiple ver-
+             sions must be comma-separated.  The default is ``2,1''.  This
              means that ssh tries version 2 and falls back to version 1 if
              version 2 is not available.
 
@@ -422,8 +438,8 @@ DESCRIPTION
              fore the session key is renegotiated.  The argument is the number
              of bytes, with an optional suffix of `K', `M', or `G' to indicate
              Kilobytes, Megabytes, or Gigabytes, respectively.  The default is
-             between ``1G'' and ``4G'', depending on the cipher.  This option
-             applies to protocol version 2 only.
+             between `1G' and `4G', depending on the cipher.  This option ap-
+             plies to protocol version 2 only.
 
      RemoteForward
              Specifies that a TCP port on the remote machine be forwarded over
@@ -446,7 +462,7 @@ DESCRIPTION
              Specifies whether to try rhosts based authentication with RSA
              host authentication.  The argument must be ``yes'' or ``no''.
              The default is ``no''.  This option applies to protocol version 1
-             only and requires ssh to be setuid root.
+             only and requires ssh(1) to be setuid root.
 
      RSAAuthentication
              Specifies whether to try RSA authentication.  The argument to
@@ -458,21 +474,23 @@ DESCRIPTION
      SendEnv
              Specifies what variables from the local environ(7) should be sent
              to the server.  Note that environment passing is only supported
-             for protocol 2, the server must also support it, and the server
+             for protocol 2.  The server must also support it, and the server
              must be configured to accept these environment variables.  Refer
              to AcceptEnv in sshd_config(5) for how to configure the server.
-             Variables are specified by name, which may contain the wildcard
-             characters `*' and `?'.  Multiple environment variables may be
-             separated by whitespace or spread across multiple SendEnv direc-
-             tives.  The default is not to send any environment variables.
+             Variables are specified by name, which may contain wildcard char-
+             acters.  Multiple environment variables may be separated by
+             whitespace or spread across multiple SendEnv directives.  The de-
+             fault is not to send any environment variables.
+
+             See PATTERNS for more information on patterns.
 
      ServerAliveCountMax
              Sets the number of server alive messages (see below) which may be
-             sent without ssh receiving any messages back from the server.  If
-             this threshold is reached while server alive messages are being
-             sent, ssh will disconnect from the server, terminating the ses-
-             sion.  It is important to note that the use of server alive mes-
-             sages is very different from TCPKeepAlive (below).  The server
+             sent without ssh(1) receiving any messages back from the server.
+             If this threshold is reached while server alive messages are be-
+             ing sent, ssh will disconnect from the server, terminating the
+             session.  It is important to note that the use of server alive
+             messages is very different from TCPKeepAlive (below).  The server
              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 server alive mechanism is valu-
@@ -480,39 +498,41 @@ DESCRIPTION
              tion has become inactive.
 
              The default value is 3.  If, for example, ServerAliveInterval
-             (see below) is set to 15, and ServerAliveCountMax is left at the
-             default, if the server becomes unresponsive ssh will disconnect
-             after approximately 45 seconds.
+             (see below) is set to 15 and ServerAliveCountMax is left at the
+             default, if the server becomes unresponsive, ssh will disconnect
+             after approximately 45 seconds.  This option applies to protocol
+             version 2 only.
 
      ServerAliveInterval
              Sets a timeout interval in seconds after which if no data has
-             been received from the server, ssh will send a message through
+             been received from the server, ssh(1) will send a message through
              the encrypted channel to request a response from the server.  The
              default is 0, indicating that these messages will not be sent to
              the server.  This option applies to protocol version 2 only.
 
      SmartcardDevice
              Specifies which smartcard device to use.  The argument to this
-             keyword is the device ssh should use to communicate with a smart-
-             card used for storing the user's private RSA key.  By default, no
-             device is specified and smartcard support is not activated.
+             keyword is the device ssh(1) should use to communicate with a
+             smartcard used for storing the user's private RSA key.  By de-
+             fault, no device is specified and smartcard support is not acti-
+             vated.
 
      StrictHostKeyChecking
-             If this flag is set to ``yes'', ssh will never automatically add
-             host keys to the ~/.ssh/known_hosts file, and refuses to connect
-             to hosts whose host key has changed.  This provides maximum pro-
-             tection against trojan horse attacks, however, can be annoying
-             when the /etc/ssh/ssh_known_hosts file is poorly maintained, or
-             connections to new hosts are frequently made.  This option forces
-             the user to manually add all new hosts.  If this flag is set to
-             ``no'', ssh will automatically add new host keys to the user
-             known hosts files.  If this flag is set to ``ask'', new host keys
-             will be added to the user known host files only after the user
-             has confirmed that is what they really want to do, and ssh will
-             refuse to connect to hosts whose host key has changed.  The host
-             keys of known hosts will be verified automatically in all cases.
-             The argument must be ``yes'', ``no'' or ``ask''.  The default is
-             ``ask''.
+             If this flag is set to ``yes'', ssh(1) will never automatically
+             add host keys to the ~/.ssh/known_hosts file, and refuses to con-
+             nect to hosts whose host key has changed.  This provides maximum
+             protection against trojan horse attacks, though it can be annoy-
+             ing when the /etc/ssh/ssh_known_hosts file is poorly maintained
+             or when connections to new hosts are frequently made.  This op-
+             tion forces the user to manually add all new hosts.  If this flag
+             is set to ``no'', ssh will automatically add new host keys to the
+             user known hosts files.  If this flag is set to ``ask'', new host
+             keys will be added to the user known host files only after the
+             user has confirmed that is what they really want to do, and ssh
+             will refuse to connect to hosts whose host key has changed.  The
+             host keys of known hosts will be verified automatically in all
+             cases.  The argument must be ``yes'', ``no'', or ``ask''.  The
+             default is ``ask''.
 
      TCPKeepAlive
              Specifies whether the system should send TCP keepalive messages
@@ -528,22 +548,27 @@ DESCRIPTION
              To disable TCP keepalive messages, the value should be set to
              ``no''.
 
-     Tunnel  Request starting tun(4) device forwarding between the client and
-             the server.  This option also allows requesting layer 2 (ether-
-             net) instead of layer 3 (point-to-point) tunneling from the serv-
-             er.  The argument must be ``yes'', ``point-to-point'',
-             ``ethernet'' or ``no''.  The default is ``no''.
+     Tunnel  Request tun(4) device forwarding between the client and the serv-
+             er.  The argument must be ``yes'', ``point-to-point'' (layer 3),
+             ``ethernet'' (layer 2), or ``no''.  Specifying ``yes'' requests
+             the default tunnel mode, which is ``point-to-point''.  The de-
+             fault is ``no''.
 
      TunnelDevice
-             Force a specified tun(4) device on the client.  Without this op-
-             tion, the next available device will be used.
+             Specifies the tun(4) devices to open on the client (local_tun)
+             and the server (remote_tun).
+
+             The argument must be local_tun[:remote_tun].  The devices may be
+             specified by numerical ID or the keyword ``any'', which uses the
+             next available tunnel device.  If remote_tun is not specified, it
+             defaults to ``any''.  The default is ``any:any''.
 
      UsePrivilegedPort
              Specifies whether to use a privileged port for outgoing connec-
              tions.  The argument must be ``yes'' or ``no''.  The default is
-             ``no''.  If set to ``yes'' ssh must be setuid root.  Note that
-             this option must be set to ``yes'' for RhostsRSAAuthentication
-             with older servers.
+             ``no''.  If set to ``yes'', ssh(1) must be setuid root.  Note
+             that this option must be set to ``yes'' for
+             RhostsRSAAuthentication with older servers.
 
      User    Specifies the user to log in as.  This can be useful when a dif-
              ferent user name is used on different machines.  This saves the
@@ -562,18 +587,42 @@ DESCRIPTION
              set to ``ask''.  If this option is set to ``ask'', information on
              fingerprint match will be displayed, but the user will still need
              to confirm new host keys according to the StrictHostKeyChecking
-             option.  The argument must be ``yes'', ``no'' or ``ask''.  The
+             option.  The argument must be ``yes'', ``no'', or ``ask''.  The
              default is ``no''.  Note that this option applies to protocol
              version 2 only.
 
+             See also VERIFYING HOST KEYS in ssh(1).
+
      XAuthLocation
              Specifies the full pathname of the xauth(1) program.  The default
              is /usr/X11R6/bin/xauth.
 
+PATTERNS
+     A pattern consists of zero or more non-whitespace characters, `*' (a
+     wildcard that matches zero or more characters), or `?' (a wildcard that
+     matches exactly one character).  For example, to specify a set of decla-
+     rations for any host in the ``.co.uk'' set of domains, the following pat-
+     tern could be used:
+
+           Host *.co.uk
+
+     The following pattern would match any host in the 192.168.0.[0-9] network
+     range:
+
+           Host 192.168.0.?
+
+     A pattern-list is a comma-separated list of patterns.  Patterns within
+     pattern-lists may be negated by preceding them with an exclamation mark
+     (`!').  For example, to allow a key to be used from anywhere within an
+     organisation except from the ``dialup'' pool, the following entry (in au-
+     thorized_keys) could be used:
+
+           from="!*.dialup.example.com,*.example.com"
+
 FILES
      ~/.ssh/config
              This is the per-user configuration file.  The format of this file
-             is described above.  This file is used by the ssh client.  Be-
+             is described above.  This file is used by the SSH client.  Be-
              cause of the potential for abuse, this file must have strict per-
              missions: read/write for the user, and not accessible by others.
 
@@ -593,4 +642,4 @@ AUTHORS
      ated OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 3.9                   September 25, 1999                             9
+OpenBSD 4.1                   September 25, 1999                            10