aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2016-12-15 12:59:48 +0000
committerJustus Winter <[email protected]>2016-12-15 12:59:48 +0000
commit3c691097ca144e9a1d4c9185636c59a848bec85c (patch)
tree47e09330234b5559f4c0a244570c98058ff59b2f
parentg10: Shorten unreasonably long option. (diff)
downloadgnupg-3c691097ca144e9a1d4c9185636c59a848bec85c.tar.gz
gnupg-3c691097ca144e9a1d4c9185636c59a848bec85c.zip
g10: Spell out --desig-revoke.
* g10/gpg.c (opts): Rename option. * doc/gpg.texi: Update accordingly. -- This is a rather long name, but I believe that this command is rarely used, and in places where it is used frequently, the process is likely automated. GnuPG-bug-id: 2700 Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to '')
-rw-r--r--doc/gpg.texi4
-rw-r--r--g10/gpg.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 753bec334..d24584ad1 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -727,7 +727,9 @@ published, which is best done by sending the key to a keyserver
to a file which is then send to frequent communication partners.
-@item --desig-revoke @code{name}
+@item --generate-designated-revocation @code{name}
+@opindex generate-designated-revocation
+@itemx --desig-revoke @code{name}
@opindex desig-revoke
Generate a designated revocation certificate for a key. This allows a
user (with the permission of the keyholder) to revoke someone else's
diff --git a/g10/gpg.c b/g10/gpg.c
index 7702bb32b..f0eb930fa 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -476,6 +476,7 @@ static ARGPARSE_OPTS opts[] = {
ARGPARSE_c (aEditKey, "key-edit" ,"@"),
ARGPARSE_c (aPasswd, "change-passphrase", N_("change a passphrase")),
ARGPARSE_c (aPasswd, "passwd", "@"),
+ ARGPARSE_c (aDesigRevoke, "generate-designated-revocation", "@"),
ARGPARSE_c (aDesigRevoke, "desig-revoke","@" ),
ARGPARSE_c (aExport, "export" , N_("export keys") ),
ARGPARSE_c (aSendKeys, "send-keys" , N_("export keys to a keyserver") ),
@@ -4555,7 +4556,7 @@ main (int argc, char **argv)
case aDesigRevoke:
if (argc != 1)
- wrong_args ("--desig-revoke user-id");
+ wrong_args ("--generate-designated-revocation user-id");
username = make_username (*argv);
gen_desig_revoke (ctrl, username, locusr);
xfree (username);