diff options
Diffstat (limited to '')
| -rw-r--r-- | doc/DETAILS | 10 | ||||
| -rw-r--r-- | doc/gpg.sgml | 21 |
2 files changed, 28 insertions, 3 deletions
diff --git a/doc/DETAILS b/doc/DETAILS index 84b42833b..6ff7cb656 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -85,8 +85,11 @@ more arguments in future versions. unique ids - others may yield duplicated ones when they have been created in the same second. - ENC_TO <long keyid> + ENC_TO <long keyid> <keytype> <keylength> The message is encrypted to this keyid. + keytype is the numerical value of the public key algorithm, + kenlength is the length of the key or 0 if it is not known + (which is currently always the case). NODATA <what> No data has been found. Codes for what are: @@ -122,8 +125,11 @@ more arguments in future versions. SHM_GET_BOOL SHM_GET_HIDDEN - NEED_PASSPHRASE <long keyid> + NEED_PASSPHRASE <long keyid> <keytype> <keylength> Issued whenever a passphrase is needed. + keytype is the numerical value of the public key algorithm + or 0 if this is not applicable, keylength is the length + of the key or 0 if it is not known (this is currently always the case). NEED_PASSPHRASE_SYM <cipher_algo> <s2k_mode> <s2k_hash> Issued whenever a passphrase for symmetric encryption is needed. diff --git a/doc/gpg.sgml b/doc/gpg.sgml index 82e069b56..21d74fc83 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -269,6 +269,12 @@ certificate should be generated.</para></listitem></varlistentry> Change the owner trust value. This updates the trust-db immediately and no save is required.</para></listitem></varlistentry> <varlistentry> + <term>disable</term> + <term>enable</term> + <listitem><para> +Disable or enable an entire key. A disabled key can normally not be used +for encryption.</para></listitem></varlistentry> + <varlistentry> <term>adduid</term> <listitem><para> Create an alternate user id.</para></listitem></varlistentry> @@ -537,7 +543,8 @@ in the options file and may be used together with an own user-id as an "encrypt-to-self". These keys are only used when there are other recipients given either by use of --recipient or by the asked user id. -No trust checking is performed for these user ids. +No trust checking is performed for these user ids and +even disabled keys can be used. </para></listitem></varlistentry> @@ -699,6 +706,18 @@ Valid values for &ParmName; are:</para> <varlistentry> +<term>--utf8-strings</term> +<term>--no-utf8-strings</term> +<listitem><para> +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 effects all following arguments. Both options may +used multiple times. +</para></listitem></varlistentry> + + +<varlistentry> <term>--options &ParmFile;</term> <listitem><para> Read options from &ParmFile; and do not try to read |