mirror of
git://git.gnupg.org/gnupg.git
synced 2025-04-17 15:44:34 +02:00
* gpg.sgml: Document new --delete behaviour.
This commit is contained in:
parent
4493a9603b
commit
557e7ccda0
@ -8,6 +8,10 @@
|
|||||||
the passphrase must be changed for this to take effect. Note that
|
the passphrase must be changed for this to take effect. Note that
|
||||||
--pgp7 does not disable MDC. Document --no-mdc-warning.
|
--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>
|
2002-07-25 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
* gpg.sgml: Clarify the differences between "pref" and "showpref".
|
* gpg.sgml: Clarify the differences between "pref" and "showpref".
|
||||||
|
10
doc/gpg.sgml
10
doc/gpg.sgml
@ -490,19 +490,23 @@ This is a shortcut version of the subcommand "nrsign" from --edit.
|
|||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term>--delete-key &ParmName;</term>
|
<term>--delete-key &ParmName;</term>
|
||||||
<listitem><para>
|
<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>
|
</para></listitem></varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term>--delete-secret-key &ParmName;</term>
|
<term>--delete-secret-key &ParmName;</term>
|
||||||
<listitem><para>
|
<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>
|
</para></listitem></varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term>--delete-secret-and-public-key &ParmName;</term>
|
<term>--delete-secret-and-public-key &ParmName;</term>
|
||||||
<listitem><para>
|
<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>
|
</para></listitem></varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user