--- gnupg-1.4.1/g10/options.skel.orig	2004-10-28 13:06:50 +0400

+++ gnupg-1.4.1/g10/options.skel	2005-03-17 16:34:46 +0300

@@ -22,35 +22,38 @@

 #

 # See the man page for a list of options.

-# Uncomment the following option to get rid of the copyright notice

-

-#no-greeting

+# Comment out the following option to reenable the copyright notice

+no-greeting

 # If you have more than 1 secret key in your keyring, you may want to

 # uncomment the following option and set your preferred keyid.

-

 #default-key 621CC013

 # If you do not pass a recipient to gpg, it will ask for one.  Using

 # this option you can encrypt to a default key.  Key validation will

 # not be done in this case.  The second form uses the default key as

 # default recipient.

-

 #default-recipient some-user-id

 #default-recipient-self

+# Same  as  --recipient but this one is intended for use in the

+# options file and may be used with  your  own  user-id  as  an

+# "encrypt-to-self".   These  keys are only used when there are

+# other recipients given either by use of --recipient or by the

+# asked user id.  No trust checking is performed for these user

+# ids and even disabled keys can be used.

+#encrypt-to 9658398D181B12008FC526B8F6F8846BC1E23429

+

 # By default GnuPG creates version 3 signatures for data files.  This

 # is not strictly OpenPGP compliant but PGP 6 and most versions of PGP

 # 7 require them.  To disable this behavior, you may use this option

 # or --openpgp.

-

 #no-force-v3-sigs

 # Because some mailers change lines starting with "From " to ">From "

 # it is good to handle such lines in a special way when creating

 # cleartext signatures; all other PGP versions do it this way too.

 # To enable full OpenPGP compliance you may want to use this option.

-

 #no-escape-from-lines

 # If you do not use the Latin-1 (ISO-8859-1) charset, you should tell

@@ -60,7 +63,6 @@

 # translation.  Note that future version of GnuPG will change to UTF-8

 # as default character set.  In most cases this option is not required 

 # GnuPG is able to figure out the correct charset and use that.

-

 #charset utf-8

 # Group names may be defined like this:

@@ -72,13 +74,11 @@

 # 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, which is usually preferable.

-

 #lock-once

 # GnuPG can send and receive keys to and from a keyserver.  These

@@ -111,7 +111,6 @@

 # servers via DNS round-robin.  hkp://subkeys.pgp.net is an example of

 # such a "server", which spreads the load over a number of physical

 # servers.

-

 keyserver hkp://subkeys.pgp.net

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

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

@@ -148,17 +147,14 @@ keyserver hkp://subkeys.pgp.net

 #

 # no-include-attributes = do not include attribute IDs (aka "photo IDs")

 #                         when sending keys to the keyserver.

-

 #keyserver-options auto-key-retrieve

 # Display photo user IDs in key listings

-

-# list-options show-photos

+#list-options show-photos

 # Display photo user IDs when a signature from a key with a photo is

 # verified

-

-# verify-options show-photos

+#verify-options show-photos

 # Use this program to display photo user IDs

 #

@@ -184,12 +180,15 @@ keyserver hkp://subkeys.pgp.net

 # photo-viewer "qiv %i"

 # photo-viewer "ee %i"

 # photo-viewer "display -title 'KeyID 0x%k'"

-#

+

+# Uncomment following lines if you have those extensions installed.

+#load-extension idea

+

 # This one saves a copy of the photo ID in your home directory:

-# photo-viewer "cat > ~/photoid-for-key-%k.%t"

-#

+#photo-viewer "cat > ~/photoid-for-key-%k.%t"

+

 # Use your MIME handler to view photos:

-# photo-viewer "metamail -q -d -b -c %T -s 'KeyID 0x%k' -f GnuPG"

+#photo-viewer "metamail -q -d -b -c %T -s 'KeyID 0x%k' -f GnuPG"

 # Passphrase agent

 #

@@ -197,9 +196,8 @@ keyserver hkp://subkeys.pgp.net

 # 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

+

 # which tries to use the agent but will fallback to the regular mode

 # if there is a problem connecting to the agent.  The normal way to

 # locate the agent is by looking at the environment variable

@@ -210,3 +208,6 @@ keyserver hkp://subkeys.pgp.net

 # --gpg-agent-info=<path>:<pid>:1

 #

 # may be used to override it.

+

+# Comment out the next line to reenable the warning about "using insecure memory".

+no-secmem-warning