diff options
| author | Werner Koch <wk@gnupg.org> | 2002-08-02 12:16:41 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2002-08-02 12:16:41 +0200 |
| commit | 557e7ccda086070dcc52ee30d6d21d04f2d9eed9 (patch) | |
| tree | e137766f67b1068c251a8f54fa917df04dadafcd /doc | |
| parent | * delkey.c (do_delete_key): Always allow to delete a key in batch mode (diff) | |
| download | gnupg2-557e7ccda086070dcc52ee30d6d21d04f2d9eed9.tar.xz gnupg2-557e7ccda086070dcc52ee30d6d21d04f2d9eed9.zip | |
* gpg.sgml: Document new --delete behaviour.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/gpg.sgml | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index b8e7e6551..479a2abfb 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -8,6 +8,10 @@ the passphrase must be changed for this to take effect. Note that --pgp7 does not disable MDC. Document --no-mdc-warning. +2002-07-25 Werner Koch <wk@gnupg.org> + + * gpg.sgml: Document new --delete behaviour. + 2002-07-25 David Shaw <dshaw@jabberwocky.com> * gpg.sgml: Clarify the differences between "pref" and "showpref". diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 2ae5a7d80..8899121f7 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -490,19 +490,23 @@ This is a shortcut version of the subcommand "nrsign" from --edit. <varlistentry> <term>--delete-key &ParmName;</term> <listitem><para> -Remove key from the public keyring +Remove key from the public keyring. In batch mode either --yes is +required or the key must be specified by fingerprint. This is a +safeguard against accidental deletion of multiple keys. </para></listitem></varlistentry> <varlistentry> <term>--delete-secret-key &ParmName;</term> <listitem><para> -Remove key from the secret and public keyring +Remove key from the secret and public keyring. In batch mode the key +must be specified by fingerprint. </para></listitem></varlistentry> <varlistentry> <term>--delete-secret-and-public-key &ParmName;</term> <listitem><para> -Same as --delete-key, but if a secret key exists, it will be removed first. +Same as --delete-key, but if a secret key exists, it will be removed +first. In batch mode the key must be specified by fingerprint. </para></listitem></varlistentry> <varlistentry> |