1 files changed, 37 insertions, 8 deletions

diff --git a/ssh_config.0 b/ssh_config.0
index 4be1d7f3f..d1a6ab364 100644
--- a/ssh_config.0
+++ b/ssh_config.0
@@ -82,8 +82,11 @@ DESCRIPTION
 
      Ciphers
              Specifies the ciphers allowed for protocol version 2 in order of
-             preference.  Multiple ciphers must be comma-separated.  The de-
-             fault is
+             preference.  Multiple ciphers must be comma-separated.  The sup-
+             ported ciphers are ``3des-cbc'', ``aes128-cbc'', ``aes192-cbc'',
+             ``aes256-cbc'', ``aes128-ctr'', ``aes192-ctr'', ``aes256-ctr'',
+             ``arcfour'', ``blowfish-cbc'', and ``cast128-cbc''.  The default
+             is
 
                ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,
                  aes192-cbc,aes256-cbc''
@@ -118,6 +121,22 @@ DESCRIPTION
              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).
+             These sessions will reuse the master instance's network connec-
+             tion rather than initiating new ones.  Setting this to ``ask''
+             will cause ssh to listen for control connections, but require
+             confirmation using the SSH_ASKPASS program before they are ac-
+             cepted (see ssh-add(1) for details).
+
+     ControlPath
+             Specify the path to the control socket used for connection shar-
+             ing.  See ControlMaster above.
+
      DynamicForward
              Specifies that a TCP/IP port on the local machine be forwarded
              over the secure channel, and the application protocol is then
@@ -169,7 +188,7 @@ DESCRIPTION
              ForwardX11Trusted option is also enabled.
 
      ForwardX11Trusted
-             If the this option is set to ``yes'' then remote X11 clients will
+             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 ``no'' then remote X11 clients will be considered untrust-
              ed and prevented from stealing or tampering with data belonging
@@ -344,6 +363,17 @@ DESCRIPTION
              tion agent is running.  The default is ``yes''.  Note that this
              option applies to protocol version 1 only.
 
+     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
+             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.
+
      ServerAliveInterval
              Sets a timeout interval in seconds after which if no data has
              been received from the server, ssh will send a message through
@@ -441,10 +471,9 @@ DESCRIPTION
 FILES
      $HOME/.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.  This
-             file does not usually contain any sensitive information, but the
-             recommended permissions are read/write for the user, and not ac-
-             cessible by others.
+             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.
 
      /etc/ssh/ssh_config
              Systemwide configuration file.  This file provides defaults for
@@ -462,4 +491,4 @@ AUTHORS
      ated OpenSSH.  Markus Friedl contributed the support for SSH protocol
      versions 1.5 and 2.0.
 
-OpenBSD 3.5                   September 25, 1999                             8
+OpenBSD 3.6                   September 25, 1999                             8