aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2007-12-06 19:02:42 +0000
committerWerner Koch <[email protected]>2007-12-06 19:02:42 +0000
commite2aefc427e66577b62a1dfa6e8d75a4daaf49495 (patch)
treedead5b0a173d51fbab2ad4e1ece09255ffc52e36 /doc
parentMore code for the audit log. (diff)
downloadgnupg-e2aefc427e66577b62a1dfa6e8d75a4daaf49495.tar.gz
gnupg-e2aefc427e66577b62a1dfa6e8d75a4daaf49495.zip
Add support for help stuff to audit.c
Diffstat (limited to 'doc')
-rw-r--r--doc/gpgsm.texi16
-rw-r--r--doc/help.txt12
2 files changed, 24 insertions, 4 deletions
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index f9f783702..e5ae1688c 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -731,7 +731,7 @@ by a white space is current ignored but might late be used for other
purposes.
Note that even if a certificate is listed in this file, this does not
-mean that thecertificate is trusted; in general the certificates listed
+mean that the certificate is trusted; in general the certificates listed
in this file need to be listed also in @file{trustlist.txt}.
This is a global file an installed in the data directory
@@ -753,6 +753,20 @@ confirm that such a legally binding signature shall really be created.
Because this software has not yet been approved for use with such
certificates, appropriate notices will be shown to indicate this fact.
+@item help.txt
+@cindex help.txt
+This is plain text file with a few help entries used with
+@command{pinentry} as well as a large list of help items for
+@command{gpg} and @command{gpgsm}. The standard file has English help
+texts; to install localized versions use filenames like @file{help.LL.txt}
+with LL denoting the locale. GnuPG comes with a set of predefined help
+files in the data directory (e.g. @file{/usr/share/gnupg/help.de.txt})
+and allows overriding of any help item by help files stored in the
+system configuration directory (e.g. @file{/etc/gnupg/help.de.txt}).
+For a reference of the help file's syntax, please see the installed
+@file{help.txt} file.
+
+
@end table
@c man:.RE
diff --git a/doc/help.txt b/doc/help.txt
index ec9a6a7a0..afaaa29dc 100644
--- a/doc/help.txt
+++ b/doc/help.txt
@@ -297,9 +297,15 @@ An empty line ends the text.
-
-
-
+.gpgsm.root-cert-not-trusted
+# This text gets displayed by the audit log if
+# a root certificates was not trusted.
+The root certificate (the trust-anchor) is not trusted. Depending on
+the configuration you may have been prompted to mark that root
+certificate as trusted or you need to manually tell GnuPG to trust that
+certificate. Trusted certificates are configured in the file
+trustlist.txt in GnuPG's home directory. If you are in doubt, ask
+your system administrator whether you should trust this certificate.