Add a warning note to --allow-multiple-messages.

s/Sylpeed-Claws/Claws-Mail/.

2 files changed, 10 insertions, 6 deletions

diff --git a/doc/faq.raw b/doc/faq.raw
index 4527760c8..ff872cb61 100644
--- a/doc/faq.raw
+++ b/doc/faq.raw
@@ -509,7 +509,7 @@ you could search in the mailing list archive.
        Mulberry          Y      Y      P
        Mutt              Y      Y      N
        Sylpheed          Y      Y      N
-       Sylpheed-claws    Y      Y      N
+       Claws-mail        Y      Y      N
        TkRat             Y      Y      N
        XEmacs/Gnus       Y      Y      T (Mailcrypt)
        XEmacs/Mew        Y      Y      N
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 56f441e63..1f59e4043 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2458,11 +2458,15 @@ This is an obsolete option and is not used anywhere.
 
 @item --allow-multiple-messages
 @item --no-allow-multiple-messages
-Allow processing of multiple OpenPGP messages contained in a single
-file or stream.  Some programs that call GPG are not prepared to deal
-with multiple messages being processed together, so this option
-defaults to no.  Note that versions of GPG prior to 1.4.7 always
-allowed multiple messages.
+Allow processing of multiple OpenPGP messages contained in a single file
+or stream.  Some programs that call GPG are not prepared to deal with
+multiple messages being processed together, so this option defaults to
+no.  Note that versions of GPG prior to 1.4.7 always allowed multiple
+messages.  
+
+Warning: Do not use this option unless you need it as a temporary
+workaround!
+
 
 @item --enable-special-filenames
 This options enables a mode in which filenames of the form