2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 8124065c3..0557b0fdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,10 @@
    - jmc@cvs.openbsd.org 2006/05/29 16:13:23
      [ssh.1]
      add GSSAPI to the list of authentication methods supported;
+   - mk@cvs.openbsd.org 2006/05/30 11:46:38
+     [ssh-add.c]
+     Sync usage() with man page and reality.
+     ok deraadt dtucker
 
 20060521
  - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
@@ -4663,4 +4667,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4338 2006/06/13 03:03:16 djm Exp $
+$Id: ChangeLog,v 1.4339 2006/06/13 03:03:34 djm Exp $
diff --git a/ssh-add.c b/ssh-add.c
index ff85af031..836cb5f9c 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.79 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.80 2006/05/30 11:46:38 mk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -299,7 +299,7 @@ do_file(AuthenticationConnection *ac, int deleting, char *file)
 static void
 usage(void)
 {
-        fprintf(stderr, "Usage: %s [options]\n", __progname);
+        fprintf(stderr, "Usage: %s [options] [file ...]\n", __progname);
         fprintf(stderr, "Options:\n");
         fprintf(stderr, "  -l          List fingerprints of all identities.\n");
         fprintf(stderr, "  -L          List public key parameters of all identities.\n");