Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 5 insertions, 5 deletions

diff --git a/ssh-add.0 b/ssh-add.0
index 95929d4d3..93116334b 100644
--- a/ssh-add.0
+++ b/ssh-add.0
@@ -1,4 +1,4 @@
-SSH-ADD(1)                BSD General Commands Manual               SSH-ADD(1)
+SSH-ADD(1)                 OpenBSD Reference Manual                 SSH-ADD(1)
 
 NAME
      ssh-add - adds RSA or DSA identities to the authentication agent
@@ -14,11 +14,11 @@ DESCRIPTION
      $HOME/.ssh/id_rsa, $HOME/.ssh/id_dsa and $HOME/.ssh/identity.  Alterna-
      tive file names can be given on the command line.  If any file requires a
      passphrase, ssh-add asks for the passphrase from the user.  The
-     passphrase is read from the userM-bM-^@M-^Ys tty.  ssh-add retries the last
+     passphrase is read from the user's tty.  ssh-add retries the last
      passphrase if multiple identity files are given.
 
-     The authentication agent must be running and must be an ancestor of the
-     current process for ssh-add to work.
+     The authentication agent must be running and the SSH_AUTH_SOCK environ-
+     ment variable must contain the name of its socket for ssh-add to work.
 
      The options are as follows:
 
@@ -99,4 +99,4 @@ AUTHORS
      ated 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                             2