diff options
| author | Justus Winter <[email protected]> | 2016-12-13 16:43:22 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-12-13 16:43:22 +0000 |
| commit | ec1bd3ae685e95563e38077ab3c1655fd55dea07 (patch) | |
| tree | 17c2a857d40ae15c3b1ed0cb39c1450d0ccc5293 /g10 | |
| parent | g10: Spell out --full-gen-key. (diff) | |
| download | gnupg-ec1bd3ae685e95563e38077ab3c1655fd55dea07.tar.gz gnupg-ec1bd3ae685e95563e38077ab3c1655fd55dea07.zip | |
g10: Spell out --gen-revoke.
* g10/gpg.c (opts): Spell out option.
* doc/gpg.texi: Update accordingly.
* po: Update translations.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/gpg.c | 6 | ||||
| -rw-r--r-- | g10/revoke.c | 3 |
2 files changed, 6 insertions, 3 deletions
@@ -459,7 +459,9 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_c (aFullKeygen, "full-generate-key" , N_("full featured key pair generation")), ARGPARSE_c (aFullKeygen, "full-gen-key", "@"), - ARGPARSE_c (aGenRevoke, "gen-revoke",N_("generate a revocation certificate")), + ARGPARSE_c (aGenRevoke, "generate-revocation-certificate", + N_("generate a revocation certificate")), + ARGPARSE_c (aGenRevoke, "gen-revoke", "@"), ARGPARSE_c (aDeleteKeys,"delete-keys", N_("remove keys from the public keyring")), ARGPARSE_c (aDeleteSecretKeys, "delete-secret-keys", @@ -4544,7 +4546,7 @@ main (int argc, char **argv) case aGenRevoke: if( argc != 1 ) - wrong_args("--gen-revoke user-id"); + wrong_args("--generate-revocation-certificate user-id"); username = make_username(*argv); gen_revoke( username ); xfree( username ); diff --git a/g10/revoke.c b/g10/revoke.c index 68fc44ac8..17c9b8c3a 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -571,7 +571,8 @@ gen_standard_revoke (PKT_public_key *psk, const char *cache_nonce) "the secret key. However, if the secret key is still accessible,\n" "it is better to generate a new revocation certificate and give\n" "a reason for the revocation. For details see the description of\n" - "of the gpg command \"--gen-revoke\" in the GnuPG manual."), + "of the gpg command \"--generate-revocation-certificate\" in the " + "GnuPG manual."), _("To avoid an accidental use of this file, a colon has been inserted\n" "before the 5 dashes below. Remove this colon with a text editor\n" "before importing and publishing this revocation certificate.")); |