From e028b7760b28b3beaf19377d94cbf71911ceb48c Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 6 Aug 2002 13:37:09 +0000
Subject: * options.skel: Changed comments.

* gpg.sgml: Fixed doc regarding the name change of the option
file.
---
 doc/ChangeLog |  5 +++++
 doc/gpg.sgml  | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 479a2abfb..0e8dced15 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -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
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 98610b699..7899b51b8 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -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>
-- 
cgit v1.2.3