aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2002-06-17 16:20:13 +0000
committerWerner Koch <[email protected]>2002-06-17 16:20:13 +0000
commitc519e80ee5032b1cc6ba4556e3de454f0d76be7d (patch)
tree3b8622737bc1f130337a899dda4289695b2518ea
parent* keyedit.c (show_key_with_all_names), keylist.c (list_keyblock_print): (diff)
downloadgnupg-c519e80ee5032b1cc6ba4556e3de454f0d76be7d.tar.gz
gnupg-c519e80ee5032b1cc6ba4556e3de454f0d76be7d.zip
* gpg.sgml: Grammar fix.
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/DETAILS12
-rw-r--r--doc/gpg.sgml6
3 files changed, 16 insertions, 6 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4277f308b..06638f9a1 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-17 Werner Koch <[email protected]>
+
+ * gpg.sgml: Grammar fix.
+
2002-06-03 David Shaw <[email protected]>
* DETAILS: Details of ATTRIBUTE.
diff --git a/doc/DETAILS b/doc/DETAILS
index d5418e5dd..6120fc61f 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -182,13 +182,14 @@ more arguments in future versions.
0 - not further specified 1
- TRUST_UNDEFINED
- TRUST_NEVER
+ TRUST_UNDEFINED <error token>
+ TRUST_NEVER <error token>
TRUST_MARGINAL
TRUST_FULLY
TRUST_ULTIMATE
For good signatures one of these status lines are emitted
- to indicate how trustworthy the signature is. No arguments yet.
+ to indicate how trustworthy the signature is. The error token
+ values are currently only emiited by gpgsm.
SIGEXPIRED
This is deprecated in favor of KEYEXPIRED.
@@ -352,6 +353,11 @@ more arguments in future versions.
The output was truncated to MAXNO items. This status code is issued
for certain external requests
+ ERROR <error location> <error code>
+ This is a generic error status message, it might be followed
+ by error location specific data. <error token> and
+ <error_location> should not contain a space.
+
ATTRIBUTE <fpr> <octets> <type> <index> <count>
<timestamp> <expiredate> <flags>
This is one long line issued for each attribute subpacket when
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 53e3f8dc7..59d9c9edf 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -2088,9 +2088,9 @@ in front.
<para>
Note that you can append an exclamation mark to key IDs or
-fingerprints. This flag which tells GnuPG to use exactly
-that primary or secondary key and don't try to figure out which
-secondary or primary key to use.
+fingerprints. This flag tells GnuPG to use exactly the given primary
+or secondary key and not to try to figure out which secondary or
+primary key to use.
</para>
</refsect1>