security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

* options.skel: Changed comments. 

* gpg.sgml: Fixed doc regarding the name change of the option
file.
This commit is contained in:
Werner Koch 2002-08-06 13:37:09 +00:00
parent 67faf234a3
commit e028b7760b
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/ChangeLog
View File

@ -1,3 +1,8 @@
2002-08-06 Werner Koch <wk@gnupg.org>
* gpg.sgml: Fixed doc regarding the name change of the option
file.
2002-07-30 David Shaw <dshaw@jabberwocky.com>
* gpg.sgml: Clarify --edit/addrevoker (sensitive), and

10
doc/gpg.sgml
View File

@ -706,7 +706,7 @@ all options.
<refsect1>
<title>OPTIONS</title>
<para>
Long options can be put in an options file (default "~/.gnupg/options").
Long options can be put in an options file (default "~/.gnupg/gpg.conf").
Do not write the 2 dashes, but simply the name of the option and any
required arguments. Lines with a hash as the first non-white-space
character are ignored. Commands may be put in this file too, but that
@ -2360,9 +2360,15 @@ be used to overide it.</para></listitem>
<listitem><para>used to preserve the internal random pool</para></listitem>
</varlistentry>
<varlistentry>
<term>~/.gnupg/gpg.conf</term>
<listitem><para>Default configuration file</para></listitem>
</varlistentry>
<varlistentry>
<term>~/.gnupg/options</term>
<listitem><para>May contain options</para></listitem>
<listitem><para>Old style configuration file; only used when gpg.conf
is not found</para></listitem>
</varlistentry>
<varlistentry>

2
g10/ChangeLog
View File

@ -1,5 +1,7 @@
2002-08-06 Werner Koch <wk@gnupg.org>
* options.skel: Changed comments.
* g10.c (main): Try to use "gpg.conf" as default option file.
* openfile.c (copy_options_file): Changed name of created file.

4
g10/options.skel
View File

@ -1,4 +1,4 @@
These first three lines are not copied to the options file in
These first three lines are not copied to the gpg.conf file in
the users home directory.
$Id$
# Options for GnuPG
@ -14,7 +14,7 @@ $Id$
#
# Unless you you specify which option file to use (with the
# command line option "--options filename"), GnuPG uses the
# file ~/.gnupg/options by default.
# file ~/.gnupg/gpg.conf by default.
#
# An option file can contain all long options which are
# available in GnuPG. If the first non white space character of