Install README.SECURITY in the doc directory, document

mailcap_sanitize.

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8aa7bc0f2510794862e05d6a443821df1ffe0abe..0a8d69b13cd06066c3631021bfbbec4b17bcf5ce 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -38,7 +38,7 @@ srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt  \
        manual.txt
 
 topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog   \
-       README NEWS TODO
+       README NEWS TODO README.SECURITY
 
 DOCFILES = manual.txt
 

diff --git a/doc/manual.sgml.in b/doc/manual.sgml.in
index 7ddcdb3f8e34a5488a6b775e242de1304332f13d..c26d597f5ad09fe731612de7575d136cddb72b88 100644 (file)
--- a/doc/manual.sgml.in
+++ b/doc/manual.sgml.in
@@ -3139,6 +3139,18 @@ Default: $MAILCAPS or ˜/.mailcap:/usr/local/share/mailcap:/etc/mail
 This variable specifies which files to consult when attempting to display
 MIME bodies not directly supported by Mutt.
 
+<sect2>mailcap&lowbar;sanitize<label id="mailcap_sanitize">
+<p>
+Type: boolean<newline>
+Default: set
+
+If set, mutt will restrict possible characters in mailcap % expandos
+to a well-defined set of safe characters.  This is the safe setting,
+but we are not sure it doesn't break some more advanced MIME stuff.
+
+<bf/DON'T CHANGE THIS SETTING UNLESS YOU ARE REALLY SURE WHAT YOU ARE
+DOING!/
+
 <sect2>mail&lowbar;check<label id="mail_check">
 <p>
 Type: number<newline>