diff options
| author | Werner Koch <[email protected]> | 2015-06-02 15:46:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-06-02 15:47:10 +0000 |
| commit | 0de9aedf3eb73608eb4d1197b80e8cae6a0736a6 (patch) | |
| tree | 90c62107544b726036a4d02aa44deb58d4b97a1d | |
| parent | gpg: Consider that gcry_mpi_get_opaque may return NULL. (diff) | |
| download | gnupg-0de9aedf3eb73608eb4d1197b80e8cae6a0736a6.tar.gz gnupg-0de9aedf3eb73608eb4d1197b80e8cae6a0736a6.zip | |
doc: Replace "conventional encryption" by "symmetric encryption".
--
Suggested-by: Daniel Kahn Gillmor <[email protected]>
| -rw-r--r-- | doc/DETAILS | 6 | ||||
| -rw-r--r-- | doc/gpg-agent.texi | 2 | ||||
| -rw-r--r-- | doc/gpg.texi | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/doc/DETAILS b/doc/DETAILS index 65974dd86..645814a4c 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -434,9 +434,9 @@ more arguments in future versions. 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 return an errorcode because it may not be possible to - verify a signature for some reasons. + for a symmetric with passphrase encrypted message was given. + The program itself may return an errorcode because it may not + be possible to verify a signature for some reasons. NO_PUBKEY <long keyid> NO_SECKEY <long keyid> diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi index b7b0d4ca1..9f2070465 100644 --- a/doc/gpg-agent.texi +++ b/doc/gpg-agent.texi @@ -1177,7 +1177,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 f5ffc04cf..28085628c 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2266,9 +2266,9 @@ 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 CAST5. This cipher is also used for -conventional encryption if @option{--personal-cipher-preferences} and -@option{--cipher-algo} is not given. +The default cipher is CAST5. 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 @@ -2281,7 +2281,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 |