From a0885928589dbdbe8a83d599ed48ad88120e4df7 Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <kevin@8t8.us>
Date: Wed, 22 Feb 2017 12:50:02 -0800
Subject: [PATCH] Minor touchups to documentation and UPDATING file.

---
 UPDATING            | 3 ++-
 doc/manual.xml.head | 2 ++
 init.h              | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/UPDATING b/UPDATING
index b09925a7..ac3000b7 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,7 +31,8 @@ The keys used are:
     $XDG_CONFIG_HOME/mutt/.
   + Compressed mbox and mmdf files are now supported via open-hook,
     close-hook, and append-hook.  See contrib/sample.muttrc-compress
-    for suggested settings.
+    for suggested settings.  Note this is a compile-time option:
+    --enable-compressed.
   + When $flag_safe is set, flagged messages cannot be deleted.
   + The '@' pattern modifier can be used to limit matches to known aliases.
   + <mark-message> creates a hotkey binding to a specific message.  The hotkey
diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index acece30e..18a5a0dc 100644
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -8440,12 +8440,14 @@ please have a look at the mixmaster documentation.
       </arg>
 
       <command>unsidebar_whitelist<anchor id="unsidebar-whitelist"/></command>
+      <group choice="req">
       <arg choice="plain">
 	<replaceable class="parameter">*</replaceable>
       </arg>
       <arg choice="plain" rep="repeat">
 	<replaceable class="parameter">mailbox</replaceable>
       </arg>
+      </group>
     </cmdsynopsis>
 
     <para>
diff --git a/init.h b/init.h
index cd6f7154..2844ccec 100644
--- a/init.h
+++ b/init.h
@@ -224,9 +224,9 @@ struct option_t MuttVars[] = {
   ** .dt %C  .dd charset
   ** .dt %c  .dd requires charset conversion (``n'' or ``c'')
   ** .dt %D  .dd deleted flag
-  ** .dt %d  .dd description
+  ** .dt %d  .dd description (if none, falls back to %F)
   ** .dt %e  .dd MIME content-transfer-encoding
-  ** .dt %F  .dd filename for content-disposition header
+  ** .dt %F  .dd filename in content-disposition header (if none, falls back to %f)
   ** .dt %f  .dd filename
   ** .dt %I  .dd disposition (``I'' for inline, ``A'' for attachment)
   ** .dt %m  .dd major MIME type
-- 
2.40.0