diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/gpg.texi | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 5b4c0d0dd..a7f455349 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2009-07-23 David Shaw <[email protected]> + + * gpg.texi (GPG Configuration Options): LDAP uses DNS-SD to locate + a server before falling back to keys.{domain}. + 2009-07-23 Werner Koch <[email protected]> * help.txt (gpgsm.crl-problem): New. diff --git a/doc/gpg.texi b/doc/gpg.texi index 035f948dd..14a8b1d92 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -1376,8 +1376,9 @@ Locate a key using DNS CERT, as specified in rfc4398. Locate a key using DNS PKA. @item ldap -Locate a key using the PGP Universal method of checking -@samp{ldap://keys.(thedomain)}. +Using DNS Service Discovery, check the domain in question for any LDAP +keyservers to use. If this fails, attempt to locate the key using the +PGP Universal method of checking @samp{ldap://keys.(thedomain)}. @item keyserver Locate a key using whatever keyserver is defined using the |