aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2007-11-27 08:01:19 +0000
committerWerner Koch <[email protected]>2007-11-27 08:01:19 +0000
commit598a3d0ab4a401f929c03d08cea5c272bf49abda (patch)
tree3c1e527c7fc15b8da3599d81832e195a0fbde3c2 /doc
parentAdd option --data to GETAUDITLOG command. (diff)
downloadgnupg-598a3d0ab4a401f929c03d08cea5c272bf49abda.tar.gz
gnupg-598a3d0ab4a401f929c03d08cea5c272bf49abda.zip
[W32] Changed default socket for dirmngr.
[W32] Add some code for event notifications between scdaemon and gpg-agent.
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog3
-rw-r--r--doc/gpg.texi2
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1e276e2a3..6fbde7c95 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,8 @@
2007-11-19 Werner Koch <[email protected]>
+ * gpg.texi (GPG Configuration Options): English Grammar fix.
+ Thanks to Gerg Troxel.
+
* gpgsm.texi (Certificate Options): Document
--auto-issuer-key-retrieve.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 0a1b92ab9..f7b7df856 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1141,7 +1141,7 @@ found.
Set the name of the native character set. This is used to convert
some informational strings like user IDs to the proper UTF-8 encoding.
Note that this has nothing to do with the character set of data to be
-encrypted or signed; GnuPG does not recode user supplied data. If
+encrypted or signed; GnuPG does not recode user-supplied data. If
this option is not used, the default character set is determined from
the current locale. A verbosity level of 3 shows the chosen set.
Valid values for @code{name} are: