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 --- g10/call-agent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/call-agent.c') diff --git a/g10/call-agent.c b/g10/call-agent.c index fd9b96413..335e12a01 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -660,7 +660,7 @@ agent_scd_learn (struct agent_card_info_s *info, int force) care about the data returned. If the card has already been initialized, this is a very fast command. The main reason we need to do this here is to handle a card removed case so that an - "l" command in --card-edit can be used to show ta newly inserted + "l" command in --edit-card can be used to show ta newly inserted card. We request the openpgp card because that is what we expect. */ rc = assuan_transact (agent_ctx, "SCD SERIALNO openpgp", -- cgit v1.2.3