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 <dshaw@jabberwocky.com> + + * 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 <dshaw@jabberwocky.com> * 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 @@ -1276,12 +1276,6 @@ exporting keys. Options can be prepended with a `no-' to give the 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> @@ -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>