From 6e4396723e9e5865015ebf7033628fa3919cf7d1 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 15 Dec 2016 14:50:10 +0100 Subject: g10: Rename 'card-edit' to 'edit-card'. * g10/gpg.c (opts): Rename option. * g10/call-agent.c (agent_scd_learn): Update comment. * doc/gpg.texi: Update accordingly. -- This change has a surprising side effect. Previously, --edit was an alias for --edit-key, because the argument parser actually accepts unique prefixes of all options. With this change, however, --edit is ambiguous. GnuPG-bug-id: 2700 Signed-off-by: Justus Winter --- doc/gpg.texi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/gpg.texi b/doc/gpg.texi index d24584ad1..81588e119 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -367,7 +367,9 @@ values are dumped and not only their lengths. Note that the output of this command may change with new releases. -@item --card-edit +@item --edit-card +@opindex edit-card +@itemx --card-edit @opindex card-edit Present a menu to work with a smartcard. The subcommand "help" provides an overview on available commands. For a detailed description, please @@ -382,7 +384,7 @@ Show the content of the smart card. @opindex change-pin Present a menu to allow changing the PIN of a smartcard. This functionality is also available as the subcommand "passwd" with the -@option{--card-edit} command. +@option{--edit-card} command. @item --delete-keys @code{name} @itemx --delete-keys @code{name} -- cgit v1.2.3