summaryrefslogtreecommitdiffstats
path: root/doc/pacman-key.8.txt
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-09-01 22:20:53 +0200
committerDan McGee <dan@archlinux.org>2011-09-03 04:43:03 +0200
commitd9545103b9a9517cb8996562d990431094027663 (patch)
treef47f03ec344c6a538737675109717e72283ec714 /doc/pacman-key.8.txt
parent5a9b07b0e7fc73dc85f07bbab5cba007efe8d8aa (diff)
downloadpacman-d9545103b9a9517cb8996562d990431094027663.tar.gz
pacman-d9545103b9a9517cb8996562d990431094027663.tar.xz
pacman-key: split keyserver to a separate option
This also renames '--receive' to '-recv-keys' to match the wrapped gpg option name, rather than invent a new one, now that the calling convention is the same. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'doc/pacman-key.8.txt')
-rw-r--r--doc/pacman-key.8.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt
index 7481ce5b..824f0b3b 100644
--- a/doc/pacman-key.8.txt
+++ b/doc/pacman-key.8.txt
@@ -71,6 +71,12 @@ Options
Ensure the keyring is properly initialized and has the required access
permissions.
+*\--keyserver* <keyserver>::
+ Use the specified keyserver if the operation requires one. This will take
+ precedence over any keyserver option specified in a `gpg.conf`
+ configuration file. Running '\--init' with this option will set the default
+ keyserver if one was not already configured.
+
*-l, \--list-keys* [keyid(s)]::
Lists all or specified keys from the public keyring.
@@ -81,8 +87,8 @@ Options
Locally sign the given key. This is primarily used to root the web of trust
in the local private key generated by '\--init'.
-*-r, \--receive* <keyserver> <keyid(s)>::
- Fetch the specified keyid(s) from the specified key server URL.
+*-r, \--recv-keys* <keyid(s)>::
+ Equivalent to '\--recv-keys' in GnuPG.
*\--populate* [keyring(s)]::
Reload the default keys from the (optionally provided) keyrings in