diff options
| author | Justus Winter <[email protected]> | 2016-09-23 11:40:55 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-09-23 11:41:25 +0000 |
| commit | 8a673ed83d7f3645280a3ae5abab00e6b205312f (patch) | |
| tree | a2347fb0e06a92f56196cc3f1171b24be0451b4b | |
| parent | g10: When adding a user id, make sure the keyblock has been prepared. (diff) | |
| download | gnupg-8a673ed83d7f3645280a3ae5abab00e6b205312f.tar.gz gnupg-8a673ed83d7f3645280a3ae5abab00e6b205312f.zip | |
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 <[email protected]>
| -rw-r--r-- | doc/gpg.texi | 12 | ||||
| -rw-r--r-- | g10/gpg.c | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index 6cc35e04e..050410578 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -458,8 +458,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. -@item --recv-keys @code{key IDs} -@opindex recv-keys +@item --receive-keys @code{key IDs} +@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. @@ -1735,7 +1735,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 -@option{--recv-keys}, @option{--send-keys}, and @option{--search-keys} +@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: @@ -1803,9 +1803,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. @@ -2207,7 +2207,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. @@ -463,7 +463,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", |