Fix sidebar documentation a bit. (closes #3859)

Sidebar_whitelist is a command, not a variable.  Also add a blurb about what it does.

Fix the sort order for $sidebar_divider_char and $sidebar_delim_chars.

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 4b7d37d866e3326f41b04d19b9399ca374fe18bc..46c152b7e80e39c5cc0aedbc9d89129121e43339 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -8207,11 +8207,6 @@ please have a look at the mixmaster documentation.
            <entry>boolean</entry>
            <entry><literal>no</literal></entry>
          </row>
-         <row>
-           <entry><literal>sidebar_whitelist</literal></entry>
-           <entry>list</entry>
-           <entry>(empty)</entry>
-         </row>
          <row>
            <entry><literal>sidebar_width</literal></entry>
            <entry>number</entry>
@@ -8297,6 +8292,13 @@ please have a look at the mixmaster documentation.
        <replaceable class="parameter">mailbox</replaceable>
       </arg>
     </cmdsynopsis>
+
+    <para>
+      This command specifies mailboxes that will always be displayed
+      in the sidebar, even if <link
+      linkend="sidebar-new-mail-only">$sidebar_new_mail_only</link>
+      is set and the mailbox does not contain new mail.
+    </para>
   </sect2>
 
   <sect2 id="sidebar-colors">

diff --git a/init.h b/init.h
index 3f3f96d9dd57e3d12e609bd9e3c01f8cc3fd7d93..3c4256c7822f1c92f8e4309dd0fe1802516fcfd8 100644 (file)
--- a/init.h
+++ b/init.h
@@ -2693,13 +2693,6 @@ struct option_t MuttVars[] = {
   ** shell from \fC/etc/passwd\fP is used.
   */
 #ifdef USE_SIDEBAR
-  { "sidebar_divider_char", DT_STR, R_SIDEBAR, UL &SidebarDividerChar, UL "|" },
-  /*
-  ** .pp
-  ** This specifies the characters to be drawn between the sidebar (when
-  ** visible) and the other Mutt panels. ASCII and Unicode line-drawing
-  ** characters are supported.
-  */
   { "sidebar_delim_chars", DT_STR, R_SIDEBAR, UL &SidebarDelimChars, UL "/." },
   /*
   ** .pp
@@ -2718,6 +2711,13 @@ struct option_t MuttVars[] = {
   ** .pp
   ** \fBSee also:\fP $$sidebar_short_path, $$sidebar_folder_indent, $$sidebar_indent_string.
   */
+  { "sidebar_divider_char", DT_STR, R_SIDEBAR, UL &SidebarDividerChar, UL "|" },
+  /*
+  ** .pp
+  ** This specifies the characters to be drawn between the sidebar (when
+  ** visible) and the other Mutt panels. ASCII and Unicode line-drawing
+  ** characters are supported.
+  */
   { "sidebar_folder_indent", DT_BOOL, R_SIDEBAR, OPTSIDEBARFOLDERINDENT, 0 },
   /*
   ** .pp