aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2005-12-08 19:39:59 +0000
committerDavid Shaw <[email protected]>2005-12-08 19:39:59 +0000
commitf8c4263b1a38b7fda2549464dd0d9e1f4769bae4 (patch)
tree51ab658d9def7519299bc75ee1e4f5335f66e826
parent* keyserver.c (keyserver_fetch): Switch on fast-import before we (diff)
downloadgnupg-f8c4263b1a38b7fda2549464dd0d9e1f4769bae4.tar.gz
gnupg-f8c4263b1a38b7fda2549464dd0d9e1f4769bae4.zip
* gpg.sgml: Document --fetch-keys.
Diffstat (limited to '')
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/gpg.sgml11
2 files changed, 14 insertions, 1 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index cbc0782eb..a1883492e 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-08 David Shaw <[email protected]>
+
+ * gpg.sgml: Document --fetch-keys.
+
2005-12-07 David Shaw <[email protected]>
* gpg.sgml: Document -d. Add [file] to a few options.
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index c96fbb839..d02ff2dae 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -44,6 +44,7 @@
<!entity ParmN "<parameter>n</parameter>">
<!entity ParmFlags "<parameter>flags</parameter>">
<!entity ParmString "<parameter>string</parameter>">
+<!entity ParmURIs "<parameter>URIs</parameter>">
<!entity ParmValue "<parameter>value</parameter>">
<!entity ParmNameValue "<parameter>name=value</parameter>">
<!entity ParmNameValues "<parameter>name=value1 <optional>value2 value3 ...</optional></parameter>">
@@ -741,7 +742,7 @@ keyservers set (see --keyserver-option honor-keyserver-url).
</para></listitem></varlistentry>
<varlistentry>
-<term>--search-keys &OptParmNames;</term>
+<term>--search-keys &ParmNames;</term>
<listitem><para>
Search the keyserver for the given names. Multiple names given here
will be joined together to create the search string for the keyserver.
@@ -753,6 +754,14 @@ only LDAP supports them all.
</para></listitem></varlistentry>
<varlistentry>
+<term>--fetch-keys &ParmURIs;</term>
+<listitem><para>
+Retrieve keys located at the specified URIs. Note that different
+installations of GnuPG may support different protocols (HTTP, FTP,
+LDAP, etc.)
+</para></listitem></varlistentry>
+
+<varlistentry>
<term>--update-trustdb</term>
<listitem><para>
Do trust database maintenance. This command iterates over all keys