summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2002-08-06 19:22:31 +0200
committerDavid Shaw <dshaw@jabberwocky.com>2002-08-06 19:22:31 +0200
commitf48650872efdebc6fd15561cede50590ffb15ec6 (patch)
tree63ad7e990e3913be3a20985efd8163f190d3dc44 /doc
parent* revoke.c (export_minimal_pk, gen_desig_revoke, gen_revoke): Export a (diff)
downloadgnupg2-f48650872efdebc6fd15561cede50590ffb15ec6.tar.xz
gnupg2-f48650872efdebc6fd15561cede50590ffb15ec6.zip
* gpg.sgml: Clarify that only long-form options can go in the config file.
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/gpg.sgml12
2 files changed, 12 insertions, 5 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0e8dced15..51b35e067 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-06 David Shaw <dshaw@jabberwocky.com>
+
+ * gpg.sgml: Clarify that only long-form options can go in the
+ config file.
+
2002-08-06 Werner Koch <wk@gnupg.org>
* gpg.sgml: Fixed doc regarding the name change of the option
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 7899b51b8..f263b9b3b 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -706,11 +706,13 @@ all options.
<refsect1>
<title>OPTIONS</title>
<para>
-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
-does not make sense.
+Long options can be put in an options file (default
+"~/.gnupg/gpg.conf"). Short option names will not work - for example,
+"armor" is a valid option for the options file, while "a" is not. 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 does not make sense.
</para>
<para>
<command/gpg/ recognizes these options: