2 files changed, 20 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 602d8ad6b..6eb002c7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
    - markus@cvs.openbsd.org 2007/06/11 09:14:00
      [channels.h]
      increase default channel windows; ok djm
+   - djm@cvs.openbsd.org 2007/06/12 07:41:00
+     [ssh-add.1]
+     better document ssh-add's -d option (delete identies from agent), bz#1224
+     new text based on some provided by andrewmc-debian AT celt.dias.ie;
+     ok dtucker@
 
 20070611
  - (djm) Bugzilla #1306: silence spurious error messages from hang-on-exit
@@ -3017,4 +3022,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4689 2007/06/12 13:38:53 dtucker Exp $
+$Id: ChangeLog,v 1.4690 2007/06/12 13:39:52 dtucker Exp $
diff --git a/ssh-add.1 b/ssh-add.1
index 68b0de714..550562f94 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ssh-add.1,v 1.44 2007/05/31 19:20:16 jmc Exp $
+.\"     $OpenBSD: ssh-add.1,v 1.45 2007/06/12 07:41:00 djm Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -37,7 +37,7 @@
 .\" (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: May 31 2007 $
+.Dd $Mdocdate: June 5 2007 $
 .Dt SSH-ADD 1
 .Os
 .Sh NAME
@@ -89,7 +89,18 @@ program, rather than text entered into the requester.
 .It Fl D
 Deletes all identities from the agent.
 .It Fl d
-Instead of adding the identity, removes the identity from the agent.
+Instead of adding identies, removes identities from the agent.
+If
+.Nm
+has been run without arguments, the keys for the default identies will
+be removed.
+Otherwise, the argument list will be interpreted as a list of paths to
+public key files and matching keys will be removed from the agent.
+If no public key is found at a given path,
+.Nm
+will append
+.Pa .pub
+and retry.
 .It Fl e Ar reader
 Remove key in smartcard
 .Ar reader .