aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2004-05-20 03:01:46 +0000
committerDavid Shaw <[email protected]>2004-05-20 03:01:46 +0000
commite2e267e8234fe5b74a7728a1142bf8ba016c9fbd (patch)
treee5d055d3ea21a436f557e4d8b2ef1ee31885427e
parent* pubkey-enc.c (get_session_key, get_it), keyedit.c (diff)
downloadgnupg-e2e267e8234fe5b74a7728a1142bf8ba016c9fbd.tar.gz
gnupg-e2e267e8234fe5b74a7728a1142bf8ba016c9fbd.zip
* gpg.sgml: Clarify that --charset applies to informational strings and
does not recode messages themselves. Remove include-non-rfc export-option.
-rw-r--r--doc/ChangeLog6
-rw-r--r--doc/gpg.sgml14
2 files changed, 10 insertions, 10 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 572bf4df9..18ab887e1 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-19 David Shaw <[email protected]>
+
+ * gpg.sgml: Clarify that --charset applies to informational
+ strings and does not recode messages themselves. Remove
+ include-non-rfc export-option.
+
2004-05-08 David Shaw <[email protected]>
* DETAILS, credits-1.0, credits-1.2: ElGamal -> Elgamal.
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 8fd2888bf..9bdf78083 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1277,12 +1277,6 @@ opposite meaning. The options are:
<variablelist>
<varlistentry>
-<term>include-non-rfc</term>
-<listitem><para>
-Include non-RFC compliant keys in the export. Defaults to yes.
-</para></listitem></varlistentry>
-
-<varlistentry>
<term>include-local-sigs</term>
<listitem><para>
Allow exporting key signatures marked as "local". This is not
@@ -1549,10 +1543,10 @@ $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. 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>
+some informational strings like user IDs to the 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 Latin 1 set.</para></listitem>