[Pkg-gnupg-commit] [gnupg2] 97/180: g10: Spell out --recv-keys.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit ca598152345b40f3a236227dfc63ae04ddf777d7
Author: Justus Winter <justus at g10code.com>
Date:   Fri Sep 23 13:40:55 2016 +0200

    g10: Spell out --recv-keys.
    
    * g10/gpg.c (opts): Spell out option.
    * doc/gpg.texi: Update accordingly.
    
    GnuPG-bug-id: 2700
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 doc/gpg.texi | 12 ++++++------
 g10/gpg.c    |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/gpg.texi b/doc/gpg.texi
index c7c7db6..9ea3b80 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -464,8 +464,8 @@ Most notable here is the @option{--import-options merge-only} option
 which does not insert new keys but does only the merging of new
 signatures, user-IDs and subkeys.
 
- at item --recv-keys @code{key IDs}
- at opindex recv-keys
+ at item --receive-keys @code{key IDs}
+ at opindex receive-keys
 Import the keys with the given key IDs from a keyserver. Option
 @option{--keyserver} must be used to give the name of this keyserver.
 
@@ -1757,7 +1757,7 @@ This option is deprecated - please use the @option{--keyserver} in
 @file{dirmngr.conf} instead.
 
 Use @code{name} as your keyserver. This is the server that
- at option{--recv-keys}, @option{--send-keys}, and @option{--search-keys}
+ at option{--receive-keys}, @option{--send-keys}, and @option{--search-keys}
 will communicate with to receive keys from, send keys to, and search for
 keys on. The format of the @code{name} is a URI:
 `scheme:[//]keyservername[:port]' The scheme is the type of keyserver:
@@ -1825,9 +1825,9 @@ are available for all keyserver types, some common options are:
   Tell the keyserver helper program how long (in seconds) to try and
   perform a keyserver action before giving up. Note that performing
   multiple actions at the same time uses this timeout value per action.
-  For example, when retrieving multiple keys via @option{--recv-keys}, the
+  For example, when retrieving multiple keys via @option{--receive-keys}, the
   timeout applies separately to each key retrieval, and not to the
-  @option{--recv-keys} command as a whole. Defaults to 30 seconds.
+  @option{--receive-keys} command as a whole. Defaults to 30 seconds.
 
   @item http-proxy=@code{value}
   This option is deprecated.
@@ -2229,7 +2229,7 @@ opposite meaning. The options are:
   that this cannot completely repair the damaged key as some crucial data
   is removed by the keyserver, but it does at least give you back one
   subkey. Defaults to no for regular @option{--import} and to yes for
-  keyserver @option{--recv-keys}.
+  keyserver @option{--receive-keys}.
 
   @item import-show
   Show a listing of the key as imported right before it is stored.
diff --git a/g10/gpg.c b/g10/gpg.c
index c087387..7de62fd 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -470,7 +470,8 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_c (aDesigRevoke, "desig-revoke","@" ),
   ARGPARSE_c (aExport, "export"           , N_("export keys") ),
   ARGPARSE_c (aSendKeys, "send-keys"     , N_("export keys to a keyserver") ),
-  ARGPARSE_c (aRecvKeys, "recv-keys"     , N_("import keys from a keyserver") ),
+  ARGPARSE_c (aRecvKeys, "receive-keys" , N_("import keys from a keyserver") ),
+  ARGPARSE_c (aRecvKeys, "recv-keys"     , "@"),
   ARGPARSE_c (aSearchKeys, "search-keys" ,
               N_("search for keys on a keyserver") ),
   ARGPARSE_c (aRefreshKeys, "refresh-keys",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git