* packet.h, main.h, sig-check.c (signature_check2, check_key_signature2,

[gnupg.git] / g10 / options.skel

diff --git a/g10/options.skel b/g10/options.skel
index ed5a2a9..c03221f 100644 (file)
--- a/g10/options.skel
+++ b/g10/options.skel
@@ -1,8 +1,8 @@
-These first three lines are not copied to the gpg.conf file in
-the users home directory.
-$Id$
+# These first three lines are not copied to the gpg.conf file in
+# the users home directory.
+# $Id$

 # Options for GnuPG
 # Options for GnuPG

-# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.

 # 
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
 # 
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without


@@ -56,14 +56,14 @@ $Id$
 # If you do not use the Latin-1 (ISO-8859-1) charset, you should tell
 # GnuPG which is the native character set.  Please check the man page
 # for supported character sets.  This character set is only used for
 # If you do not use the Latin-1 (ISO-8859-1) charset, you should tell
 # GnuPG which is the native character set.  Please check the man page
 # for supported character sets.  This character set is only used for

-# Meta data and not for the actual message which does not undergo any
+# metadata 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:
 # 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:

-#   group mynames paige 0x12345678 joe patti
+#   group mynames = paige 0x12345678 joe patti

 #
 # Any time "mynames" is a recipient (-r or --recipient), it will be
 # expanded to the names "paige", "joe", and "patti", and the key 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


@@ -72,30 +72,36 @@ $Id$
 # 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.
 
 # 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
+#group mynames = paige 0x12345678 joe patti
+
+# Some old Windows platforms require 8.3 filenames.  If your system
+# can handle long filenames, uncomment this.
+
+#no-mangle-dos-filenames

 
 # 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.
 
 
 # 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.
 

-lock-once
+#lock-once

 
 # GnuPG can send and receive keys to and from a keyserver.  These
 # servers can be HKP, email, or LDAP (if GnuPG is built with LDAP
 # support).
 #
 # Example HKP keyserver:
 
 # GnuPG can send and receive keys to and from a keyserver.  These
 # servers can be HKP, email, or LDAP (if GnuPG is built with LDAP
 # support).
 #
 # Example HKP keyserver:

-#      x-hkp://keyserver.cryptnet.net
+#      hkp://subkeys.pgp.net

 #
 # Example email keyserver:
 #
 # Example email keyserver:

-#      mailto:pgp-public-keys@keys.nl.pgp.net
+#      mailto:pgp-public-keys@keys.pgp.net

 #
 #

-# Example LDAP keyserver:
+# Example LDAP keyservers:

 #      ldap://pgp.surfnet.nl:11370
 #      ldap://pgp.surfnet.nl:11370

+#      ldap://keyserver.pgp.com

 #
 # Regular URL syntax applies, and you can set an alternate port
 # through the usual method:
 #
 # Regular URL syntax applies, and you can set an alternate port
 # through the usual method:

-#      x-hkp://keyserver.example.net:22742
+#      hkp://keyserver.example.net:22742

 #
 # If you have problems connecting to a HKP server through a buggy http
 # proxy, you can use keyserver option broken-http-proxy (see below),
 #
 # If you have problems connecting to a HKP server through a buggy http
 # proxy, you can use keyserver option broken-http-proxy (see below),


@@ -106,17 +112,18 @@ lock-once
 # Most servers do synchronize with each other and DNS round-robin may
 # give you a quasi-random server each time.
 
 # Most servers do synchronize with each other and DNS round-robin may
 # give you a quasi-random server each time.
 

-#keyserver x-hkp://pgp.mit.edu
+keyserver hkp://subkeys.pgp.net

 #keyserver mailto:pgp-public-keys@keys.nl.pgp.net
 #keyserver ldap://pgp.surfnet.nl:11370
 #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:
 #
 # include-disabled = when searching, include keys marked as "disabled"
 #                    on the keyserver (not all keyservers support this).
 #
 
 # Common options for keyserver functions:
 #
 # include-disabled = when searching, include keys marked as "disabled"
 #                    on the keyserver (not all keyservers support this).
 #

-# include-revoked = when searching, include keys marked as "revoked"
-#                   on the keyserver.
+# no-include-revoked = when searching, do not include keys marked as
+#                      "revoked" on the keyserver.

 #
 # verbose = show more information as the keys are fetched.
 #           Can be used more than once to increase the amount
 #
 # verbose = show more information as the keys are fetched.
 #           Can be used more than once to increase the amount


@@ -142,7 +149,7 @@ lock-once
 # no-include-attributes = do not include attribute IDs (aka "photo IDs")
 #                         when sending keys to the keyserver.
 
 # 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
+#keyserver-options auto-key-retrieve

 
 # Uncomment this line to display photo user IDs in key listings and
 # when a signature from a key with a photo is verified.
 
 # Uncomment this line to display photo user IDs in key listings and
 # when a signature from a key with a photo is verified.


@@ -166,7 +173,8 @@ lock-once
 # generating and then cleaning up a secure temp file.
 #
 # The default program is "xloadimage -fork -quiet -title 'KeyID 0x%k' stdin"
 # generating and then cleaning up a secure temp file.
 #
 # The default program is "xloadimage -fork -quiet -title 'KeyID 0x%k' stdin"

-# On Mac OS X and Windows, the default is to use your regular image viewer.
+# On Mac OS X and Windows, the default is to use your regular JPEG image
+# viewer.

 #
 # Some other viewers:
 # photo-viewer "qiv %i"
 #
 # Some other viewers:
 # photo-viewer "qiv %i"


@@ -179,13 +187,12 @@ lock-once
 # Use your MIME handler to view photos:
 # photo-viewer "metamail -q -d -b -c %T -s 'KeyID 0x%k' -f GnuPG"
 
 # Use your MIME handler to view photos:
 # photo-viewer "metamail -q -d -b -c %T -s 'KeyID 0x%k' -f GnuPG"
 

-

 # Passphrase agent
 #
 # Passphrase agent
 #

-# We support the old experimental passphrase agent protocol as well
-# as the new Assuan based one (currently available in the "newpg" package
-# at ftp.gnupg.org/gcrypt/alpha/aegypten/).  To make use of the agent, you have
-# to run an agent as daemon and use the option
+# We support the old experimental passphrase agent protocol as well as
+# the new Assuan based one (currently available in the "newpg" package
+# at ftp.gnupg.org/gcrypt/alpha/aegypten/).  To make use of the agent,
+# you have to run an agent as daemon and use the option

 #
 # use-agent
 # 
 #
 # use-agent
 #