diff options
Diffstat (limited to '')
| -rw-r--r-- | doc/DETAILS | 2 | ||||
| -rw-r--r-- | doc/gpg-agent.texi | 2 | ||||
| -rw-r--r-- | doc/gpg.texi | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/doc/DETAILS b/doc/DETAILS index fd72b8882..db01baa8e 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -463,7 +463,7 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB: *** DECRYPTION_OKAY The decryption process succeeded. This means, that either the correct secret key has been used or the correct passphrase for a - conventional encrypted message was given. The program itself may + symmetric encrypted message was given. The program itself may return an errorcode because it may not be possible to verify a signature for some reasons. diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi index dea462e0d..eb02c9c75 100644 --- a/doc/gpg-agent.texi +++ b/doc/gpg-agent.texi @@ -1273,7 +1273,7 @@ Replaced by a single @code{@@} @subsection Ask for a passphrase This function is usually used to ask for a passphrase to be used for -conventional encryption, but may also be used by programs which need +symmetric encryption, but may also be used by programs which need special handling of passphrases. This command uses a syntax which helps clients to use the agent with minimum effort. diff --git a/doc/gpg.texi b/doc/gpg.texi index 887a62458..0d855c9ea 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2291,9 +2291,10 @@ to consider (e.g. @option{--symmetric}). @item --s2k-cipher-algo @code{name} @opindex s2k-cipher-algo Use @code{name} as the cipher algorithm used to protect secret keys. -The default cipher is @value{DEFSYMENCALGO}. This cipher is also used for -conventional encryption if @option{--personal-cipher-preferences} and -@option{--cipher-algo} is not given. +The default cipher is @value{DEFSYMENCALGO}. This cipher is also used +for symmetric encryption with a passphrase if +@option{--personal-cipher-preferences} and @option{--cipher-algo} is +not given. @item --s2k-digest-algo @code{name} @opindex s2k-digest-algo @@ -2306,7 +2307,7 @@ Selects how passphrases are mangled. If @code{n} is 0 a plain passphrase (which is not recommended) will be used, a 1 adds a salt to the passphrase and a 3 (the default) iterates the whole process a number of times (see --s2k-count). Unless @option{--rfc1991} is used, -this mode is also used for conventional encryption. +this mode is also used for symmetric encryption with a passphrase. @item --s2k-count @code{n} @opindex s2k-count |