[svn] GnuPG - r4029 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2006-02-27 20:31:13 +0100 (Mon, 27 Feb 2006)
New Revision: 4029

Modified:
   trunk/g10/ChangeLog
   trunk/g10/options.skel
Log:
* options.skel: Document auto-key-locate and give a pointer to Simon
Josefsson's page for CERT.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-02-25 00:21:20 UTC (rev 4028)
+++ trunk/g10/ChangeLog	2006-02-27 19:31:13 UTC (rev 4029)
@@ -1,3 +1,8 @@
+2006-02-27  David Shaw  <dshaw at jabberwocky.com>
+
+	* options.skel: Document auto-key-locate and give a pointer to
+	Simon Josefsson's page for CERT.
+
 2006-02-24  David Shaw  <dshaw at jabberwocky.com>
 
 	* keydb.h, getkey.c (release_akl), gpg.c (main): Add

Modified: trunk/g10/options.skel
===================================================================
--- trunk/g10/options.skel	2006-02-25 00:21:20 UTC (rev 4028)
+++ trunk/g10/options.skel	2006-02-27 19:31:13 UTC (rev 4029)
@@ -216,3 +216,27 @@
 # --gpg-agent-info=<path>:<pid>:1
 #
 # may be used to override it.
+
+# Automatic key location
+#
+# GnuPG can automatically locate and retrieve keys as needed using the
+# auto-key-locate option.  This happens when encrypting to an email
+# address (in the "user at example.com" form), and there are no
+# user at example.com keys on the local keyring.  This option takes the
+# following arguments, in the order they are to be tried:
+# 
+# cert = locate a key using DNS CERT, as specified in 2538bis
+# (currently in draft): http://www.josefsson.org/rfc2538bis/
+#
+# pka = locate a key using DNS PKA.
+#
+# ldap = locate a key using the PGP Universal method of checking
+# "ldap://keys.(thedomain)".
+#
+# keyserver = locate a key using whatever keyserver is defined using
+# the keyserver option.
+#
+# You may also list arbitrary keyservers here by URL.
+#
+# Try CERT, then PKA, then LDAP, then hkp://subkeys.net:
+#auto-key-locate cert pka ldap hkp://subkeys.pgp.net