Rocco Rutte:

- fix some indexing and content issues for vardef
- try to find better names for tables given _before_ reference chapter
- move sidebar function table out to reference chapter
- kill <screen/> cr*p for functions in reference chapter, use tables instead
- fix appendices

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@514 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/VERSION.svn b/VERSION.svn
index 31cf34b..a087962 100644 (file)
--- a/VERSION.svn
+++ b/VERSION.svn
@@ -1 +1 @@
-513
+514

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 83168b4..a0da42b 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -141,7 +141,7 @@ clean:
        rm -f *.aux *.log *.tex *.out
 
 clean-real:
        rm -f *.aux *.log *.tex *.out
 
 clean-real:

-       rm -f manual.txt manual.html manual.xml manual.pdf
+       rm -f manual.txt manual.html manual.xml manual-pre.xml manual.pdf

        rm -rf html
 
 maintainer-clean: clean clean-real distclean
        rm -rf html
 
 maintainer-clean: clean clean-real distclean

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index 021d40d..e41494c 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -691,7 +691,7 @@
     <para>
 
       <table>
     <para>
 
       <table>

-        <title>Default Menu Movement Keys</title>
+        <title>Most commonly used movement bindings</title>

         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>


@@ -769,7 +769,7 @@
     <para>
 
       <table>
     <para>
 
       <table>

-        <title>Built-In Editor Functions</title>
+        <title>Line Editor Functions</title>

         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>


@@ -906,10 +906,6 @@
       <literal>bind editor &lt;delete&gt; backspace</literal>
     </para>
     
       <literal>bind editor &lt;delete&gt; backspace</literal>
     </para>
     

-    <para>
-      
-    </para>
-    

   </sect1>
     <!--}}}-->
   
   </sect1>
     <!--}}}-->
   


@@ -935,7 +931,7 @@
       <para>
 
       <table>
       <para>
 
       <table>

-        <title>Default Index Menu Bindings</title>
+        <title>Most commonly used Index Bindings</title>

         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>


@@ -1294,7 +1290,7 @@
       <para>
 
       <table>
       <para>
 
       <table>

-        <title>Default Pager Menu Bindings</title>
+        <title>Most commonly used Pager Bindings</title>

         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>


@@ -1521,7 +1517,7 @@
         <para>
 
         <table>
         <para>
 
         <table>

-          <title>Default Thread Function Bindings</title>
+          <title>Most commonly used thread-related bindings</title>

           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
             <row>


@@ -1643,9 +1639,7 @@
           command is added to the file specified by the <muttng-doc:varref name="alias_file" link="alias-file"/>
           variable for future use. <emphasis role="bold">Note:</emphasis>
           Specifying an <muttng-doc:varref name="alias_file" link="alias-file"/>
           command is added to the file specified by the <muttng-doc:varref name="alias_file" link="alias-file"/>
           variable for future use. <emphasis role="bold">Note:</emphasis>
           Specifying an <muttng-doc:varref name="alias_file" link="alias-file"/>

-          does not add the aliases specified there-in, you must also <link linkend="source">
-            source
-          </link>
+          does not add the aliases specified there-in, you must also <link linkend="source">source</link>

           the file.
         </para>
         
           the file.
         </para>
         


@@ -1668,9 +1662,7 @@
         </para>
         
         <para>
         </para>
         
         <para>

-          Toggles the weeding of message header fields specified by <link linkend="ignore">
-            ignore
-          </link>
+          Toggles the weeding of message header fields specified by <link linkend="ignore">ignore</link>

           commands.
         </para>
         
           commands.
         </para>
         


@@ -1703,9 +1695,7 @@
         </para>
         
         <para>
         </para>
         
         <para>

-          Note that this command is also available on the <link linkend="compose-menu">
-            compose-menu
-          </link>
+          Note that this command is also available on the <link linkend="compose-menu">compose-menu</link>

           .There, it's used to
           fine-tune the properties of attachments you are going to send.
         </para>
           .There, it's used to
           fine-tune the properties of attachments you are going to send.
         </para>


@@ -1749,9 +1739,7 @@
         <para>
           Reply to the current or tagged message(s) by extracting any addresses
           which
         <para>
           Reply to the current or tagged message(s) by extracting any addresses
           which

-          match the regular expressions given by the <link linkend="lists">
-            lists
-          </link>
+          match the regular expressions given by the <link linkend="lists">lists</link>

           commands, but also honor any <literal>Mail-Followup-To</literal>
           header(s) if the
           <muttng-doc:varref name="honor_followup_to" link="honor-followup-to"/>
           commands, but also honor any <literal>Mail-Followup-To</literal>
           header(s) if the
           <muttng-doc:varref name="honor_followup_to" link="honor-followup-to"/>


@@ -1858,7 +1846,7 @@
       <para>
 
         <table>
       <para>
 
         <table>

-          <title>Default Mail Composition Bindings</title>
+          <title>Most commonly used Mail Composition Bindings</title>

           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
             <row>


@@ -1913,10 +1901,7 @@
         Bouncing a message sends the message as is to the recipient you
         specify.  Forwarding a message allows you to add comments or
         modify the message you are forwarding.  These items are discussed
         Bouncing a message sends the message as is to the recipient you
         specify.  Forwarding a message allows you to add comments or
         modify the message you are forwarding.  These items are discussed

-        in greater detail in the next chapter <link linkend="forwarding-mail">
-          forwarding-mail
-        </link>
-        .
+        in greater detail in the next chapter <link linkend="forwarding-mail">forwarding-mail</link>.

       </para>
       
       <sect2 id="sending-compose">
       </para>
       
       <sect2 id="sending-compose">


@@ -2028,7 +2013,7 @@ set edit_headers</screen>
         <para>
 
         <table>
         <para>
 
         <table>

-          <title>Default Compose Menu Bindings</title>
+          <title>Most commonly used Compose Menu Bindings</title>

           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
             <row>


@@ -2741,10 +2726,7 @@ a horrible death.
       <title>Basic Syntax of Initialization Files</title>
       
       <para>
       <title>Basic Syntax of Initialization Files</title>
       
       <para>

-        An initialization file consists of a series of <link linkend="commands">
-          commands
-        </link>
-        .Each line of the file may contain one or more commands.
+        An initialization file consists of a series of <link linkend="commands">commands</link>. Each line of the file may contain one or more commands.

         When multiple commands are used, they must be separated by a semicolon
         (;).
         
         When multiple commands are used, they must be separated by a semicolon
         (;).
         


@@ -3292,10 +3274,8 @@ alias theguys manny, moe, jack</screen>
         Unlike other mailers, Mutt-ng doesn't require aliases to be defined
         in a special file.  The <literal>alias</literal> command can appear
         anywhere in
         Unlike other mailers, Mutt-ng doesn't require aliases to be defined
         in a special file.  The <literal>alias</literal> command can appear
         anywhere in

-        a configuration file, as long as this file is <link linkend="source">
-          source
-        </link>
-        .Consequently, you can have multiple alias files, or
+        a configuration file, as long as this file is <link linkend="source">source</link>.
+        Consequently, you can have multiple alias files, or

         you can have all aliases defined in your muttrc.
       </para>
       
         you can have all aliases defined in your muttrc.
       </para>
       


@@ -3308,9 +3288,7 @@ alias theguys manny, moe, jack</screen>
         special either,
         in the sense that Mutt-ng will happily append aliases to any file, but
         in
         special either,
         in the sense that Mutt-ng will happily append aliases to any file, but
         in

-        order for the new aliases to take effect you need to explicitly <link linkend="source">
-          source
-        </link>
+        order for the new aliases to take effect you need to explicitly <link linkend="source">source</link>

         this file too.
       </para>
       
         this file too.
       </para>
       


@@ -3641,10 +3619,8 @@ Usage: <literal>bind</literal> <emphasis>map</emphasis> <emphasis>key</emphasis>
           key
         </emphasis>
         is pressed.
           key
         </emphasis>
         is pressed.

-        For a complete list of functions, see the <link linkend="functions">
-          functions
-        </link>
-        .The special function <literal>noop</literal> unbinds the specified key
+        For a complete list of functions, see the <link linkend="functions">functions</link>. 
+        The special function <literal>noop</literal> unbinds the specified key

         sequence.
       </para>
       
         sequence.
       </para>
       


@@ -4517,14 +4493,11 @@ Usage: <literal>[un]subscribe</literal> <emphasis>regexp</emphasis> [<emphasis>r
       </para>
       
       <para>
       </para>
       
       <para>

-        Mutt-ng has a few nice features for <link linkend="using-lists">
-          using-lists
-        </link>
-        .In order to take advantage of them, you must
+        Mutt-ng has a few nice features for <link linkend="using-lists">using-lists</link>. 
+        In order to take advantage of them, you must

         specify which addresses belong to mailing lists, and which mailing
         specify which addresses belong to mailing lists, and which mailing

-        lists you are subscribed to.  Once you have done this, the <link linkend="func-list-reply">
-          list-reply
-        </link>
+        lists you are subscribed to.  Once you have done this, the
+        <link linkend="func-list-reply">list-reply</link>

         function will work for all known lists.
         Additionally, when you send a message to a subscribed list, mutt will
         add a Mail-Followup-To header to tell other users' mail user agents
         function will work for all known lists.
         Additionally, when you send a message to a subscribed list, mutt will
         add a Mail-Followup-To header to tell other users' mail user agents


@@ -4676,9 +4649,7 @@ Usage: <literal>[un]mailboxes</literal> [!]<emphasis>filename</emphasis> [<empha
           mailboxes
         </literal>
         command are resolved when
           mailboxes
         </literal>
         command are resolved when

-        the command is executed, so if these names contain <link linkend="shortcuts">
-          shortcuts
-        </link>
+        the command is executed, so if these names contain <link linkend="shortcuts">shortcuts</link>

         (such as ``='' and ``!''), any variable
         definition that affect these characters (like <muttng-doc:varref name="folder"/>
         and <muttng-doc:varref name="spoolfile"/>)
         (such as ``='' and ``!''), any variable
         definition that affect these characters (like <muttng-doc:varref name="folder"/>
         and <muttng-doc:varref name="spoolfile"/>)


@@ -5081,8 +5052,7 @@ Usage: <literal>push</literal> <emphasis>string</emphasis>
 
         This command adds the named string to the keyboard buffer. The
         string may contain control characters, key names and function
 
         This command adds the named string to the keyboard buffer. The
         string may contain control characters, key names and function

-        names like the sequence string in the <link
-          linkend="macro">macro</link> command. You may use it to
+        names like the sequence string in the <link linkend="macro">macro</link> command. You may use it to

         automatically run a sequence of commands at startup, or when
         entering certain folders. For example, the following command
         will automatically collapse all threads when entering a folder:
         automatically run a sequence of commands at startup, or when
         entering certain folders. For example, the following command
         will automatically collapse all threads when entering a folder:


@@ -5445,10 +5415,8 @@ Usage: <literal>reset</literal> <emphasis>variable</emphasis> [<emphasis>variabl
       </para>
       
       <para>
       </para>
       
       <para>

-        This command is used to set (and unset) <link linkend="variables">
-          variables
-        </link>
-        .There are four basic types of variables:
+        This command is used to set (and unset) <link linkend="variables">variables</link>. 
+        There are four basic types of variables:

         boolean, number, string and quadoption.  <emphasis>boolean</emphasis>
         variables can be
         <emphasis>set</emphasis> (true) or <emphasis>unset</emphasis> (false). 
         boolean, number, string and quadoption.  <emphasis>boolean</emphasis>
         variables can be
         <emphasis>set</emphasis> (true) or <emphasis>unset</emphasis> (false). 


@@ -7062,56 +7030,6 @@ color sidebar white black</screen>
         
       </para>
       
         
       </para>
       

-      <para>
-        The available functions are:
-
-        <table>
-          <title>Default Sidebar Function Bindings</title>
-          <tgroup cols="3" align="left" colsep="1" rowsep="1">
-          <thead>
-            <row>
-              <entry>Key</entry>
-              <entry>Function</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-scroll-up"/></entry>
-              <entry>Scrolls the mailbox list up 1 page</entry>
-            </row>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-scroll-down"/></entry>
-              <entry>Scrolls the mailbox list down 1 page</entry>
-            </row>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-next"/></entry>
-              <entry>Highlights the next mailbox</entry>
-            </row>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-next-new"/></entry>
-              <entry>Highlights the next mailbox with new mail</entry>
-            </row>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-previous"/></entry>
-              <entry>Highlights the previous mailbox</entry>
-            </row>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-open"/></entry>
-              <entry>Opens the currently highlighted mailbox</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-
-      </para>
-      

       <para>
         Reasonable key bindings look e.g. like this:
         
       <para>
         Reasonable key bindings look e.g. like this:
         


@@ -7387,9 +7305,8 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         through which you received a message (i.e., of a subscribed list) in
         the <emphasis>index</emphasis> menu display.  This is useful to
         distinguish between
         through which you received a message (i.e., of a subscribed list) in
         the <emphasis>index</emphasis> menu display.  This is useful to
         distinguish between

-        personal and list mail in the same mailbox.  In the <link linkend="index-format">
-          index-format
-        </link>
+        personal and list mail in the same mailbox.  In the
+        <muttng-doc:varref name="index_format" link="index-format"/>

         variable, the escape ``%L''
         will return the string ``To &lt;list&gt;'' when ``list'' appears in the
         ``To'' field, and ``Cc &lt;list&gt;'' when it appears in the ``Cc''
         variable, the escape ``%L''
         will return the string ``To &lt;list&gt;'' when ``list'' appears in the
         ``To'' field, and ``Cc &lt;list&gt;'' when it appears in the ``Cc''


@@ -7412,9 +7329,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         Mutt-ng also supports the <literal>Mail-Followup-To</literal> header. 
         When you send
         a message to a list of recipients which includes one or several
         Mutt-ng also supports the <literal>Mail-Followup-To</literal> header. 
         When you send
         a message to a list of recipients which includes one or several

-        subscribed mailing lists, and if the <link linkend="followup-to">
-          followup-to
-        </link>
+        subscribed mailing lists, and if the <muttng-doc:varref name="followup_to" link="followup-to"/>

         option is set, mutt will generate
         a Mail-Followup-To header which contains all the recipients to whom
         you send this message, but not your address. This indicates that
         option is set, mutt will generate
         a Mail-Followup-To header which contains all the recipients to whom
         you send this message, but not your address. This indicates that


@@ -7681,9 +7596,8 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
       
       <para>
         Another way to access your POP3 mail is the <emphasis>fetch-mail</emphasis> function
       
       <para>
         Another way to access your POP3 mail is the <emphasis>fetch-mail</emphasis> function

-        (default: G).  It allows to connect to <link linkend="pop-host">
-          pop-host
-        </link>
+        (default: G).  It allows to connect to <link
+          linkend="pop-host">pop-host</link>

         ,fetch all your new mail and place it in the
         local <muttng-doc:varref name="spoolfile" link="spoolfile"/>.  After this
         point, Mutt-ng runs exactly as if the mail had always been local.
         ,fetch all your new mail and place it in the
         local <muttng-doc:varref name="spoolfile" link="spoolfile"/>.  After this
         point, Mutt-ng runs exactly as if the mail had always been local.


@@ -8052,28 +7966,20 @@ score !<muttng-doc:pattern name="*"/> =42</screen>
         <literal>--with-libesmtp</literal> or the output <literal>muttng -v</literal> contains
         <literal>+USE_LIBESMTP</literal>, this will be or is the case
         already. The SMTP
         <literal>--with-libesmtp</literal> or the output <literal>muttng -v</literal> contains
         <literal>+USE_LIBESMTP</literal>, this will be or is the case
         already. The SMTP

-        support includes support for Delivery Status Notification (see <link linkend="dsn">
-          dsn
-        </link>
-        section) as well as
-        handling the <literal>8BITMIME</literal> flag controlled via <link linkend="use-8bitmime">
-          use-8bitmime
-        </link>
-        .
+        support includes support for Delivery Status Notification
+        (see <link linkend="dsn">dsn</link> section) as well as
+        handling the <literal>8BITMIME</literal> flag controlled via
+        <muttng-doc:varref name="use_8bitmime" link="use-8bitmime"/>.

       </para>
       
       <para>
         To enable sending mail directly via SMTP without an MTA such as
       </para>
       
       <para>
         To enable sending mail directly via SMTP without an MTA such as

-        Postfix or SSMTP and the like, simply set the <link linkend="smtp-host">
-          smtp-host
-        </link>
+        Postfix or SSMTP and the like, simply set the <muttng-doc:varref name="smtp_host" link="smtp-host"/>

         variable pointing to your SMTP server.
       </para>
       
       <para>
         variable pointing to your SMTP server.
       </para>
       
       <para>

-        Authentication mechanisms are available via the <link linkend="smtp-user">
-          smtp-user
-        </link>
+        Authentication mechanisms are available via the <muttng-doc:varref name="smtp_user" link="smtp-user"/>

         and <muttng-doc:varref name="smtp_pass" link="smtp-pass"/> variables.
       </para>
       
         and <muttng-doc:varref name="smtp_pass" link="smtp-pass"/> variables.
       </para>
       


@@ -8219,9 +8125,8 @@ append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </screen>
         supposes it is not compressed. This is important because it allows the
         use of programs that do not have well defined extensions. Just use
         &quot;.&quot; as a regexp. But this may be surprising if your
         supposes it is not compressed. This is important because it allows the
         use of programs that do not have well defined extensions. Just use
         &quot;.&quot; as a regexp. But this may be surprising if your

-        compressing script produces empty files. In this situation, unset <link linkend="save-empty">
-          save-empty
-        </link>
+        compressing script produces empty files. In this situation, unset
+        <muttng-doc:varref name="save_empty" link="save-empty"/>

         ,so that the compressed file
         will be removed if you delete all of the messages.
       </para>
         ,so that the compressed file
         will be removed if you delete all of the messages.
       </para>


@@ -8382,9 +8287,7 @@ append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </screen>
           When <muttng-doc:hook name="append"/> is used, the
           folder is
           not opened, which saves time, but this means that we can not find out
           When <muttng-doc:hook name="append"/> is used, the
           folder is
           not opened, which saves time, but this means that we can not find out

-          what the folder type is. Thus the default (<link linkend="mbox-type">
-            mbox-type
-          </link>
+          what the folder type is. Thus the default (<muttng-doc:varref name="mbox_type" link="mbox-type"/>

           )type is always supposed (i.e.
           this is the format used for the temporary folder).
         </para>
           )type is always supposed (i.e.
           this is the format used for the temporary folder).
         </para>


@@ -8817,9 +8720,7 @@ text/*; more</screen>
           parameters
           in expansion of %s syntaxes properly, and avoids risky
           characters by
           parameters
           in expansion of %s syntaxes properly, and avoids risky
           characters by

-          substituting them, see the <link linkend="mailcap-sanitize">
-            mailcap-sanitize
-          </link>
+          substituting them, see the <muttng-doc:varref name="mailcap_sanitize" link="mailcap-sanitize"/>

           variable.
         </para>
         
           variable.
         </para>
         


@@ -8907,10 +8808,8 @@ text/html; lynx -dump %s ; copiousoutput</screen>
                 <term>needsterminal</term>
                 <listitem>
                   <para>
                 <term>needsterminal</term>
                 <listitem>
                   <para>

-                    Mutt-ng uses this flag when viewing attachments with <link linkend="auto-view">
-                      auto-view
-                    </link>
-                    ,in order to decide whether it should honor the setting
+                    Mutt-ng uses this flag when viewing attachments with <link linkend="auto-view">auto-view</link>,
+                    in order to decide whether it should honor the setting

                     of the <muttng-doc:varref name="wait_key" link="wait-key"/> variable or
                     not.  When an attachment is viewed using an interactive
                     program, and the
                     of the <muttng-doc:varref name="wait_key" link="wait-key"/> variable or
                     not.  When an attachment is viewed using an interactive
                     program, and the


@@ -9063,9 +8962,7 @@ nametemplate=%s.gif</screen>
           </para>
           
           <para>
           </para>
           
           <para>

-            In addition, you can use this with <link linkend="auto-view">
-              auto-view
-            </link>
+            In addition, you can use this with <link linkend="auto-view">auto-view</link>

             to denote two commands for viewing an attachment, one to be viewed
             automatically, the other to be viewed interactively from the
             attachment
             to denote two commands for viewing an attachment, one to be viewed
             automatically, the other to be viewed interactively from the
             attachment


@@ -9494,9 +9391,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
         </para>
         
         <para>
         </para>
         
         <para>

-          When <emphasis>unsetting</emphasis> the <link linkend="strict-mailto">
-            strict-mailto
-          </link>
+          When <emphasis>unsetting</emphasis> the <muttng-doc:varref name="strict_mailto" link="strict-mailto"/>

           variable, mutt-ng will
         </para>
         
           variable, mutt-ng will
         </para>
         


@@ -9649,7 +9544,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       <para>
         
         <table>
       <para>
         
         <table>

-          <title>Mutt-NG Command Line Options</title>
+          <title>Reference: Command Line Options</title>

           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
             <row>


@@ -9817,7 +9712,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       <para>
 
         <table id="tab-patterns">
       <para>
 
         <table id="tab-patterns">

-          <title>Patterns</title>
+          <title>Reference: Patterns</title>

           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
             <row>


@@ -10066,18 +9961,11 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       </para>
       
       <para>
       </para>
       
       <para>

-        *) The forms <literal>&lt;]MAX[</literal>, <literal>
-          &gt;]MIN[
-        </literal>
-        ,
-        <literal>]MIN[-</literal> and <literal>-]MAX[</literal>
+        *) The forms <literal>&lt;[MAX]</literal>, <literal>&gt;[MIN]</literal>,
+        <literal>[MIN]-</literal> and <literal>-[MAX]</literal>

         are allowed, too.
       </para>
       
         are allowed, too.
       </para>
       

-      <para>
-        
-      </para>
-      

     </sect1>
     
     <sect1 id="commands">
     </sect1>
     
     <sect1 id="commands">


@@ -10631,7 +10519,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
         <anchor id="sect-obsolete"/>
 
         <table>
         <anchor id="sect-obsolete"/>
 
         <table>

-          <title>Obsolete Variables</title>
+          <title>Reference: Obsolete Variables</title>

           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
             <row>


@@ -10690,7 +10578,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
               </row>
             <row>
               <entry><literal>pgp_replysignencrypted</literal></entry>
               </row>
             <row>
               <entry><literal>pgp_replysignencrypted</literal></entry>

-              <entry><muttng-doc:varref name="crypt-replysignencrypted" link="crypt-replysignencrypted"/></entry>
+              <entry><muttng-doc:varref name="crypt_replysignencrypted" link="crypt-replysignencrypted"/></entry>

               </row>
             <row>
               <entry><literal>pgp_verify_sig</literal></entry>
               </row>
             <row>
               <entry><literal>pgp_verify_sig</literal></entry>


@@ -10722,7 +10610,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
               </row>
             <row>
               <entry><literal>shorten_hierarchy</literal></entry>
               </row>
             <row>
               <entry><literal>shorten_hierarchy</literal></entry>

-              <entry><muttng-doc:varref name="sidebar-shorten-hierarchy" link="sidebar-shorten-hierarchy"/></entry>
+              <entry><muttng-doc:varref name="sidebar_shorten_hierarchy" link="sidebar-shorten-hierarchy"/></entry>

               </row>
             <row>
               <entry><literal>ask_followup_to</literal></entry>
               </row>
             <row>
               <entry><literal>ask_followup_to</literal></entry>

diff --git a/doc/manual.xml.tail b/doc/manual.xml.tail
index ebc29da..63af51d 100644 (file)
--- a/doc/manual.xml.tail
+++ b/doc/manual.xml.tail
@@ -28,42 +28,176 @@
         
         <para>
           
         
         <para>
           

-          <screen>
-            bottom-page                L   move to the bottom of the page
-            current-bottom     not bound   move current entry to bottom of page
-            current-middle     not bound   move current entry to middle of page
-            current-top        not bound   move current entry to top of page
-            enter-command              :   enter a muttngrc command
-            exit                       q   exit this menu
-            first-entry                =   move to the first entry
-            half-down                  ]   scroll down 1/2 page
-            half-up                    [   scroll up 1/2 page
-            help                       ?   this screen
-            jump                  number   jump to an index number
-            last-entry                 *   move to the last entry
-            middle-page                M   move to the middle of the page
-            next-entry                 j   move to the next entry
-            next-line                  &gt;   scroll down one line
-            next-page                  z   move to the next page
-            previous-entry             k   move to the previous entry
-            previous-line              &lt;   scroll up one line
-            previous-page              Z   move to the previous page
-            refresh                   ^L   clear and redraw the screen
-            search                     /   search for a regular expression
-            search-next                n   search for next match
-            search-opposite    not bound   search for next match in opposite
-            direction
-            search-reverse         ESC /   search backwards for a regular
-            expression
-            select-entry             RET   select the current entry
-            shell-escape               !   run a program in a subshell
-            tag-entry                  t   toggle the tag on the current entry
-            tag-prefix                 ;   apply next command to tagged entries
-            tag-prefix-cond    not bound   apply next function ONLY to tagged
-            messages
-            top-page                   H   move to the top of the page
-            what-key           not bound   display the keycode for a key press
-          </screen>
+        <table>
+          <title>Reference: Default Generic Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Function</entry>
+              <entry>Default Key</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><muttng-doc:funcref name="bottom-page"/></entry>
+              <entry><literal>L</literal></entry>
+              <entry>move to the bottom of the page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="current-bottom"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>move current entry to bottom of page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="current-middle"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>move current entry to middle of page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="current-top"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>move current entry to top of page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="enter-command"/></entry>
+              <entry><literal>:</literal></entry>
+              <entry>enter a muttngrc command</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="exit"/></entry>
+              <entry><literal>q</literal></entry>
+              <entry>exit this menu</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="first-entry"/></entry>
+              <entry><literal>=</literal></entry>
+              <entry>move to the first entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="half-down"/></entry>
+              <entry><literal>]</literal></entry>
+              <entry>scroll down 1/2 page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="half-up"/></entry>
+              <entry><literal>[</literal></entry>
+              <entry>scroll up 1/2 page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="help"/></entry>
+              <entry><literal>?</literal></entry>
+              <entry>this screen</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="jump"/></entry>
+              <entry><literal>number</literal></entry>
+              <entry>jump to an index number</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="last-entry"/></entry>
+              <entry><literal>*</literal></entry>
+              <entry>move to the last entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="middle-page"/></entry>
+              <entry><literal>M</literal></entry>
+              <entry>move to the middle of the page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-entry"/></entry>
+              <entry><literal>j</literal></entry>
+              <entry>move to the next entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-line"/></entry>
+              <entry><literal>&gt;</literal></entry>
+              <entry>scroll down one line</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-page"/></entry>
+              <entry><literal>z</literal></entry>
+              <entry>move to the next page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-entry"/></entry>
+              <entry><literal>k</literal></entry>
+              <entry>move to the previous entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-line"/></entry>
+              <entry><literal>&lt;</literal></entry>
+              <entry>scroll up one line</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-page"/></entry>
+              <entry><literal>Z</literal></entry>
+              <entry>move to the previous page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="refresh"/></entry>
+              <entry><literal>^L</literal></entry>
+              <entry>clear and redraw the screen</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search"/></entry>
+              <entry><literal>/</literal></entry>
+              <entry>search for a regular expression</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-next"/></entry>
+              <entry><literal>n</literal></entry>
+              <entry>search for next match</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-opposite"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>search for next match in opposite direction</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-reverse"/></entry>
+              <entry><literal>ESC /</literal></entry>
+              <entry>search backwards for a regular expression</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="select-entry"/></entry>
+              <entry><literal>RET</literal></entry>
+              <entry>select the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="shell-escape"/></entry>
+              <entry><literal>!</literal></entry>
+              <entry>run a program in a subshell</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="tag-entry"/></entry>
+              <entry><literal>t</literal></entry>
+              <entry>toggle the tag on the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="tag-prefix"/></entry>
+              <entry><literal>;</literal></entry>
+              <entry>apply next command to tagged entries</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="tag-prefix-cond"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>apply next function ONLY to tagged messages</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="top-page"/></entry>
+              <entry><literal>H</literal></entry>
+              <entry>move to the top of the page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="what-key"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>display the keycode for a key press</entry>
+            </row>
+                  </tbody>
+      </tgroup>
+    </table>
+

           
         </para>
         
           
         </para>
         


@@ -74,91 +208,366 @@
         
         <para>
           
         
         <para>
           

-          <screen>
-            bounce-message             b   remail a message to another user
-            change-folder              c   open a different folder
-            change-folder-readonly ESC c   open a different folder in read only
-            mode
-            check-traditional-pgp  ESC P   check for classic pgp
-            clear-flag                 W   clear a status flag from a message
-            copy-message               C   copy a message to a file/mailbox
-            create-alias               a   create an alias from a message
-            senderdecode-copy            ESC C   decode a message and copy it
-            to a file/mailbox
-            decode-save            ESC s   decode a message and save it to a
-            file/mailbox
-            delete-message             d   delete the current entry
-            delete-pattern             D   delete messages matching a pattern
-            delete-subthread       ESC d   delete all messages in subthread
-            delete-thread             ^D   delete all messages in thread
-            display-address            @   display full address of sender
-            display-toggle-weed        h   display message and toggle header
-            weeding
-            display-message          RET   display a message
-            edit                       e   edit the current message
-            edit-type                 ^E   edit the current message's
-            Content-Type
-            exit                       x   exit without saving changes
-            extract-keys              ^K   extract PGP public keys
-            fetch-mail                 G   retrieve mail from POP server
-            flag-message               F   toggle a message's 'important' flag
-            forget-passphrase         ^F   wipe PGP passphrase from memory
-            forward-message            f   forward a message with comments
-            group-reply                g   reply to all recipients
-            limit                      l   show only messages matching a
-            patternlist-reply                 L   reply to specified mailing
-            list
-            mail                       m   compose a new mail message
-            mail-key               ESC k   mail a PGP public key
-            next-new           not bound   jump to the next new message
-            next-new-then-unread     TAB   jump to the next new or unread message
-            next-subthread         ESC n   jump to the next subthread
-            next-thread               ^N   jump to the next thread
-            next-undeleted             j   move to the next undeleted message
-            next-unread        not bound   jump to the next unread message
-            parent-message             P   jump to parent message in thread
-            pipe-message               |   pipe message/attachment to a shell
-            command
-            previous-new       not bound   jump to the previous new message
-            previous-new-then-unread
-                                 ESC TAB   jump to the previous new or unread message
+        <table>
+          <title>Reference: Default Index Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Function</entry>
+              <entry>Default Key</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><muttng-doc:funcref name="bounce-message"/></entry>
+              <entry><literal>b</literal></entry>
+              <entry>remail a message to another user</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="change-folder"/></entry>
+              <entry><literal>c</literal></entry>
+              <entry>open a different folder</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="change-folder-readonly"/></entry>
+              <entry><literal>ESC c</literal></entry>
+              <entry>open a different folder in read only mode</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="check-traditional-pgp"/></entry>
+              <entry><literal>ESC P</literal></entry>
+              <entry>check for classic pgp</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="clear-flag"/></entry>
+              <entry><literal>W</literal></entry>
+              <entry>clear a status flag from a message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="copy-message"/></entry>
+              <entry><literal>C</literal></entry>
+              <entry>copy a message to a file/mailbox</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="create-alias"/></entry>
+              <entry><literal>a</literal></entry>
+              <entry>create an alias from a message sender</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="decode-copy"/></entry>
+              <entry><literal>ESC C</literal></entry>
+              <entry>decode a message and copy it to a file/mailbox</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="decode-save"/></entry>
+              <entry><literal>ESC s</literal></entry>
+              <entry>decode a message and save it to a file/mailbox</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="delete-message"/></entry>
+              <entry><literal>d</literal></entry>
+              <entry>delete the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="delete-pattern"/></entry>
+              <entry><literal>D</literal></entry>
+              <entry>delete messages matching a pattern</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="delete-subthread"/></entry>
+              <entry><literal>ESC d</literal></entry>
+              <entry>delete all messages in subthread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="delete-thread"/></entry>
+              <entry><literal>^D</literal></entry>
+              <entry>delete all messages in thread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="display-address"/></entry>
+              <entry><literal>@</literal></entry>
+              <entry>display full address of sender</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
+              <entry><literal>h</literal></entry>
+              <entry>display message and toggle header weeding</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="display-message"/></entry>
+              <entry><literal>RET</literal></entry>
+              <entry>display a message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit"/></entry>
+              <entry><literal>e</literal></entry>
+              <entry>edit the current message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-type"/></entry>
+              <entry><literal>^E</literal></entry>
+              <entry>edit the current message's Content-Type</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="exit"/></entry>
+              <entry><literal>x</literal></entry>
+              <entry>exit without saving changes</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="extract-keys"/></entry>
+              <entry><literal>^K</literal></entry>
+              <entry>extract PGP public keys</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="fetch-mail"/></entry>
+              <entry><literal>G</literal></entry>
+              <entry>retrieve mail from POP server</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="flag-message"/></entry>
+              <entry><literal>F</literal></entry>
+              <entry>toggle a message's 'important' flag</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
+              <entry><literal>^F</literal></entry>
+              <entry>wipe PGP passphrase from memory</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="forward-message"/></entry>
+              <entry><literal>f</literal></entry>
+              <entry>forward a message with comments</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="group-reply"/></entry>
+              <entry><literal>g</literal></entry>
+              <entry>reply to all recipients</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="limit"/></entry>
+              <entry><literal>l</literal></entry>
+              <entry>show only messages matching a pattern</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="list-reply"/></entry>
+              <entry><literal>L</literal></entry>
+              <entry>reply to specified mailing list</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="mail"/></entry>
+              <entry><literal>m</literal></entry>
+              <entry>compose a new mail message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="mail-key"/></entry>
+              <entry><literal>ESC k</literal></entry>
+              <entry>mail a PGP public key</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-new"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>jump to the next new message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-new-then-unread"/></entry>
+              <entry><literal>TAB</literal></entry>
+              <entry>jump to the next new or unread message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-subthread"/></entry>
+              <entry><literal>ESC n</literal></entry>
+              <entry>jump to the next subthread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-thread"/></entry>
+              <entry><literal>^N</literal></entry>
+              <entry>jump to the next thread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-undeleted"/></entry>
+              <entry><literal>j</literal></entry>
+              <entry>move to the next undeleted message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-unread"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>jump to the next unread message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="parent-message"/></entry>
+              <entry><literal>P</literal></entry>
+              <entry>jump to parent message in thread </entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="pipe-message"/></entry>
+              <entry><literal>|</literal></entry>
+              <entry>pipe message/attachment to a shell command</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-new"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>jump to the previous new message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-new-then-unread"/></entry>
+              <entry><literal>ESC TAB</literal></entry>
+              <entry>jump to the previous new or unread message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-page"/></entry>
+              <entry><literal>Z</literal></entry>
+              <entry>move to the previous page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-subthread"/></entry>
+              <entry><literal>ESC p</literal></entry>
+              <entry>jump to previous subthread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-thread"/></entry>
+              <entry><literal>^P</literal></entry>
+              <entry>jump to previous thread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-undeleted"/></entry>
+              <entry><literal>k</literal></entry>
+              <entry>move to the last undelete message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-unread"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>jump to the previous unread message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="print-message"/></entry>
+              <entry><literal>p</literal></entry>
+              <entry>print the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="query"/></entry>
+              <entry><literal>Q</literal></entry>
+              <entry>query external program for addresses</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="quit"/></entry>
+              <entry><literal>q</literal></entry>
+              <entry>save changes to mailbox and quit</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="read-subthread"/></entry>
+              <entry><literal>ESC r</literal></entry>
+              <entry>mark the current subthread as read</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="read-thread"/></entry>
+              <entry><literal>^R</literal></entry>
+              <entry>mark the current thread as read</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="recall-message"/></entry>
+              <entry><literal>R</literal></entry>
+              <entry>recall a postponed message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="reply"/></entry>
+              <entry><literal>r</literal></entry>
+              <entry>reply to a message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="resend-message"/></entry>
+              <entry><literal>ESC e</literal></entry>
+              <entry>resend message and preserve MIME structure</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="save-message"/></entry>
+              <entry><literal>s</literal></entry>
+              <entry>save message/attachment to a file</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="set-flag"/></entry>
+              <entry><literal>w</literal></entry>
+              <entry>set a status flag on a message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="show-version"/></entry>
+              <entry><literal>V</literal></entry>
+              <entry>show the Mutt-ng version number and date</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="show-limit"/></entry>
+              <entry><literal>ESC l</literal></entry>
+              <entry>show currently active limit pattern, if any</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="sort-mailbox"/></entry>
+              <entry><literal>o</literal></entry>
+              <entry>sort messages</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="sort-reverse"/></entry>
+              <entry><literal>O</literal></entry>
+              <entry>sort messages in reverse order</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="sync-mailbox"/></entry>
+              <entry><literal>$</literal></entry>
+              <entry>save changes to mailbox</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="tag-pattern"/></entry>
+              <entry><literal>T</literal></entry>
+              <entry>tag messages matching a pattern</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="tag-thread"/></entry>
+              <entry><literal>ESC t</literal></entry>
+              <entry>tag/untag all messages in the current thread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="toggle-new"/></entry>
+              <entry><literal>N</literal></entry>
+              <entry>toggle a message's 'new' flag</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="toggle-write"/></entry>
+              <entry><literal>%</literal></entry>
+              <entry>toggle whether the mailbox will be rewritten</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="undelete-message"/></entry>
+              <entry><literal>u</literal></entry>
+              <entry>undelete the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="undelete-pattern"/></entry>
+              <entry><literal>U</literal></entry>
+              <entry>undelete messages matching a pattern</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="undelete-subthread"/></entry>
+              <entry><literal>ESC u</literal></entry>
+              <entry>undelete all messages in subthread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="undelete-thread"/></entry>
+              <entry><literal>^U</literal></entry>
+              <entry>undelete all messages in thread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="untag-pattern"/></entry>
+              <entry><literal>^T</literal></entry>
+              <entry>untag messages matching a pattern</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="view-attachments"/></entry>
+              <entry><literal>v</literal></entry>
+              <entry>show MIME attachments</entry>
+            </row>
+                  </tbody>
+      </tgroup>
+    </table>

 
 

-            previous-page              Z   move to the previous page
-            previous-subthread     ESC p   jump to previous subthread
-            previous-thread           ^P   jump to previous thread
-            previous-undeleted         k   move to the last undelete message
-            previous-unread    not bound   jump to the previous unread message
-            print-message              p   print the current entry
-            query                      Q   query external program for addresses
-            quit                       q   save changes to mailbox and quit
-            read-subthread         ESC r   mark the current subthread as read
-            read-thread               ^R   mark the current thread as read
-            recall-message             R   recall a postponed message
-            reply                      r   reply to a message
-            resend-message         ESC e   resend message and preserve MIME
-            structure
-            save-message               s   save message/attachment to a file
-            set-flag                   w   set a status flag on a message
-            show-version               V   show the Mutt-ng version number and
-            date
-            show-limit             ESC l   show currently active limit pattern,
-            if any
-            sort-mailbox               o   sort messages
-            sort-reverse               O   sort messages in reverse order
-            sync-mailbox               $   save changes to mailbox
-            tag-pattern                T   tag messages matching a pattern
-            tag-thread             ESC t   tag/untag all messages in the
-            current thread
-            toggle-new                 N   toggle a message's 'new' flag
-            toggle-write               %   toggle whether the mailbox will be
-            rewritten
-            undelete-message           u   undelete the current entry
-            undelete-pattern           U   undelete messages matching a pattern
-            undelete-subthread     ESC u   undelete all messages in subthread
-            undelete-thread           ^U   undelete all messages in thread
-            untag-pattern             ^T   untag messages matching a pattern
-            view-attachments           v   show MIME attachments
-          </screen>

           
         </para>
         
           
         </para>
         


@@ -169,92 +578,391 @@
         
         <para>
           
         
         <para>
           

-          <screen>
-            bottom             not bound   jump to the bottom of the message
-            bounce-message             b   remail a message to another user
-            change-folder              c   open a different folder
-            change-folder-readonly ESC c   open a different folder in read only
-            mode
-            check-traditional-pgp  ESC P   check for classic pgp
-            copy-message               C   copy a message to a file/mailbox
-            create-alias               a   create an alias from a message
-            senderdecode-copy            ESC C   decode a message and copy it
-            to a file/mailbox
-            decode-save            ESC s   decode a message and save it to a
-            file/mailbox
-            delete-message             d   delete the current entry
-            delete-subthread       ESC d   delete all messages in subthread
-            delete-thread             ^D   delete all messages in thread
-            display-address            @   display full address of sender
-            display-toggle-weed        h   display message and toggle header
-            weeding
-            edit                       e   edit the current message
-            edit-type                 ^E   edit the current message's
-            Content-Type
-            enter-command              :   enter a muttngrc command
-            exit                       i   return to the main-menu
-            extract-keys              ^K   extract PGP public keys
-            flag-message               F   toggle a message's 'important' flag
-            forget-passphrase         ^F   wipe PGP passphrase from memory
-            forward-message            f   forward a message with comments
-            group-reply                g   reply to all recipients
-            half-up            not bound   move up one-half page
-            half-down          not bound   move down one-half page
-            help                       ?   this screen
-            list-reply                 L   reply to specified mailing list
-            mail                       m   compose a new mail message
-            mail-key               ESC k   mail a PGP public key
-            mark-as-new                N   toggle a message's 'new' flag
-            next-line                RET   scroll down one line
-            next-entry                 J   move to the next entry
-            next-new           not bound   jump to the next new message
-            next-new-then-unread     TAB   jump to the next new or unread message
-            next-page                      move to the next page
-            next-subthread         ESC n   jump to the next subthread
-            next-thread               ^N   jump to the next thread
-            next-undeleted             j   move to the next undeleted message
-            next-unread        not bound   jump to the next unread message
-            parent-message             P   jump to parent message in thread
-            pipe-message               |   pipe message/attachment to a shell
-            command
-            previous-line      BackSpace   scroll up one line
-            previous-entry             K   move to the previous entry
-            previous-new       not bound   jump to the previous new message
-            previous-new-then-unread
-                               not bound   jump to the previous new or unread message
-            previous-page              -   move to the previous page
-            previous-subthread     ESC p   jump to previous subthread
-            previous-thread           ^P   jump to previous thread
-            previous-undeleted         k   move to the last undelete message
-            previous-unread    not bound   jump to the previous unread message
-            print-message              p   print the current entry
-            quit                       Q   save changes to mailbox and quit
-            read-subthread         ESC r   mark the current subthread as read
-            read-thread               ^R   mark the current thread as read
-            recall-message             R   recall a postponed message
-            redraw-screen             ^L   clear and redraw the screen
-            reply                      r   reply to a message
-            save-message               s   save message/attachment to a file
-            search                     /   search for a regular expression
-            search-next                n   search for next match
-            search-opposite    not bound   search for next match in opposite
-            direction
-            search-reverse         ESC /   search backwards for a regular
-            expression
-            search-toggle              \   toggle search pattern coloring
-            shell-escape               !   invoke a command in a subshell
-            show-version               V   show the Mutt-ng version number and
-            date
-            skip-quoted                S   skip beyond quoted text
-            sync-mailbox               $   save changes to mailbox
-            tag-message                t   tag a message
-            toggle-quoted              T   toggle display of quoted text
-            top                        ^   jump to the top of the message
-            undelete-message           u   undelete the current entry
-            undelete-subthread     ESC u   undelete all messages in subthread
-            undelete-thread           ^U   undelete all messages in thread
-            view-attachments           v   show MIME attachments
-          </screen>
+        <table>
+          <title>Reference: Default Pager Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Function</entry>
+              <entry>Default Key</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><muttng-doc:funcref name="bottom"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>jump to the bottom of the message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="bounce-message"/></entry>
+              <entry><literal>b</literal></entry>
+              <entry>remail a message to another user</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="change-folder"/></entry>
+              <entry><literal>c  </literal></entry>
+              <entry>open a different folder</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="change-folder-readonly"/></entry>
+              <entry><literal>ESC c</literal></entry>
+              <entry>open a different folder in read only mode</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="check-traditional-pgp"/></entry>
+              <entry><literal>ESC P</literal></entry>
+              <entry>check for classic pgp</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="copy-message"/></entry>
+              <entry><literal>C</literal></entry>
+              <entry>copy a message to a file/mailbox</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="create-alias"/></entry>
+              <entry><literal>a</literal></entry>
+              <entry>create an alias from a message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="senderdecode-copy"/></entry>
+              <entry><literal>ESC C</literal></entry>
+              <entry>decode a message and copy it to a file/mailbox</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="decode-save"/></entry>
+              <entry><literal>ESC s</literal></entry>
+              <entry>decode a message and save it to a file/mailbox</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="delete-message"/></entry>
+              <entry><literal>d</literal></entry>
+              <entry>delete the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="delete-subthread"/></entry>
+              <entry><literal>ESC d</literal></entry>
+              <entry>delete all messages in subthread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="delete-thread"/></entry>
+              <entry><literal>^D</literal></entry>
+              <entry>delete all messages in thread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="display-address"/></entry>
+              <entry><literal>@</literal></entry>
+              <entry>display full address of sender</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
+              <entry><literal>h</literal></entry>
+              <entry>display message and toggle header weeding</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit"/></entry>
+              <entry><literal>e</literal></entry>
+              <entry>edit the current message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-type"/></entry>
+              <entry><literal>^E</literal></entry>
+              <entry>edit the current message's             Content-Type</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="enter-command"/></entry>
+              <entry><literal>:</literal></entry>
+              <entry>enter a muttngrc command</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="exit"/></entry>
+              <entry><literal>i</literal></entry>
+              <entry>return to the main-menu</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="extract-keys"/></entry>
+              <entry><literal>^K</literal></entry>
+              <entry>extract PGP public keys</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="flag-message"/></entry>
+              <entry><literal>F</literal></entry>
+              <entry>toggle a message's 'important' flag</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
+              <entry><literal>^F</literal></entry>
+              <entry>wipe PGP passphrase from memory</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="forward-message"/></entry>
+              <entry><literal>f</literal></entry>
+              <entry>forward a message with comments</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="group-reply"/></entry>
+              <entry><literal>g</literal></entry>
+              <entry>reply to all recipients</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="half-up"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>move up one-half page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="half-down"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>move down one-half page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="help"/></entry>
+              <entry><literal>?</literal></entry>
+              <entry>this screen</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="list-reply"/></entry>
+              <entry><literal>L</literal></entry>
+              <entry>reply to specified mailing list</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="mail"/></entry>
+              <entry><literal>m</literal></entry>
+              <entry>compose a new mail message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="mail-key"/></entry>
+              <entry><literal>ESC k</literal></entry>
+              <entry>mail a PGP public key</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="mark-as-new"/></entry>
+              <entry><literal>N</literal></entry>
+              <entry>toggle a message's 'new' flag</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-line"/></entry>
+              <entry><literal>RET</literal></entry>
+              <entry>scroll down one line</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-entry"/></entry>
+              <entry><literal>J</literal></entry>
+              <entry>move to the next entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-new"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>jump to the next new message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-new-then-unread"/></entry>
+              <entry><literal>TAB</literal></entry>
+              <entry>jump to the next new or unread message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-page"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>move to the next page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-subthread"/></entry>
+              <entry><literal>ESC n</literal></entry>
+              <entry>jump to the next subthread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-thread"/></entry>
+              <entry><literal>^N</literal></entry>
+              <entry>jump to the next thread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-undeleted"/></entry>
+              <entry><literal>j</literal></entry>
+              <entry>move to the next undeleted message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="next-unread"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>jump to the next unread message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="parent-message"/></entry>
+              <entry><literal>P</literal></entry>
+              <entry>jump to parent message in thread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="pipe-message"/></entry>
+              <entry><literal></literal>|</entry>
+              <entry>pipe message/attachment to a shell command</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-line"/></entry>
+              <entry><literal>BackSpace</literal></entry>
+              <entry>scroll up one line</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-entry"/></entry>
+              <entry><literal>K</literal></entry>
+              <entry>move to the previous entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-new"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>jump to the previous new message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-new-then-unread"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>jump to the previous new or unread message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-page"/></entry>
+              <entry><literal>-</literal></entry>
+              <entry>move to the previous page</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-subthread"/></entry>
+              <entry><literal>ESC p</literal></entry>
+              <entry>jump to previous subthread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-thread"/></entry>
+              <entry><literal>^P</literal></entry>
+              <entry>jump to previous thread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-undeleted"/></entry>
+              <entry><literal>k</literal></entry>
+              <entry>move to the last undelete message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="previous-unread"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>jump to the previous unread message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="print-message"/></entry>
+              <entry><literal>p</literal></entry>
+              <entry>print the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="quit"/></entry>
+              <entry><literal>Q</literal></entry>
+              <entry>save changes to mailbox and quit</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="read-subthread"/></entry>
+              <entry><literal>ESC r</literal></entry>
+              <entry>mark the current subthread as read</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="read-thread"/></entry>
+              <entry><literal>^R</literal></entry>
+              <entry>mark the current thread as read</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="recall-message"/></entry>
+              <entry><literal>R</literal></entry>
+              <entry>recall a postponed message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="redraw-screen"/></entry>
+              <entry><literal>^L</literal></entry>
+              <entry>clear and redraw the screen</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="reply"/></entry>
+              <entry><literal>r</literal></entry>
+              <entry>reply to a message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="save-message"/></entry>
+              <entry><literal>s</literal></entry>
+              <entry>save message/attachment to a file</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search"/></entry>
+              <entry><literal>/</literal></entry>
+              <entry>search for a regular expression</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-next"/></entry>
+              <entry><literal>n</literal></entry>
+              <entry>search for next match</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-opposite"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>search for next match in opposite direction</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-reverse"/></entry>
+              <entry><literal>ESC /</literal></entry>
+              <entry>search backwards for a regular expression</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-toggle"/></entry>
+              <entry><literal>\</literal></entry>
+              <entry>toggle search pattern coloring</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="shell-escape"/></entry>
+              <entry><literal>!</literal></entry>
+              <entry>invoke a command in a subshell</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="show-version"/></entry>
+              <entry><literal>V</literal></entry>
+              <entry>show the Mutt-ng version number and date</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="skip-quoted"/></entry>
+              <entry><literal>S</literal></entry>
+              <entry>skip beyond quoted text</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="sync-mailbox"/></entry>
+              <entry><literal>$</literal></entry>
+              <entry>save changes to mailbox</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="tag-message"/></entry>
+              <entry><literal>t</literal></entry>
+              <entry>tag a message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="toggle-quoted"/></entry>
+              <entry><literal>T</literal></entry>
+              <entry>toggle display of quoted text</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="top"/></entry>
+              <entry><literal>^</literal></entry>
+              <entry>jump to the top of the message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="undelete-message"/></entry>
+              <entry><literal>u</literal></entry>
+              <entry>undelete the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="undelete-subthread"/></entry>
+              <entry><literal>ESC u</literal></entry>
+              <entry>undelete all messages in subthread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="undelete-thread"/></entry>
+              <entry><literal>^U</literal></entry>
+              <entry>undelete all messages in thread</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="view-attachments"/></entry>
+              <entry><literal>v</literal></entry>
+              <entry>show MIME attachments</entry>
+            </row>
+                  </tbody>
+      </tgroup>
+    </table>
+

           
         </para>
         
           
         </para>
         


@@ -265,12 +973,36 @@
         
         <para>
           
         
         <para>
           

-          <screen>
-            search                     /   search for a regular expression
-            search-next                n   search for next match
-            search-reverse         ESC /   search backwards for a regular
-            expression
-          </screen>
+        <table>
+          <title>Reference: Default Alias Menu Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Function</entry>
+              <entry>Default Key</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><muttng-doc:funcref name="search"/></entry>
+              <entry><literal>/</literal></entry>
+              <entry>search for a regular expression</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-next"/></entry>
+              <entry><literal>n</literal></entry>
+              <entry>search for next match</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-reverse"/></entry>
+              <entry><literal>ESC /</literal></entry>
+              <entry>search backwards for a regular expression</entry>
+            </row>
+                  </tbody>
+      </tgroup>
+    </table>
+

           
         </para>
         
           
         </para>
         


@@ -281,19 +1013,61 @@
         
         <para>
           
         
         <para>
           

-          <screen>
-            create-alias               a   create an alias from a message
-            sendermail                       m   compose a new mail message
-            query                      Q   query external program for addresses
-            query-append               A   append new query results to current
-            results
-            search                     /   search for a regular expression
-            search-next                n   search for next match
-            search-opposite    not bound   search for next match in opposite
-            direction
-            search-reverse         ESC /   search backwards for a regular
-            expression
-          </screen>
+        <table>
+          <title>Reference: Default Query Menu Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Function</entry>
+              <entry>Default Key</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><muttng-doc:funcref name="create-alias"/></entry>
+              <entry><literal>a</literal></entry>
+              <entry>create an alias from a message sender</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="mail"/></entry>
+              <entry><literal>m</literal></entry>
+              <entry>compose a new mail message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="query"/></entry>
+              <entry><literal>Q</literal></entry>
+              <entry>query external program for addresses</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="query-append"/></entry>
+              <entry><literal>A</literal></entry>
+              <entry>append new query results to current results</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search"/></entry>
+              <entry><literal>/</literal></entry>
+              <entry>search for a regular expression</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-next"/></entry>
+              <entry><literal>n</literal></entry>
+              <entry>search for next match</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-opposite"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>search for next match in opposite direction</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-reverse"/></entry>
+              <entry><literal>ESC /</literal></entry>
+              <entry>search backwards for a regular expression</entry>
+            </row>
+                  </tbody>
+      </tgroup>
+    </table>
+

           
         </para>
         
           
         </para>
         


@@ -304,31 +1078,111 @@
         
         <para>
           
         
         <para>
           

-          <screen>
-            bounce-message             b   remail a message to another user
-            collapse-parts             v   toggle display of subparts
-            delete-entry               d   delete the current entry
-            display-toggle-weed        h   display message and toggle header
-            weeding
-            edit-type                 ^E   edit the current entry's
-            Content-Typeextract-keys              ^K   extract PGP public keys
-            forward-message            f   forward a message with comments
-            group-reply                g   reply to all recipients
-            list-reply                 L   reply to specified mailing list
-            pipe-entry                 |   pipe message/attachment to a shell
-            command
-            print-entry                p   print the current entry
-            reply                      r   reply to a message
-            resend-message         ESC e   resend message and preserve MIME
-            structure
-            save-entry                 s   save message/attachment to a file
-            undelete-entry             u   undelete the current entry
-            view-attach              RET   view attachment using mailcap entry
-            if necessary
-            view-mailcap               m   force viewing of attachment using
-            mailcap
-            view-text                  T   view attachment as text
-          </screen>
+        <table>
+          <title>Reference: Default Attachment Menu Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Function</entry>
+              <entry>Default Key</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><muttng-doc:funcref name="bounce-message"/></entry>
+              <entry><literal>b</literal></entry>
+              <entry>remail a message to another user</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="collapse-parts"/></entry>
+              <entry><literal>v</literal></entry>
+              <entry>toggle display of subparts</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="delete-entry"/></entry>
+              <entry><literal>d</literal></entry>
+              <entry>delete the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
+              <entry><literal>h</literal></entry>
+              <entry>display message and toggle header weeding</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-type"/></entry>
+              <entry><literal>^E</literal></entry>
+              <entry>edit the current entry's Content-Type</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="extract-keys"/></entry>
+              <entry><literal>^K</literal></entry>
+              <entry>extract PGP public keys</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="forward-message"/></entry>
+              <entry><literal>f</literal></entry>
+              <entry>forward a message with comments</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="group-reply"/></entry>
+              <entry><literal>g</literal></entry>
+              <entry>reply to all recipients</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="list-reply"/></entry>
+              <entry><literal>L</literal></entry>
+              <entry>reply to specified mailing list</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="pipe-entry"/></entry>
+              <entry><literal>|</literal></entry>
+              <entry>pipe message/attachment to a shell command</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="print-entry"/></entry>
+              <entry><literal>p</literal></entry>
+              <entry>print the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="reply"/></entry>
+              <entry><literal>r</literal></entry>
+              <entry>reply to a message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="resend-message"/></entry>
+              <entry><literal>ESC e</literal></entry>
+              <entry>resend message and preserve MIME        structure</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="save-entry"/></entry>
+              <entry><literal>s</literal></entry>
+              <entry>save message/attachment to a file</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="undelete-entry"/></entry>
+              <entry><literal>u</literal></entry>
+              <entry>undelete the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="view-attach"/></entry>
+              <entry><literal>RET</literal></entry>
+              <entry>view attachment using mailcap entry if necessary</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="view-mailcap"/></entry>
+              <entry><literal>m</literal></entry>
+              <entry>force viewing of attachment using mailcap</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="view-text"/></entry>
+              <entry><literal>T</literal></entry>
+              <entry>view attachment as text</entry>
+            </row>
+                  </tbody>
+      </tgroup>
+    </table>
+

           
         </para>
         
           
         </para>
         


@@ -339,48 +1193,186 @@
         
         <para>
           
         
         <para>
           

-          <screen>
-            attach-file                a   attach a file(s) to this message
-            attach-message             A   attach message(s) to this message
-            attach-key             ESC k   attach a PGP public key
-            copy-file                  C   save message/attachment to a file
-            detach-file                D   delete the current entry
-            display-toggle-weed        h   display message and toggle header
-            weeding
-            edit-bcc                   b   edit the BCC list
-            edit-cc                    c   edit the CC list
-            edit-description           d   edit attachment description
-            edit-encoding             ^E   edit attachment transfer-encoding
-            edit-fcc                   f   enter a file to save a copy of this
-            message in
-            edit-from              ESC f   edit the from: field
-            edit-file               ^X e   edit the file to be attached
-            edit-headers               E   edit the message with headers
-            edit                       e   edit the message
-            edit-mime                  m   edit attachment using mailcap entry
-            edit-reply-to              r   edit the Reply-To field
-            edit-subject               s   edit the subject of this message
-            edit-to                    t   edit the TO list
-            edit-type                 ^T   edit attachment type
-            filter-entry               F   filter attachment through a shell
-            command
-            forget-passphrase         ^F   wipe PGP passphrase from memory
-            ispell                     i   run ispell on the message
-            new-mime                   n   compose new attachment using mailcap
-            entry
-            pgp-menu                   p   show PGP options
-            pipe-entry                 |   pipe message/attachment to a shell
-            command
-            postpone-message           P   save this message to send later
-            print-entry                l   print the current entry
-            rename-file                R   rename/move an attached file
-            send-message               y   send the message
-            toggle-unlink              u   toggle whether to delete file after
-            sending it
-            view-attach              RET   view attachment using mailcap entry
-            if necessary
-            write-fcc             w   write the message to a folder
-          </screen>
+        <table>
+          <title>Reference: Default Compose Menu Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Function</entry>
+              <entry>Default Key</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><muttng-doc:funcref name="attach-file"/></entry>
+              <entry><literal>a</literal></entry>
+              <entry>attach a file(s) to this message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="attach-message"/></entry>
+              <entry><literal>A</literal></entry>
+              <entry>attach message(s) to this message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="attach-key"/></entry>
+              <entry><literal>ESC k</literal></entry>
+              <entry>attach a PGP public key</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="copy-file"/></entry>
+              <entry><literal>C</literal></entry>
+              <entry>save message/attachment to a file</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="detach-file"/></entry>
+              <entry><literal>D</literal></entry>
+              <entry>delete the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
+              <entry><literal>h</literal></entry>
+              <entry>display message and toggle header weeding</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-bcc"/></entry>
+              <entry><literal>b</literal></entry>
+              <entry>edit the BCC list</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-cc"/></entry>
+              <entry><literal>c</literal></entry>
+              <entry>edit the CC list</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-description"/></entry>
+              <entry><literal>d</literal></entry>
+              <entry>edit attachment description</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-encoding"/></entry>
+              <entry><literal>^E</literal></entry>
+              <entry>edit attachment transfer-encoding</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-fcc"/></entry>
+              <entry><literal>f</literal></entry>
+              <entry>enter a file to save a copy of this message in</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-from"/></entry>
+              <entry><literal>ESC f</literal></entry>
+              <entry>edit the from: field</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-file"/></entry>
+              <entry><literal>^X e</literal></entry>
+              <entry>edit the file to be attached</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-headers"/></entry>
+              <entry><literal>E</literal></entry>
+              <entry>edit the message with headers</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit"/></entry>
+              <entry><literal>e</literal></entry>
+              <entry>edit the message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-mime"/></entry>
+              <entry><literal>m</literal></entry>
+              <entry>edit attachment using mailcap entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-reply-to"/></entry>
+              <entry><literal>r</literal></entry>
+              <entry>edit the Reply-To field</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-subject"/></entry>
+              <entry><literal>s</literal></entry>
+              <entry>edit the subject of this message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-to"/></entry>
+              <entry><literal>t</literal></entry>
+              <entry>edit the TO list</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="edit-type"/></entry>
+              <entry><literal>^T</literal></entry>
+              <entry>edit attachment type</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="filter-entry"/></entry>
+              <entry><literal>F</literal></entry>
+              <entry>filter attachment through a shell command</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
+              <entry><literal>^F</literal></entry>
+              <entry>wipe PGP passphrase from memory</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="ispell"/></entry>
+              <entry><literal>i</literal></entry>
+              <entry>run ispell on the message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="new-mime"/></entry>
+              <entry><literal>n</literal></entry>
+              <entry>compose new attachment using mailcap entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="pgp-menu"/></entry>
+              <entry><literal>p</literal></entry>
+              <entry>show PGP options</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="pipe-entry"/></entry>
+              <entry><literal>|</literal></entry>
+              <entry>pipe message/attachment to a shell command</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="postpone-message"/></entry>
+              <entry><literal>P</literal></entry>
+              <entry>save this message to send later</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="print-entry"/></entry>
+              <entry><literal>l</literal></entry>
+              <entry>print the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="rename-file"/></entry>
+              <entry><literal>R</literal></entry>
+              <entry>rename/move an attached file</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="send-message"/></entry>
+              <entry><literal>y</literal></entry>
+              <entry>send the message</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="toggle-unlink"/></entry>
+              <entry><literal>u</literal></entry>
+              <entry>toggle whether to delete file after sending it</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="view-attach"/></entry>
+              <entry><literal>RET</literal></entry>
+              <entry>view attachment using mailcap entry if necessary</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="write-fcc"/></entry>
+              <entry><literal>w  </literal></entry>
+              <entry>write the message to a folder</entry>
+            </row>
+                  </tbody>
+      </tgroup>
+    </table>
+

           
         </para>
         
           
         </para>
         


@@ -391,10 +1383,31 @@
         
         <para>
           
         
         <para>
           

-          <screen>
-            delete-entry               d   delete the current entry
-            undelete-entry             u   undelete the current entry
-          </screen>
+        <table>
+          <title>Reference: Default Postpone Menu Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Function</entry>
+              <entry>Default Key</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><muttng-doc:funcref name="delete-entry"/></entry>
+              <entry><literal>d</literal></entry>
+              <entry>delete the current entry</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="undelete-entry"/></entry>
+              <entry><literal>u</literal></entry>
+              <entry>undelete the current entry</entry>
+            </row>
+                  </tbody>
+      </tgroup>
+    </table>
+

           
         </para>
         
           
         </para>
         


@@ -405,27 +1418,91 @@
         
         <para>
           
         
         <para>
           

-          <screen>
-            change-dir                 c   change directories
-            check-new                TAB   check mailboxes for new mail
-            enter-mask                 m   enter a file mask
-            search                     /   search for a regular expression
-            search-next                n   search for next match
-            search-reverse         ESC /   search backwards for a regular
-            expression
-            select-new                 N   select a new file in this directory
-            sort                       o   sort messages
-            sort-reverse               O   sort messages in reverse order
-            toggle-mailboxes         TAB   toggle whether to browse mailboxes
-            or all files
-            view-file              SPACE   view file
-            subscribe                  s   subscribe to current mailbox (IMAP
-            Only)
-            unsubscribe                u   unsubscribe to current mailbox (IMAP
-            Only)
-            toggle-subscribed          T   toggle view all/subscribed mailboxes
-            (IMAP Only)
-          </screen>
+        <table>
+          <title>Reference: Default Browser Menu Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Function</entry>
+              <entry>Default Key</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><muttng-doc:funcref name="change-dir"/></entry>
+              <entry><literal>c</literal></entry>
+              <entry>change directories</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="check-new"/></entry>
+              <entry><literal>TAB</literal></entry>
+              <entry>check mailboxes for new mail</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="enter-mask"/></entry>
+              <entry><literal>m</literal></entry>
+              <entry>enter a file mask</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search"/></entry>
+              <entry><literal>/</literal></entry>
+              <entry>search for a regular expression</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-next"/></entry>
+              <entry><literal>n</literal></entry>
+              <entry>search for next match</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="search-reverse"/></entry>
+              <entry><literal>ESC /</literal></entry>
+              <entry>search backwards for a regular expression</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="select-new"/></entry>
+              <entry><literal>N</literal></entry>
+              <entry>select a new file in this directory</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="sort"/></entry>
+              <entry><literal>o</literal></entry>
+              <entry>sort messages</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="sort-reverse"/></entry>
+              <entry><literal>O</literal></entry>
+              <entry>sort messages in reverse order</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="toggle-mailboxes"/></entry>
+              <entry><literal>TAB</literal></entry>
+              <entry>toggle whether to browse mailboxes or all files</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="view-file"/></entry>
+              <entry><literal>SPACE</literal></entry>
+              <entry>view file</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="subscribe"/></entry>
+              <entry><literal>s</literal></entry>
+              <entry>subscribe to current mailbox (IMAP            Only)</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="unsubscribe"/></entry>
+              <entry><literal>u</literal></entry>
+              <entry>unsubscribe to current mailbox (IMAP            Only)</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="toggle-subscribed"/></entry>
+              <entry><literal>T</literal></entry>
+              <entry>toggle view all/subscribed mailboxes            (IMAP Only)</entry>
+            </row>
+                  </tbody>
+      </tgroup>
+    </table>
+

           
         </para>
         
           
         </para>
         


@@ -436,10 +1513,31 @@
         
         <para>
           
         
         <para>
           

-          <screen>
-            view-name                  %   view the key's user id
-            verify-key                 c   verify a PGP public key
-          </screen>
+        <table>
+          <title>Reference: Default PGP Menu Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Function</entry>
+              <entry>Default Key</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><muttng-doc:funcref name="view-name"/></entry>
+              <entry><literal>%</literal></entry>
+              <entry>view the key's user id</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="verify-key"/></entry>
+              <entry><literal>c</literal></entry>
+              <entry>verify a PGP public key</entry>
+            </row>
+                  </tbody>
+      </tgroup>
+    </table>
+

           
         </para>
         
           
         </para>
         


@@ -450,52 +1548,193 @@
         
         <para>
           
         
         <para>
           

-          <screen>
-            backspace          BackSpace   delete the char in front of the
-            cursor
-            backward-char             ^B   move the cursor one character to the
-            left
-            backward-word          ESC b   move the cursor to the previous word
-            bol                       ^A   jump to the beginning of the line
-            buffy-cycle            Space   cycle among incoming mailboxes
-            capitalize-word        ESC c   uppercase the first character in the
-            word
-            complete                 TAB   complete filename or alias
-            complete-query            ^T   complete address with query
-            delete-char               ^D   delete the char under the cursor
-            downcase-word          ESC l   lowercase all characters in current
-            word
-            eol                       ^E   jump to the end of the line
-            forward-char              ^F   move the cursor one character to the
-            right
-            forward-word           ESC f   move the cursor to the next word
-            history-down       not bound   scroll down through the history list
-            history-up         not bound   scroll up through the history list
-            kill-eol                  ^K   delete chars from cursor to end of
-            line
-            kill-eow               ESC d   delete chars from cursor to end of
-            word
-            kill-line                 ^U   delete all chars on the line
-            kill-word                 ^W   delete the word in front of the
-            cursor
-            quote-char                ^V   quote the next typed key
-            transpose-chars    not bound   transpose character under cursor
-            with previous
-            upcase-word            ESC u   uppercase all characters in current
-            word
-          </screen>
+        <table>
+          <title>Reference: Default Editor Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Function</entry>
+              <entry>Default Key</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><muttng-doc:funcref name="backspace"/></entry>
+              <entry><literal>BackSpace</literal></entry>
+              <entry>delete the char in front of the cursor</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="backward-char"/></entry>
+              <entry><literal>^B</literal></entry>
+              <entry>move the cursor one character to the left</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="backward-word"/></entry>
+              <entry><literal>ESC b</literal></entry>
+              <entry>move the cursor to the previous word</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="bol"/></entry>
+              <entry><literal>^A</literal></entry>
+              <entry>jump to the beginning of the line</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="buffy-cycle"/></entry>
+              <entry><literal>Space</literal></entry>
+              <entry>cycle among incoming mailboxes</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="capitalize-word"/></entry>
+              <entry><literal>ESC c</literal></entry>
+              <entry>uppercase the first character in the word</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="complete"/></entry>
+              <entry><literal>TAB</literal></entry>
+              <entry>complete filename or alias</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="complete-query"/></entry>
+              <entry><literal>^T</literal></entry>
+              <entry>complete address with query</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="delete-char"/></entry>
+              <entry><literal>^D</literal></entry>
+              <entry>delete the char under the cursor</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="downcase-word"/></entry>
+              <entry><literal>ESC l</literal></entry>
+              <entry>lowercase all characters in current word</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="eol"/></entry>
+              <entry><literal>^E</literal></entry>
+              <entry>jump to the end of the line</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="forward-char"/></entry>
+              <entry><literal>^F</literal></entry>
+              <entry>move the cursor one character to the right</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="forward-word"/></entry>
+              <entry><literal>ESC f</literal></entry>
+              <entry>move the cursor to the next word</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="history-down"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>scroll down through the history list</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="history-up"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>scroll up through the history list</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="kill-eol"/></entry>
+              <entry><literal>^K</literal></entry>
+              <entry>delete chars from cursor to end of line</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="kill-eow"/></entry>
+              <entry><literal>ESC d</literal></entry>
+              <entry>delete chars from cursor to end of word</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="kill-line"/></entry>
+              <entry><literal>^U</literal></entry>
+              <entry>delete all chars on the line</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="kill-word"/></entry>
+              <entry><literal>^W</literal></entry>
+              <entry>delete the word in front of the cursor</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="quote-char"/></entry>
+              <entry><literal>^V</literal></entry>
+              <entry>quote the next typed key</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="transpose-chars"/></entry>
+              <entry><literal>not bound</literal></entry>
+              <entry>transpose character under cursor with previous</entry>
+            </row>
+            <row>
+              <entry><muttng-doc:funcref name="upcase-word"/></entry>
+              <entry><literal>ESC u</literal></entry>
+              <entry>uppercase all characters in current word</entry>
+            </row>
+                  </tbody>
+      </tgroup>
+    </table>
+

           
         </para>
         
       </sect2>
           
         </para>
         
       </sect2>

-      
+
+      <sect2 id="functions-sidebar">
+        <title>sidebar</title>
+        
+      <para>
+        <table>
+          <title>Referene: Default Sidebar Function Bindings</title>
+          <tgroup cols="3" align="left" colsep="1" rowsep="1">
+          <thead>
+            <row>
+              <entry>Key</entry>
+              <entry>Function</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry><literal>none</literal></entry>
+              <entry><muttng-doc:funcref name="sidebar-scroll-up"/></entry>
+              <entry>Scrolls the mailbox list up 1 page</entry>
+            </row>
+            <row>
+              <entry><literal>none</literal></entry>
+              <entry><muttng-doc:funcref name="sidebar-scroll-down"/></entry>
+              <entry>Scrolls the mailbox list down 1 page</entry>
+            </row>
+            <row>
+              <entry><literal>none</literal></entry>
+              <entry><muttng-doc:funcref name="sidebar-next"/></entry>
+              <entry>Highlights the next mailbox</entry>
+            </row>
+            <row>
+              <entry><literal>none</literal></entry>
+              <entry><muttng-doc:funcref name="sidebar-next-new"/></entry>
+              <entry>Highlights the next mailbox with new mail</entry>
+            </row>
+            <row>
+              <entry><literal>none</literal></entry>
+              <entry><muttng-doc:funcref name="sidebar-previous"/></entry>
+              <entry>Highlights the previous mailbox</entry>
+            </row>
+            <row>
+              <entry><literal>none</literal></entry>
+              <entry><muttng-doc:funcref name="sidebar-open"/></entry>
+              <entry>Opens the currently highlighted mailbox</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </para>
+
+    </sect2>
+

     </sect1>
     
   </chapter>
 
     </sect1>
     
   </chapter>
 

-  <appendix/>
-
-  <chapter id="acknowledgments">
+  <appendix id="acknowledgments">

     <title>Acknowledgments</title>
     
     <para>
     <title>Acknowledgments</title>
     
     <para>


@@ -683,9 +1922,9 @@
         </itemizedlist>
       </para>
 
         </itemizedlist>
       </para>
 

-    </chapter>
+    </appendix>

 
 

-    <chapter id="hacking-documentation">
+    <appendix id="hacking-documentation">

       <title>Hacking Documentation</title>
 
       <para>
       <title>Hacking Documentation</title>
 
       <para>


@@ -810,7 +2049,7 @@
         </variablelist>
       </para>
 
         </variablelist>
       </para>
 

-    </chapter>
+    </appendix>

 
     <index/>
 
 
     <index/>
 

diff --git a/doc/muttng-manual.xsl b/doc/muttng-manual.xsl
index 8f68116..6cf0fbb 100644 (file)
--- a/doc/muttng-manual.xsl
+++ b/doc/muttng-manual.xsl
@@ -105,9 +105,9 @@
       <title><xsl:value-of select="concat('$',@name)"/></title>
       <indexterm>
         <primary>Configuration Variables</primary>
       <title><xsl:value-of select="concat('$',@name)"/></title>
       <indexterm>
         <primary>Configuration Variables</primary>

-        <secondary><xsl:value-of select="@name"/></secondary>
+        <secondary>$<xsl:value-of select="@name"/></secondary>

       </indexterm>
       </indexterm>

-      <xsl:value-of select="text()"/>
+      <xsl:apply-templates/>

     </sect1>
   </xsl:template>
  
     </sect1>
   </xsl:template>