diff options
| author | Justus Winter <justus@g10code.com> | 2016-11-14 16:59:23 +0100 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2016-12-13 17:30:55 +0100 |
| commit | 892c827e72b1396e3b58e2f8869cc48328a2b59c (patch) | |
| tree | 7e1bb783297cb7e0d215ab436f5ebc83a6999a79 /g10 | |
| parent | g10,sm: Spell out --check-sigs. (diff) | |
| download | gnupg2-892c827e72b1396e3b58e2f8869cc48328a2b59c.tar.xz gnupg2-892c827e72b1396e3b58e2f8869cc48328a2b59c.zip | |
g10,sm: Spell out --gen-key.
* g10/gpg.c (opts): Spell out option.
* sm/gpgsm.c (opts): Likewise.
* doc/gpg.texi: Update accordingly.
GnuPG-bug-id: 2700
Signed-off-by: Justus Winter <justus@g10code.com>
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/gpg.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -444,8 +444,9 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_c (aCheckKeys, "check-sigs", "@"), ARGPARSE_c (oFingerprint, "fingerprint", N_("list keys and fingerprints")), ARGPARSE_c (aListSecretKeys, "list-secret-keys", N_("list secret keys")), - ARGPARSE_c (aKeygen, "gen-key", + ARGPARSE_c (aKeygen, "generate-key", N_("generate a new key pair")), + ARGPARSE_c (aKeygen, "gen-key", "@"), ARGPARSE_c (aQuickKeygen, "quick-gen-key" , N_("quickly generate a new key pair")), ARGPARSE_c (aQuickAddUid, "quick-adduid", @@ -4318,20 +4319,20 @@ main (int argc, char **argv) case aKeygen: /* generate a key */ if( opt.batch ) { if( argc > 1 ) - wrong_args("--gen-key [parameterfile]"); + wrong_args("--generate-key [parameterfile]"); generate_keypair (ctrl, 0, argc? *argv : NULL, NULL, 0); } else { if (opt.command_fd != -1 && argc) { if( argc > 1 ) - wrong_args("--gen-key [parameterfile]"); + wrong_args("--generate-key [parameterfile]"); opt.batch = 1; generate_keypair (ctrl, 0, argc? *argv : NULL, NULL, 0); } else if (argc) - wrong_args ("--gen-key"); + wrong_args ("--generate-key"); else generate_keypair (ctrl, 0, NULL, NULL, 0); } |