From 20917c3c305c6765685906d8548e32d518521064 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 1 Jun 2004 20:34:58 +0000 Subject: [PATCH] * gpg.sgml: Note that --charset is --display-charset. Some language tweaks for --simple-sk-checksum (Debian 251795). --- doc/ChangeLog | 5 +++++ doc/gpg.sgml | 46 +++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 4c1891d48..afdfb31c2 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2004-06-01 David Shaw + + * gpg.sgml: Note that --charset is --display-charset. Some + language tweaks for --simple-sk-checksum (Debian 251795). + 2004-05-08 David Shaw * DETAILS, credits-1.0, credits-1.2: ElGamal -> Elgamal. diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 110b68865..a534b1a09 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -1336,13 +1336,13 @@ $GNUPGHOME. ---charset &ParmName; +--display-charset &ParmName; 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. 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: +chosen set. Valid values for &ParmName; are: iso-8859-1This is the Latin 1 set. @@ -1369,11 +1369,11 @@ that the OS uses native UTF-8 encoding. --utf8-strings --no-utf8-strings -Assume that the arguments are already given as UTF8 strings. The default -(--no-utf8-strings) -is to assume that arguments are encoded in the character set as specified -by --charset. These options affect all following arguments. Both options may -be used multiple times. +Assume that command line arguments are given as UTF8 strings. The +default (--no-utf8-strings) is to assume that arguments are encoded in +the character set as specified by --display-charset. These options +affect all following arguments. Both options may be used multiple +times. @@ -1512,9 +1512,9 @@ Put the name value pair into the signature as notation data. must contain a '@' character. This is to help prevent pollution of the IETF reserved notation namespace. The --expert flag overrides the '@' check. &ParmValue; may be any printable string; it will be -encoded in UTF8, so you should check that your --charset is set -correctly. If you prefix &ParmName; with an exclamation mark (!), the -notation data will be flagged as critical (rfc2440:5.2.3.15). +encoded in UTF8, so you should check that your --display-charset is +set correctly. If you prefix &ParmName; with an exclamation mark (!), +the notation data will be flagged as critical (rfc2440:5.2.3.15). --sig-notation sets a notation for data signatures. --cert-notation sets a notation for key signatures (certifications). --set-notation sets both. @@ -1680,14 +1680,14 @@ conventional encryption. --simple-sk-checksum Secret keys are integrity protected by using a SHA-1 checksum. This -method will be part of an enhanced OpenPGP specification but GnuPG -already uses it as a countermeasure against certain attacks. Old -applications don't understand this new format, so this option may be -used to switch back to the old behaviour. Using this this option -bears a security risk. Note that using this option only takes effect -when the secret key is encrypted - the simplest way to make this -happen is to change the passphrase on the key (even changing it to the -same value is acceptable). +method is part of the upcoming enhanced OpenPGP specification but +GnuPG already uses it as a countermeasure against certain attacks. +Old applications don't understand this new format, so this option may +be used to switch back to the old behaviour. Using this option bears +a security risk. Note that using this option only takes effect when +the secret key is encrypted - the simplest way to make this happen is +to change the passphrase on the key (even changing it to the same +value is acceptable). @@ -2121,11 +2121,11 @@ verification is not needed. --with-colons Print key listings delimited by colons. Note that the output will be -encoded in UTF-8 regardless of any --charset setting. This format is -useful when GnuPG is called from scripts and other programs as it is -easily machine parsed. The details of this format are documented in -the file doc/DETAILS, which is included in the GnuPG source -distribution. +encoded in UTF-8 regardless of any --display-charset setting. This +format is useful when GnuPG is called from scripts and other programs +as it is easily machine parsed. The details of this format are +documented in the file doc/DETAILS, which is included in the GnuPG +source distribution.