[svn] GnuPG - r4474 - trunk/doc

[svn author dshaw]

Author: dshaw
Date: 2007-04-15 07:01:22 +0200 (Sun, 15 Apr 2007)
New Revision: 4474

Modified:
   trunk/doc/ChangeLog
   trunk/doc/gpg.texi
Log:
* gpg.texi (OpenPGP Options): Update the personal-foo-preferences
documentation a bit.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2007-04-13 11:45:05 UTC (rev 4473)
+++ trunk/doc/ChangeLog	2007-04-15 05:01:22 UTC (rev 4474)
@@ -1,3 +1,8 @@
+2007-04-15  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.texi (OpenPGP Options): Update the personal-foo-preferences
+	documentation a bit.
+
 2007-04-10  Werner Koch  <wk at g10code.com>
 
 	* gpg.texi (GPG Configuration Options): Document --batch, no-tty,

Modified: trunk/doc/gpg.texi
===================================================================
--- trunk/doc/gpg.texi	2007-04-13 11:45:05 UTC (rev 4473)
+++ trunk/doc/gpg.texi	2007-04-15 05:01:22 UTC (rev 4474)
@@ -1,5 +1,5 @@
- at c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- at c               2006 Free Software Foundation, Inc.
+ at c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ at c               2007 Free Software Foundation, Inc.
 @c This is part of the GnuPG manual.
 @c For copying conditions, see the file gnupg.texi.
 
@@ -1866,32 +1866,32 @@
 message modification attack.
 
 @item --personal-cipher-preferences @code{string}
-Set the list of personal cipher preferences to @code{string}, this list
-should be a string similar to the one printed by the command "pref" in
-the edit menu. This allows the user to factor in their own preferred
-algorithms when algorithms are chosen via recipient key preferences.
-The most highly ranked cipher in this list is also used for the
- at option{--symmetric} encryption command.
+Set the list of personal cipher preferences to @code{string}.  Use
+ at command{@gpgname --version} to get a list of available algorithms,
+and use @code{none} to set no preference at all.  This allows the user
+to factor in their own preferred algorithms when algorithms are chosen
+via recipient key preferences.  The most highly ranked cipher in this
+list is also used for the @option{--symmetric} encryption command.
 
 @item --personal-digest-preferences @code{string}
-Set the list of personal digest preferences to @code{string}, this list
-should be a string similar to the one printed by the command "pref" in
-the edit menu. This allows the user to factor in their own preferred
-algorithms when algorithms are chosen via recipient key preferences.
-The most highly ranked digest algorithm in this list is algo used when
-signing without encryption (e.g. @option{--clearsign} or
- at option{--sign}). The default value is SHA-1.
+Set the list of personal digest preferences to @code{string}.  Use
+ at command{@gpgname --version} to get a list of available algorithms,
+and use @code{none} to set no preference at all.  This allows the user
+to factor in their own preferred algorithms when algorithms are chosen
+via recipient key preferences.  The most highly ranked digest
+algorithm in this list is algo used when signing without encryption
+(e.g. @option{--clearsign} or @option{--sign}). The default value is
+SHA-1.
 
 @item --personal-compress-preferences @code{string}
-Set the list of personal compression preferences to @code{string}, this
-list should be a string similar to the one printed by the command
-"pref" in the edit menu. This allows the user to factor in their own
-preferred algorithms when algorithms are chosen via recipient key
-preferences. The most highly ranked algorithm in this list is also
-used when there are no recipient keys to consider (e.g. @option{--symmetric}).
+Set the list of personal compression preferences to @code{string}.
+Use @command{@gpgname --version} to get a list of available
+algorithms, and use @code{none} to set no preference at all.  This
+allows the user to factor in their own preferred algorithms when
+algorithms are chosen via recipient key preferences.  The most highly
+ranked compression algorithm in this list is algo used when there are
+no recipient keys to consider (e.g. @option{--symmetric}).
 
-
-
 @item --s2k-cipher-algo @code{name}
 Use @code{name} as the cipher algorithm used to protect secret keys.
 The default cipher is CAST5. This cipher is also used for