diff options
| author | David Shaw <[email protected]> | 2002-08-20 17:16:33 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-08-20 17:16:33 +0000 |
| commit | 1cc0480be411766abc7d07e13294e73879f8889e (patch) | |
| tree | d548ca50ec475630bd6afed0d1338874f9ac33db | |
| parent | * gpgsm.c (main): Use the log file only in server mode. (diff) | |
| download | gnupg-1cc0480be411766abc7d07e13294e73879f8889e.tar.gz gnupg-1cc0480be411766abc7d07e13294e73879f8889e.zip | |
* options.skel: Document no-include-attributes for keyserver-options.
| -rw-r--r-- | g10/ChangeLog | 3 | ||||
| -rw-r--r-- | g10/options.skel | 22 |
2 files changed, 17 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 5ae9582e9..ad426af0b 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2002-08-20 David Shaw <[email protected]> + * options.skel: Document no-include-attributes for + keyserver-options. + * keylist.c, keyedit.c, keyserver.c, sign.c: Some TODOs and comments. diff --git a/g10/options.skel b/g10/options.skel index 79718783a..ed5a2a98a 100644 --- a/g10/options.skel +++ b/g10/options.skel @@ -59,6 +59,7 @@ $Id$ # Meta data and not for the actual message which does not undergo any # translation. Note that future version of GnuPG will change to UTF-8 # as default character set. + #charset utf-8 # Group names may be defined like this: @@ -67,10 +68,12 @@ $Id$ # Any time "mynames" is a recipient (-r or --recipient), it will be # expanded to the names "paige", "joe", and "patti", and the key ID # "0x12345678". Note there is only one level of expansion - you -# cannot make an group that points to another group. Note if there -# are spaces in the recipient name, this will appear as two +# cannot make an group that points to another group. Note also that +# if there are spaces in the recipient name, this will appear as two # recipients. In these cases it is better to use the key ID. +#group mynames paige 0x12345678 joe patti + # Lock the file only once for the lifetime of a process. If you do # not define this, the lock will be obtained and released every time # it is needed - normally this is not needed. @@ -103,11 +106,11 @@ lock-once # Most servers do synchronize with each other and DNS round-robin may # give you a quasi-random server each time. -#keyserver x-hkp://keyserver.cryptnet.net +#keyserver x-hkp://pgp.mit.edu #keyserver mailto:[email protected] #keyserver ldap://pgp.surfnet.nl:11370 -# Options for keyserver functions +# Common options for keyserver functions: # # include-disabled = when searching, include keys marked as "disabled" # on the keyserver (not all keyservers support this). @@ -131,10 +134,13 @@ lock-once # # broken-http-proxy = try to work around a buggy HTTP proxy # -# auto-key-retrieve = automatically fetch keys as needed from the -# keyserver when verifying signatures or when importing -# keys that have been revoked by a revocation key that -# is not present on the keyring. +# auto-key-retrieve = automatically fetch keys as needed from the keyserver +# when verifying signatures or when importing keys that +# have been revoked by a revocation key that is not +# present on the keyring. +# +# no-include-attributes = do not include attribute IDs (aka "photo IDs") +# when sending keys to the keyserver. #keyserver-options auto-key-retrieve include-disabled include-revoked |