Rocco Rutte:
[apps/madmutt.git] / doc / manual.xml.head
index fc9f088..671402a 100644 (file)
     <para>
       You should have received a copy of the GNU General Public License
       along with this program; if not, write to the Free Software
-      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </para>
     
   </sect1>
             in a typewriter font and both prefixed with a dollar sign as
             it's common for UNIX-like environments. Configuration
             variables are lower-case only while environment variables
-            are upper-case only.</para>
+            are upper-case only. <muttng-doc:varref
+              name="imap-mail-check"/> is a configuration variable while
+            <muttng-doc:envvar name="EDITOR"/> is an environment
+            variable.</para>
         </listitem>
         <listitem>
-          <para>Muttng-specific commands are enclosed in
+          <para>Muttng-specific functions are enclosed in
           <literal>&lt;&gt;</literal> and printed in a typewriter font,
-          too.</para>
+          too, as in <muttng-doc:funcref name="sync-mailbox"/>.</para>
         </listitem>
         <listitem>
           <para>As common for UNIX-like environments, references to
               name="muttngrc" sect="5"/>. Execute <literal>man [section]
               [name]</literal> to view the manual page.</para>
         </listitem>
+        <listitem>
+          <para>Keys are presented in the following way: ordinary keys
+            are just given as-is, e.g.
+            <muttng-doc:key>q</muttng-doc:key>. Control characters are
+            prefixed with <literal>C-</literal> (e.g. the screen can be
+            redraw by pressing <muttng-doc:key
+              mod="C">L</muttng-doc:key>) and <literal>E-</literal> for
+            Escape, e.g. a folder can be opened read-only with
+            <muttng-doc:key mod="E">c</muttng-doc:key>.
+          </para>
+        </listitem>
       </itemizedlist>
     </para>
 
     
     <para>
 
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l|l">
         <title>Most commonly used movement bindings</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
         </thead>
         <tbody>
           <row>
-            <entry><literal>j</literal> or <literal>Down</literal></entry>
+            <entry><muttng-doc:key>j</muttng-doc:key> or <muttng-doc:key>Down</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="next-entry"/></entry>
             <entry>move to the next entry</entry>
           </row>
           <row>
-            <entry><literal>k</literal> or <literal>Up</literal></entry>
+            <entry><muttng-doc:key>k</muttng-doc:key> or <muttng-doc:key>Up</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="previous-entry"/></entry>
             <entry>move to the previous entry</entry>
           </row>
           <row>
-            <entry><literal>z</literal> or <literal>PageDn</literal></entry>
+            <entry><muttng-doc:key>z</muttng-doc:key> or <muttng-doc:key>PageDn</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="page-down"/></entry>
             <entry>go to the next page</entry>
           </row>
           <row>
-            <entry><literal>Z</literal> or <literal>PageUp</literal></entry>
+            <entry><muttng-doc:key>Z</muttng-doc:key> or <muttng-doc:key>PageUp</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="page-up"/></entry>
             <entry>go to the previous page</entry>
           </row>
           <row>
-            <entry><literal>=</literal> or <literal>Home</literal></entry>
+            <entry><muttng-doc:key>=</muttng-doc:key> or <muttng-doc:key>Home</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="first-entry"/></entry>
             <entry>jump to the first entry</entry>
           </row>
           <row>
-            <entry><literal>*</literal> or <literal>End</literal></entry>
+            <entry><muttng-doc:key>*</muttng-doc:key> or <muttng-doc:key>End</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="last-entry"/></entry>
             <entry>jump to the last entry</entry>
           </row>
           <row>
-            <entry><literal>q</literal></entry>
+            <entry><muttng-doc:key>q</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="quit"/></entry>
             <entry>exit the current menu</entry>
           </row>
           <row>
-            <entry><literal>?</literal></entry>
+            <entry><muttng-doc:key>?</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="help"/></entry>
             <entry>list all key bindings for the current menu</entry>
           </row>
     
     <para>
 
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l|l">
         <title>Line Editor Functions</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
         </thead>
         <tbody>
           <row>
-            <entry><literal>^A or &#60;Home&#62;  </literal></entry>
+            <entry><muttng-doc:key mod="C">A</muttng-doc:key> or <muttng-doc:key>Home</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="bol"/></entry>
             <entry>move to the start of the line</entry>
           </row>
           <row>
-            <entry><literal>^B or &#60;Left&#62;   </literal></entry>
+            <entry><muttng-doc:key mod="C">B</muttng-doc:key> or <muttng-doc:key>Left</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="backward-char"/>
             </entry><entry>move back one char</entry>
           </row>
           <row>
-            <entry><literal>Esc B  </literal></entry>
+            <entry><muttng-doc:key mod="E">B</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="backward-word"/></entry>
             <entry>move back one word</entry>
           </row>
           <row>
-            <entry><literal>^D or &#60;Delete&#62;  </literal></entry>
+            <entry><muttng-doc:key mod="C">D</muttng-doc:key> or <muttng-doc:key>Delete</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="delete-char"/></entry>
             <entry>delete the char under the cursor</entry>
           </row>
           <row>
-            <entry><literal>^E or &#60;End&#62;   </literal></entry>
+            <entry><muttng-doc:key mod="C">E</muttng-doc:key> or <muttng-doc:key>End</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="eol"/></entry>
             <entry>move to the end of the line</entry>
           </row>
           <row>
-            <entry><literal>^F or &#60;Right&#62;  </literal></entry>
+            <entry><muttng-doc:key mod="C">F</muttng-doc:key> or <muttng-doc:key>Right</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="forward-char"/></entry>
             <entry>move forward one char</entry>
           </row>
           <row>
-            <entry><literal>Esc F </literal></entry>
+            <entry><muttng-doc:key mod="E">F</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="forward-word"/></entry>
             <entry>move forward one word</entry>
           </row>
           <row>
-            <entry><literal>&#60;Tab&#62;</literal></entry>
+            <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="complete"/></entry>
             <entry>complete filename or alias</entry>
           </row>
           <row>
-            <entry><literal>^T</literal></entry>
+            <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="complete-query"/></entry>
             <entry>complete address with query</entry>
           </row>
           <row>
-            <entry><literal>^K</literal></entry>
+            <entry><muttng-doc:key mod="C">K</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="kill-eol"/></entry>
             <entry>delete to the end of the line</entry>
           </row>
           <row>
-            <entry><literal>ESC d </literal></entry>
+            <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="kill-eow"/></entry>
             <entry>delete to the end of the word</entry>
           </row>
           <row>
-            <entry><literal>^W</literal></entry>
+            <entry><muttng-doc:key mod="C">W</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="kill-word"/></entry>
             <entry>kill the word in front of the cursor</entry>
           </row>
           <row>
-            <entry><literal>^U</literal></entry>
+            <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="kill-line"/></entry>
             <entry>delete entire line</entry>
           </row>
           <row>
-            <entry><literal>^V</literal></entry>
+            <entry><muttng-doc:key mod="C">V</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="quote-char"/></entry>
             <entry>quote the next typed key</entry>
           </row>
           <row>
-            <entry><literal>&#60;Up&#62;</literal></entry>
+            <entry><muttng-doc:key>Up</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="history-up"/></entry>
             <entry>recall previous string from history</entry>
           </row>
           <row>
-            <entry><literal>&#60;Down&#62;</literal></entry>
+            <entry><muttng-doc:key>Down</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="history-down"/></entry>
             <entry>recall next string from history</entry>
           </row>
           <row>
-            <entry><literal>&#60;BackSpace&#62;</literal></entry>
+            <entry><muttng-doc:key>BackSpace</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="backspace"/></entry>
             <entry>kill the char in front of the cursor</entry>
           </row>
           <row>
-            <entry><literal>Esc u        </literal></entry>
+            <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="upcase-word"/></entry>
             <entry>convert word to upper case</entry>
           </row>
           <row>
-            <entry><literal>Esc l        </literal></entry>
+            <entry><muttng-doc:key mod="E">l</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="downcase-word"/></entry>
             <entry>convert word to lower case</entry>
           </row>
           <row>
-            <entry><literal>Esc c        </literal></entry>
+            <entry><muttng-doc:key mod="E">c</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="capitalize-word"/></entry>
             <entry>capitalize the word</entry>
           </row>
           <row>
-            <entry><literal>^G</literal></entry>
-            <entry><literal>n/a</literal></entry>
+            <entry><muttng-doc:key mod="C">G</muttng-doc:key></entry>
+            <entry></entry>
             <entry>abort</entry>
           </row>
           <row>
-            <entry><literal>&#60;Return&#62;</literal></entry>
-            <entry><literal>n/a</literal></entry>
+            <entry><muttng-doc:key>Return</muttng-doc:key></entry>
+            <entry></entry>
             <entry>finish editing</entry>
           </row>
         </tbody>
     
     <para>
       You can remap the <emphasis>editor</emphasis> functions using the
-      <muttng-doc:command name="bind"/> command.  For example, to make
+      <muttng-doc:cmdref name="bind"/> command.  For example, to make
       the <emphasis>Delete</emphasis> key delete the character in front
       of the cursor rather than under, you could use
     </para>
       
       <para>
 
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l|l">
         <title>Most commonly used Index Bindings</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
         </thead>
         <tbody>
           <row>
-            <entry><literal>c</literal></entry>
+            <entry><muttng-doc:key>c</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>change to a different mailbox</entry>
           </row>
           <row>
-            <entry><literal>ESC c    </literal></entry>
+            <entry><muttng-doc:key mod="E">c</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>change to a folder in read-only mode</entry>
           </row>
           <row>
-            <entry><literal>C</literal></entry>
+            <entry><muttng-doc:key>C</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>copy the current message to another mailbox</entry>
           </row>
           <row>
-            <entry><literal>ESC C     </literal></entry>
+            <entry><muttng-doc:key mod="E">C</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>decode a message and copy it to a folder</entry>
           </row>
           <row>
-            <entry><literal>ESC s    </literal></entry>
+            <entry><muttng-doc:key mod="E">s</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>decode a message and save it to a folder</entry>
           </row>
           <row>
-            <entry><literal>D</literal></entry>
+            <entry><muttng-doc:key>D</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>delete messages matching a pattern</entry>
           </row>
           <row>
-            <entry><literal>d</literal></entry>
+            <entry><muttng-doc:key>d</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>delete the current message</entry>
           </row>
           <row>
-            <entry><literal>F</literal></entry>
+            <entry><muttng-doc:key>F</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>mark as important</entry>
           </row>
           <row>
-            <entry><literal>l</literal></entry>
+            <entry><muttng-doc:key>l</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>show messages matching a pattern</entry>
           </row>
           <row>
-            <entry><literal>N</literal></entry>
+            <entry><muttng-doc:key>N</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>mark message as new</entry>
           </row>
           <row>
-            <entry><literal>o</literal></entry>
+            <entry><muttng-doc:key>o</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>change the current sort method</entry>
           </row>
           <row>
-            <entry><literal>O</literal></entry>
+            <entry><muttng-doc:key>O</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>reverse sort the mailbox</entry>
           </row>
           <row>
-            <entry><literal>q</literal></entry>
+            <entry><muttng-doc:key>q</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>save changes and exit</entry>
           </row>
           <row>
-            <entry><literal>s</literal></entry>
+            <entry><muttng-doc:key>s</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>save-message</entry>
           </row>
           <row>
-            <entry><literal>T</literal></entry>
+            <entry><muttng-doc:key>T</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>tag messages matching a pattern</entry>
           </row>
           <row>
-            <entry><literal>t</literal></entry>
+            <entry><muttng-doc:key>t</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle the tag on a message</entry>
           </row>
           <row>
-            <entry><literal>ESC t  </literal></entry>
+            <entry><muttng-doc:key mod="E">t</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle tag on entire message thread</entry>
           </row>
           <row>
-            <entry><literal>U</literal></entry>
+            <entry><muttng-doc:key>U</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>undelete messages matching a pattern</entry>
           </row>
           <row>
-            <entry><literal>u</literal></entry>
+            <entry><muttng-doc:key>u</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>undelete-message</entry>
           </row>
           <row>
-            <entry><literal>v</literal></entry>
+            <entry><muttng-doc:key>v</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>view-attachments</entry>
           </row>
           <row>
-            <entry><literal>x</literal></entry>
+            <entry><muttng-doc:key>x</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>abort changes and exit</entry>
           </row>
           <row>
-            <entry><literal>&#60;Return&#62;</literal></entry>
+            <entry><muttng-doc:key>Return</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>display-message</entry>
           </row>
           <row>
-            <entry><literal>&#60;Tab&#62;</literal></entry>
+            <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>jump to the next new or unread message</entry>
           </row>
           <row>
-            <entry><literal>@</literal></entry>
+            <entry><muttng-doc:key>@</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>show the author's full e-mail address</entry>
           </row>
           <row>
-            <entry><literal>$</literal></entry>
+            <entry><muttng-doc:key>$</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>save changes to mailbox</entry>
           </row>
           <row>
-            <entry><literal>/</literal></entry>
+            <entry><muttng-doc:key>/</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search</entry>
           </row>
           <row>
-            <entry><literal>ESC /     </literal></entry>
+            <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search-reverse</entry>
           </row>
           <row>
-            <entry><literal>^L</literal></entry>
+            <entry><muttng-doc:key mod="C">L</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>clear and redraw the screen</entry>
           </row>
           <row>
-            <entry><literal>^T</literal></entry>
+            <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>untag messages matching a pattern</entry>
           </row>
       
       <para>
 
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l|l">
         <title>Most commonly used Pager Bindings</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
         </thead>
         <tbody>
           <row>
-            <entry><literal>&#60;Return&#62;</literal></entry>
+            <entry><muttng-doc:key>Return</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>go down one line</entry>
           </row>
           <row>
-            <entry><literal>&#60;Space&#62;</literal></entry>
+            <entry><muttng-doc:key>Space</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>display the next page (or next message if at the end of a message)</entry>
           </row>
           <row>
-            <entry><literal>-</literal></entry>
+            <entry><muttng-doc:key>-</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>go back to the previous page</entry>
           </row>
           <row>
-            <entry><literal>n</literal></entry>
+            <entry><muttng-doc:key>n</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search for next match</entry>
           </row>
           <row>
-            <entry><literal>S</literal></entry>
+            <entry><muttng-doc:key>S</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>skip beyond quoted text</entry>
           </row>
           <row>
-            <entry><literal>T</literal></entry>
+            <entry><muttng-doc:key>T</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle display of quoted text</entry>
           </row>
           <row>
-            <entry><literal>?</literal></entry>
+            <entry><muttng-doc:key>?</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>show key bindings</entry>
           </row>
           <row>
-            <entry><literal>/</literal></entry>
+            <entry><muttng-doc:key>/</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search for a regular expression (pattern)</entry>
           </row>
           <row>
-            <entry><literal>ESC /   </literal></entry>
+            <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search backwards for a regular expression</entry>
           </row>
           <row>
-            <entry><literal>\</literal></entry>
+            <entry><muttng-doc:key>\</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle search pattern coloring</entry>
           </row>
           <row>
-            <entry><literal>^</literal></entry>
+            <entry><muttng-doc:key>^</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>jump to the top of the message</entry>
           </row>
       </para>
       
       <para>
-        Also, the internal pager supports a couple other advanced features.
-        For
-        one, it will accept and translate the ``standard'' nroff sequences
-        forbold and underline. These sequences are a series of either the
-        letter,
-        backspace (^H), the letter again for bold or the letter,
-        backspace,
-        ``_'' for denoting underline. Mutt-ng will attempt to display
-        these
-        in bold and underline respectively if your terminal supports them. If
-        not, you can use the bold and underline <muttng-doc:command name="color"/>
-        objects to specify a color or mono attribute for them.
+        Also, the internal pager supports a couple other advanced
+        features.  For one, it will accept and translate the
+        ``standard'' nroff sequences forbold and underline. These
+        sequences are a series of either the letter, backspace
+        (<muttng-doc:key mod="C">H</muttng-doc:key>), the letter again for bold
+        or the letter, backspace, <muttng-doc:key>_</muttng-doc:key> for denoting
+        underline. Mutt-ng will attempt to display these in bold and
+        underline respectively if your terminal supports them. If not,
+        you can use the bold and underline <muttng-doc:cmdref
+          name="color"/> objects to specify a color or mono attribute
+        for them.
       </para>
       
       <para>
       
       <para>
 
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l">
         <title>ANSI Escape Sequences</title>
         <tgroup cols="2" align="left" colsep="1" rowsep="1">
         <thead>
     </table>
 
     
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l">
         <title>ANSI Colors</title>
         <tgroup cols="2" align="left" colsep="1" rowsep="1">
         <thead>
         <para>
           Mutt-ng uses these attributes for handling text/enriched messages,
           and they
-          can also be used by an external <muttng-doc:command name="auto-view"/>
+          can also be used by an external <muttng-doc:cmdref name="auto_view"/>
           script for highlighting purposes.  <emphasis role="bold">Note:</emphasis> If you change the colors for your
           display, for example by changing the color associated with color2 for
           your xterm, then that color will be used instead of green.
         
         <para>
 
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Most commonly used thread-related bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           </thead>
           <tbody>
             <row>
-              <entry><literal>^D</literal></entry>
+              <entry><muttng-doc:key mod="C">D</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="delete-thread"/></entry>
                 <entry>delete all messages in the current  thread</entry>
               </row>
             <row>
-              <entry><literal>^U</literal></entry>
+              <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="undelete-thread"/></entry>
                 <entry>undelete all messages in the current thread</entry>
               </row>
             <row>
-              <entry><literal>^N</literal></entry>
+              <entry><muttng-doc:key mod="C">N</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="next-thread"/></entry>
                 <entry>jump to the start of the next thread</entry>
               </row>
             <row>
-              <entry><literal>^P</literal></entry>
+              <entry><muttng-doc:key mod="C">P</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="previous-thread"/></entry>
                 <entry>jump to the start of the previous thread</entry>
               </row>
             <row>
-              <entry><literal>^R</literal></entry>
+              <entry><muttng-doc:key mod="C">R</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="read-thread"/></entry>
                 <entry>mark the current thread as read</entry>
               </row>
             <row>
-              <entry><literal>ESC d </literal></entry>
+              <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="delete-subthread"/></entry>
                 <entry>delete all messages in the current subthread</entry>
               </row>
             <row>
-              <entry><literal>ESC u </literal></entry>
+              <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="undelete-subthread"/></entry>
                 <entry>undelete all messages in the current subthread</entry>
               </row>
             <row>
-              <entry><literal>ESC n </literal></entry>
+              <entry><muttng-doc:key mod="E">n</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="next-subthread"/></entry>
                 <entry>jump to the start of the next subthread</entry>
               </row>
             <row>
-              <entry><literal>ESC p </literal></entry>
+              <entry><muttng-doc:key mod="E">p</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="previous-subthread"/></entry>
                 <entry>jump to the start of the previous subthread</entry>
               </row>
             <row>
-              <entry><literal>ESC r </literal></entry>
+              <entry><muttng-doc:key mod="E">r</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="read-subthread"/></entry>
                 <entry>mark the current subthread as read </entry>
               </row>
             <row>
-              <entry><literal>ESC t </literal></entry>
+              <entry><muttng-doc:key mod="E">t</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="tag-thread"/></entry>
                 <entry>toggle the tag on the current thread</entry>
               </row>
             <row>
-              <entry><literal>ESC v </literal></entry>
+              <entry><muttng-doc:key mod="E">v</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="collapse-thread"/></entry>
                 <entry>toggle collapse for the current thread</entry>
               </row>
             <row>
-              <entry><literal>ESC V </literal></entry>
+              <entry><muttng-doc:key mod="E">V</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="collapse-all"/></entry>
                 <entry>toggle collapse for all threads</entry>
               </row>
             <row>
-              <entry><literal>P</literal></entry>
+              <entry><muttng-doc:key>P</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="parent-message"/></entry>
                 <entry>jump to parent message in thread</entry>
               </row>
         <title>Miscellaneous Functions</title>
         
         <para>
-          <muttng-doc:funcdef name="create-alias" key="a"/>
+          <muttng-doc:funcdef name="create-alias"><muttng-doc:key>a</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
           Creates a new alias based upon the current message (or prompts for a
-          new one).  Once editing is complete, an <muttng-doc:command name="alias"/>
+          new one).  Once editing is complete, an <muttng-doc:cmdref name="alias"/>
           command is added to the file specified by the <muttng-doc:varref name="alias-file"/>
           variable for future use. <emphasis role="bold">Note:</emphasis>
           Specifying an <muttng-doc:varref name="alias-file"/>
-          does not add the aliases specified there-in, you must also <muttng-doc:command name="source"/>
+          does not add the aliases specified there-in, you must also <muttng-doc:cmdref name="source"/>
           the file.
         </para>
         
         <para>
-          <muttng-doc:funcdef name="check-traditional-pgp" key="ESC P"/>
+          <muttng-doc:funcdef name="check-traditional-pgp"><muttng-doc:key mod="E">P</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="display-toggle-weed" key="h"/>
+          <muttng-doc:funcdef name="display-toggle-weed"><muttng-doc:key>h</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
-          Toggles the weeding of message header fields specified by <muttng-doc:command name="ignore"/>
+          Toggles the weeding of message header fields specified by <muttng-doc:cmdref name="ignore"/>
           commands.
         </para>
         
         <para>
-          <muttng-doc:funcdef name="edit" key="e"/>
+          <muttng-doc:funcdef name="edit"><muttng-doc:key>e</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         
         <para>
           <muttng-doc:funcdef name="edit-type"/>
-          (default: <literal>^E</literal> on the attachment menu, and in the pager and index
-          menus; <literal>^T</literal> on the compose menu)
+          (default: <muttng-doc:key mod="C">E</muttng-doc:key> on the attachment menu, and in the pager and index
+          menus; <muttng-doc:key mod="C">T</muttng-doc:key> on the compose menu)
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="enter-command" key=":"/>
+          <muttng-doc:funcdef name="enter-command"><muttng-doc:key>:</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
           a
           configuration file.  A common use is to check the settings of
           variables, or
-          in conjunction with <muttng-doc:command name="macro"/> to change
+          in conjunction with <muttng-doc:cmdref name="macro"/> to change
           settings on the
           fly.
         </para>
         
         <para>
-          <muttng-doc:funcdef name="extract-keys" key="^K"/>
+          <muttng-doc:funcdef name="extract-keys"><muttng-doc:key mod="C">K</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="forget-passphrase" key="^F"/>
+          <muttng-doc:funcdef name="forget-passphrase"><muttng-doc:key mod="C">F</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="list-reply" key="L"/>
+          <muttng-doc:funcdef name="list-reply"><muttng-doc:key>L</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
           Reply to the current or tagged message(s) by extracting any addresses
           which
-          match the regular expressions given by the <muttng-doc:command name="lists"/>
+          match the regular expressions given by the <muttng-doc:cmdref name="lists"/>
           commands, but also honor any <literal>Mail-Followup-To</literal>
           header(s) if the
           <muttng-doc:varref name="honor-followup-to"/>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="resend-message" key="ESC e"/>
+          <muttng-doc:funcdef name="resend-message"><muttng-doc:key mod="E">e</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="shell-escape" key="!"/>
+          <muttng-doc:funcdef name="shell-escape"><muttng-doc:key>!</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="toggle-quoted" key="T"/>
+          <muttng-doc:funcdef name="toggle-quoted"><muttng-doc:key>T</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="skip-quoted" key="S"/>
+          <muttng-doc:funcdef name="skip-quoted"><muttng-doc:key>S</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
       
       <para>
 
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Most commonly used Mail Composition Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           </thead>
           <tbody>
             <row>
-              <entry><literal>m</literal></entry>
+              <entry><muttng-doc:key>m</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="compose"/></entry>
               <entry>compose a new message</entry>
             </row>
             <row>
-              <entry><literal>r</literal></entry>
+              <entry><muttng-doc:key>r</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="reply"/></entry>
               <entry>reply to sender</entry>
             </row>
             <row>
-              <entry><literal>g</literal></entry>
+              <entry><muttng-doc:key>g</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="group-reply"/></entry>
               <entry>reply to all recipients</entry>
             </row>
             <row>
-              <entry><literal>L</literal></entry>
+              <entry><muttng-doc:key>L</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="list-reply"/></entry>
               <entry>reply to mailing list address</entry>
             </row>
             <row>
-              <entry><literal>f</literal></entry>
+              <entry><muttng-doc:key>f</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="forward"/></entry>
               <entry>forward message</entry>
             </row>
             <row>
-              <entry><literal>b</literal></entry>
+              <entry><muttng-doc:key>b</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="bounce"/></entry>
               <entry>bounce (remail) message</entry>
             </row>
             <row>
-              <entry><literal>ESC k  </literal></entry>
+              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="mail-key"/></entry>
               <entry>mail a PGP public key to someone</entry>
             </row>
         <title>Composing new messages</title>
         
         <para>
-          When you want to send an email using mutt-ng, simply press <literal>m</literal> on
+          When you want to send an email using mutt-ng, simply press <muttng-doc:key>m</muttng-doc:key> on
           your keyboard. Then, mutt-ng asks for the recipient via a prompt in
           the last line:
         </para>
         
         <para>
           
-          <screen>
-To:</screen>
+          <muttng-doc:lstmail>
+To:</muttng-doc:lstmail>
           
         </para>
         
@@ -1936,10 +1949,10 @@ To:</screen>
         
         <para>
           
-          <screen>
+          <muttng-doc:lstconf>
 set editor = "vim +/^$/ -c ':set tw=72'"
 set editor = "nano"
-set editor = "emacs"</screen>
+set editor = "emacs"</muttng-doc:lstconf>
           
         </para>
         
@@ -1976,13 +1989,13 @@ set editor = "emacs"</screen>
         </para>
         
         <para>
-          At this point, you can add more attachments, pressing <literal>a</literal>, you
-          can edit the recipient addresses, pressing <literal>t</literal> for
+          At this point, you can add more attachments, pressing <muttng-doc:key>a</muttng-doc:key>, you
+          can edit the recipient addresses, pressing <muttng-doc:key>t</muttng-doc:key> for
           the "To:" field,
-          <literal>c</literal> for the "Cc:" field, and <literal>b</literal>
+          <muttng-doc:key>c</muttng-doc:key> for the "Cc:" field, and <muttng-doc:key>b</muttng-doc:key>
           for the "Bcc: field. You can
-          also edit the subject the subject by simply pressing <literal>s</literal> or the
-          email message that you've entered before by pressing <literal>e</literal>. You will
+          also edit the subject the subject by simply pressing <muttng-doc:key>s</muttng-doc:key> or the
+          email message that you've entered before by pressing <muttng-doc:key>e</muttng-doc:key>. You will
           then again return to the editor. You can even edit the sender, by
           pressing
           <literal>&lt;esc&gt;f</literal>, but this shall only be used with
@@ -1997,8 +2010,8 @@ set editor = "emacs"</screen>
         
         <para>
           
-          <screen>
-set edit_headers</screen>
+          <muttng-doc:lstconf>
+set edit_headers</muttng-doc:lstconf>
           
         </para>
         
@@ -2010,7 +2023,7 @@ set edit_headers</screen>
         
         <para>
 
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Most commonly used Compose Menu Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
@@ -2022,102 +2035,102 @@ set edit_headers</screen>
           </thead>
           <tbody>
             <row>
-              <entry><literal>a</literal></entry>
+              <entry><muttng-doc:key>a</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="attach-file"/></entry>
               <entry>attach a file</entry>
             </row>
             <row>
-              <entry><literal>A</literal></entry>
+              <entry><muttng-doc:key>A</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="attach-message"/></entry>
               <entry>attach message(s) to the message</entry>
             </row>
             <row>
-              <entry><literal>ESC k  </literal></entry>
+              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="attach-key"/></entry>
               <entry>attach a PGP public key</entry>
             </row>
             <row>
-              <entry><literal>d</literal></entry>
+              <entry><muttng-doc:key>d</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-description"/></entry>
               <entry>edit description on attachment</entry>
             </row>
             <row>
-              <entry><literal>D</literal></entry>
+              <entry><muttng-doc:key>D</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="detach-file"/></entry>
               <entry>detach a file</entry>
             </row>
             <row>
-              <entry><literal>t</literal></entry>
+              <entry><muttng-doc:key>t</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-to"/></entry>
               <entry>edit the To field</entry>
             </row>
             <row>
-              <entry><literal>ESC f </literal></entry>
+              <entry><muttng-doc:key mod="E">f</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-from"/></entry>
               <entry>edit the From field</entry>
             </row>
             <row>
-              <entry><literal>r</literal></entry>
+              <entry><muttng-doc:key>r</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-reply-to"/></entry>
               <entry>edit the Reply-To field</entry>
             </row>
             <row>
-              <entry><literal>c</literal></entry>
+              <entry><muttng-doc:key>c</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-cc"/></entry>
               <entry>edit the Cc field</entry>
             </row>
             <row>
-              <entry><literal>b</literal></entry>
+              <entry><muttng-doc:key>b</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-bcc"/></entry>
               <entry>edit the Bcc field</entry>
             </row>
             <row>
-              <entry><literal>y</literal></entry>
+              <entry><muttng-doc:key>y</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="send-message"/></entry>
               <entry>send the message</entry>
             </row>
             <row>
-              <entry><literal>s</literal></entry>
+              <entry><muttng-doc:key>s</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-subject"/></entry>
               <entry>edit the Subject</entry>
             </row>
             <row>
-              <entry><literal>S</literal></entry>
+              <entry><muttng-doc:key>S</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="smime-menu"/></entry>
               <entry>select S/MIME options</entry>
             </row>
             <row>
-              <entry><literal>f</literal></entry>
+              <entry><muttng-doc:key>f</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-fcc"/></entry>
               <entry>specify an ``Fcc'' mailbox</entry>
             </row>
             <row>
-              <entry><literal>p</literal></entry>
+              <entry><muttng-doc:key>p</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="pgp-menu"/></entry>
               <entry>select PGP options</entry>
             </row>
             <row>
-              <entry><literal>P</literal></entry>
+              <entry><muttng-doc:key>P</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="postpone-message"/></entry>
               <entry>postpone this message until later</entry>
             </row>
             <row>
-              <entry><literal>q</literal></entry>
+              <entry><muttng-doc:key>q</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="quit"/></entry>
               <entry>quit (abort) sending the message</entry>
             </row>
             <row>
-              <entry><literal>w</literal></entry>
+              <entry><muttng-doc:key>w</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="write-fcc"/></entry>
               <entry>write the message to a folder</entry>
             </row>
             <row>
-              <entry><literal>i</literal></entry>
+              <entry><muttng-doc:key>i</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="ispell"/></entry>
               <entry>check spelling (if available on your system)</entry>
             </row>
             <row>
-              <entry><literal>^F</literal></entry>
+              <entry><muttng-doc:key mod="C">F</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
               <entry>wipe passphrase(s) from memory</entry>
             </row>
@@ -2154,7 +2167,7 @@ set edit_headers</screen>
           
           <para>
             When you want to reply to an email message, select it in the index
-            menu and then press <literal>r</literal>. Mutt-ng's behaviour is
+            menu and then press <muttng-doc:key>r</muttng-doc:key>. Mutt-ng's behaviour is
             then similar to the 
             behaviour when you compose a message: first, you will be asked for
             the recipient, then for the subject, and then, mutt-ng will start
@@ -2164,12 +2177,12 @@ set edit_headers</screen>
           
           <para>
             
-            <screen>
+            <muttng-doc:lstmail>
 On Mon, Mar 07, 2005 at 05:02:12PM +0100, Michael Svensson wrote:
 &gt; Bill, can you please send last month's progress report to Mr. 
 &gt; Morgan? We also urgently need the cost estimation for the new 
 &gt; production server that we want to set up before our customer's 
-&gt; project will go live.</screen>
+&gt; project will go live.</muttng-doc:lstmail>
             
           </para>
           
@@ -2186,28 +2199,28 @@ On Mon, Mar 07, 2005 at 05:02:12PM +0100, Michael Svensson wrote:
           <para>
             The quote attribution is configurable, by default it is set to
             
-            <screen>
-set attribution = "On %d, %n wrote:"</screen>
+            <muttng-doc:lstconf>
+set attribution = "On %d, %n wrote:"</muttng-doc:lstconf>
             
           </para>
           
           <para>
             It can also be set to something more compact, e.g.
             
-            <screen>
-set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</screen>
+            <muttng-doc:lstconf>
+set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</muttng-doc:lstconf>
             
           </para>
           
           <para>
             The example above results in the following attribution:
             
-            <screen>
+            <muttng-doc:lstmail>
 * Michael Svensson &lt;svensson@foobar.com&gt; [05-03-06 17:02]:
 &gt; Bill, can you please send last month's progress report to Mr. 
 &gt; Morgan? We also urgently need the cost estimation for the new 
 &gt; production server that we want to set up before our customer's 
-&gt; project will go live.</screen>
+&gt; project will go live.</muttng-doc:lstmail>
             
           </para>
           
@@ -2239,8 +2252,8 @@ set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</screen>
             In the situation where a group of people uses email as a
             discussion, most of the emails will have one or more recipients,
             and probably several "Cc:" recipients. The group reply
-            functionalityensures that when you press <literal>g</literal>
-            instead of <literal>r</literal> to do a reply,
+            functionalityensures that when you press <muttng-doc:key>g</muttng-doc:key>
+            instead of <muttng-doc:key>r</muttng-doc:key> to do a reply,
             each and every recipient that is contained in the original message
             will receive a copy of the message, either as normal recipient or
             as "Cc:" recipient.
@@ -2263,7 +2276,7 @@ set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</screen>
           </para>
           
           <para>
-            To do a list reply, simply press <literal>L</literal>. If the email
+            To do a list reply, simply press <muttng-doc:key>L</muttng-doc:key>. If the email
             contains
             a <literal>Mail-Followup-To:</literal> header, its value will be
             used as reply
@@ -2276,8 +2289,8 @@ set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</screen>
           
           <para>
             
-            <screen>
-lists linuxevent@luga\.at vuln-dev@ mutt-ng-users@</screen>
+            <muttng-doc:lstconf>
+lists linuxevent@luga\.at vuln-dev@ mutt-ng-users@</muttng-doc:lstconf>
             
           </para>
           
@@ -2322,8 +2335,8 @@ lists linuxevent@luga\.at vuln-dev@ mutt-ng-users@</screen>
         <para>
           You can also attach files to your message by specifying
 
-          <screen>
-Attach: filename [description]</screen>
+          <muttng-doc:lstmail>
+Attach: filename [description]</muttng-doc:lstmail>
 
           where <emphasis>filename</emphasis> is the file to attach and <emphasis>
             description
@@ -2355,8 +2368,8 @@ Attach: filename [description]</screen>
         <para>
           If you want to use PGP, you can specify 
         
-          <screen>
-Pgp: [E | S | S id]</screen>
+          <muttng-doc:lstmail>
+Pgp: [E | S | S id]</muttng-doc:lstmail>
 
           ``E'' encrypts, ``S'' signs and
           ``S&lt;id&gt;'' signs with the given key, setting
@@ -2378,7 +2391,7 @@ Pgp: [E | S | S id]</screen>
           In these cases, you are dropped into a menu with a list of keys from
           which you can select one.  When you quit this menu, or mutt can't
           find any matching keys, you are prompted for a user ID.  You can, as
-          usually, abort this prompt using <literal>^G</literal>.  When
+          usually, abort this prompt using <muttng-doc:key mod="C">G</muttng-doc:key>.  When
           you do so, mutt will
           return to the compose screen.
         </para>
@@ -2401,7 +2414,7 @@ Pgp: [E | S | S id]</screen>
           flags:
 
 
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l">
           <title>PGP Key Menu Flags</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
@@ -2511,7 +2524,7 @@ Pgp: [E | S | S id]</screen>
           and
           <literal>chain-next</literal> functions, which are by default bound
           to the left
-          and right arrows and to the <literal>h</literal> and <literal>l</literal> keys (think vi
+          and right arrows and to the <muttng-doc:key>h</muttng-doc:key> and <muttng-doc:key>l</muttng-doc:key> keys (think vi
           keyboard bindings).  To insert a remailer at the current chain
           position, use the <literal>insert</literal> function.  To append a
           remailer behind
@@ -2562,7 +2575,7 @@ Pgp: [E | S | S id]</screen>
       
       <para>
         The first one is regular forwarding, as you probably know it from
-        other mail clients. You simply press <literal>f</literal>, enter the
+        other mail clients. You simply press <muttng-doc:key>f</muttng-doc:key>, enter the
         recipient
         email address, the subject of the forwarded email, and then you can
         edit the message to be forwarded in the editor. The forwarded
@@ -2572,18 +2585,18 @@ Pgp: [E | S | S id]</screen>
       
       <para>
         
-        <screen>
------ Forwarded message from Lucas User &#60;luser@example.com&#62; -----
+        <muttng-doc:lstmail>
+----- Forwarded message from Lucas User &lt;luser@example.com&gt; -----
 
-From: Lucas User &#60;luser@example.com&#62;
+From: Lucas User &lt;luser@example.com&gt;
 Date: Thu, 02 Dec 2004 03:08:34 +0100
-To: Michael Random &#60;mrandom@example.com&#62;
+To: Michael Random &lt;mrandom@example.com&gt;
 Subject: Re: blackmail
 
 Pay me EUR 50,000.- cash or your favorite stuffed animal will die
 a horrible death.
 
------ End forwarded message -----</screen>
+----- End forwarded message -----</muttng-doc:lstmail>
         
       </para>
       
@@ -2599,7 +2612,7 @@ a horrible death.
         another
         address, it will be sent in practically the same format you send it
         (except for headers that are created during transporting the
-        message). To bounce a message, press <literal>b</literal> and enter the
+        message). To bounce a message, press <muttng-doc:key>b</muttng-doc:key> and enter the
         recipient
         email address. By default, you are then asked whether you really
         want to bounce the message to the specified recipient. If you answer
@@ -2728,8 +2741,8 @@ a horrible death.
         When multiple commands are used, they must be separated by a semicolon
         (;).
         
-        <screen>
-set realname='Mutt-ng user' ; ignore x-</screen>
+        <muttng-doc:lstconf>
+set realname='Mutt-ng user' ; ignore x-</muttng-doc:lstconf>
         
         The hash mark, or pound sign
         (``#''), is used as a ``comment'' character. You can use it to
@@ -2739,8 +2752,8 @@ set realname='Mutt-ng user' ; ignore x-</screen>
       
       <para>
         
-        <screen>
-my_hdr X-Disclaimer: Why are you listening to me? # This is a comment</screen>
+        <muttng-doc:lstconf>
+my_hdr X-Disclaimer: Why are you listening to me? # This is a comment</muttng-doc:lstconf>
         
       </para>
       
@@ -2770,8 +2783,8 @@ my_hdr X-Disclaimer: Why are you listening to me? # This is a comment</screen>
         interpreted
         character.
         
-        <screen>
-set realname="Michael \"MuttDude\" Elkins"</screen>
+        <muttng-doc:lstconf>
+set realname="Michael \"MuttDude\" Elkins"</muttng-doc:lstconf>
         
       </para>
       
@@ -2797,9 +2810,9 @@ set realname="Michael \"MuttDude\" Elkins"</screen>
       
       <para>
         
-        <screen>
+        <muttng-doc:lstconf>
 # folder-hook . \
-set realname="Michael \"MuttDude\" Elkins"</screen>
+set realname="Michael \"MuttDude\" Elkins"</muttng-doc:lstconf>
         
       </para>
       
@@ -2821,12 +2834,12 @@ set realname="Michael \"MuttDude\" Elkins"</screen>
       
       <para>
         
-        <screen>
+        <muttng-doc:lstconf>
 line1\
 line2a # line2b\
 line3\
 line4
-line5</screen>
+line5</muttng-doc:lstconf>
         
       </para>
       
@@ -2867,8 +2880,8 @@ line5</screen>
         
         <para>
           
-          <screen>
-my_hdr X-Operating-System: `uname -a`</screen>
+          <muttng-doc:lstconf>
+my_hdr X-Operating-System: `uname -a`</muttng-doc:lstconf>
           
         </para>
         
@@ -2892,8 +2905,8 @@ my_hdr X-Operating-System: `uname -a`</screen>
         
         <para>
           
-          <screen>
-set record=+sent_on_$HOSTNAME</screen>
+          <muttng-doc:lstconf>
+set record=+sent_on_$HOSTNAME</muttng-doc:lstconf>
           
         </para>
         
@@ -2922,8 +2935,8 @@ set record=+sent_on_$HOSTNAME</screen>
         
         <para>
           
-          <screen>
-set imap_home_namespace = $folder</screen>
+          <muttng-doc:lstconf>
+set imap_home_namespace = $folder</muttng-doc:lstconf>
           
         </para>
         
@@ -2969,9 +2982,9 @@ set imap_home_namespace = $folder</screen>
         
         <para>
           
-          <screen>
+          <muttng-doc:lstconf>
 macro generic &lt;F1&gt; "!less -r /path/to/manual" "Show manual"
-macro pager &lt;F1&gt; "!less -r /path/to/manual" "Show manual"</screen>
+macro pager &lt;F1&gt; "!less -r /path/to/manual" "Show manual"</muttng-doc:lstconf>
           
         </para>
         
@@ -2985,11 +2998,11 @@ macro pager &lt;F1&gt; "!less -r /path/to/manual" "Show manual"</screen>
         
         <para>
           
-          <screen>
+          <muttng-doc:lstconf>
 set user_manualcmd = "!less -r /path/to_manual" 
 macro generic &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"
 macro pager &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"
-macro index &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"</screen>
+macro index &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"</muttng-doc:lstconf>
           
         </para>
         
@@ -2999,8 +3012,8 @@ macro index &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"</screen>
         
         <para>
           
-          <screen>
-macro index &lt;F2&gt; "$user_manualcmd | grep '\^[ ]\\+~. '" "Show Patterns"</screen>
+          <muttng-doc:lstconf>
+macro index &lt;F2&gt; "$user_manualcmd | grep '\^[ ]\\+~. '" "Show Patterns"</muttng-doc:lstconf>
           
         </para>
         
@@ -3028,9 +3041,9 @@ macro index &lt;F2&gt; "$user_manualcmd | grep '\^[ ]\\+~. '" "Show Patterns"</s
         
         <para>
           
-          <screen>
+          <muttng-doc:lstconf>
 set user_foo = 42
-set user_foo = 666</screen>
+set user_foo = 666</muttng-doc:lstconf>
           
         </para>
         
@@ -3042,8 +3055,8 @@ set user_foo = 666</screen>
         
         <para>
           
-          <screen>
-set ?user_foo</screen>
+          <muttng-doc:lstconf>
+set ?user_foo</muttng-doc:lstconf>
           
         </para>
         
@@ -3053,8 +3066,8 @@ set ?user_foo</screen>
         
         <para>
           
-          <screen>
-reset user_foo</screen>
+          <muttng-doc:lstconf>
+reset user_foo</muttng-doc:lstconf>
           
         </para>
         
@@ -3065,8 +3078,8 @@ reset user_foo</screen>
         
         <para>
           
-          <screen>
-unset user_foo</screen>
+          <muttng-doc:lstconf>
+unset user_foo</muttng-doc:lstconf>
           
         </para>
         
@@ -3100,8 +3113,8 @@ unset user_foo</screen>
         
         <para>
           
-          <screen>
-muttng -Q muttng_docdir</screen>
+          <muttng-doc:lstshell>
+$ muttng -Q muttng_docdir</muttng-doc:lstshell>
           
         </para>
         
@@ -3113,8 +3126,8 @@ muttng -Q muttng_docdir</screen>
         
         <para>
           
-          <screen>
-set user_manualcmd = '!less -r /path/to_manual'</screen>
+          <muttng-doc:lstconf>
+set user_manualcmd = '!less -r /path/to_manual'</muttng-doc:lstconf>
           
         </para>
         
@@ -3124,8 +3137,8 @@ set user_manualcmd = '!less -r /path/to_manual'</screen>
         
         <para>
           
-          <screen>
-set user_manualcmd = "!less -r $muttng_docdir/manual.txt"</screen>
+          <muttng-doc:lstconf>
+set user_manualcmd = "!less -r $muttng_docdir/manual.txt"</muttng-doc:lstconf>
           
         </para>
         
@@ -3146,8 +3159,8 @@ set user_manualcmd = "!less -r $muttng_docdir/manual.txt"</screen>
         
         <para>
           
-          <screen>
-folder-hook . "set user_current_folder = $muttng_folder_name"</screen>
+          <muttng-doc:lstconf>
+folder-hook . "set user_current_folder = $muttng_folder_name"</muttng-doc:lstconf>
           
         </para>
         
@@ -3158,8 +3171,8 @@ folder-hook . "set user_current_folder = $muttng_folder_name"</screen>
         
         <para>
           
-          <screen>
-folder-hook . "set user_current_folder = some_folder"</screen>
+          <muttng-doc:lstconf>
+folder-hook . "set user_current_folder = some_folder"</muttng-doc:lstconf>
           
         </para>
         
@@ -3171,8 +3184,8 @@ folder-hook . "set user_current_folder = some_folder"</screen>
         
         <para>
           
-          <screen>
-folder-hook . 'set user_current_folder = $muttng_folder_name'</screen>
+          <muttng-doc:lstconf>
+folder-hook . 'set user_current_folder = $muttng_folder_name'</muttng-doc:lstconf>
           
         </para>
         
@@ -3189,8 +3202,8 @@ folder-hook . 'set user_current_folder = $muttng_folder_name'</screen>
         
         <para>
           
-          <screen>
-folder-hook . 'source ~/.mutt/score-$muttng_folder_name'</screen>
+          <muttng-doc:lstconf>
+folder-hook . 'source ~/.mutt/score-$muttng_folder_name'</muttng-doc:lstconf>
           
         </para>
         
@@ -3215,12 +3228,12 @@ folder-hook . 'source ~/.mutt/score-$muttng_folder_name'</screen>
         
         <para>
           
-          <screen>
+          <muttng-doc:lstconf>
 set read_inc = 100
 set folder = $read_inc
 set read_inc = $folder
 set user_magic_number = 42
-set folder = $user_magic_number</screen>
+set folder = $user_magic_number</muttng-doc:lstconf>
           
         </para>
         
@@ -3228,11 +3241,13 @@ set folder = $user_magic_number</screen>
       
     </sect1>
     
-    <sect1 id="command-alias"><anchor id="command-unalias"/>
+    <sect1>
       <title>Defining/Using aliases</title>
 
       <para>
-        Usage: <muttng-doc:command name="alias"/> <emphasis>key</emphasis> <emphasis>address</emphasis> [, <emphasis>address</emphasis>,...]
+        <muttng-doc:cmddef name="alias">
+          key address [, address,...]
+        </muttng-doc:cmddef>
       </para>
       
       <para>
@@ -3255,14 +3270,16 @@ set folder = $user_magic_number</screen>
       </para>
       
       <para>
-        <literal>unalias</literal> [* | <emphasis>key</emphasis> <emphasis>...</emphasis>]
+        <muttng-doc:cmddef name="unalias">
+          [* | key ... ]
+        </muttng-doc:cmddef>
       </para>
       
       <para>
         
-        <screen>
+        <muttng-doc:lstconf>
 alias muttdude me@cs.hmc.edu (Michael Elkins)
-alias theguys manny, moe, jack</screen>
+alias theguys manny, moe, jack</muttng-doc:lstconf>
         
       </para>
       
@@ -3270,7 +3287,7 @@ 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
-        a configuration file, as long as this file is <muttng-doc:command name="source"/>.
+        a configuration file, as long as this file is <muttng-doc:cmdref name="source"/>.
         Consequently, you can have multiple alias files, or
         you can have all aliases defined in your muttrc.
       </para>
@@ -3284,7 +3301,7 @@ alias theguys manny, moe, jack</screen>
         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 <muttng-doc:command name="source"/>
+        order for the new aliases to take effect you need to explicitly <muttng-doc:cmdref name="source"/>
         this file too.
       </para>
       
@@ -3294,10 +3311,10 @@ alias theguys manny, moe, jack</screen>
       
       <para>
         
-        <screen>
+        <muttng-doc:lstconf>
 source /usr/local/share/Mutt-ng.aliases
 source ~/.mail_aliases
-set alias_file=~/.mail_aliases</screen>
+set alias_file=~/.mail_aliases</muttng-doc:lstconf>
         
       </para>
       
@@ -3340,11 +3357,13 @@ set alias_file=~/.mail_aliases</screen>
       
     </sect1>
     
-    <sect1 id="command-bind">
+    <sect1>
       <title>Changing the default key bindings</title>
       
       <para>
-        Usage: <muttng-doc:command name="bind"/> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>function</emphasis>
+        <muttng-doc:cmddef name="bind">
+          map key function
+        </muttng-doc:cmddef>
       </para>
       
       <para>
@@ -3494,7 +3513,7 @@ set alias_file=~/.mail_aliases</screen>
       
       <para>
         
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l">
           <title>Alternative Key Names</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
@@ -3509,11 +3528,11 @@ set alias_file=~/.mail_aliases</screen>
               <entry>tab</entry>
             </row>
             <row>
-              <entry><literal>&#60;tab&#62;</literal></entry>
+              <entry><literal>&lt;tab&gt;</literal></entry>
               <entry>tab</entry>
             </row>
             <row>
-              <entry><literal>&#60;backtab&#62;</literal></entry>
+              <entry><literal>&lt;backtab&gt;</literal></entry>
               <entry>backtab / shift-tab</entry>
             </row>
             <row>
@@ -3529,71 +3548,71 @@ set alias_file=~/.mail_aliases</screen>
               <entry>escape</entry>
             </row>
             <row>
-              <entry><literal>&#60;esc&#62;</literal></entry>
+              <entry><literal>&lt;esc&gt;</literal></entry>
               <entry>escape</entry>
             </row>
             <row>
-              <entry><literal>&#60;up&#62;</literal></entry>
+              <entry><literal>&lt;up&gt;</literal></entry>
               <entry>up arrow</entry>
             </row>
             <row>
-              <entry><literal>&#60;down&#62;</literal></entry>
+              <entry><literal>&lt;down&gt;</literal></entry>
               <entry>down arrow</entry>
             </row>
             <row>
-              <entry><literal>&#60;left&#62;</literal></entry>
+              <entry><literal>&lt;left&gt;</literal></entry>
               <entry>left arrow</entry>
             </row>
             <row>
-              <entry><literal>&#60;right&#62;</literal></entry>
+              <entry><literal>&lt;right&gt;</literal></entry>
               <entry>right arrow</entry>
             </row>
             <row>
-              <entry><literal>&#60;pageup&#62;</literal></entry>
+              <entry><literal>&lt;pageup&gt;</literal></entry>
               <entry>Page Up</entry>
             </row>
             <row>
-              <entry><literal>&#60;pagedown&#62;</literal></entry>
+              <entry><literal>&lt;pagedown&gt;</literal></entry>
               <entry>Page Down</entry>
             </row>
             <row>
-              <entry><literal>&#60;backspace&#62;</literal></entry>
+              <entry><literal>&lt;backspace&gt;</literal></entry>
               <entry>Backspace</entry>
             </row>
             <row>
-              <entry><literal>&#60;delete&#62;</literal></entry>
+              <entry><literal>&lt;delete&gt;</literal></entry>
               <entry>Delete</entry>
             </row>
             <row>
-              <entry><literal>&#60;insert&#62;</literal></entry>
+              <entry><literal>&lt;insert&gt;</literal></entry>
               <entry>Insert</entry>
             </row>
             <row>
-              <entry><literal>&#60;enter&#62;</literal></entry>
+              <entry><literal>&lt;enter&gt;</literal></entry>
               <entry>Enter</entry>
             </row>
             <row>
-              <entry><literal>&#60;return&#62;</literal></entry>
+              <entry><literal>&lt;return&gt;</literal></entry>
               <entry>Return</entry>
             </row>
             <row>
-              <entry><literal>&#60;home&#62;</literal></entry>
+              <entry><literal>&lt;home&gt;</literal></entry>
               <entry>Home</entry>
             </row>
             <row>
-              <entry><literal>&#60;end&#62;</literal></entry>
+              <entry><literal>&lt;end&gt;</literal></entry>
               <entry>End</entry>
             </row>
             <row>
-              <entry><literal>&#60;space&#62;</literal></entry>
+              <entry><literal>&lt;space&gt;</literal></entry>
               <entry>Space bar</entry>
             </row>
             <row>
-              <entry><literal>&#60;f1&#62;</literal></entry>
+              <entry><literal>&lt;f1&gt;</literal></entry>
               <entry>function key 1</entry>
             </row>
             <row>
-              <entry><literal>&#60;f10&#62;</literal></entry>
+              <entry><literal>&lt;f10&gt;</literal></entry>
               <entry>function key 10</entry>
             </row>
           </tbody>
@@ -3693,8 +3712,8 @@ set alias_file=~/.mail_aliases</screen>
       
       <para>
         
-        <screen>
-folder-hook mutt set sort=threads</screen>
+        <muttng-doc:lstconf>
+folder-hook mutt set sort=threads</muttng-doc:lstconf>
         
       </para>
       
@@ -3707,8 +3726,8 @@ folder-hook mutt set sort=threads</screen>
       
       <para>
         
-        <screen>
-folder-hook . set sort=date-sent</screen>
+        <muttng-doc:lstconf>
+folder-hook . set sort=date-sent</muttng-doc:lstconf>
         
       </para>
       
@@ -3718,11 +3737,13 @@ folder-hook . set sort=date-sent</screen>
       
     </sect1>
     
-    <sect1 id="command-macro">
+    <sect1>
       <title>Keyboard macros</title>
       
       <para>
-        Usage: <muttng-doc:command name="macro"/> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>sequence</emphasis> [<emphasis>description</emphasis>]
+        <muttng-doc:cmddef name="macro">
+          menu key sequence [description]
+        </muttng-doc:cmddef>
       </para>
       
       <para>
@@ -3747,22 +3768,18 @@ folder-hook . set sort=date-sent</screen>
       </para>
       
       <para>
-        <emphasis>key</emphasis> and <emphasis>sequence</emphasis> are expanded
-        by the same rules as the <muttng-doc:command name="bind"/>.  There are
-        some additions however.  The
-        first is that control characters in <emphasis>sequence</emphasis> can
-        also be specified
-        as <emphasis>^x</emphasis>.  In order to get a caret (`^'')
-        you need to use
-        <emphasis>^^</emphasis>.  Secondly, to specify a certain key
-        such as <emphasis>up</emphasis>
-        or to invoke a function directly, you can use the format
+        <emphasis>key</emphasis> and <emphasis>sequence</emphasis> are
+        expanded by the same rules as the <muttng-doc:cmdref
+          name="bind"/>.  There are some additions however.  The first
+        is that control characters in <emphasis>sequence</emphasis> can
+        also be specified as <literal>^x</literal>.  In order to get a
+        caret (`^'') you need to specify it twice.  Secondly,
+        to specify a certain key such as <emphasis>up</emphasis> or to
+        invoke a function directly, you can use the format
         <emphasis>&lt;key name&gt;</emphasis> and <emphasis>&lt;function
-          name&gt;
-        </emphasis>
-        .For a listing of key
-        names see the section on <muttng-doc:command name="bind"/>.  Functions
-        are listed in the <link linkend="functions">functions</link>.
+          name&gt; </emphasis> .For a listing of key names see the
+        section on <muttng-doc:cmdref name="bind"/>.  Functions are
+        listed in the <link linkend="functions">functions</link>.
       </para>
       
       <para>
@@ -3792,19 +3809,17 @@ folder-hook . set sort=date-sent</screen>
       
     </sect1>
     
-    <sect1 id="command-color"><anchor id="command-uncolor"/>
+    <sect1>
       <title>Using color and mono video attributes</title>
 
-      <anchor id="command-mono"/>
-      <anchor id="command-unmono"/>
       <para>
-        Usage: <muttng-doc:command name="color"/> <emphasis>object</emphasis> <emphasis>foreground</emphasis><emphasis>background</emphasis> [<emphasis>regexp</emphasis>]
+        <muttng-doc:cmddef name="color">object foreground background [regexp]</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="color"/> index <emphasis>foreground</emphasis> <emphasis>background</emphasis><emphasis>pattern</emphasis>
+        <muttng-doc:cmddef name="color" noanchor="1">index foreground pattern</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="uncolor"/> index <emphasis>pattern</emphasis>[<emphasis>pattern</emphasis>...]
+        <muttng-doc:cmddef name="uncolor">index pattern [pattern ...]</muttng-doc:cmddef>
       </para>
       
       <para>
@@ -4038,9 +4053,9 @@ folder-hook . set sort=date-sent</screen>
       
       <para>
         
-        <screen>
+        <muttng-doc:lstshell>
 set COLORFGBG="green;black"
-export COLORFGBG</screen>
+export COLORFGBG</muttng-doc:lstshell>
         
       </para>
       
@@ -4087,13 +4102,13 @@ export COLORFGBG</screen>
       </para>
       
       <para>
-        Usage: <muttng-doc:command name="mono"/> <emphasis>&lt;object&gt; &lt;attribute&gt;</emphasis>[<emphasis>regexp</emphasis>]
+        <muttng-doc:cmddef name="mono">object attribute [regexp]</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="mono"/> index <emphasis>attribute</emphasis> <emphasis>pattern</emphasis>
+        <muttng-doc:cmddef name="mono" noanchor="1">index attribute pattern</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="unmono"/> index <emphasis>pattern</emphasis> [<emphasis>pattern</emphasis>...]
+        <muttng-doc:cmddef name="unmono">index pattern [pattern ...]</muttng-doc:cmddef>
       </para>
       
       <para>
@@ -4144,15 +4159,15 @@ export COLORFGBG</screen>
       
     </sect1>
     
-    <sect1 id="command-ignore"><anchor id="command-unignore"/>
+    <sect1>
       <title>Ignoring (weeding) unwanted message headers</title>
 
       <para>
-        Usage: <muttng-doc:command name="ignore"/> <emphasis>pattern</emphasis> [<emphasis>pattern</emphasis>...]
+        <muttng-doc:cmddef name="ignore">pattern [pattern ...]</muttng-doc:cmddef>
       </para>
 
       <para>
-        Usage: <muttng-doc:command name="unignore"/> <emphasis>pattern</emphasis> [<emphasis>pattern</emphasis>...]
+        <muttng-doc:cmddef name="unignore">pattern [pattern ...]</muttng-doc:cmddef>
       </para>
  
       <para>
@@ -4186,12 +4201,12 @@ export COLORFGBG</screen>
       <para>
         For example:
         
-        <screen>
+        <muttng-doc:lstconf>
 # Sven's draconian header weeding
 ignore *
 unignore from date subject to cc
 unignore organization organisation x-mailer: x-newsreader: x-mailing-list:
-unignore posted-to:</screen>
+unignore posted-to:</muttng-doc:lstconf>
         
       </para>
       
@@ -4201,15 +4216,15 @@ unignore posted-to:</screen>
       
     </sect1>
     
-    <sect1 id="command-alternates"><anchor id="command-unalternates"/>
+    <sect1>
       <title>Alternative addresses</title>
       
       <para>
-        Usage: <muttng-doc:command name="alternates"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
+        <muttng-doc:cmddef name="alternates">regexp [regexp ...]</muttng-doc:cmddef>
       </para>
 
       <para>
-        Usage: <muttng-doc:command name="unalternates"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
+        <muttng-doc:cmddef name="unalternates">regexp [regexp ...]</muttng-doc:cmddef>
       </para>
  
       <para>
@@ -4308,8 +4323,8 @@ unignore posted-to:</screen>
         
         <para>
           
-          <screen>
-set wrapmargin = 10</screen>
+          <muttng-doc:lstconf>
+set wrapmargin = 10</muttng-doc:lstconf>
           
         </para>
         
@@ -4325,8 +4340,8 @@ set wrapmargin = 10</screen>
         
         <para>
           
-          <screen>
-set max_line_length = 120</screen>
+          <muttng-doc:lstconf>
+set max_line_length = 120</muttng-doc:lstconf>
           
         </para>
         
@@ -4343,11 +4358,11 @@ set max_line_length = 120</screen>
         
         <para>
           
-          <screen>
+          <muttng-doc:lstmail>
 &gt;Bill, can you please send last month's progress report to Mr. 
 &gt;Morgan? We also urgently need the cost estimation for the new 
 &gt;production server that we want to set up before our customer's 
-&gt;project will go live.</screen>
+&gt;project will go live.</muttng-doc:lstmail>
           
         </para>
         
@@ -4359,8 +4374,8 @@ set max_line_length = 120</screen>
         
         <para>
           
-          <screen>
-set stuff_quoted</screen>
+          <muttng-doc:lstconf>
+set stuff_quoted</muttng-doc:lstconf>
           
         </para>
         
@@ -4370,11 +4385,11 @@ set stuff_quoted</screen>
         
         <para>
           
-          <screen>
+          <muttng-doc:lstmail>
 &gt; Bill, can you please send last month's progress report to Mr. 
 &gt; Morgan? We also urgently need the cost estimation for the new 
 &gt; production server that we want to set up before our customer's
-&gt; project will go live.</screen>
+&gt; project will go live.</muttng-doc:lstmail>
           
         </para>
         
@@ -4390,8 +4405,8 @@ set stuff_quoted</screen>
         
         <para>
           
-          <screen>
-set text_flowed</screen>
+          <muttng-doc:lstconf>
+set text_flowed</muttng-doc:lstconf>
           
         </para>
         
@@ -4467,21 +4482,20 @@ set text_flowed</screen>
       
     </sect1>
     
-    <sect1 id="command-lists"><anchor id="command-unlists"/><anchor id="command-subscribe"/>
-      <anchor id="command-unsubscribe"/>
+    <sect1>
       <title>Mailing lists</title>
       
       <para>
-        Usage: <muttng-doc:command name="lists"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
+        <muttng-doc:cmddef name="lists">regexp [regexp ...]</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="unlists"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
+        <muttng-doc:cmddef name="unlists">regexp [regexp ...]</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="subscribe"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
+        <muttng-doc:cmddef name="subscribe">regexp [regexp ...]</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="unsubscribe"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
+        <muttng-doc:cmddef name="unsubscribe">regexp [regexp ...]</muttng-doc:cmddef>
       </para>
       
       <para>
@@ -4584,14 +4598,14 @@ set text_flowed</screen>
       
     </sect1>
     
-    <sect1 id="command-mailboxes"><anchor id="command-unmailboxes"/>
+    <sect1>
       <title>Defining mailboxes which receive mail</title>
 
       <para>
-        Usage: <muttng-doc:command name="mailboxes"/> [!]<emphasis>filename</emphasis> [<emphasis>filename</emphasis>...]
+        <muttng-doc:cmddef name="mailboxes"> [!]filename [filename ... ]</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="unmailboxes"/> [!]<emphasis>filename</emphasis> [<emphasis>filename</emphasis>...]
+        <muttng-doc:cmddef name="unmailboxes"> [!]filename [filename ... ]</muttng-doc:cmddef>
       </para>
  
       <para>
@@ -4653,14 +4667,14 @@ set text_flowed</screen>
       
     </sect1>
     
-    <sect1 id="command-my-hdr"><anchor id="command-unmy-hdr"/>
+    <sect1>
       <title>User defined headers</title>
       
       <para>
-        Usage: <muttng-doc:command name="my-hdr"/> <emphasis>string</emphasis>
+        <muttng-doc:cmddef name="my_hdr">string</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="unmy-hdr"/> <emphasis>field</emphasis> [<emphasis>field</emphasis>...]
+        <muttng-doc:cmddef name="unmy_hdr">field [field ...]</muttng-doc:cmddef>
       </para>
       
       <para>
@@ -4675,8 +4689,8 @@ set text_flowed</screen>
       </para>
       
       <para>
-        <screen>
-my_hdr Organization: A Really Big Company, Anytown, USA</screen>
+        <muttng-doc:lstconf>
+my_hdr Organization: A Really Big Company, Anytown, USA</muttng-doc:lstconf>
       </para>
       
       <para>
@@ -4709,8 +4723,8 @@ my_hdr Organization: A Really Big Company, Anytown, USA</screen>
       </para>
       
       <para>
-        <screen>
-unmy_hdr to cc</screen>
+        <muttng-doc:lstconf>
+unmy_hdr to cc</muttng-doc:lstconf>
       </para>
       
       <para>
@@ -4719,13 +4733,17 @@ unmy_hdr to cc</screen>
       
     </sect1>
     
-    <sect1 id="command-hdr-order"><anchor id="command-unhdr-order"/>
+    <sect1>
       <title>Defining the order of headers when viewing messages</title>
       
       <para>
-        Usage: <muttng-doc:command name="hdr-order"/> <emphasis>header1</emphasis><emphasis>header2</emphasis> <emphasis>header3</emphasis>
+        <muttng-doc:cmddef name="hdr_order">header header [header ...]</muttng-doc:cmddef>
       </para>
-      
+
+      <para>
+        <muttng-doc:cmddef name="unhdr_order">[ * | header header ...]</muttng-doc:cmddef>
+      </para>
       <para>
         With this command, you can specify an order in which mutt will attempt
         to present headers to you when viewing messages.
@@ -4740,8 +4758,8 @@ unmy_hdr to cc</screen>
       
       <para>
         
-        <screen>
-hdr_order From Date: From: To: Cc: Subject:</screen>
+        <muttng-doc:lstconf>
+hdr_order From Date: From: To: Cc: Subject:</muttng-doc:lstconf>
         
       </para>
       
@@ -4780,9 +4798,9 @@ hdr_order From Date: From: To: Cc: Subject:</screen>
       
       <para>
         
-        <screen>
+        <muttng-doc:lstconf>
 save-hook me@(turing\\.)?cs\\.hmc\\.edu$ +elkins
-save-hook aol\\.com$ +spam</screen>
+save-hook aol\\.com$ +spam</muttng-doc:lstconf>
         
       </para>
       
@@ -4821,16 +4839,18 @@ save-hook aol\\.com$ +spam</screen>
       </para>
       
       <para>
-        Example: <literal><muttng-doc:hook name="fcc"/> [@.]aol\\.com$
-          +spammers
-        </literal>
+        Example:
+      </para>
+
+      <para>
+        <muttng-doc:lstconf>
+fcc-hook [@.]aol\\.com$ +spammers</muttng-doc:lstconf>
       </para>
       
       <para>
-        The above will save a copy of all messages going to the aol.com domain
-        to
-        the `+spammers' mailbox by default.  Also see the <muttng-doc:hook name="fcc-save"/>
-        command.
+        The above will save a copy of all messages going to the aol.com
+        domain to the `+spammers' mailbox by default.  Also see the
+        <muttng-doc:hook name="fcc-save"/> command.
       </para>
       
       <para>
@@ -4978,9 +4998,9 @@ save-hook aol\\.com$ +spam</screen>
       <para>
         Example:
         
-        <screen>
-message-hook <muttng-doc:pattern name="A"/> 'set pager=builtin'
-message-hook '<muttng-doc:pattern name="f"/> freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</screen>
+        <muttng-doc:lstconf>
+message-hook ~A 'set pager=builtin'
+message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</muttng-doc:lstconf>
         
       </para>
       
@@ -5021,25 +5041,24 @@ message-hook '<muttng-doc:pattern name="f"/> freshmeat-news' 'set pager="less \"
       
     </sect1>
     
-    <sect1 id="command-push">
+    <sect1>
       <title>Adding key sequences to the keyboard buffer</title>
       
       <para>
-        Usage: <muttng-doc:command name="push"/> <emphasis>string</emphasis>
+        <muttng-doc:cmddef name="push">string</muttng-doc:cmddef>
       </para>
       
       <para>
 
         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 <muttng-doc:command name="macro"/> command. You may use it to
+        names like the sequence string in the <muttng-doc:cmdref name="macro"/> 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:
 
-        <screen>
-folder-hook . 'push &lt;collapse-all&gt;'
-        </screen>
+        <muttng-doc:lstconf>
+folder-hook . 'push &lt;collapse-all&gt;'</muttng-doc:lstconf>
 
       </para>
       
@@ -5049,11 +5068,11 @@ folder-hook . 'push &lt;collapse-all&gt;'
       
     </sect1>
     
-    <sect1 id="command-exec">
+    <sect1>
       <title>Executing functions</title>
       
       <para>
-        Usage: <muttng-doc:command name="exec"/> <emphasis>function</emphasis> [<emphasis>function</emphasis>...]
+        <muttng-doc:cmddef name="exec">function [function ... ]</muttng-doc:cmddef>
       </para>
       
       <para>
@@ -5068,14 +5087,14 @@ folder-hook . 'push &lt;collapse-all&gt;'
       
     </sect1>
     
-    <sect1 id="command-score"><anchor id="command-unscore"/>
+    <sect1>
       <title>Message Scoring</title>
       
       <para>
-        Usage: <muttng-doc:command name="score"/> <emphasis>pattern</emphasis> <emphasis>value</emphasis>
+        <muttng-doc:cmddef name="score">pattern value</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="unscore"/> <emphasis>pattern</emphasis> [<emphasis>pattern</emphasis>...]
+        <muttng-doc:cmddef name="unscore">pattern [pattern ... ]</muttng-doc:cmddef>
       </para>
       
       <para>
@@ -5098,9 +5117,9 @@ folder-hook . 'push &lt;collapse-all&gt;'
       
       <para>
         
-        <screen>
-score "<muttng-doc:pattern name="f"/> nion@muttng\.org" 50
-score "<muttng-doc:pattern name="f"/> @sco\.com" -100</screen>
+        <muttng-doc:lstconf>
+score "~f nion@muttng\.org" 50
+score "~f @sco\.com" -100</muttng-doc:lstconf>
         
       </para>
       
@@ -5112,8 +5131,8 @@ score "<muttng-doc:pattern name="f"/> @sco\.com" -100</screen>
       
       <para>
         
-        <screen>
-score "<muttng-doc:pattern name="f"/> santaclaus@northpole\.int" =666</screen>
+        <muttng-doc:lstconf>
+score "~f santaclaus@northpole\.int" =666</muttng-doc:lstconf>
         
       </para>
       
@@ -5187,9 +5206,9 @@ score "<muttng-doc:pattern name="f"/> santaclaus@northpole\.int" =666</screen>
       
       <para>
         
-        <screen>
-color index  black   yellow  "<muttng-doc:pattern name="n"/> 10-"
-color index  red     yellow  "<muttng-doc:pattern name="n"/> 100-"</screen>
+        <muttng-doc:lstconf>
+color index  black   yellow  "~n 10-"
+color index  red     yellow  "~n 100-"</muttng-doc:lstconf>
         
       </para>
       
@@ -5207,14 +5226,14 @@ color index  red     yellow  "<muttng-doc:pattern name="n"/> 100-"</screen>
       
     </sect1>
     
-    <sect1 id="command-spam"><anchor id="command-nospam"/>
+    <sect1>
       <title>Spam detection</title>
 
       <para>
-        Usage: <muttng-doc:command name="spam"/> <emphasis>pattern</emphasis> <emphasis>format </emphasis>
+        <muttng-doc:cmddef name="spam">pattern format</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="nospam"/> <emphasis>pattern</emphasis>
+        <muttng-doc:cmddef name="nospam">pattern</muttng-doc:cmddef>
       </para>
       
       <para>
@@ -5269,11 +5288,11 @@ color index  red     yellow  "<muttng-doc:pattern name="n"/> 100-"</screen>
         For example, suppose I use DCC, SpamAssassin, and PureMessage. I might
         define these spam settings:
         
-        <screen>
+        <muttng-doc:lstconf>
 spam "X-DCC-.*-Metrics:.*(....)=many"         "90+/DCC-%1"
 spam "X-Spam-Status: Yes"                     "90+/SA"
 spam "X-PerlMX-Spam: .*Probability=([0-9]+)%" "%1/PM"
-set spam_separator=", "</screen>
+set spam_separator=", "</muttng-doc:lstconf>
         
       </para>
       
@@ -5368,8 +5387,8 @@ set spam_separator=", "</screen>
       
       <para>
         
-        <screen>
-spam "^From: .*MAILER-DAEMON"       "999"</screen>
+        <muttng-doc:lstconf>
+spam "^From: .*MAILER-DAEMON"       "999"</muttng-doc:lstconf>
         
       </para>
       
@@ -5379,20 +5398,20 @@ spam "^From: .*MAILER-DAEMON"       "999"</screen>
       
     </sect1>
     
-    <sect1 id="command-set"><anchor id="command-unset"/><anchor id="command-reset"/><anchor id="command-toggle"/>
+    <sect1>
       <title>Setting variables</title>
 
       <para>
-        Usage: <muttng-doc:command name="set"/> [no|inv]<emphasis>variable</emphasis>[=<emphasis>value</emphasis>] [<emphasis>variable</emphasis>...]
+        <muttng-doc:cmddef name="set">[no|inv]variable [=value] [variable...]</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="toggle"/> <emphasis>variable</emphasis> [<emphasis>variable</emphasis>...]
+        <muttng-doc:cmddef name="toggle">variable [variable ...]</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="unset"/> <emphasis>variable</emphasis> [<emphasis>variable</emphasis>...]
+        <muttng-doc:cmddef name="unset">variable [variable ...]</muttng-doc:cmddef>
       </para>
       <para>
-        Usage: <muttng-doc:command name="reset"/> <emphasis>variable</emphasis> [<emphasis>variable</emphasis>...]
+        <muttng-doc:cmddef name="reset">variable [variable ...]</muttng-doc:cmddef>
       </para>
       
       <para>
@@ -5474,8 +5493,8 @@ spam "^From: .*MAILER-DAEMON"       "999"</screen>
       
       <para>
         
-        <screen>
-set ?allow_8bit</screen>
+        <muttng-doc:lstconf>
+set ?allow_8bit</muttng-doc:lstconf>
         
       </para>
       
@@ -5505,11 +5524,11 @@ set ?allow_8bit</screen>
       
     </sect1>
     
-    <sect1 id="command-source">
+    <sect1>
       <title>Reading initialization commands from another file</title>
       
       <para>
-        Usage: <muttng-doc:command name="source"/> <emphasis>filename</emphasis> [<emphasis>filename</emphasis>...]
+        <muttng-doc:cmddef name="source">filename [filename ...]</muttng-doc:cmddef>
       </para>
       
       <para>
@@ -5541,11 +5560,11 @@ set ?allow_8bit</screen>
       
     </sect1>
     
-    <sect1 id="command-unhook">
+    <sect1>
       <title>Removing hooks</title>
       
       <para>
-        Usage: <muttng-doc:command name="unhook"/> [* | <emphasis>hook-type</emphasis>]
+        <muttng-doc:cmddef name="unhook">[* | hook-type]</muttng-doc:cmddef>
       </para>
       
       <para>
@@ -5585,8 +5604,8 @@ set ?allow_8bit</screen>
         
         <para>
           
-          <screen>
-set config_charset = "..."</screen>
+          <muttng-doc:lstconf>
+set config_charset = "..."</muttng-doc:lstconf>
           
         </para>
         
@@ -5651,9 +5670,9 @@ set config_charset = "..."</screen>
         
         <para>
           
-          <screen>
+          <muttng-doc:lstconf>
 ifdef &lt;item&gt; &lt;command&gt;
-ifndef &lt;item&gt; &lt;command&gt;</screen>
+ifndef &lt;item&gt; &lt;command&gt;</muttng-doc:lstconf>
           
         </para>
         
@@ -5714,10 +5733,10 @@ ifndef &lt;item&gt; &lt;command&gt;</screen>
         
         <para>
           
-          <screen>
+          <muttng-doc:lstconf>
 ifdef feature_imap 'source ~/.mutt-ng/setup-imap'
 ifdef feature_pop  'source ~/.mutt-ng/setup-pop'
-ifdef feature_nntp 'source ~/.mutt-ng/setup-nntp'</screen>
+ifdef feature_nntp 'source ~/.mutt-ng/setup-nntp'</muttng-doc:lstconf>
           
         </para>
         
@@ -5740,8 +5759,8 @@ ifdef feature_nntp 'source ~/.mutt-ng/setup-nntp'</screen>
         
         <para>
           
-          <screen>
-ifdef imap_mail_check 'set imap_mail_check = 300'</screen>
+          <muttng-doc:lstconf>
+ifdef imap_mail_check 'set imap_mail_check = 300'</muttng-doc:lstconf>
           
         </para>
         
@@ -5755,8 +5774,8 @@ ifdef imap_mail_check 'set imap_mail_check = 300'</screen>
         
         <para>
           
-          <screen>
-ifdef pager 'set pager_index_lines = 10'</screen>
+          <muttng-doc:lstconf>
+ifdef pager 'set pager_index_lines = 10'</muttng-doc:lstconf>
           
         </para>
         
@@ -5770,9 +5789,9 @@ ifdef pager 'set pager_index_lines = 10'</screen>
         
         <para>
           
-          <screen>
+          <muttng-doc:lstconf>
 ifdef feature_ncurses 'source ~/.mutt-ng/setup-ncurses'
-ifndef feature_ncurses 'source ~/.mutt-ng/setup-slang'</screen>
+ifndef feature_ncurses 'source ~/.mutt-ng/setup-slang'</muttng-doc:lstconf>
           
         </para>
         
@@ -5782,9 +5801,9 @@ ifndef feature_ncurses 'source ~/.mutt-ng/setup-slang'</screen>
         
         <para>
           
-          <screen>
+          <muttng-doc:lstconf>
 ifdef feature_slang 'source ~/.mutt-ng/setup-slang'
-ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
+ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
           
         </para>
         
@@ -6260,7 +6279,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
       <para>
         It must be noted that in this table, <literal>EXPR</literal> is
         a regular expression. For ranges, the forms
-        <literal>&lt;[MAX]</literal>, <literal>&gt;&#62;[MIN]</literal>,
+        <literal>&lt;[MAX]</literal>, <literal>&gt;&gt;[MIN]</literal>,
         <literal> [MIN]-</literal> and <literal>-[MAX]</literal> are
         also possible.
       </para>
@@ -6445,8 +6464,8 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
         
         <para>
           
-          <screen>
-set status_format = "%v on %h: ..."</screen>
+          <muttng-doc:lstconf>
+set status_format = "%v on %h: ..."</muttng-doc:lstconf>
           
         </para>
         
@@ -6506,8 +6525,8 @@ Mutt-ng 1.5.9i on mailhost: ...</screen>
         
         <para>
           
-          <screen>
-set status_format = "%v on %h: %B: ...</screen>
+          <muttng-doc:lstconf>
+set status_format = "%v on %h: %B: ...</muttng-doc:lstconf>
           
         </para>
         
@@ -6551,8 +6570,8 @@ Mutt-ng 1.5.9i on mailhost: Inbox: ...</screen>
         
         <para>
           
-          <screen>
-set status_format = "%v on %h: %B %?n?%n new? ...</screen>
+          <muttng-doc:lstconf>
+set status_format = "%v on %h: %B %?n?%n new? ...</muttng-doc:lstconf>
           
         </para>
         
@@ -6567,7 +6586,7 @@ set status_format = "%v on %h: %B %?n?%n new? ...</screen>
         <para>
           
           <screen>
-%?&#60;item&#62;?&#60;string if nonzero&#62;?</screen>
+%?&lt;item&gt;?&lt;string if nonzero&gt;?</screen>
           
         </para>
         
@@ -6593,7 +6612,7 @@ set status_format = "%v on %h: %B %?n?%n new? ...</screen>
         <para>
           
           <screen>
-%?&#60;item&#62;?&#60;string if nonzero&#62;&#38;&#60;string if zero&#62;?</screen>
+%?&lt;item&gt;?&lt;string if nonzero&gt;&#38;&lt;string if zero&gt;?</screen>
           
         </para>
         
@@ -6633,8 +6652,8 @@ set status_format = "%v on %h: %B %?n?%n new? ...</screen>
         
         <para>
           
-          <screen>
-set status_format = "%v on %h: %B: %?n?%n new messages&amp;no new messages? ...</screen>
+          <muttng-doc:lstconf>
+set status_format = "%v on %h: %B: %?n?%n new messages&amp;no new messages? ...</muttng-doc:lstconf>
           
         </para>
         
@@ -6645,8 +6664,8 @@ set status_format = "%v on %h: %B: %?n?%n new messages&amp;no new messages? ...<
         
         <para>
           
-          <screen>
-set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages ...</screen>
+          <muttng-doc:lstconf>
+set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages ...</muttng-doc:lstconf>
           
         </para>
         
@@ -6729,8 +6748,8 @@ set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages ...</screen>
                 
                 <para>
                   
-                  <screen>
-set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages %|-"</screen>
+                  <muttng-doc:lstconf>
+set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages %|-"</muttng-doc:lstconf>
                   
                 </para>
               </listitem>
@@ -6755,8 +6774,8 @@ set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages %|-"</screen>
                 
                 <para>
                   
-                  <screen>
-set status_format = "%B: %?n?%n&amp;no? new messages %&#62; (%v on %h)"</screen>
+                  <muttng-doc:lstconf>
+set status_format = "%B: %?n?%n&amp;no? new messages %&gt; (%v on %h)"</muttng-doc:lstconf>
                   
                 </para>
               </listitem>
@@ -6806,7 +6825,7 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&#62; (%v on %h)"</screen>
       </para>
       
       <para>
-        In <muttng-doc:command name="macro"/> or <muttng-doc:command name="push"/> commands,
+        In <muttng-doc:cmdref name="macro"/> or <muttng-doc:cmdref name="push"/> commands,
         you can use the ``tag-prefix-cond'' operator.  If there are no tagged
         messages, mutt will "eat" the rest of the macro to abort it's
         execution.Mutt-ng will stop "eating" the macro when it encounters the
@@ -6901,9 +6920,9 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&#62; (%v on %h)"</screen>
       
       <para>
         
-        <screen>
+        <muttng-doc:lstconf>
 send-hook . 'unmy_hdr From:'
-send-hook <muttng-doc:pattern name="C"/>'^b@b\.b$' my-hdr from: c@c.c</screen>
+send-hook '~C ^b@b\.b$' my-hdr from: c@c.c</muttng-doc:lstconf>
         
       </para>
       
@@ -6936,8 +6955,8 @@ send-hook <muttng-doc:pattern name="C"/>'^b@b\.b$' my-hdr from: c@c.c</screen>
           sending
           mail to a specific address, you could do something like:
           
-          <screen>
-send-hook '<muttng-doc:pattern name="t"/> ^me@cs\.hmc\.edu$' 'my-hdr From: Mutt-ng User &#60;user@host&#62;'</screen>
+          <muttng-doc:lstconf>
+send-hook '~t ^me@cs\.hmc\.edu$' 'my-hdr From: Mutt-ng User &lt;user@host&gt;'</muttng-doc:lstconf>
           
           which would execute the given command when sending mail to
           <emphasis>me@cs.hmc.edu</emphasis>.
@@ -6980,37 +6999,37 @@ send-hook '<muttng-doc:pattern name="t"/> ^me@cs\.hmc\.edu$' 'my-hdr From: Mutt-
         and highlights the ones with new email
         Use the following configuration commands:
         
-        <screen>
+        <muttng-doc:lstconf>
 set sidebar_visible="yes"
-set sidebar_width=25</screen>
+set sidebar_width=25</muttng-doc:lstconf>
         
       </para>
       
       <para>
         If you want to specify the mailboxes you can do so with:
         
-        <screen>
+        <muttng-doc:lstconf>
 set mbox='=INBOX'
 mailboxes INBOX \
 MBOX1 \
 MBOX2 \
-...</screen>
+...</muttng-doc:lstconf>
         
       </para>
       
       <para>
         You can also specify the colors for mailboxes with new mails by using:
         
-        <screen>
+        <muttng-doc:lstconf>
 color sidebar_new red black
-color sidebar white black</screen>
+color sidebar white black</muttng-doc:lstconf>
         
       </para>
       
       <para>
         Reasonable key bindings look e.g. like this:
         
-        <screen>
+        <muttng-doc:lstconf>
 bind index \Cp sidebar-prev
 bind index \Cn sidebar-next
 bind index \Cb sidebar-open
@@ -7019,7 +7038,7 @@ bind pager \Cn sidebar-next
 bind pager \Cb sidebar-open
 
 macro index B ':toggle sidebar_visible^M'
-macro pager B ':toggle sidebar_visible^M'</screen>
+macro pager B ':toggle sidebar_visible^M'</muttng-doc:lstconf>
         
       </para>
       
@@ -7049,8 +7068,8 @@ macro pager B ':toggle sidebar_visible^M'</screen>
       
       <para>
         
-        <screen>
-set query_command = "mutt_ldap_query.pl '%s'"</screen>
+        <muttng-doc:lstconf>
+set query_command = "mutt_ldap_query.pl '%s'"</muttng-doc:lstconf>
         
       </para>
       
@@ -7127,8 +7146,8 @@ roessler@guug.de        Thomas Roessler mutt pgp</screen>
       
       <para>
         
-        <screen>
-From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
+        <muttng-doc:lstmail>
+From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
         
       </para>
       
@@ -7272,7 +7291,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         know what addresses you consider to be mailing lists (technically
         this does not have to be a mailing list, but that is what it is most
         often used for), and what lists you are subscribed to.  This is
-        accomplished through the use of the <muttng-doc:command name="lists"/>
+        accomplished through the use of the <muttng-doc:cmdref name="lists"/>
         commands in your muttrc.
       </para>
       
@@ -7832,7 +7851,7 @@ imap://imapserver:port/INBOX</screen>
         If compiled with ``--enable-nntp'' option, Mutt-ng can read news from
         a newsserver via NNTP.  You can open a newsgroup with the
         ``change-newsgroup'' function from the index/pager which is by default
-        bound to <literal>i</literal>.
+        bound to <muttng-doc:key>i</muttng-doc:key>.
       </para>
       
       <para>
@@ -7871,8 +7890,8 @@ imap://imapserver:port/INBOX</screen>
         
         <para>
           
-          <screen>
-score <muttng-doc:pattern name="*"/> =42</screen>
+          <muttng-doc:lstconf>
+score ~* =42</muttng-doc:lstconf>
           
         </para>
         
@@ -7883,8 +7902,8 @@ score <muttng-doc:pattern name="*"/> =42</screen>
         
         <para>
           
-          <screen>
-score !<muttng-doc:pattern name="*"/> =42</screen>
+          <muttng-doc:lstconf>
+score !~* =42</muttng-doc:lstconf>
           
         </para>
         
@@ -8006,10 +8025,10 @@ score !<muttng-doc:pattern name="*"/> =42</screen>
       
       <para>
         
-        <screen>
+        <muttng-doc:lstconf>
 account-hook . 'unset imap_user; unset imap_pass; unset tunnel'
 account-hook imap://host1/ 'set imap_user=me1 imap_pass=foo'
-account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"'</screen>
+account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"'</muttng-doc:lstconf>
         
       </para>
       
@@ -8031,9 +8050,9 @@ account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"'</screen>
         retrieved at <muttng-doc:web url="ftp://ftp.mutt.org/mutt/contrib/"/>
         and the configuration commands:
         
-        <screen>
+        <muttng-doc:lstconf>
 macro index \cb |urlview\n
-macro pager \cb |urlview\n</screen>
+macro pager \cb |urlview\n</muttng-doc:lstconf>
         
       </para>
       
@@ -8083,10 +8102,10 @@ macro pager \cb |urlview\n</screen>
       
       <para>
         
-        <screen>
-open-hook \\.gz$ "gzip -cd %f &#62; %t" 
-close-hook \\.gz$ "gzip -c %t &#62; %f"
-append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </screen>
+        <muttng-doc:lstconf>
+open-hook \\.gz$ "gzip -cd %f &gt; %t" 
+close-hook \\.gz$ "gzip -c %t &gt; %f"
+append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </muttng-doc:lstconf>
         
       </para>
       
@@ -8154,9 +8173,8 @@ append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </screen>
         
         <para>
           
-          <screen>
-open-hook \\.gz$ "gzip -cd %f &#62; %t" 
-</screen>
+          <muttng-doc:lstconf>
+open-hook \\.gz$ "gzip -cd %f &gt; %t"</muttng-doc:lstconf>
           
         </para>
         
@@ -8204,8 +8222,8 @@ open-hook \\.gz$ "gzip -cd %f &#62; %t"
         
         <para>
           
-          <screen>
-close-hook \\.gz$ "gzip -c %t &#62; %f"</screen>
+          <muttng-doc:lstconf>
+close-hook \\.gz$ "gzip -c %t &gt; %f"</muttng-doc:lstconf>
           
         </para>
         
@@ -8254,8 +8272,8 @@ close-hook \\.gz$ "gzip -c %t &#62; %f"</screen>
         
         <para>
           
-          <screen>
-append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </screen>
+          <muttng-doc:lstconf>
+append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </muttng-doc:lstconf>
           
         </para>
         
@@ -8296,10 +8314,9 @@ append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </screen>
         
         <para>
           
-          <screen>
-open-hook  \\.pgp$ "pgp -f &#60; %f &#62; %t"
-close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &#60; %t &#62; %f"
-</screen>
+          <muttng-doc:lstconf>
+open-hook  \\.pgp$ "pgp -f &lt; %f &gt; %t"
+close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"</muttng-doc:lstconf>
           
         </para>
         
@@ -8447,8 +8464,8 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &#60; %t &#62; %f"
           Attachments appear as follows:
           
           <screen>
-1 [text/plain, 7bit, 1K]             /tmp/mutt-euler-8082-0 &#60;no description&#62;
-2 [applica/x-gunzip, base64, 422K]   ~/src/mutt-0.85.tar.gz &#60;no description&#62;</screen>
+1 [text/plain, 7bit, 1K]             /tmp/mutt-euler-8082-0 &lt;no description&gt;
+2 [applica/x-gunzip, base64, 422K]   ~/src/mutt-0.85.tar.gz &lt;no description&gt;</screen>
           
         </para>
         
@@ -8784,7 +8801,7 @@ text/html; lynx -dump %s ; copiousoutput</screen>
                 <term>needsterminal</term>
                 <listitem>
                   <para>
-                    Mutt-ng uses this flag when viewing attachments with <muttng-doc:command name="auto-view"/>,
+                    Mutt-ng uses this flag when viewing attachments with <muttng-doc:cmdref name="auto_view"/>,
                     in order to decide whether it should honor the setting
                     of the <muttng-doc:varref name="wait-key"/> variable or
                     not.  When an attachment is viewed using an interactive
@@ -8938,7 +8955,7 @@ nametemplate=%s.gif</screen>
           </para>
           
           <para>
-            In addition, you can use this with <muttng-doc:command name="auto-view"/>
+            In addition, you can use this with <muttng-doc:cmdref name="auto_view"/>
             to denote two commands for viewing an attachment, one to be viewed
             automatically, the other to be viewed interactively from the
             attachment
@@ -8951,7 +8968,7 @@ text/html;      netscape -remote 'openURL(%s)' ; test=RunningX
 text/html;      lynx %s; nametemplate=%s.html
 text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput</screen>
             
-            For <muttng-doc:command name="auto-view"/>, Mutt-ng will choose
+            For <muttng-doc:cmdref name="auto_view"/>, Mutt-ng will choose
             the third
             entry because of the copiousoutput tag.  For interactive viewing,
             Mutt
@@ -9019,8 +9036,8 @@ text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput</screen>
                     instance, if
                     Your mail message contains:
                     
-                    <screen>
-Content-Type: text/plain; charset=iso-8859-1</screen>
+                    <muttng-doc:lstmail>
+Content-Type: text/plain; charset=iso-8859-1</muttng-doc:lstmail>
                     
                     then Mutt-ng will expand %{charset} to
                     iso-8859-1.  The default metamail
@@ -9057,8 +9074,8 @@ Content-Type: text/plain; charset=iso-8859-1</screen>
           
           <screen>>
 # I'm always running X :)
-video/*;        xanim %s &#62; /dev/null
-image/*;        xv %s &#62; /dev/null
+video/*;        xanim %s &gt; /dev/null
+image/*;        xv %s &gt; /dev/null
 
 # I'm always running netscape (if my computer had more memory, maybe)
 text/html;      netscape -remote 'openURL(%s)'</screen>
@@ -9074,7 +9091,7 @@ text/html;      netscape -remote 'openURL(%s)'</screen>
           <screen>
 # Use xanim to view all videos   Xanim produces a header on startup,
 # send that to /dev/null so I don't see it
-video/*;        xanim %s &#62; /dev/null
+video/*;        xanim %s &gt; /dev/null
 
 # Send html to a running netscape by remote
 text/html;      netscape -remote 'openURL(%s)'; test=RunningNetscape
@@ -9100,8 +9117,8 @@ image/jpeg;xv %s; x-mozilla-flags=internal
 image/*;xv %s; test=RunningX; edit=xpaint %s
 
 # Convert images to text using the netpbm tools
-image/*;  (anytopnm %s | pnmscale -xysize 80 46 | ppmtopgm | pgmtopbm |
-pbmtoascii -1x2 ) 2&#62;&#38;1 ; copiousoutput
+image/*;  (anytopnm %s | pnmscale -xysize 80 46 | ppmtopgm | \
+pgmtopbm | pbmtoascii -1x2 ) 2&gt;&#38;1 ; copiousoutput
 
 # Send excel spreadsheets to my NT box
 application/ms-excel; open.pl %s</screen>
@@ -9116,9 +9133,17 @@ application/ms-excel; open.pl %s</screen>
       
     </sect1>
     
-    <sect1 id="command-auto-view"><anchor id="command-unauto-view"/>
+    <sect1>
       <title>MIME Autoview</title>
-      
+
+      <para>
+        <muttng-doc:cmddef name="auto_view">mime-type [mime-type ...]</muttng-doc:cmddef>
+      </para>
+
+      <para>
+        <muttng-doc:cmddef name="unauto_view">mime-type [mime-type ...]</muttng-doc:cmddef>
+      </para>
       <para>
         In addition to explicitly telling Mutt-ng to view an attachment with
         theMIME viewer defined in the mailcap file, Mutt-ng has support for
@@ -9142,9 +9167,9 @@ application/ms-excel; open.pl %s</screen>
       <para>
         For instance, if you set auto_view to:
         
-        <screen>
+        <muttng-doc:lstconf>
 auto_view text/html application/x-gunzip application/postscript
-image/gif application/x-tar-gz</screen>
+image/gif application/x-tar-gz</muttng-doc:lstconf>
         
       </para>
       
@@ -9175,9 +9200,17 @@ application/postscript; ps2ascii %s; copiousoutput</screen>
       
     </sect1>
     
-    <sect1 id="command-alternative-order"><anchor id="command-unalternative-order"/>
+    <sect1>
       <title>MIME Multipart/Alternative</title>
+
+      <para>
+        <muttng-doc:cmddef name="alternative_order">mime-type [mime-type ...]</muttng-doc:cmddef>
+      </para>
       
+      <para>
+        <muttng-doc:cmddef name="unalternative_order">mime-type [mime-type ...]</muttng-doc:cmddef>
+      </para>
       <para>
         Mutt-ng has some heuristics for determining which attachment of a
         multipart/alternative type to display.  First, mutt will check the 
@@ -9186,16 +9219,16 @@ application/postscript; ps2ascii %s; copiousoutput</screen>
         number of
         MIME types in order, including support for implicit and explicit
         wildcards, for example:
-        
-        <screen>
+       
+        <muttng-doc:lstconf>
 alternative_order text/enriched text/plain text
-application/postscript image/*</screen>
+application/postscript image/*</muttng-doc:lstconf>
         
       </para>
       
       <para>
         Next, mutt will check if any of the types have a defined 
-        <muttng-doc:command name="auto-view"/>, and use that.  Failing
+        <muttng-doc:cmdref name="auto_view"/>, and use that.  Failing
         that, Mutt-ng will look for any text type.  As a last attempt, mutt
         willlook for any type it knows how to handle.
       </para>
@@ -9210,10 +9243,139 @@ application/postscript image/*</screen>
       </para>
       
     </sect1>
-    
-    <sect1 id="command-mime-lookup"><anchor id="command-unmime-lookup"/>
+
+    <sect1 id="attachments">
+      <title>Attachment Searching and Counting</title>
+
+      <para>
+        If you ever lose track of attachments in your mailboxes, Mutt's
+        attachment-counting and -searching support might be for you. You
+        can make your message index display the number of qualifying
+        attachments in each message, or search for messages by
+        attachment count. You also can configure what kinds of
+        attachments qualify for this feature with the attachments and
+        unattachments commands.
+      </para>
+
+<para>
+The syntax is:
+</para>
+
+<para>
+  <muttng-doc:cmddef name="attachments">
+    ( {+|-}disposition mime-type | ? )
+  </muttng-doc:cmddef>
+</para>
+<para>
+  <muttng-doc:cmddef name="unattachments">
+    {+|-}disposition mime-type
+  </muttng-doc:cmddef>
+</para>
+
+<para>
+Disposition is the attachment's Content-disposition type -- either
+"inline" or "attachment". You can abbreviate this to I or A.
+</para>
+
+<para>
+Disposition is prefixed by either a + symbolor a - symbol. If it's
+a +, you're saying that you want to allow this disposition and MIME
+type to qualify. If it's a -, you're saying that this disposition
+and MIME type is an exception to previous + rules. There are examples
+below of how this is useful.
+</para>
+
+<para>
+Mime-type is, unsurprisingly, the MIME type of the attachment you want
+to affect. A MIME type is always of the format "major/minor", where
+"major" describes the broad category of document you're looking at, and
+"minor" describes the specific type within that category. The major
+part of mim-type must be literal text (or the special token "*"), but
+the minor part may be a regular expression. (Therefore, "*/.*" matches
+any MIME type.)
+</para>
+
+<para>
+The MIME types you give to the attachments directive are a kind of
+pattern. When you use the attachments directive, the patterns you
+specify are added to a list. When you use unattachments, the pattern
+is removed from the list. The patterns are not expanded and matched
+to specific MIME types at this time -- they're just text in a list.
+They're only matched when actually evaluating a message.
+</para>
+
+<para>
+Some examples might help to illustrate. The examples that are not
+commented out define the default configuration of the lists.
+</para>
+
+<screen>
+## Removing a pattern from a list removes that pattern literally. It
+## does not remove any type matching the pattern.
+##
+## attachments +A */.*
+## attachments +A image/jpeg
+## unattachments +A */.*
+##
+## This leaves "attached" image/jpeg files on the allowed attachments
+## list. It does not remove all items, as you might expect, because the
+## second */.* is not a matching expression at this time.
+##
+## Remember: "unattachments" only undoes what "attachments" has done!
+## It does not trigger any matching on actual messages.
+
+
+## Qualify any MIME part with an "attachment" disposition, EXCEPT for
+## text/x-vcard and application/pgp parts. (PGP parts are already known
+## to mutt, and can be searched for with ~g, ~G, and ~k.)
+##
+## I've added x-pkcs7 to this, since it functions (for S/MIME)
+## analogously to PGP signature attachments. S/MIME isn't supported
+## in a stock mutt build, but we can still treat it specially here.
+##
+attachments +A */.*
+attachments -A text/x-vcard application/pgp.*
+attachments -A application/x-pkcs7-.*
+
+## Discount all MIME parts with an "inline" disposition, unless they're
+## text/plain. (Why inline a text/plain part unless it's external to the
+## message flow?)
+##
+attachments +I text/plain
+
+## These two lines make Mutt qualify MIME containers. (So, for example,
+## a message/rfc822 forward will count as an attachment.) The first
+## line is unnecessary if you already have "attach-allow */.*", of
+## course. These are off by default! The MIME elements contained
+## within a message/* or multipart/* are still examined, even if the
+## containers themseves don't qualify.
+##
+#attachments +A message/.* multipart/.*
+#attachments +I message/.* multipart/.*
+
+## You probably don't really care to know about deleted attachments.
+attachments -A message/external-body
+attachments -I message/external-body
+</screen>
+
+<para>
+"attachments ?" will list your current settings in Muttrc format, so
+that it can be pasted elsewhere.
+</para>
+
+</sect1>
+
+    <sect1>
       <title>MIME Lookup</title>
-      
+
+      <para>
+        <muttng-doc:cmddef name="mime_lookup">mime-type [mime-type ...]</muttng-doc:cmddef>
+      </para>
+
+      <para>
+        <muttng-doc:cmddef name="unmime_lookup">mime-type [mime-type ...]</muttng-doc:cmddef>
+      </para>
       <para>
         Mutt-ng's mime_lookup list specifies a list of mime-types that
         should not
@@ -9230,8 +9392,8 @@ application/postscript image/*</screen>
         configuration
         options (such as auto_view) specified.  Common usage would be:
         
-        <screen>
-mime_lookup application/octet-stream application/X-Lotus-Manuscript</screen>
+        <muttng-doc:lstconf>
+mime_lookup application/octet-stream application/X-Lotus-Manuscript</muttng-doc:lstconf>
         
       </para>
       
@@ -9518,7 +9680,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       
       <para>
         
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l">
           <title>Reference: Command Line Options</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
@@ -9686,7 +9848,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
 
       <para>
 
-        <table frame="none" rowsep="1" id="tab-patterns">
+        <table frame="none" rowsep="1" id="tab-patterns" texstr="l|l|l">
           <title>Reference: Patterns</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
@@ -9892,6 +10054,11 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the `References' field</entry>
             </row>
+            <row>
+              <entry><muttng-doc:pattern full="1" name="X"/></entry>
+              <entry><literal>[MIN]-[MAX]</literal></entry>
+              <entry>messages with MIN to MAX attachments *)</entry>
+            </row>
             <row>
               <entry><muttng-doc:pattern full="1" name="y"/></entry>
               <entry><literal>EXPR</literal></entry>
@@ -9962,37 +10129,37 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="alias"/></literal> <emphasis>key</emphasis> <emphasis>address</emphasis> [, <emphasis>address</emphasis>, ... ]
+              <literal><muttng-doc:cmdref name="alias"/></literal> <emphasis>key</emphasis> <emphasis>address</emphasis> [, <emphasis>address</emphasis>, ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unalias"/></literal> [ * | <emphasis>key</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="unalias"/></literal> [ * | <emphasis>key</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="alternates"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="alternates"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unalternates"/></literal> [ * | <emphasis>regexp</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="unalternates"/></literal> [ * | <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="alternative-order"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="alternative_order"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unalternative-order"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="unalternative_order"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
@@ -10004,19 +10171,19 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="auto-view"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="auto_view"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unauto-view"/></literal><emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="unauto_view"/></literal><emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="bind"/></literal> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>function</emphasis>
+              <literal><muttng-doc:cmdref name="bind"/></literal> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>function</emphasis>
             </para>
           </listitem>
           <listitem>
@@ -10034,19 +10201,19 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="color"/></literal> <emphasis>object</emphasis> <emphasis>foreground</emphasis> <emphasis>background</emphasis> [ <emphasis>regexp</emphasis> ]
+              <literal><muttng-doc:cmdref name="color"/></literal> <emphasis>object</emphasis> <emphasis>foreground</emphasis> <emphasis>background</emphasis> [ <emphasis>regexp</emphasis> ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="uncolor"/></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="uncolor"/></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="exec"/></literal> <emphasis>function</emphasis> [ <emphasis>function</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="exec"/></literal> <emphasis>function</emphasis> [ <emphasis>function</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
@@ -10070,13 +10237,13 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="hdr-order"/></literal> <emphasis>header</emphasis> [ <emphasis>header</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="hdr_order"/></literal> <emphasis>header</emphasis> [ <emphasis>header</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unhdr-order"/></literal> <emphasis>header</emphasis> [ <emphasis>header</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="unhdr_order"/></literal> <emphasis>header</emphasis> [ <emphasis>header</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
@@ -10088,37 +10255,37 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="ignore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="ignore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unignore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="unignore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="lists"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="lists"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unlists"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="unlists"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="macro"/></literal> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>sequence</emphasis> [ <emphasis>description</emphasis> ]
+              <literal><muttng-doc:cmdref name="macro"/></literal> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>sequence</emphasis> [ <emphasis>description</emphasis> ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="mailboxes"/></literal> <emphasis>filename</emphasis> [ <emphasis>filename</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="mailboxes"/></literal> <emphasis>filename</emphasis> [ <emphasis>filename</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
@@ -10136,38 +10303,38 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="mime-lookup"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="mime_lookup"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
               <literal>
-                <muttng-doc:command name="unmime-lookup"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+                <muttng-doc:cmdref name="unmime_lookup"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="mono"/></literal> <emphasis>object attribute</emphasis> [ <emphasis>regexp</emphasis> ]
+              <literal><muttng-doc:cmdref name="mono"/></literal> <emphasis>object attribute</emphasis> [ <emphasis>regexp</emphasis> ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unmono"/></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="unmono"/></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="my-hdr"/></literal> <emphasis>string</emphasis>
+              <literal><muttng-doc:cmdref name="my_hdr"/></literal> <emphasis>string</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unmy-hdr"/></literal> <emphasis>field</emphasis> [ <emphasis>field</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="unmy_hdr"/></literal> <emphasis>field</emphasis> [ <emphasis>field</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
@@ -10185,13 +10352,13 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="push"/></literal> <emphasis>string</emphasis>
+              <literal><muttng-doc:cmdref name="push"/></literal> <emphasis>string</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="reset"/> </literal><emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="reset"/> </literal><emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
@@ -10203,13 +10370,13 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="score"/> </literal> <emphasis>pattern</emphasis> <emphasis>value</emphasis>
+              <literal><muttng-doc:cmdref name="score"/> </literal> <emphasis>pattern</emphasis> <emphasis>value</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unscore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="unscore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
@@ -10227,55 +10394,55 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="set"/></literal> [no|inv]<emphasis>variable</emphasis>[ =<emphasis>value</emphasis> ] [ <emphasis>variable</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="set"/></literal> [no|inv]<emphasis>variable</emphasis>[ =<emphasis>value</emphasis> ] [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unset"/></literal> <emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="unset"/></literal> <emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="source"/></literal> <emphasis>filename</emphasis>
+              <literal><muttng-doc:cmdref name="source"/></literal> <emphasis>filename</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="spam"/></literal> <emphasis>pattern</emphasis> <emphasis>format</emphasis>
+              <literal><muttng-doc:cmdref name="spam"/></literal> <emphasis>pattern</emphasis> <emphasis>format</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="nospam"/></literal> <emphasis>pattern</emphasis>
+              <literal><muttng-doc:cmdref name="nospam"/></literal> <emphasis>pattern</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="subscribe"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ] 
+              <literal><muttng-doc:cmdref name="subscribe"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ] 
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unsubscribe"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ] 
+              <literal><muttng-doc:cmdref name="unsubscribe"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ] 
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="toggle"/></literal> <emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
+              <literal><muttng-doc:cmdref name="toggle"/></literal> <emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:command name="unhook"/></literal> <emphasis>hook-type</emphasis>
+              <literal><muttng-doc:cmdref name="unhook"/></literal> <emphasis>hook-type</emphasis>
             </para>
           </listitem>
           
@@ -10298,7 +10465,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       <para>
         <anchor id="sect-obsolete"/>
 
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l">
           <title>Reference: Obsolete Variables</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>