diff --git a/doc/ChangeLog b/doc/ChangeLog
index f4c1bb1f0..be20c5796 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-29  David Shaw  <dshaw@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@g10code.com>
 
 	* DETAILS: Fix description of IMPORT_RES.  Reported by Nicholas Cole.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 5ccb5413f..63cc7b64c 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1029,9 +1029,11 @@ give the opposite meaning.  The options are:
 @item show-photos
 @opindex list-options:show-photos
 Causes @option{--list-keys}, @option{--list-sigs},
-@option{--list-public-keys}, and @option{--list-secret-keys} to display
-any photo IDs attached to the key.  Defaults to no. See also
-@option{--photo-viewer}.
+@option{--list-public-keys}, and @option{--list-secret-keys} to
+display any photo IDs attached to the key.  Defaults to no. See also
+@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 @@ to safely override the algorithm chosen by the recipient key
 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}.