[svn] GnuPG - r4300 - trunk/doc

[svn author dshaw]

Author: dshaw
Date: 2006-10-13 06:09:56 +0200 (Fri, 13 Oct 2006)
New Revision: 4300

Modified:
   trunk/doc/ChangeLog
   trunk/doc/gpg.texi
Log:
* gpg.texi: Document --s2k-count.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2006-10-13 04:06:24 UTC (rev 4299)
+++ trunk/doc/ChangeLog	2006-10-13 04:09:56 UTC (rev 4300)
@@ -1,3 +1,7 @@
+2006-10-12  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.texi: Document --s2k-count.
+
 2006-09-25  Werner Koch  <wk at g10code.com>
 
 	* gpg.texi (GPG Examples): Add markup to all options.  This is

Modified: trunk/doc/gpg.texi
===================================================================
--- trunk/doc/gpg.texi	2006-10-13 04:06:24 UTC (rev 4299)
+++ trunk/doc/gpg.texi	2006-10-13 04:09:56 UTC (rev 4300)
@@ -1866,6 +1866,13 @@
 couple of times. Unless @option{--rfc1991} is used, this mode is also used for
 conventional encryption.
 
+ at item --s2k-count @code{n}
+Specify how many times the passphrase mangling is repeated.  This
+value may range between 1024 and 65011712 inclusive, and the default
+is 65536.  Note that not all values in the 1024-65011712 range are
+legal and if an illegal value is selected, GnuPG will round up to the
+nearest legal value.  This option is only meaningful if
+ at option{--s2k-mode} is 3.
 
 
 @end table