[svn] GnuPG - r4324 - trunk/doc

[svn author dshaw]

Author: dshaw
Date: 2006-11-06 04:22:13 +0100 (Mon, 06 Nov 2006)
New Revision: 4324

Modified:
   trunk/doc/ChangeLog
   trunk/doc/gpg.texi
Log:
* gpg.texi: Reference to --s2k-count in --s2k-mode.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2006-11-05 15:08:58 UTC (rev 4323)
+++ trunk/doc/ChangeLog	2006-11-06 03:22:13 UTC (rev 4324)
@@ -1,3 +1,7 @@
+2006-11-05  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.texi: Reference to --s2k-count in --s2k-mode.
+
 2006-10-30  Werner Koch  <wk at g10code.com>
 
 	* faq.raw: Minor corrections.

Modified: trunk/doc/gpg.texi
===================================================================
--- trunk/doc/gpg.texi	2006-11-05 15:08:58 UTC (rev 4323)
+++ trunk/doc/gpg.texi	2006-11-06 03:22:13 UTC (rev 4324)
@@ -1864,8 +1864,8 @@
 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