aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog5
-rw-r--r--doc/DETAILS12
-rw-r--r--doc/gpg.texi15
3 files changed, 26 insertions, 6 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index c7a86d22e..3c04a980b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-26 Werner Koch <[email protected]>
+
+ * gpg.texi (GPG Configuration): Document envvar LANGUAGE.
+ (GPG Configuration Options): Document show-primary-uid-only.
+
2007-02-18 Werner Koch <[email protected]>
* gpg.texi (GPG Esoteric Options): No card reader options for gpg2.
diff --git a/doc/DETAILS b/doc/DETAILS
index 5dda75191..b947b47c0 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -559,14 +559,14 @@ 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>
+ ERROR <error location> <error code> [<more>]
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. The error code
- is a either a string commencing with a letter or such string
- prefix with a numerical error code and an underscore; e.g.:
- "151011327_EOF"
+ by error location specific data. <error code> and
+ <error_location> should not contain spaces. The error code is
+ a either a string commencing with a letter or such a string
+ prefixed with a numerical error code and an underscore; e.g.:
+ "151011327_EOF".
ATTRIBUTE <fpr> <octets> <type> <index> <count>
<timestamp> <expiredate> <flags>
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 330be40cf..cff4a0f53 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1003,6 +1003,11 @@ the signature. Defaults to no.
Show revoked and expired user IDs during signature verification.
Defaults to no.
+@item show-primary-uid-only
+Show only the primary user ID during signature verification. That is
+all the AKA lines as well as photo Ids are not shown with the signature
+verification status.
+
@item pka-lookups
Enable PKA lookups to verify sender addresses. Note that PKA is based
on DNS, and so enabling this option may disclose information on when
@@ -2581,6 +2586,16 @@ value. The option @option{--gpg-agent-info} can be used to override it.
@itemx LINES
Used to size some displays to the full size of the screen.
+
+@item LANGUAGE
+Apart from its use by GNU, it is used in the W32 version to override the
+language selection done through the Registry. If used and set to a a
+valid and available language name (@var{langid}), the file with the
+translation is loaded from
+@code{@var{gpgdir}/gnupg.nls/@var{langid}.mo}. Here @var{gpgdir} is the
+directory out of which the gpg binary has been laoded. If it can't be
+loaded the Registry is tried as a fallback.
+
@end table