[svn] GnuPG - r5476 - trunk/doc

[svn author dshaw]

Author: dshaw
Date: 2010-10-29 21:41:28 +0200 (Fri, 29 Oct 2010)
New Revision: 5476

Modified:
   trunk/doc/ChangeLog
   trunk/doc/gpg.texi
Log:
* gpg.texi (GPG Configuration Options): Clarify that show-photos
doesn't work with --with-colons.  --personal-digest-preferences does
not have a default any longer.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2010-10-29 19:16:27 UTC (rev 5475)
+++ trunk/doc/ChangeLog	2010-10-29 19:41:28 UTC (rev 5476)
@@ -1,3 +1,9 @@
+2010-10-29  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.texi (GPG Configuration Options): Clarify that show-photos
+	doesn't work with --with-colons.  --personal-digest-preferences
+	does not have a default any longer.
+
 2010-10-18  Werner Koch  <wk at g10code.com>
 
 	* DETAILS: Fix description of IMPORT_RES.  Reported by Nicholas Cole.

Modified: trunk/doc/gpg.texi
===================================================================
--- trunk/doc/gpg.texi	2010-10-29 19:16:27 UTC (rev 5475)
+++ trunk/doc/gpg.texi	2010-10-29 19:41:28 UTC (rev 5476)
@@ -1029,9 +1029,11 @@
 @item show-photos
 @opindex list-options:show-photos
 Causes @option{--list-keys}, @option{--list-sigs},
- at option{--list-public-keys}, and @option{--list-secret-keys} to display
-any photo IDs attached to the key.  Defaults to no. See also
- at option{--photo-viewer}.
+ at option{--list-public-keys}, and @option{--list-secret-keys} to
+display any photo IDs attached to the key.  Defaults to no. See also
+ at option{--photo-viewer}.  Does not work with @option{--with-colons}:
+see @option{--attribute-fd} for the appropriate way to get photo data
+for scripts and other frontends.
 
 @item show-policy-urls
 @opindex list-options:show-policy-urls
@@ -2042,8 +2044,7 @@
 preferences, as GPG will only select an algorithm that is usable by
 all recipients.  The most highly ranked digest algorithm in this list
 is also used when signing without encryption
-(e.g. @option{--clearsign} or @option{--sign}). The default value is
-SHA-1.
+(e.g. @option{--clearsign} or @option{--sign}).
 
 @item --personal-compress-preferences @code{string}
 Set the list of personal compression preferences to @code{string}.