diff options
| author | David Shaw <[email protected]> | 2005-09-22 03:09:38 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-09-22 03:09:38 +0000 |
| commit | 8db0dc2f08e25423a83afdd76c7279668720307d (patch) | |
| tree | 130c8ac38b3a35a5181b96c652abb5021e979dd8 | |
| parent | * mainproc.c (proc_symkey_enc): Take care of a canceled passphrase (diff) | |
| download | gnupg-8db0dc2f08e25423a83afdd76c7279668720307d.tar.gz gnupg-8db0dc2f08e25423a83afdd76c7279668720307d.zip | |
* gpg.sgml: Note that --display-charset is just for display and
doesn't recode data. Note that --search-keys can use the standard
search syntax now (<, =, *, @). Document the @-address mode.
Diffstat (limited to '')
| -rw-r--r-- | doc/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/gpg.sgml | 26 |
2 files changed, 26 insertions, 6 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index a7036309f..8b39cd134 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2005-09-21 David Shaw <[email protected]> + + * gpg.sgml: Note that --display-charset is just for display and + doesn't recode data. Note that --search-keys can use the standard + search syntax now (<, =, *, @). Document the @-address mode. + 2005-08-23 David Shaw <[email protected]> * gpg.sgml: Fix documentation for setpref/updpref, document diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 62d635f02..ee8a3040f 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -749,6 +749,10 @@ keyservers set (see --keyserver-option honor-keyserver-url). Search the keyserver for the given names. Multiple names given here will be joined together to create the search string for the keyserver. Option --keyserver must be used to give the name of this keyserver. +Keyservers that support different search methods allow using the +syntax specified in "How to specify a user ID" below. Note that +different keyserver types support different search methods. Currently +only LDAP supports them all. </para></listitem></varlistentry> <varlistentry> @@ -1470,8 +1474,8 @@ the --edit-key command "clean uids" before export. Defaults to no. <listitem><para> When using the "--export-secret-subkeys" command, this option resets the passphrases for all exported subkeys to empty. This is useful -when the exported subkey is to be used on an unattended amchine where -a passphrase won't make sense. Defaults to no. +when the exported subkey is to be used on an unattended machine where +a passphrase doesn't necessarily make sense. Defaults to no. </para></listitem></varlistentry> </variablelist> @@ -1756,10 +1760,12 @@ found. <term>--display-charset &ParmName;</term> <listitem><para> 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 -chosen set. Valid values for &ParmName; are:</para> +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 +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 &ParmName; are:</para> <variablelist> <varlistentry> <term>iso-8859-1</term><listitem><para>This is the Latin 1 set.</para></listitem> @@ -2943,6 +2949,14 @@ indicates this email address mode. </para></listitem> </varlistentry> +<varlistentry> +<term>@heinrichh</term> +<listitem><para> +Match within the <email.address> part of a user ID. The at sign +indicates this email address mode. +</para></listitem> +</varlistentry> + <!-- we don't do this <varlistentry> <term>+Heinrich Heine duesseldorf</term> |