* gpg.sgml: Document new --delete behaviour.

This commit is contained in:
Werner Koch 2002-08-02 10:16:41 +00:00
parent 4493a9603b
commit 557e7ccda0
2 changed files with 11 additions and 3 deletions

View File

@ -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".

View File

@ -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>