From 88439e2783d14d1e8d79cf6307692bf602d55ef7 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Mon, 6 Nov 2006 03:22:13 +0000 Subject: [PATCH] * gpg.texi: Reference to --s2k-count in --s2k-mode. --- doc/ChangeLog | 4 ++++ doc/gpg.texi | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 24399cd0c..8be4be931 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2006-11-05 David Shaw + + * gpg.texi: Reference to --s2k-count in --s2k-mode. + 2006-10-30 Werner Koch * faq.raw: Minor corrections. diff --git a/doc/gpg.texi b/doc/gpg.texi index cc5b070f3..04ba2ff06 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -1864,8 +1864,8 @@ The default algorithm is SHA-1. 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 -couple of times. Unless @option{--rfc1991} is used, this mode is also used for -conventional encryption. +number of times (see --s2k-count). Unless @option{--rfc1991} is used, +this mode is also used for conventional encryption. @item --s2k-count @code{n} Specify how many times the passphrase mangling is repeated. This