merge 5.7p1

1 files changed, 9 insertions, 8 deletions

diff --git a/ssh-add.1 b/ssh-add.1
index d7cc53101..fd48ff98f 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,6 +1,4 @@
-.\"     $OpenBSD: ssh-add.1,v 1.52 2010/03/05 10:28:21 djm Exp $
-.\"
-.\"  -*- nroff -*-
+.\"     $OpenBSD: ssh-add.1,v 1.55 2010/10/28 18:33:28 jmc Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -37,12 +35,12 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 5 2010 $
+.Dd $Mdocdate: October 28 2010 $
 .Dt SSH-ADD 1
 .Os
 .Sh NAME
 .Nm ssh-add
-.Nd adds RSA or DSA identities to the authentication agent
+.Nd adds private key identities to the authentication agent
 .Sh SYNOPSIS
 .Nm ssh-add
 .Op Fl cDdLlXx
@@ -54,11 +52,12 @@
 .Fl e Ar pkcs11
 .Sh DESCRIPTION
 .Nm
-adds RSA or DSA identities to the authentication agent,
+adds private key identities to the authentication agent,
 .Xr ssh-agent 1 .
 When run without arguments, it adds the files
 .Pa ~/.ssh/id_rsa ,
-.Pa ~/.ssh/id_dsa
+.Pa ~/.ssh/id_dsa ,
+.Pa ~/.ssh/id_ecdsa
 and
 .Pa ~/.ssh/identity .
 After loading a private key,
@@ -165,6 +164,8 @@ socket used to communicate with the agent.
 Contains the protocol version 1 RSA authentication identity of the user.
 .It Pa ~/.ssh/id_dsa
 Contains the protocol version 2 DSA authentication identity of the user.
+.It Pa ~/.ssh/id_ecdsa
+Contains the protocol version 2 ECDSA authentication identity of the user.
 .It Pa ~/.ssh/id_rsa
 Contains the protocol version 2 RSA authentication identity of the user.
 .El
@@ -173,7 +174,7 @@ Identity files should not be readable by anyone but the user.
 Note that
 .Nm
 ignores identity files if they are accessible by others.
-.Sh DIAGNOSTICS
+.Sh EXIT STATUS
 Exit status is 0 on success, 1 if the specified command fails,
 and 2 if
 .Nm