From bcedc5dad1a5b858b61bed8b7cdccfd31f87dffe Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 2 Sep 2002 10:58:46 +0000
Subject: [PATCH] * gpg.sgml: Updated the charset option.

* DETAILS: Added status IMPORT_OK.
---
 doc/ChangeLog |  4 ++++
 doc/DETAILS   | 11 +++++++++++
 doc/gpg.sgml  |  9 +++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 4b248ec04..183c48928 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,9 @@
 2002-09-02  Werner Koch  <wk@gnupg.org>
 
+	* gpg.sgml: Updated the charset option.
+
+	* DETAILS: Added status IMPORT_OK.
+
 	* gnupg.7: New mini man page.
 
 2002-08-30  David Shaw  <dshaw@jabberwocky.com>
diff --git a/doc/DETAILS b/doc/DETAILS
index 5c5eb07b7..859103775 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -270,6 +270,17 @@ more arguments in future versions.
     IMPORTED   <long keyid>  <username>
 	The keyid and name of the signature just imported
 
+    IMPORT_OK  <reason> [<fingerprint>]
+        The key with the primary key's FINGERPRINT has been imported.
+        Reason flags:
+          0 := Not actually changed
+          1 := Entirely new key.
+          2 := New user IDs
+          4 := New signatures
+          8 := New subkeys 
+         16 := Contains private key.
+        The flags may be XORed.
+
     IMPORT_PROBLEM <reason> [<fingerprint>]
         Issued for each import failure.  Reason codes are:
           0 := "No specific reason given".
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 0abf4c62e..afae9681c 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1200,16 +1200,21 @@ also overrides the environment variable "GNUPGHOME".
 <term>--charset &ParmName;</term>
 <listitem><para>
 Set the name of the native character set.  This is used
-to convert some strings to proper UTF-8 encoding.
+to convert some strings to proper UTF-8 encoding. If this option is not used, the default character set is determined
+from the current locale.  A verbosity level of 3 shows the used one.
 Valid values for &ParmName; are:</para>
 <variablelist>
 <varlistentry>
-<term>iso-8859-1</term><listitem><para>This is the default Latin 1 set.</para></listitem>
+<term>iso-8859-1</term><listitem><para>This is the Latin 1 set.</para></listitem>
 </varlistentry>
 <varlistentry>
 <term>iso-8859-2</term><listitem><para>The Latin 2 set.</para></listitem>
 </varlistentry>
 <varlistentry>
+<term>iso-8859-15</term><listitem><para>This is currently an alias for
+the Latin 1 set.</para></listitem>
+</varlistentry>
+<varlistentry>
 <term>koi8-r</term><listitem><para>The usual Russian set (rfc1489).</para></listitem>
 </varlistentry>
 <varlistentry>