summaryrefslogtreecommitdiffstats
path: root/g10/options.skel
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2002-08-30 20:01:32 +0200
committerDavid Shaw <dshaw@jabberwocky.com>2002-08-30 20:01:32 +0200
commitc721e11bf53e9c35c444c0439902fb046d169c61 (patch)
tree50442edc18f139f79bdb06682732298c8b1e2d0f /g10/options.skel
parent* iobuf.c (block_filter): Removed the assert, so that one can pass (diff)
downloadgnupg2-c721e11bf53e9c35c444c0439902fb046d169c61.tar.xz
gnupg2-c721e11bf53e9c35c444c0439902fb046d169c61.zip
* pkclist.c (build_pk_list): Fail if any recipient keys are unusable.
* options.skel: The PGP LDAP keyserver is back. Use MIT keyserver as a sample rather than cryptnet as cryptnet does not support searching yet. * keyedit.c (show_key_with_all_names): Fix error message (preferences are userid/selfsig and not key specific).
Diffstat (limited to 'g10/options.skel')
-rw-r--r--g10/options.skel6
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/options.skel b/g10/options.skel
index 924b0783e..2ea02923d 100644
--- a/g10/options.skel
+++ b/g10/options.skel
@@ -85,13 +85,14 @@ lock-once
# support).
#
# Example HKP keyserver:
-# x-hkp://keyserver.cryptnet.net
+# x-hkp://pgp.mit.edu
#
# Example email keyserver:
# mailto:pgp-public-keys@keys.nl.pgp.net
#
-# Example LDAP keyserver:
+# Example LDAP keyservers:
# ldap://pgp.surfnet.nl:11370
+# ldap://keyserver.pgp.com
#
# Regular URL syntax applies, and you can set an alternate port
# through the usual method:
@@ -109,6 +110,7 @@ lock-once
#keyserver x-hkp://pgp.mit.edu
#keyserver mailto:pgp-public-keys@keys.nl.pgp.net
#keyserver ldap://pgp.surfnet.nl:11370
+#keyserver ldap://keyserver.pgp.com
# Common options for keyserver functions:
#