Nico Golde:
[apps/madmutt.git] / doc / manual.xml.head
index fd74325..fc9f088 100644 (file)
@@ -14,7 +14,7 @@
     <firstname>Michael</firstname><surname>Elkins</surname>
     <email>me@cs.hmc.edu</email>
   </author>
-  <pubdate>version devel-r473</pubdate>
+  <pubdate>version @VERSION@</pubdate>
   <abstract>
     <para>
       Michael Elinks on mutt, circa 1995:
@@ -62,7 +62,7 @@
     <title>Mutt-ng Home Page</title>
     
     <para>
-      <ulink url="http://www.muttng.org/">http://www.muttng.org</ulink>
+      <muttng-doc:web url="http://www.muttng.org/"/>
     </para>
     
     <para>
     
     <para>
       So far, there are no official releases of Mutt-ng, but you can
-      download daily snapshots from <ulink
-        url="http://mutt-ng.berlios.de/snapshots/"
-        >http://mutt-ng.berlios.de/snapshots/</ulink>
+      download daily snapshots from <muttng-doc:web url="http://mutt-ng.berlios.de/snapshots/"/>
     </para>
     
     <para>
     
     <para>
 
-      <table>
-        <title>Default Menu Movement Keys</title>
+      <table frame="none" rowsep="1">
+        <title>Most commonly used movement bindings</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>
     
     <para>
 
-      <table>
-        <title>Built-In Editor Functions</title>
+      <table frame="none" rowsep="1">
+        <title>Line Editor Functions</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>
       <literal>bind editor &lt;delete&gt; backspace</literal>
     </para>
     
-    <para>
-      
-    </para>
-    
   </sect1>
     <!--}}}-->
   
       
       <para>
 
-      <table>
-        <title>Default Index Menu Bindings</title>
+      <table frame="none" rowsep="1">
+        <title>Most commonly used Index Bindings</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>
           Furthermore, the following flags reflect who the message is
           addressed
           to.  They can be customized with the
-          <muttng-doc:varref name="to_chars" link="to-chars"/> variable.
+          <muttng-doc:varref name="to-chars"/> variable.
         </para>
         
         <para>
       
       <para>
 
-      <table>
-        <title>Default Pager Menu Bindings</title>
+      <table frame="none" rowsep="1">
+        <title>Most commonly used Pager Bindings</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
           <row>
       
       <para>
 
-      <table>
+      <table frame="none" rowsep="1">
         <title>ANSI Escape Sequences</title>
         <tgroup cols="2" align="left" colsep="1" rowsep="1">
         <thead>
     </table>
 
     
-      <table>
+      <table frame="none" rowsep="1">
         <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 <link linkend="auto-view">autoview</link>
+          can also be used by an external <muttng-doc:command 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>
-          <title>Default Thread Function Bindings</title>
+        <table frame="none" rowsep="1">
+          <title>Most commonly used thread-related bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
           in the thread and hides the others. This is useful when threads
           contain so many messages that you can only see a handful of threads
           onthe screen. See <literal>%M</literal> in
-          <muttng-doc:varref name="index_format" link="index-format"/>.
+          <muttng-doc:varref name="index-format"/>.
         </para>
 
         <para>
           For example, you could use
-          <literal>%?M?(#%03M)&amp;(%4l)?</literal> in <muttng-doc:varref name="index_format" link="index-format"/>
+          <literal>%?M?(#%03M)&amp;(%4l)?</literal> in <muttng-doc:varref name="index-format"/>
           to optionally
           display the number of hidden messages if the thread is collapsed.
         </para>
         
         <para>
-          See also the <muttng-doc:varref name="strict_threads" link="strict-threads"/> variable.
+          See also the <muttng-doc:varref name="strict-threads"/> variable.
         </para>
         
       </sect2>
         <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"/>
-          command is added to the file specified by the <muttng-doc:varref name="alias_file" link="alias-file"/>
+          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" link="alias-file"/>
-          does not add the aliases specified there-in, you must also <link linkend="source">
-            source
-          </link>
+          Specifying an <muttng-doc:varref name="alias-file"/>
+          does not add the aliases specified there-in, you must also <muttng-doc:command name="source"/>
           the file.
         </para>
         
         </para>
         
         <para>
-          Toggles the weeding of message header fields specified by <link linkend="ignore">
-            ignore
-          </link>
+          Toggles the weeding of message header fields specified by <muttng-doc:command name="ignore"/>
           commands.
         </para>
         
         </para>
         
         <para>
-          Note that this command is also available on the <link linkend="compose-menu">
-            compose-menu
-          </link>
+          Note that this command is also available on the <link linkend="compose-menu">compose-menu</link>
           .There, it's used to
           fine-tune the properties of attachments you are going to send.
         </para>
           a
           configuration file.  A common use is to check the settings of
           variables, or
-          in conjunction with <link linkend="macro">macro</link> to change
+          in conjunction with <muttng-doc:command name="macro"/> to change
           settings on the
           fly.
         </para>
         <para>
           Reply to the current or tagged message(s) by extracting any addresses
           which
-          match the regular expressions given by the <link linkend="lists">
-            lists
-          </link>
+          match the regular expressions given by the <muttng-doc:command name="lists"/>
           commands, but also honor any <literal>Mail-Followup-To</literal>
           header(s) if the
-          <muttng-doc:varref name="honor_followup_to" link="honor-followup-to"/>
+          <muttng-doc:varref name="honor-followup-to"/>
           configuration variable is set.  Using this when replying to messages
           posted
           to mailing lists helps avoid duplicate copies being sent to the
         <para>
           Asks for an external Unix command and pipes the current or
           tagged message(s) to it. The variables
-          <muttng-doc:varref name="pipe_decode" link="honor-followup-to"/>,
-          <muttng-doc:varref name="pipe_split" link="pipe-split"/>,
-          <muttng-doc:varref name="pipe_decode" link="pipe-decode"/> and
-          <muttng-doc:varref name="wait_key" link="wait-key"/> 
+          <muttng-doc:varref name="pipe-decode"/>,
+          <muttng-doc:varref name="pipe-split"/>,
+          <muttng-doc:varref name="pipe-decode"/> and
+          <muttng-doc:varref name="wait-key"/> 
           control the exact behavior of this function.
         </para>
         
         
         <para>
           Asks for an external Unix command and executes it.  The
-          <muttng-doc:varref name="wait_key" link="wait-key"/>
+          <muttng-doc:varref name="wait-key"/>
           can be used to control
           whether Mutt-ng will wait for a key to be pressed when the command
           returns
         
         <para>
           The <emphasis>pager</emphasis> uses the
-          <muttng-doc:varref name="quote_regexp" link="quote-regexp"/>
+          <muttng-doc:varref name="quote-regexp"/>
           variable to detect quoted text when
           displaying the body of the message.  This function toggles the
           displayof the quoted material in the message.  It is particularly
       
       <para>
 
-        <table>
-          <title>Default Mail Composition Bindings</title>
+        <table frame="none" rowsep="1">
+          <title>Most commonly used Mail Composition Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
         Bouncing a message sends the message as is to the recipient you
         specify.  Forwarding a message allows you to add comments or
         modify the message you are forwarding.  These items are discussed
-        in greater detail in the next chapter <link linkend="forwarding-mail">
-          forwarding-mail
-        </link>
-        .
+        in greater detail in the next chapter <link linkend="forwarding-mail">forwarding-mail</link>.
       </para>
       
       <sect2 id="sending-compose">
@@ -2027,8 +2010,8 @@ set edit_headers</screen>
         
         <para>
 
-        <table>
-          <title>Default Compose Menu Bindings</title>
+        <table frame="none" rowsep="1">
+          <title>Most commonly used Compose Menu Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
@@ -2152,7 +2135,7 @@ set edit_headers</screen>
           certainoperations like composing a new mail, replying, forwarding,
           etc. are
           not permitted when you are in that folder. The <literal>%r</literal>
-          in <muttng-doc:varref name="status_format" link="status-format"/>
+          in <muttng-doc:varref name="status-format"/>
           will change to
           a 'A' to indicate that you are in attach-message mode.
         </para>
@@ -2356,8 +2339,8 @@ Attach: filename [description]</screen>
         </para>
         
         <para>
-          Also see the <muttng-doc:varref name="edit_headers" link="edit-headers"/> and
-          <muttng-doc:varref name="editor_headers" link="editor-headers"/> variables
+          Also see the <muttng-doc:varref name="edit-headers"/> and
+          <muttng-doc:varref name="editor-headers"/> variables
         </para>
         
         <para>
@@ -2377,7 +2360,7 @@ Pgp: [E | S | S id]</screen>
 
           ``E'' encrypts, ``S'' signs and
           ``S&lt;id&gt;'' signs with the given key, setting
-          <muttng-doc:varref name="pgp_sign_as" link="pgp-sign-as"/>
+          <muttng-doc:varref name="pgp-sign-as"/>
           permanently.
         </para>
         
@@ -2407,7 +2390,7 @@ Pgp: [E | S | S id]</screen>
         
         <para>
           Most fields of the entries in the key selection menu (see also 
-          <muttng-doc:varref name="pgp_entry_format" link="pgp-entry-format"/>)
+          <muttng-doc:varref name="pgp-entry-format"/>)
           have obvious meanings.  But some explanations on the capabilities,
           flags, 
           and validity fields are in order.
@@ -2418,7 +2401,7 @@ Pgp: [E | S | S id]</screen>
           flags:
 
 
-        <table>
+        <table frame="none" rowsep="1">
           <title>PGP Key Menu Flags</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
@@ -2547,7 +2530,7 @@ Pgp: [E | S | S id]</screen>
         <para>
           Note that different remailers do have different capabilities,
           indicated in the <literal>%c</literal> entry of the remailer menu lines (see
-          <muttng-doc:varref name="mix_entry_format" link="mix-entry-format"/>).
+          <muttng-doc:varref name="mix-entry-format"/>).
           Most important is
           the ``middleman'' capability, indicated by a capital ``M'': This
           means that the remailer in question cannot be used as the final
@@ -2741,10 +2724,7 @@ a horrible death.
       <title>Basic Syntax of Initialization Files</title>
       
       <para>
-        An initialization file consists of a series of <link linkend="commands">
-          commands
-        </link>
-        .Each line of the file may contain one or more commands.
+        An initialization file consists of a series of <link linkend="commands">commands</link>. Each line of the file may contain one or more commands.
         When multiple commands are used, they must be separated by a semicolon
         (;).
         
@@ -2948,7 +2928,7 @@ set imap_home_namespace = $folder</screen>
         </para>
         
         <para>
-          would set the value of <muttng-doc:varref name="imap_home_namespace" link="imap-home-namespace"/>
+          would set the value of <muttng-doc:varref name="imap-home-namespace"/>
           to the value to which <muttng-doc:varref name="folder"/>
           is <emphasis>currently</emphasis> set to.
         </para>
@@ -2956,7 +2936,7 @@ set imap_home_namespace = $folder</screen>
         <para>
           <emphasis role="bold">Note:</emphasis> There're no logical links
           established in such cases so
-          that the the value for <muttng-doc:varref name="imap_home_namespace" link="imap-home-namespace"/>
+          that the the value for <muttng-doc:varref name="imap-home-namespace"/>
           won't change even
           if <muttng-doc:varref name="folder"/> gets changed.
         </para>
@@ -3248,13 +3228,11 @@ set folder = $user_magic_number</screen>
       
     </sect1>
     
-    <sect1 id="alias">
+    <sect1 id="command-alias"><anchor id="command-unalias"/>
       <title>Defining/Using aliases</title>
-      
+
       <para>
-        <literallayout>
-Usage: <literal>alias</literal> <emphasis>key</emphasis> <emphasis>address</emphasis> [, <emphasis>address</emphasis>,...]
-        </literallayout>
+        Usage: <muttng-doc:command name="alias"/> <emphasis>key</emphasis> <emphasis>address</emphasis> [, <emphasis>address</emphasis>,...]
       </para>
       
       <para>
@@ -3292,25 +3270,21 @@ 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 <link linkend="source">
-          source
-        </link>
-        .Consequently, you can have multiple alias files, or
+        a configuration file, as long as this file is <muttng-doc:command name="source"/>.
+        Consequently, you can have multiple alias files, or
         you can have all aliases defined in your muttrc.
       </para>
       
       <para>
         On the other hand, the <muttng-doc:funcref name="create-alias"/>
         function can use only one file, the one pointed to by the
-        <muttng-doc:varref name="alias_file" link="alias-file"/>
+        <muttng-doc:varref name="alias-file"/>
         variable (which is
         <literal>~/.muttrc</literal> by default). This file is not
         special either,
         in the sense that Mutt-ng will happily append aliases to any file, but
         in
-        order for the new aliases to take effect you need to explicitly <link linkend="source">
-          source
-        </link>
+        order for the new aliases to take effect you need to explicitly <muttng-doc:command name="source"/>
         this file too.
       </para>
       
@@ -3335,7 +3309,7 @@ set alias_file=~/.mail_aliases</screen>
         prompt.  You can
         also enter aliases in your editor at the appropriate headers if you
         have the
-        <muttng-doc:varref name="editor_headers" link="edit-headers"/>
+        <muttng-doc:varref name="editor-headers"/>
         variable set.
       </para>
       
@@ -3366,13 +3340,11 @@ set alias_file=~/.mail_aliases</screen>
       
     </sect1>
     
-    <sect1 id="bind">
+    <sect1 id="command-bind">
       <title>Changing the default key bindings</title>
       
       <para>
-        <literallayout>
-Usage: <literal>bind</literal> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>function</emphasis>
-        </literallayout>
+        Usage: <muttng-doc:command name="bind"/> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>function</emphasis>
       </para>
       
       <para>
@@ -3522,7 +3494,7 @@ Usage: <literal>bind</literal> <emphasis>map</emphasis> <emphasis>key</emphasis>
       
       <para>
         
-        <table>
+        <table frame="none" rowsep="1">
           <title>Alternative Key Names</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
@@ -3641,10 +3613,8 @@ Usage: <literal>bind</literal> <emphasis>map</emphasis> <emphasis>key</emphasis>
           key
         </emphasis>
         is pressed.
-        For a complete list of functions, see the <link linkend="functions">
-          functions
-        </link>
-        .The special function <literal>noop</literal> unbinds the specified key
+        For a complete list of functions, see the <link linkend="functions">functions</link>. 
+        The special function <literal>noop</literal> unbinds the specified key
         sequence.
       </para>
       
@@ -3656,12 +3626,13 @@ Usage: <literal>bind</literal> <emphasis>map</emphasis> <emphasis>key</emphasis>
     
     <sect1 id="charset-hook">
       <title>Defining aliases for character sets</title>
-      
+
+      <anchor id="iconv-hook"/>
+      <para>
+        Usage: <muttng-doc:hook name="charset"/> <emphasis>alias</emphasis> <emphasis> charset</emphasis>
+      </para>
       <para>
-        <literallayout>
-Usage: <muttng-doc:hook name="charset"/> <emphasis>alias</emphasis> <emphasis> charset</emphasis>
-Usage: <muttng-doc:hook name="iconv"/> <emphasis>charset</emphasis> <emphasis> local-charset </emphasis>
-        </literallayout>
+        Usage: <muttng-doc:hook name="iconv"/> <emphasis>charset</emphasis> <emphasis> local-charset </emphasis>
       </para>
       
       <para>
@@ -3689,10 +3660,7 @@ Usage: <muttng-doc:hook name="iconv"/> <emphasis>charset</emphasis> <emphasis> l
       <title>Setting variables based upon mailbox</title>
       
       <para>
-        <literallayout>
-Usage: <muttng-doc:hook name="folder"/> [!]<emphasis>regexp</emphasis> <emphasis>command</emphasis>
-        </literallayout>
-
+        Usage: <muttng-doc:hook name="folder"/> [!]<emphasis>regexp</emphasis> <emphasis>command</emphasis>
       </para>
       
       <para>
@@ -3750,13 +3718,11 @@ folder-hook . set sort=date-sent</screen>
       
     </sect1>
     
-    <sect1 id="macro">
+    <sect1 id="command-macro">
       <title>Keyboard macros</title>
       
       <para>
-        <literallayout>
-Usage: <literal>macro</literal> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>sequence</emphasis> [<emphasis>description</emphasis>]
-        </literallayout>
+        Usage: <muttng-doc:command name="macro"/> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>sequence</emphasis> [<emphasis>description</emphasis>]
       </para>
       
       <para>
@@ -3782,7 +3748,7 @@ Usage: <literal>macro</literal> <emphasis>menu</emphasis> <emphasis>key</emphasi
       
       <para>
         <emphasis>key</emphasis> and <emphasis>sequence</emphasis> are expanded
-        by the same rules as the <link linkend="bind">bind</link>.  There are
+        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
@@ -3795,7 +3761,7 @@ Usage: <literal>macro</literal> <emphasis>menu</emphasis> <emphasis>key</emphasi
           name&gt;
         </emphasis>
         .For a listing of key
-        names see the section on <link linkend="bind">bind</link>.  Functions
+        names see the section on <muttng-doc:command name="bind"/>.  Functions
         are listed in the <link linkend="functions">functions</link>.
       </para>
       
@@ -3826,15 +3792,19 @@ Usage: <literal>macro</literal> <emphasis>menu</emphasis> <emphasis>key</emphasi
       
     </sect1>
     
-    <sect1 id="color">
+    <sect1 id="command-color"><anchor id="command-uncolor"/>
       <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>]
+      </para>
       <para>
-        <literallayout>
-Usage: <literal>color</literal> <emphasis>object</emphasis> <emphasis>foreground</emphasis><emphasis>background</emphasis> [<emphasis>regexp</emphasis>]
-Usage: <literal>color</literal> index <emphasis>foreground</emphasis> <emphasis>background</emphasis><emphasis>pattern</emphasis>
-Usage: <literal>uncolor</literal> index <emphasis>pattern</emphasis>[<emphasis>pattern</emphasis>...]
-      </literallayout>
+        Usage: <muttng-doc:command name="color"/> index <emphasis>foreground</emphasis> <emphasis>background</emphasis><emphasis>pattern</emphasis>
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="uncolor"/> index <emphasis>pattern</emphasis>[<emphasis>pattern</emphasis>...]
       </para>
       
       <para>
@@ -3924,7 +3894,7 @@ Usage: <literal>uncolor</literal> index <emphasis>pattern</emphasis>[<emphasis>p
           <listitem>
             
             <para>
-              quoted (text matching <muttng-doc:varref name="quote_regexp" link="quote-regexp"/> in the body of a message)
+              quoted (text matching <muttng-doc:varref name="quote-regexp"/> in the body of a message)
             </para>
           </listitem>
           <listitem>
@@ -4117,11 +4087,13 @@ export COLORFGBG</screen>
       </para>
       
       <para>
-        <literallayout>
-Usage: <literal>mono</literal> <emphasis>&lt;object&gt; &lt;attribute&gt;</emphasis>[<emphasis>regexp</emphasis>]
-Usage: <literal>mono</literal> index <emphasis>attribute</emphasis> <emphasis>pattern</emphasis>
-Usage: <literal>unmono</literal> index <emphasis>pattern</emphasis> [<emphasis>pattern</emphasis>...]
-        </literallayout>
+        Usage: <muttng-doc:command name="mono"/> <emphasis>&lt;object&gt; &lt;attribute&gt;</emphasis>[<emphasis>regexp</emphasis>]
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="mono"/> index <emphasis>attribute</emphasis> <emphasis>pattern</emphasis>
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="unmono"/> index <emphasis>pattern</emphasis> [<emphasis>pattern</emphasis>...]
       </para>
       
       <para>
@@ -4172,15 +4144,17 @@ Usage: <literal>unmono</literal> index <emphasis>pattern</emphasis> [<emphasis>p
       
     </sect1>
     
-    <sect1 id="ignore">
+    <sect1 id="command-ignore"><anchor id="command-unignore"/>
       <title>Ignoring (weeding) unwanted message headers</title>
-      
+
       <para>
-        <literallayout>
-Usage: <literal>[un]ignore</literal> <emphasis>pattern</emphasis> [<emphasis>pattern</emphasis>...]
-        </literallayout>
+        Usage: <muttng-doc:command name="ignore"/> <emphasis>pattern</emphasis> [<emphasis>pattern</emphasis>...]
       </para>
-      
+
+      <para>
+        Usage: <muttng-doc:command name="unignore"/> <emphasis>pattern</emphasis> [<emphasis>pattern</emphasis>...]
+      </para>
       <para>
         Messages often have many header fields added by automatic processing
         systems,
@@ -4227,14 +4201,17 @@ unignore posted-to:</screen>
       
     </sect1>
     
-    <sect1 id="alternates">
+    <sect1 id="command-alternates"><anchor id="command-unalternates"/>
       <title>Alternative addresses</title>
       
       <para>
-        Usage: <literal>[un]alternates</literal> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
-        
+        Usage: <muttng-doc:command name="alternates"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
       </para>
-      
+
+      <para>
+        Usage: <muttng-doc:command name="unalternates"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
+      </para>
       <para>
         With various functions, mutt will treat messages differently,
         depending on whether you sent them or whether you received them from
@@ -4242,7 +4219,7 @@ unignore posted-to:</screen>
         sent to a different party, mutt will automatically suggest to send
         the response to the original message's recipients--responding to
         yourself won't make much sense in many cases.
-        (See <muttng-doc:varref name="reply_to" link="reply-to"/>.)
+        (See <muttng-doc:varref name="reply-to"/>.)
       </para>
       
       <para>
@@ -4313,7 +4290,7 @@ unignore posted-to:</screen>
         <para>
           For introductory information on <literal>format=flowed</literal>
           messages, see
-          <ulink URL="http://www.joeclark.org/ffaq.html">&#60;http://www.joeclark.org/ffaq.html&#62;</ulink>.
+          <muttng-doc:web url="http://www.joeclark.org/ffaq.html"/>.
         </para>
         
       </sect2>
@@ -4437,7 +4414,7 @@ set text_flowed</screen>
           side, the first space (if any) is removed. As a consequence and in
           addition to the above simple setting, please keep this in mind when
           making manual formattings within the editor. Also note that mutt-ng
-          currently violates the standard (RfC 3676) as it does not
+          currently violates the standard (<muttng-doc:rfc num="3676"/>) as it does not
           space-stuff lines starting with:
         </para>
         
@@ -4445,7 +4422,6 @@ set text_flowed</screen>
           
           <itemizedlist>
             <listitem>
-              
               <para>
                 <literal>&gt;</literal> This is <emphasis>not</emphasis> the
                 quote character but a right
@@ -4453,21 +4429,6 @@ set text_flowed</screen>
                 
               </para>
             </listitem>
-            <listitem>
-              
-              <para>
-                <literal>From</literal> with a trailing space.
-                
-              </para>
-            </listitem>
-            <listitem>
-              
-              <para>
-                just a space for formatting reasons
-                
-              </para>
-            </listitem>
-            
           </itemizedlist>
           
         </para>
@@ -4482,7 +4443,7 @@ set text_flowed</screen>
         <title>Additional Notes</title>
         
         <para>
-          For completeness, the <muttng-doc:varref name="delete_space" link="delete-space"/> variable provides the mechanism
+          For completeness, the <muttng-doc:varref name="delete-space"/> variable provides the mechanism
           to generate a <literal>DelSp=yes</literal> parameter on <emphasis>
             outgoing
           </emphasis>
@@ -4506,25 +4467,29 @@ set text_flowed</screen>
       
     </sect1>
     
-    <sect1 id="lists">
+    <sect1 id="command-lists"><anchor id="command-unlists"/><anchor id="command-subscribe"/>
+      <anchor id="command-unsubscribe"/>
       <title>Mailing lists</title>
       
       <para>
-        <literallayout>
-Usage: <literal>[un]lists</literal> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
-Usage: <literal>[un]subscribe</literal> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
-        </literallayout>
+        Usage: <muttng-doc:command name="lists"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="unlists"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="subscribe"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="unsubscribe"/> <emphasis>regexp</emphasis> [<emphasis>regexp</emphasis>...]
       </para>
       
       <para>
-        Mutt-ng has a few nice features for <link linkend="using-lists">
-          using-lists
-        </link>
-        .In order to take advantage of them, you must
+        Mutt-ng has a few nice features for <link linkend="using-lists">using-lists</link>. 
+        In order to take advantage of them, you must
         specify which addresses belong to mailing lists, and which mailing
-        lists you are subscribed to.  Once you have done this, the <link linkend="func-list-reply">
-          list-reply
-        </link>
+        lists you are subscribed to.  Once you have done this, the
+        <link linkend="func-list-reply">list-reply</link>
         function will work for all known lists.
         Additionally, when you send a message to a subscribed list, mutt will
         add a Mail-Followup-To header to tell other users' mail user agents
@@ -4534,7 +4499,7 @@ Usage: <literal>[un]subscribe</literal> <emphasis>regexp</emphasis> [<emphasis>r
         against
         receiving personal CCs of list messages.  Also note that the generation
         of the Mail-Followup-To header is controlled by the
-        <muttng-doc:varref name="followup_to" link="followup-to"/>
+        <muttng-doc:varref name="followup-to"/>
         configuration variable.
       </para>
       
@@ -4590,9 +4555,7 @@ Usage: <literal>[un]subscribe</literal> <emphasis>regexp</emphasis> [<emphasis>r
       <title>Using Multiple spool mailboxes</title>
       
       <para>
-        <literallayout>
-Usage: <muttng-doc:hook name="mbox"/> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
-        </literallayout>
+        Usage: <muttng-doc:hook name="mbox"/> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
       </para>
       
       <para>
@@ -4621,15 +4584,16 @@ Usage: <muttng-doc:hook name="mbox"/> [!]<emphasis>pattern</emphasis> <emphasis>
       
     </sect1>
     
-    <sect1 id="mailboxes">
+    <sect1 id="command-mailboxes"><anchor id="command-unmailboxes"/>
       <title>Defining mailboxes which receive mail</title>
-      
+
       <para>
-        <literallayout>
-Usage: <literal>[un]mailboxes</literal> [!]<emphasis>filename</emphasis> [<emphasis>filename</emphasis>...]
-        </literallayout>
+        Usage: <muttng-doc:command name="mailboxes"/> [!]<emphasis>filename</emphasis> [<emphasis>filename</emphasis>...]
       </para>
-      
+      <para>
+        Usage: <muttng-doc:command name="unmailboxes"/> [!]<emphasis>filename</emphasis> [<emphasis>filename</emphasis>...]
+      </para>
       <para>
         This command specifies folders which can receive mail and
         which will be checked for new messages.  By default, the
@@ -4676,9 +4640,7 @@ Usage: <literal>[un]mailboxes</literal> [!]<emphasis>filename</emphasis> [<empha
           mailboxes
         </literal>
         command are resolved when
-        the command is executed, so if these names contain <link linkend="shortcuts">
-          shortcuts
-        </link>
+        the command is executed, so if these names contain <link linkend="shortcuts">shortcuts</link>
         (such as ``='' and ``!''), any variable
         definition that affect these characters (like <muttng-doc:varref name="folder"/>
         and <muttng-doc:varref name="spoolfile"/>)
@@ -4691,14 +4653,14 @@ Usage: <literal>[un]mailboxes</literal> [!]<emphasis>filename</emphasis> [<empha
       
     </sect1>
     
-    <sect1 id="my-hdr">
+    <sect1 id="command-my-hdr"><anchor id="command-unmy-hdr"/>
       <title>User defined headers</title>
       
       <para>
-        <literallayout>
-Usage: <literal>my_hdr</literal> <emphasis>string</emphasis>
-Usage: <literal>unmy_hdr</literal> <emphasis>field</emphasis> [<emphasis>field</emphasis>...]
-        </literallayout>
+        Usage: <muttng-doc:command name="my-hdr"/> <emphasis>string</emphasis>
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="unmy-hdr"/> <emphasis>field</emphasis> [<emphasis>field</emphasis>...]
       </para>
       
       <para>
@@ -4726,13 +4688,13 @@ my_hdr Organization: A Really Big Company, Anytown, USA</screen>
           not
         </emphasis>
         allowed between the keyword and
-        the colon (``:'').  The standard for electronic mail (RFC822) says that
+        the colon (``:'').  The standard for electronic mail (<muttng-doc:rfc num="822"/>) says that
         space is illegal there, so Mutt-ng enforces the rule.
       </para>
       
       <para>
         If you would like to add a header field to a single message, you should
-        either set the <muttng-doc:varref name="edit_headers" link="edit-headers"/>
+        either set the <muttng-doc:varref name="edit-headers"/>
         variable,
         or use the <emphasis>edit-headers</emphasis> function (default: ``E'')
         in the send-menu so
@@ -4757,13 +4719,11 @@ unmy_hdr to cc</screen>
       
     </sect1>
     
-    <sect1 id="hdr-order">
+    <sect1 id="command-hdr-order"><anchor id="command-unhdr-order"/>
       <title>Defining the order of headers when viewing messages</title>
       
       <para>
-        <literallayout>
-Usage: <literal>hdr_order</literal> <emphasis>header1</emphasis><emphasis>header2</emphasis> <emphasis>header3</emphasis>
-        </literallayout>
+        Usage: <muttng-doc:command name="hdr-order"/> <emphasis>header1</emphasis><emphasis>header2</emphasis> <emphasis>header3</emphasis>
       </para>
       
       <para>
@@ -4795,9 +4755,7 @@ hdr_order From Date: From: To: Cc: Subject:</screen>
       <title>Specify default save filename</title>
       
       <para>
-        <literallayout>
-Usage: <muttng-doc:hook name="save"/> [!]<emphasis>pattern</emphasis> <emphasis>filename</emphasis>
-        </literallayout>
+        Usage: <muttng-doc:hook name="save"/> [!]<emphasis>pattern</emphasis> <emphasis>filename</emphasis>
       </para>
       
       <para>
@@ -4843,9 +4801,7 @@ save-hook aol\\.com$ +spam</screen>
       <title>Specify default Fcc: mailbox when composing</title>
       
       <para>
-        <literallayout>
-Usage: <muttng-doc:hook name="fcc"/> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
-        </literallayout>
+        Usage: <muttng-doc:hook name="fcc"/> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
       </para>
       
       <para>
@@ -4865,7 +4821,7 @@ Usage: <muttng-doc:hook name="fcc"/> [!]<emphasis>pattern</emphasis> <emphasis>m
       </para>
       
       <para>
-        Example: <literal><muttng-doc:hook name="fcc"/> ]@.[aol\\.com$
+        Example: <literal><muttng-doc:hook name="fcc"/> [@.]aol\\.com$
           +spammers
         </literal>
       </para>
@@ -4887,9 +4843,7 @@ Usage: <muttng-doc:hook name="fcc"/> [!]<emphasis>pattern</emphasis> <emphasis>m
       <title>Specify default save filename and default Fcc: mailbox at once</title>
       
       <para>
-        <literallayout>
-Usage: <literal><muttng-doc:hook name="fcc-save"/></literal> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
-        </literallayout>
+        Usage: <literal><muttng-doc:hook name="fcc-save"/></literal> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
       </para>
       
       <para>
@@ -4907,12 +4861,15 @@ Usage: <literal><muttng-doc:hook name="fcc-save"/></literal> [!]<emphasis>patter
       <title>Change settings based upon message recipients</title>
 
       <anchor id="reply-hook"/>
+      <anchor id="send2-hook"/>
       <para>
-        <literallayout>
-Usage: <muttng-doc:hook name="reply"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
-Usage: <muttng-doc:hook name="send"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
-Usage: <muttng-doc:hook name="send2"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
-        </literallayout>v
+        Usage: <muttng-doc:hook name="reply"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
+      </para>
+      <para>
+        Usage: <muttng-doc:hook name="send"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
+      </para>
+      <para>
+        Usage: <muttng-doc:hook name="send2"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
       </para>
       
       <para>
@@ -5000,9 +4957,7 @@ Usage: <muttng-doc:hook name="send2"/> [!]<emphasis>pattern</emphasis> <emphasis
       <title>Change settings before formatting a message</title>
       
       <para>
-        <literallayout>
-Usage: <muttng-doc:hook name="message"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
-        </literallayout>
+        Usage: <muttng-doc:hook name="message"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
       </para>
       
       <para>
@@ -5039,9 +4994,7 @@ message-hook '<muttng-doc:pattern name="f"/> freshmeat-news' 'set pager="less \"
       <title>Choosing the cryptographic key of the recipient</title>
       
       <para>
-        <literallayout>
-Usage: <muttng-doc:hook name="crypt"/> <emphasis>pattern</emphasis> <emphasis>keyid</emphasis>
-        </literallayout>
+        Usage: <muttng-doc:hook name="crypt"/> <emphasis>pattern</emphasis> <emphasis>keyid</emphasis>
       </para>
       
       <para>
@@ -5068,21 +5021,18 @@ Usage: <muttng-doc:hook name="crypt"/> <emphasis>pattern</emphasis> <emphasis>ke
       
     </sect1>
     
-    <sect1 id="push">
+    <sect1 id="command-push">
       <title>Adding key sequences to the keyboard buffer</title>
       
       <para>
-        <literallayout>
-Usage: <literal>push</literal> <emphasis>string</emphasis>
-        </literallayout>
+        Usage: <muttng-doc:command name="push"/> <emphasis>string</emphasis>
       </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 <link
-          linkend="macro">macro</link> command. You may use it to
+        names like the sequence string in the <muttng-doc:command 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:
@@ -5099,13 +5049,11 @@ folder-hook . 'push &lt;collapse-all&gt;'
       
     </sect1>
     
-    <sect1 id="exec">
+    <sect1 id="command-exec">
       <title>Executing functions</title>
       
       <para>
-        <literallayout>
-Usage: <literal>exec</literal> <emphasis>function</emphasis> [<emphasis>function</emphasis>...]
-        </literallayout>
+        Usage: <muttng-doc:command name="exec"/> <emphasis>function</emphasis> [<emphasis>function</emphasis>...]
       </para>
       
       <para>
@@ -5120,14 +5068,14 @@ Usage: <literal>exec</literal> <emphasis>function</emphasis> [<emphasis>function
       
     </sect1>
     
-    <sect1 id="score-command">
+    <sect1 id="command-score"><anchor id="command-unscore"/>
       <title>Message Scoring</title>
       
       <para>
-        <literallayout>
-Usage: <literal>score</literal> <emphasis>pattern</emphasis> <emphasis>value</emphasis>
-Usage: <literal>unscore</literal> <emphasis>pattern</emphasis> [<emphasis>pattern</emphasis>...]
-        </literallayout>
+        Usage: <muttng-doc:command name="score"/> <emphasis>pattern</emphasis> <emphasis>value</emphasis>
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="unscore"/> <emphasis>pattern</emphasis> [<emphasis>pattern</emphasis>...]
       </para>
       
       <para>
@@ -5215,14 +5163,14 @@ score "<muttng-doc:pattern name="f"/> santaclaus@northpole\.int" =666</screen>
       
       <para>
         These three thresholds can be set via the variables
-        <muttng-doc:varref name="score_threshold_read" link="score-threshold-read"/>,
-        <muttng-doc:varref name="score_threshold_flag" link="score-threshold-flag"/> and
-        <muttng-doc:varref name="score_threshold_delete" link="score-threshold-delete"/>.
+        <muttng-doc:varref name="score-threshold-read"/>,
+        <muttng-doc:varref name="score-threshold-flag"/> and
+        <muttng-doc:varref name="score-threshold-delete"/>.
       </para>
       <para>
         By default,
-        <muttng-doc:varref name="score_threshold_read" link="score-threshold-read"/> and
-        <muttng-doc:varref name="score_threshold_delete" link="score-threshold-delete"/> 
+        <muttng-doc:varref name="score-threshold-read"/> and
+        <muttng-doc:varref name="score-threshold-delete"/> 
         are set to
         <literal>-1</literal>, which means that in the default threshold
         configuration no
@@ -5259,15 +5207,15 @@ color index  red     yellow  "<muttng-doc:pattern name="n"/> 100-"</screen>
       
     </sect1>
     
-    <sect1 id="spam">
+    <sect1 id="command-spam"><anchor id="command-nospam"/>
       <title>Spam detection</title>
-      
+
       <para>
-        <literallayout>
-Usage: <literal>spam</literal> <emphasis>pattern</emphasis> <emphasis>format </emphasis>
-Usage: <literal>nospam</literal> <emphasis>pattern</emphasis>
-        </literallayout>
-        </para>
+        Usage: <muttng-doc:command name="spam"/> <emphasis>pattern</emphasis> <emphasis>format </emphasis>
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="nospam"/> <emphasis>pattern</emphasis>
+      </para>
       
       <para>
         Mutt-ng has generalized support for external spam-scoring filters.
@@ -5281,7 +5229,7 @@ Usage: <literal>nospam</literal> <emphasis>pattern</emphasis>
         mail based on its spam attributes, as determined by the external
         filter. You also can display the spam attributes in your index
         display using the <literal>%H</literal> selector in the
-        <muttng-doc:varref name="index_format" link="index-format"/>
+        <muttng-doc:varref name="index-format"/>
         variable. (Tip: try <literal>%?H?[%H] ?</literal>
         to display spam tags only when they are defined for a given message.)
       </para>
@@ -5431,24 +5379,25 @@ spam "^From: .*MAILER-DAEMON"       "999"</screen>
       
     </sect1>
     
-    <sect1 id="set">
+    <sect1 id="command-set"><anchor id="command-unset"/><anchor id="command-reset"/><anchor id="command-toggle"/>
       <title>Setting variables</title>
-      
-      <para>
-        <literallayout>
-Usage: <literal>set</literal> [no|inv]<emphasis>variable</emphasis>[=<emphasis>value</emphasis>] [<emphasis>variable</emphasis>...]
-Usage: <literal>toggle</literal> <emphasis>variable</emphasis> [<emphasis>variable</emphasis>...]
-Usage: <literal>unset</literal> <emphasis>variable</emphasis> [<emphasis>variable</emphasis>...]
-Usage: <literal>reset</literal> <emphasis>variable</emphasis> [<emphasis>variable</emphasis>...]
-      </literallayout>
 
+      <para>
+        Usage: <muttng-doc:command name="set"/> [no|inv]<emphasis>variable</emphasis>[=<emphasis>value</emphasis>] [<emphasis>variable</emphasis>...]
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="toggle"/> <emphasis>variable</emphasis> [<emphasis>variable</emphasis>...]
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="unset"/> <emphasis>variable</emphasis> [<emphasis>variable</emphasis>...]
+      </para>
+      <para>
+        Usage: <muttng-doc:command name="reset"/> <emphasis>variable</emphasis> [<emphasis>variable</emphasis>...]
       </para>
       
       <para>
-        This command is used to set (and unset) <link linkend="variables">
-          variables
-        </link>
-        .There are four basic types of variables:
+        This command is used to set (and unset) <link linkend="variables">variables</link>. 
+        There are four basic types of variables:
         boolean, number, string and quadoption.  <emphasis>boolean</emphasis>
         variables can be
         <emphasis>set</emphasis> (true) or <emphasis>unset</emphasis> (false). 
@@ -5556,13 +5505,11 @@ set ?allow_8bit</screen>
       
     </sect1>
     
-    <sect1 id="source">
+    <sect1 id="command-source">
       <title>Reading initialization commands from another file</title>
       
       <para>
-        <literallayout>
-Usage: <literal>source</literal> <emphasis>filename</emphasis> [<emphasis>filename</emphasis>...]
-        </literallayout>
+        Usage: <muttng-doc:command name="source"/> <emphasis>filename</emphasis> [<emphasis>filename</emphasis>...]
       </para>
       
       <para>
@@ -5594,14 +5541,12 @@ Usage: <literal>source</literal> <emphasis>filename</emphasis> [<emphasis>filena
       
     </sect1>
     
-    <sect1 id="unhook">
+    <sect1 id="command-unhook">
       <title>Removing hooks</title>
       
       <para>
-        <literallayout>
-Usage: <literal>unhook</literal> [* | <emphasis>hook-type</emphasis>]
-        </literallayout>
-        </para>
+        Usage: <muttng-doc:command name="unhook"/> [* | <emphasis>hook-type</emphasis>]
+      </para>
       
       <para>
         This command permits you to flush hooks you have previously defined.
@@ -5789,7 +5734,7 @@ ifdef feature_nntp 'source ~/.mutt-ng/setup-nntp'</screen>
           An example for testing for variable names can be used if users
           use different revisions of mutt-ng whereby the older one may not
           have a certain variable. To test for the availability of
-          <muttng-doc:varref name="imap_mail_check" link="imap-mail-check"/>
+          <muttng-doc:varref name="imap-mail-check"/>
           use:
         </para>
         
@@ -5802,8 +5747,8 @@ ifdef imap_mail_check 'set imap_mail_check = 300'</screen>
         
         <para>
           Provided for completeness is the test for menu names. To set
-          <muttng-doc:varref name="pager_index_lines"
-            link="pager-index-lines"/>
+          <muttng-doc:varref name="pager-index-lines"
+           />
           only if the pager
           menu is available, use:
         </para>
@@ -5930,26 +5875,26 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
       </para>
       
       <para>
-        A list of characters enclosed by ``]'' and ``['' matches any
+        A list of characters enclosed by ``]'' and ``]'' matches any
         single character in that list; if the first character of the list
         is a caret ``^'' then it matches any character <emphasis role="bold">
           not
         </emphasis>
         in the
         list.  For example, the regular expression <emphasis role="bold">
-          ]0123456789[
+          ]0123456789]
         </emphasis>
         matches any single digit.  A range of ASCII characters may be specified
         by giving the first and last characters, separated by a hyphen
         ``-''.  Most metacharacters lose their special meaning inside
-        lists.  To include a literal ``['' place it first in the list.
+        lists.  To include a literal ``]'' place it first in the list.
         Similarly, to include a literal ``^'' place it anywhere but first.
         Finally, to include a literal hyphen ``-'' place it last.
       </para>
       
       <para>
         Certain named classes of characters are predefined.  Character classes
-        consist of ``]:'', a keyword denoting the class, and ``:[''.
+        consist of ``[:'', a keyword denoting the class, and ``:]''.
         The following classes are defined by the POSIX standard:
       </para>
       
@@ -5957,7 +5902,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
         <variablelist>
           
           <varlistentry>
-            <term>]:alnum:[</term>
+            <term>[:alnum:]</term>
             <listitem>
               <para>
                 Alphanumeric characters.
@@ -5965,7 +5910,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>]:alpha:[</term>
+            <term>[:alpha:]</term>
             <listitem>
               <para>
                 Alphabetic characters.
@@ -5973,7 +5918,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>]:blank:[</term>
+            <term>[:blank:]</term>
             <listitem>
               <para>
                 Space or tab characters.
@@ -5981,7 +5926,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>]:cntrl:[</term>
+            <term>[:cntrl:]</term>
             <listitem>
               <para>
                 Control characters.
@@ -5989,7 +5934,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>]:digit:[</term>
+            <term>[:digit:]</term>
             <listitem>
               <para>
                 Numeric characters.
@@ -5997,7 +5942,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>]:graph:[</term>
+            <term>[:graph:]</term>
             <listitem>
               <para>
                 Characters that are both printable and visible.  (A space is
@@ -6007,7 +5952,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>]:lower:[</term>
+            <term>[:lower:]</term>
             <listitem>
               <para>
                 Lower-case alphabetic characters.
@@ -6015,7 +5960,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>]:print:[</term>
+            <term>[:print:]</term>
             <listitem>
               <para>
                 Printable characters (characters that are not control
@@ -6024,7 +5969,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>]:punct:[</term>
+            <term>[:punct:]</term>
             <listitem>
               <para>
                 Punctuation characters (characters that are not letter, digits,
@@ -6034,7 +5979,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>]:space:[</term>
+            <term>[:space:]</term>
             <listitem>
               <para>
                 Space characters (such as space, tab and formfeed, to name a
@@ -6043,7 +5988,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>]:upper:[</term>
+            <term>[:upper:]</term>
             <listitem>
               <para>
                 Upper-case alphabetic characters.
@@ -6051,7 +5996,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term>]:xdigit:[</term>
+            <term>[:xdigit:]</term>
             <listitem>
               <para>
                 Characters that are hexadecimal digits.
@@ -6066,8 +6011,8 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
         brackets of a character list.  Note that the brackets in these
         class names are part of the symbolic names, and must be included
         in addition to the brackets delimiting the bracket list.  For
-        example, <emphasis role="bold">]]:digit:[[</emphasis> is equivalent to
-        <emphasis role="bold">]0-9[</emphasis>.
+        example, <emphasis role="bold">[[:digit:]]</emphasis> is equivalent to
+        <emphasis role="bold">[0-9]</emphasis>.
       </para>
       
       <para>
@@ -6088,14 +6033,14 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
               <para>
                 A collating symbol is a multi-character collating element
                 enclosed in
-                ``].'' and ``.[''.  For example, if ``ch'' is a
+                ``[.'' and ``.]''.  For example, if ``ch'' is a
                 collating
                 element, then <emphasis role="bold">
-                  ]].ch.[[
+                  [[.ch.]]
                 </emphasis>
                 is a regexp that matches
                 this collating element, while <emphasis role="bold">
-                  ]ch[
+                  [ch]
                 </emphasis>
                 is a regexp that
                 matches either ``c'' or ``h''.
@@ -6108,11 +6053,11 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
               <para>
                 An equivalence class is a locale-specific name for a list of
                 characters that are equivalent. The name is enclosed in
-                ``]=''
-                and ``=[''.  For example, the name ``e'' might be used to
+                ``[=''
+                and ``=]''.  For example, the name ``e'' might be used to
                 represent all of ``è'' ``é'' and ``e''.  In this
                 case,
-                <emphasis role="bold">]]=e=[[</emphasis> is
+                <emphasis role="bold">[[=e=]]</emphasis> is
                 a regexp that matches any of
                 ``è'', ``é'' and ``e''.
               </para>
@@ -6488,7 +6433,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
         
         <para>
           The setting for the status bar of the index is controlled via the
-          <muttng-doc:varref name="status_format" link="status-format"/>
+          <muttng-doc:varref name="status-format"/>
           variable. For the hostname and version string, there's an expando
           for <literal>$status_format</literal>: <literal>
             %h
@@ -6855,13 +6800,13 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&#62; (%v on %h)"</screen>
         </emphasis>
         operation will
         be applied to all tagged messages if that operation can be used in that
-        manner.  If the <muttng-doc:varref name="auto_tag" link="auto-tag"/>
+        manner.  If the <muttng-doc:varref name="auto-tag"/>
         variable is set, the next operation applies to the tagged messages
         automatically, without requiring the ``tag-prefix''.
       </para>
       
       <para>
-        In <link linkend="macro">macro</link> or <link linkend="push">push</link> commands,
+        In <muttng-doc:command name="macro"/> or <muttng-doc:command 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
@@ -6958,7 +6903,7 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&#62; (%v on %h)"</screen>
         
         <screen>
 send-hook . 'unmy_hdr From:'
-send-hook <muttng-doc:pattern name="C"/>'^b@b\.b$' my_hdr from: c@c.c</screen>
+send-hook <muttng-doc:pattern name="C"/>'^b@b\.b$' my-hdr from: c@c.c</screen>
         
       </para>
       
@@ -6992,7 +6937,7 @@ send-hook <muttng-doc:pattern name="C"/>'^b@b\.b$' my_hdr from: c@c.c</screen>
           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>
+send-hook '<muttng-doc:pattern name="t"/> ^me@cs\.hmc\.edu$' 'my-hdr From: Mutt-ng User &#60;user@host&#62;'</screen>
           
           which would execute the given command when sending mail to
           <emphasis>me@cs.hmc.edu</emphasis>.
@@ -7062,56 +7007,6 @@ color sidebar white black</screen>
         
       </para>
       
-      <para>
-        The available functions are:
-
-        <table>
-          <title>Default Sidebar Function Bindings</title>
-          <tgroup cols="3" align="left" colsep="1" rowsep="1">
-          <thead>
-            <row>
-              <entry>Key</entry>
-              <entry>Function</entry>
-              <entry>Description</entry>
-            </row>
-          </thead>
-          <tbody>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-scroll-up"/></entry>
-              <entry>Scrolls the mailbox list up 1 page</entry>
-            </row>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-scroll-down"/></entry>
-              <entry>Scrolls the mailbox list down 1 page</entry>
-            </row>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-next"/></entry>
-              <entry>Highlights the next mailbox</entry>
-            </row>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-next-new"/></entry>
-              <entry>Highlights the next mailbox with new mail</entry>
-            </row>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-previous"/></entry>
-              <entry>Highlights the previous mailbox</entry>
-            </row>
-            <row>
-              <entry><literal>none</literal></entry>
-              <entry><muttng-doc:funcref name="sidebar-open"/></entry>
-              <entry>Opens the currently highlighted mailbox</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-
-      </para>
-      
       <para>
         Reasonable key bindings look e.g. like this:
         
@@ -7147,7 +7042,7 @@ macro pager B ':toggle sidebar_visible^M'</screen>
         LDAP,
         ph/qi, bbdb, or NIS through a wrapper script which connects to mutt
         using a simple interface.  Using the
-        <muttng-doc:varref name="query_command" link="query-command"/>
+        <muttng-doc:varref name="query-command"/>
         variable, you specify the wrapper
         command to use.  For example:
       </para>
@@ -7219,7 +7114,7 @@ roessler@guug.de        Thomas Roessler mutt pgp</screen>
         mbox, MMDF, MH and Maildir.  The mailbox type is autodetected, so there
         is no need to use a flag for different mailbox types.  When creating
         newmailboxes, Mutt-ng uses the default specified with the
-        <muttng-doc:varref name="mbox_type" link="mbox-type"/>
+        <muttng-doc:varref name="mbox-type"/>
         variable.
       </para>
       
@@ -7309,20 +7204,20 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
           <listitem>
             
             <para>
-              ! -- refers to your <muttng-doc:varref name="spoolfile" link="spoolfile"/>
+              ! -- refers to your <muttng-doc:varref name="spoolfile"/>
               (incoming) mailbox
             </para>
           </listitem>
           <listitem>
             
             <para>
-              &gt; -- refers to your <muttng-doc:varref name="mbox" link="mbox"/> file
+              &gt; -- refers to your <muttng-doc:varref name="mbox"/> file
             </para>
           </listitem>
           <listitem>
             
             <para>
-              &lt; -- refers to your <muttng-doc:varref name="record" link="record"/> file
+              &lt; -- refers to your <muttng-doc:varref name="record"/> file
             </para>
           </listitem>
           <listitem>
@@ -7346,7 +7241,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
           <listitem>
             
             <para>
-              = or + -- refers to your <muttng-doc:varref name="folder" link="folder"/>
+              = or + -- refers to your <muttng-doc:varref name="folder"/>
               directory
             </para>
           </listitem>
@@ -7377,7 +7272,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 <link linkend="lists">lists</link>
+        accomplished through the use of the <muttng-doc:command name="lists"/>
         commands in your muttrc.
       </para>
       
@@ -7387,9 +7282,8 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         through which you received a message (i.e., of a subscribed list) in
         the <emphasis>index</emphasis> menu display.  This is useful to
         distinguish between
-        personal and list mail in the same mailbox.  In the <link linkend="index-format">
-          index-format
-        </link>
+        personal and list mail in the same mailbox.  In the
+        <muttng-doc:varref name="index-format"/>
         variable, the escape ``%L''
         will return the string ``To &lt;list&gt;'' when ``list'' appears in the
         ``To'' field, and ``Cc &lt;list&gt;'' when it appears in the ``Cc''
@@ -7412,9 +7306,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         Mutt-ng also supports the <literal>Mail-Followup-To</literal> header. 
         When you send
         a message to a list of recipients which includes one or several
-        subscribed mailing lists, and if the <link linkend="followup-to">
-          followup-to
-        </link>
+        subscribed mailing lists, and if the <muttng-doc:varref name="followup-to"/>
         option is set, mutt will generate
         a Mail-Followup-To header which contains all the recipients to whom
         you send this message, but not your address. This indicates that
@@ -7428,7 +7320,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         Conversely, when group-replying or list-replying to a message which
         has a <literal>Mail-Followup-To</literal> header, mutt will respect
         this header if
-        the <muttng-doc:varref name="honor_followup_to" link="honor-followup-to"/>
+        the <muttng-doc:varref name="honor-followup-to"/>
         configuration
         variable is set.  Using list-reply will in this case also make sure
         that the reply goes to the mailing list, even if it's not specified
@@ -7448,7 +7340,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         than the author of the message.  This can create problems when trying
         to reply directly to the author in private, since most mail clients
         will automatically reply to the address given in the ``Reply-To''
-        field.  Mutt-ng uses the <muttng-doc:varref name="reply_to" link="reply-to"/>
+        field.  Mutt-ng uses the <muttng-doc:varref name="reply-to"/>
         variable to help decide which address to use.  If set to <emphasis>
           ask-yes
         </emphasis>
@@ -7464,7 +7356,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
       <para>
         The ``X-Label:'' header field can be used to further identify mailing
         lists or list subject matter (or just to annotate messages
-        individually).  The <muttng-doc:varref name="index_format" link="index-format"/>
+        individually).  The <muttng-doc:varref name="index-format"/>
         variable's ``%y'' and
         ``%Y'' escapes can be used to expand ``X-Label:'' fields in the
         index, and Mutt-ng's pattern-matcher can match regular expressions to
@@ -7556,7 +7448,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
       <title>Delivery Status Notification (DSN) Support</title>
       
       <para>
-        RFC1894 defines a set of MIME content types for relaying information
+        <muttng-doc:rfc num="1894"/> defines a set of MIME content types for relaying information
         about the status of electronic mail messages.  These can be thought of
         as
         ``return receipts.''
@@ -7599,7 +7491,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
           <listitem>
             
             <para>
-              <muttng-doc:varref name="dsn_notify" link="dsn-notify"/> is used
+              <muttng-doc:varref name="dsn-notify"/> is used
               to request receipts for different results (such as failed
               message,message delivered, etc.).
               
@@ -7608,7 +7500,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
           <listitem>
             
             <para>
-              <muttng-doc:varref name="dsn_return" link="dsn-return"/> requests
+              <muttng-doc:varref name="dsn-return"/> requests
               how much of your message should be returned with the receipt
               (headers or full message).
               
@@ -7663,7 +7555,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         reason the frequency at which Mutt-ng will check for mail remotely can
         be
         controlled by the
-        <muttng-doc:varref name="pop_mail_check" link="pop-mail-check"/>
+        <muttng-doc:varref name="pop-mail-check"/>
         variable, which defaults to every 60 seconds.
       </para>
       
@@ -7681,11 +7573,10 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
       
       <para>
         Another way to access your POP3 mail is the <emphasis>fetch-mail</emphasis> function
-        (default: G).  It allows to connect to <link linkend="pop-host">
-          pop-host
-        </link>
+        (default: G).  It allows to connect to <link
+          linkend="pop-host">pop-host</link>
         ,fetch all your new mail and place it in the
-        local <muttng-doc:varref name="spoolfile" link="spoolfile"/>.  After this
+        local <muttng-doc:varref name="spoolfile"/>.  After this
         point, Mutt-ng runs exactly as if the mail had always been local.
       </para>
       
@@ -7706,34 +7597,48 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
       <title>IMAP Support (OPTIONAL)</title>
       
       <para>
-        If Mutt-ng was compiled with IMAP support (by running the <emphasis>
-          configure
-        </emphasis>
-        script with the <emphasis>--enable-imap</emphasis> flag), it has the
-        ability to work
-        with folders located on a remote IMAP server.
+        If Mutt-ng was compiled with IMAP support (by running the
+        <emphasis>configure</emphasis> script with the
+        <emphasis>--enable-imap</emphasis> flag), it has the
+        ability to work with folders located on a remote IMAP server.
       </para>
       
       <para>
-        You can access the remote inbox by selecting the folder
-        <literal>imap://imapserver/INBOX</literal>, where <literal>imapserver</literal> is the name of the
-        IMAP server and <literal>INBOX</literal> is the special name for your
-        spool mailbox on
-        the IMAP server. If you want to access another mail folder at the IMAP
-        server, you should use <literal>imap://imapserver/path/to/folder</literal> where
-        <literal>path/to/folder</literal> is the path of the folder you want to
-        access.
+        You can access the remote inbox by selecting the folder via its
+        URL:
       </para>
-      
+
       <para>
-        You can select an alternative port by specifying it with the server,
-        i.e.:
-        <literal>imap://imapserver:port/INBOX</literal>.
+        <screen>
+imap://imapserver/INBOX</screen>
+      </para>
+
+      <para>
+        where <literal>imapserver</literal> is the name of the IMAP
+        server and <literal>INBOX</literal> is the special name for your
+        spool mailbox on the IMAP server. If you want to access another
+        mail folder at the IMAP server, you should use
+      </para>
+
+      <para>
+        <screen>
+imap://imapserver/path/to/folder</screen>
+      </para>
+        
+      <para>
+        where <literal>path/to/folder</literal> is the path
+        of the folder you want to access. You can select an alternative
+        port by specifying it with the server, i.e.:
+      </para>
+
+      <para>
+        <screen>
+imap://imapserver:port/INBOX</screen>
       </para>
       
       <para>
-        You can also specify different username for each folder, i.e.:
-        <literal>imap://username@imapserver[:port]/INBOX</literal>.
+        You can also specify different username for each folder by
+        prenpending your username and an @ symbol to the server's name.
       </para>
       
       <para>
@@ -7743,14 +7648,9 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         script with the <emphasis>--with-ssl</emphasis> flag), connections to
         IMAP servers
         can be encrypted. This naturally requires that the server supports
-        SSL encrypted connections. To access a folder with IMAP/SSL, you should
-        use <literal>imaps://[username@]imapserver[:port]/path/to/folder</literal> as your 
-        folder path.
-      </para>
-      
-      <para>
-        Pine-compatible notation is also supported, i.e.
-        <literal>{[username@]imapserver[:port][/ssl]}path/to/folder</literal>
+        SSL encrypted connections. To access a folder with IMAP/SSL, you only
+        need to substitute the initial <literal>imap://</literal> by
+        <literal>imaps://</literal> in the above examples.
       </para>
       
       <para>
@@ -7764,7 +7664,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         When browsing folders on an IMAP server, you can toggle whether to look
         at only the folders you are subscribed to, or all folders with the
         <emphasis>toggle-subscribed</emphasis> command.  See also the 
-        <muttng-doc:varref name="imap_list_subscribed" link="imap-list-subscribed"/>
+        <muttng-doc:varref name="imap-list-subscribed"/>
         variable.
       </para>
       
@@ -7772,9 +7672,9 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         Polling for new mail on an IMAP server can cause noticeable delays. So,
         you'll
         want to carefully tune the
-        <muttng-doc:varref name="imap_mail_check" link="imap-mail-check"/>
+        <muttng-doc:varref name="imap-mail-check"/>
         and
-        <muttng-doc:varref name="timeout" link="timeout"/>
+        <muttng-doc:varref name="timeout"/>
         variables.
       </para>
       
@@ -7882,7 +7782,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
             <listitem>
               
               <para>
-                <muttng-doc:varref name="imap_user" link="imap-user"/> - controls
+                <muttng-doc:varref name="imap-user"/> - controls
                 the username under which you request authentication on the IMAP
                 server,
                 for all authenticators. This is overridden by an explicit
@@ -7894,7 +7794,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
             <listitem>
               
               <para>
-                <muttng-doc:varref name="imap_pass" link="imap-pass"/> - a
+                <muttng-doc:varref name="imap-pass"/> - a
                 password which you may preset, used by all authentication
                 methods where
                 a password is needed.
@@ -7903,7 +7803,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
             <listitem>
               
               <para>
-                <muttng-doc:varref name="imap_authenticators" link="imap-authenticators"/>
+                <muttng-doc:varref name="imap-authenticators"/>
                 - a colon-delimited list of IMAP
                 authentication methods to try, in the order you wish to try
                 them. If
@@ -7940,7 +7840,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         environment variable. Like other
         news readers,
         info about subscribed newsgroups is saved in a file as specified by the
-        <muttng-doc:varref name="nntp_newsrc" link="nntp-newsrc"/> variable.
+        <muttng-doc:varref name="nntp-newsrc"/> variable.
         Article headers are cached and can be loaded from a file when a
         newsgroup is entered instead loading from newsserver; currently, this
         caching mechanism still is different from the header caching for
@@ -7954,7 +7854,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
           Especially for Usenet, people often ask for advanced filtering
           and scoring functionality. Of course, mutt-ng has scoring and
           allows a killfile, too. How to use a killfile has been discussed
-          in <link linkend="score-command">Message Scoring</link>.
+          in <link linkend="command-score">Message Scoring</link>.
         </para>
         
         <para>
@@ -7999,10 +7899,7 @@ score !<muttng-doc:pattern name="*"/> =42</screen>
             <listitem>
               
               <para>
-                Email addresses must be valid according to RFC 2822, see
-                <ulink
-                  URL="ftp://ftp.rfc-editor.org/in-notes/rfc2822.txt">&#60;ftp://ftp.rfc-editor.org/in-notes/rfc2822.txt&#62;
-                </ulink>
+                Email addresses must be valid according to <muttng-doc:rfc num="2822"/>
               </para>
             </listitem>
             <listitem>
@@ -8052,35 +7949,27 @@ score !<muttng-doc:pattern name="*"/> =42</screen>
         <literal>--with-libesmtp</literal> or the output <literal>muttng -v</literal> contains
         <literal>+USE_LIBESMTP</literal>, this will be or is the case
         already. The SMTP
-        support includes support for Delivery Status Notification (see <link linkend="dsn">
-          dsn
-        </link>
-        section) as well as
-        handling the <literal>8BITMIME</literal> flag controlled via <link linkend="use-8bitmime">
-          use-8bitmime
-        </link>
-        .
+        support includes support for Delivery Status Notification
+        (see <link linkend="dsn">dsn</link> section) as well as
+        handling the <literal>8BITMIME</literal> flag controlled via
+        <muttng-doc:varref name="use-8bitmime"/>.
       </para>
       
       <para>
         To enable sending mail directly via SMTP without an MTA such as
-        Postfix or SSMTP and the like, simply set the <link linkend="smtp-host">
-          smtp-host
-        </link>
+        Postfix or SSMTP and the like, simply set the <muttng-doc:varref name="smtp-host"/>
         variable pointing to your SMTP server.
       </para>
       
       <para>
-        Authentication mechanisms are available via the <link linkend="smtp-user">
-          smtp-user
-        </link>
-        and <muttng-doc:varref name="smtp_pass" link="smtp-pass"/> variables.
+        Authentication mechanisms are available via the <muttng-doc:varref name="smtp-user"/>
+        and <muttng-doc:varref name="smtp-pass"/> variables.
       </para>
       
       <para>
         Transport Encryption via the StartTLS command is also available. For
         this to work, first of all Mutt-ng must be built with SSL or GNUTLS.
-        Secondly, the <muttng-doc:varref name="smtp_use_tls" link="smtp-use-tls"/> variable
+        Secondly, the <muttng-doc:varref name="smtp-use-tls"/> variable
         must be either set
         to ``enabled'' or ``required.'' In both cases, StartTLS will be used if
         the server supports it: for the second case, the connection will fail
@@ -8093,7 +7982,7 @@ score !<muttng-doc:pattern name="*"/> =42</screen>
         sender, i.e. they allow for only one value which may not be what the
         user wants to send as the <literal>From:</literal> header. In this
         case, the variable
-        <muttng-doc:varref name="smtp_envelope" link="smtp-envelope"/> may be used
+        <muttng-doc:varref name="smtp-envelope"/> may be used
         to set the envelope different from the <literal>From:</literal> header.
       </para>
       
@@ -8139,8 +8028,7 @@ account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"'</screen>
         efficient to get
         a menu with all the URLs and start a WWW browser on one of them.  This
         functionality is provided by the external urlview program which can be
-        retrieved at <ulink URL="ftp://ftp.mutt.org/mutt/contrib/">ftp://ftp.mutt.org/mutt/contrib/</ulink>
->
+        retrieved at <muttng-doc:web url="ftp://ftp.mutt.org/mutt/contrib/"/>
         and the configuration commands:
         
         <screen>
@@ -8219,9 +8107,8 @@ append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </screen>
         supposes it is not compressed. This is important because it allows the
         use of programs that do not have well defined extensions. Just use
         &quot;.&quot; as a regexp. But this may be surprising if your
-        compressing script produces empty files. In this situation, unset <link linkend="save-empty">
-          save-empty
-        </link>
+        compressing script produces empty files. In this situation, unset
+        <muttng-doc:varref name="save-empty"/>
         ,so that the compressed file
         will be removed if you delete all of the messages.
       </para>
@@ -8230,9 +8117,7 @@ append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </screen>
         <title>Open a compressed mailbox for reading</title>
         
         <para>
-          <literallayout>
-Usage: <muttng-doc:hook name="open"/> <emphasis>regexp</emphasis> &quot;<emphasis>command</emphasis>&quot;
-          </literallayout>
+          Usage: <muttng-doc:hook name="open"/> <emphasis>regexp</emphasis> &quot;<emphasis>command</emphasis>&quot;
         </para>
         
         <para>
@@ -8287,9 +8172,7 @@ open-hook \\.gz$ "gzip -cd %f &#62; %t"
         <title>Write a compressed mailbox</title>
         
         <para>
-          <literallayout>
-Usage: <muttng-doc:hook name="close"/> <emphasis>regexp</emphasis>&quot;<emphasis>command</emphasis>&quot;
-        </literallayout>
+          Usage: <muttng-doc:hook name="close"/> <emphasis>regexp</emphasis>&quot;<emphasis>command</emphasis>&quot;
         </para>
         
         <para>
@@ -8344,9 +8227,7 @@ close-hook \\.gz$ "gzip -c %t &#62; %f"</screen>
         <title>Append a message to a compressed mailbox</title>
         
         <para>
-          <literallayout>
-Usage: <muttng-doc:hook name="append"/> <emphasis>regexp</emphasis>&quot;<emphasis>command</emphasis>&quot;
-        </literallayout>
+          Usage: <muttng-doc:hook name="append"/> <emphasis>regexp</emphasis>&quot;<emphasis>command</emphasis>&quot;
         </para>
         
         <para>
@@ -8382,9 +8263,7 @@ append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </screen>
           When <muttng-doc:hook name="append"/> is used, the
           folder is
           not opened, which saves time, but this means that we can not find out
-          what the folder type is. Thus the default (<link linkend="mbox-type">
-            mbox-type
-          </link>
+          what the folder type is. Thus the default (<muttng-doc:varref name="mbox-type"/>
           )type is always supposed (i.e.
           this is the format used for the temporary folder).
         </para>
@@ -8670,8 +8549,8 @@ audio/x-aiff                    aif aifc aiff</screen>
       </title>
       
       <para>
-        Mutt-ng supports RFC 1524 MIME Configuration, in particular the Unix
-        specific format specified in Appendix A of RFC 1524.  This file format
+        Mutt-ng supports <muttng-doc:rfc num="1524"/> MIME Configuration, in particular the Unix
+        specific format specified in Appendix A of the RfC.  This file format
         is commonly referred to as the mailcap format.  Many MIME compliant
         programs utilize the mailcap format, allowing you to specify handling
         for all MIME types in one place for all programs.  Programs known to
@@ -8817,9 +8696,7 @@ text/*; more</screen>
           parameters
           in expansion of %s syntaxes properly, and avoids risky
           characters by
-          substituting them, see the <link linkend="mailcap-sanitize">
-            mailcap-sanitize
-          </link>
+          substituting them, see the <muttng-doc:varref name="mailcap-sanitize"/>
           variable.
         </para>
         
@@ -8907,15 +8784,13 @@ text/html; lynx -dump %s ; copiousoutput</screen>
                 <term>needsterminal</term>
                 <listitem>
                   <para>
-                    Mutt-ng uses this flag when viewing attachments with <link linkend="auto-view">
-                      auto-view
-                    </link>
-                    ,in order to decide whether it should honor the setting
-                    of the <muttng-doc:varref name="wait_key" link="wait-key"/> variable or
+                    Mutt-ng uses this flag when viewing attachments with <muttng-doc:command 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
                     program, and the
                     corresponding mailcap entry has a <emphasis>needsterminal</emphasis> flag, Mutt-ng will use
-                    <muttng-doc:varref name="wait_key" link="wait-key"/> and the exit
+                    <muttng-doc:varref name="wait-key"/> and the exit
                     statusof the program to decide if it will ask you to press
                     a key after the
                     external program has exited.  In all other situations it
@@ -9063,9 +8938,7 @@ nametemplate=%s.gif</screen>
           </para>
           
           <para>
-            In addition, you can use this with <link linkend="auto-view">
-              auto-view
-            </link>
+            In addition, you can use this with <muttng-doc:command 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
@@ -9078,7 +8951,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 <link linkend="auto-view">auto-view</link>, Mutt-ng will choose
+            For <muttng-doc:command name="auto-view"/>, Mutt-ng will choose
             the third
             entry because of the copiousoutput tag.  For interactive viewing,
             Mutt
@@ -9168,7 +9041,7 @@ Content-Type: text/plain; charset=iso-8859-1</screen>
             </variablelist>
             Mutt-ng does not currently support the %F and %n
             keywords
-            specified in RFC 1524.  The main purpose of these parameters is for
+            specified in <muttng-doc:rfc num="1524"/>.  The main purpose of these parameters is for
             multipart messages, which is handled internally by Mutt-ng.
           </para>
           
@@ -9243,7 +9116,7 @@ application/ms-excel; open.pl %s</screen>
       
     </sect1>
     
-    <sect1 id="auto-view">
+    <sect1 id="command-auto-view"><anchor id="command-unauto-view"/>
       <title>MIME Autoview</title>
       
       <para>
@@ -9302,7 +9175,7 @@ application/postscript; ps2ascii %s; copiousoutput</screen>
       
     </sect1>
     
-    <sect1 id="alternative-order">
+    <sect1 id="command-alternative-order"><anchor id="command-unalternative-order"/>
       <title>MIME Multipart/Alternative</title>
       
       <para>
@@ -9322,7 +9195,7 @@ application/postscript image/*</screen>
       
       <para>
         Next, mutt will check if any of the types have a defined 
-        <link linkend="auto-view">auto-view</link>, and use that.  Failing
+        <muttng-doc:command 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>
@@ -9338,7 +9211,7 @@ application/postscript image/*</screen>
       
     </sect1>
     
-    <sect1 id="mime-lookup">
+    <sect1 id="command-mime-lookup"><anchor id="command-unmime-lookup"/>
       <title>MIME Lookup</title>
       
       <para>
@@ -9430,11 +9303,11 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</screen>
       
       <para>
         Mutt-ng uses many temporary files for viewing messages, verifying
-        digital signatures, etc. The <muttng-doc:varref name="umask" link="umask"/>
+        digital signatures, etc. The <muttng-doc:varref name="umask"/>
         variable can be used to change the default permissions of these
         files. Please only change it if you really know what you are doing.
         Also, a different location for these files may be desired which can
-        be changed via the <muttng-doc:varref name="tmpdir" link="tmpdir"/> variable.
+        be changed via the <muttng-doc:varref name="tmpdir"/> variable.
       </para>
       
     </sect1>
@@ -9454,7 +9327,7 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</screen>
           information probably telling others how many mail you sent in which
           time, you at least need to remove the <literal>%P</literal>
           expando from the
-          default setting of the <muttng-doc:varref name="msgid_format" link="msgid-format"/> variable. Please make sure that
+          default setting of the <muttng-doc:varref name="msgid-format"/> variable. Please make sure that
           you really know how local parts of these <literal>Message-ID:</literal> headers
           are composed.
         </para>
@@ -9471,7 +9344,7 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</screen>
           will be strict in interpreting them which means that arbitrary
           header fields can be embedded in these links which could override
           existing header fields or attach arbitrary files. This may be
-          problematic if the <muttng-doc:varref name="edit_headers" link="edit-headers"/>
+          problematic if the <muttng-doc:varref name="edit-headers"/>
           variable is <emphasis>unset</emphasis>, i.e. the
           user doesn't want to see header fields while editing the message.
         </para>
@@ -9494,9 +9367,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
         </para>
         
         <para>
-          When <emphasis>unsetting</emphasis> the <link linkend="strict-mailto">
-            strict-mailto
-          </link>
+          When <emphasis>unsetting</emphasis> the <muttng-doc:varref name="strict-mailto"/>
           variable, mutt-ng will
         </para>
         
@@ -9516,7 +9387,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
             <listitem>
               
               <para>
-                turn on the <muttng-doc:varref name="edit_headers" link="edit-headers"/>
+                turn on the <muttng-doc:varref name="edit-headers"/>
                 variable by
                 force to let the user see all the headers
                 (because they still may leak information.)
@@ -9546,11 +9417,10 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
         
         <para>
           One of these is the <literal>mailcap</literal> mechanism as defined
-          by RfC
-          1524. Mutt-ng can be set up to <emphasis>automatically</emphasis>
+          by <muttng-doc:rfc num="1524"/>. Mutt-ng can be set up to <emphasis>automatically</emphasis>
           execute any
           given utility as listed in one of the mailcap files (see the
-          <muttng-doc:varref name="mailcap_path" link="mailcap-path"/>
+          <muttng-doc:varref name="mailcap-path"/>
           variable for details.) 
         </para>
         
@@ -9594,7 +9464,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
             <listitem>
               
               <para>
-                leave the <muttng-doc:varref name="mailcap_sanitize" link="mailcap-sanitize"/> variable in its default
+                leave the <muttng-doc:varref name="mailcap-sanitize"/> variable in its default
                 state to restrict mailcap expandos to a safe set of characters
                 
               </para>
@@ -9648,8 +9518,8 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       
       <para>
         
-        <table>
-          <title>Mutt-NG Command Line Options</title>
+        <table frame="none" rowsep="1">
+          <title>Reference: Command Line Options</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
@@ -9761,10 +9631,10 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       </para>
       
       <para>
-        <literal>mutt</literal> ] -nz [ ] -F <emphasis>muttrc</emphasis> [ ] -m <emphasis>
+        <literal>mutt</literal> ] -nz ] ] -F <emphasis>muttrc</emphasis> ] ] -m <emphasis>
           type
         </emphasis>
-        [ ] -f <emphasis>mailbox</emphasis> [ 
+        ] ] -f <emphasis>mailbox</emphasis> ] 
       </para>
       
       <para>
@@ -9772,16 +9642,16 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       </para>
       
       <para>
-        <literal>mutt</literal> ] -n [ ] -F <emphasis>muttrc</emphasis> [ ] -a <emphasis>
+        <literal>mutt</literal> ] -n ] ] -F <emphasis>muttrc</emphasis> ] ] -a <emphasis>
           file
         </emphasis>
-        [ ] -c <emphasis>address</emphasis> [ ] -i <emphasis>
+        ] ] -c <emphasis>address</emphasis> ] ] -i <emphasis>
           filename
         </emphasis>
-        [ ] -s <emphasis>subject</emphasis> [ <emphasis>address</emphasis> ] <emphasis>
+        ] ] -s <emphasis>subject</emphasis> ] <emphasis>address</emphasis> ] <emphasis>
           address
         </emphasis>
-        ... [ 
+        ... ] 
       </para>
       
       <para>
@@ -9816,8 +9686,8 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
 
       <para>
 
-        <table id="tab-patterns">
-          <title>Patterns</title>
+        <table frame="none" rowsep="1" id="tab-patterns">
+          <title>Reference: Patterns</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
@@ -9828,222 +9698,222 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:pattern name="A"/></entry>
+              <entry><muttng-doc:pattern full="1" name="A"/></entry>
               <entry><literal></literal></entry>
               <entry>all messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="b"/></entry>
+              <entry><muttng-doc:pattern full="1" name="b"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the message body</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="B"/></entry>
+              <entry><muttng-doc:pattern full="1" name="B"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the whole message</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="c"/></entry>
+              <entry><muttng-doc:pattern full="1" name="c"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages carbon-copied to EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="C"/></entry>
+              <entry><muttng-doc:pattern full="1" name="C"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>message is either to: or cc: EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="D"/></entry>
+              <entry><muttng-doc:pattern full="1" name="D"/></entry>
               <entry><literal></literal></entry>
               <entry>deleted messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="d"/></entry>
+              <entry><muttng-doc:pattern full="1" name="d"/></entry>
               <entry><literal>[MIN]-[MAX]</literal></entry>
               <entry>messages with ``date-sent'' in a Date range</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="E"/></entry>
+              <entry><muttng-doc:pattern full="1" name="E"/></entry>
               <entry><literal></literal></entry>
               <entry>expired messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="e"/></entry>
+              <entry><muttng-doc:pattern full="1" name="e"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>message which contains EXPR in the ``Sender'' field</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="F"/></entry>
+              <entry><muttng-doc:pattern full="1" name="F"/></entry>
               <entry><literal></literal></entry>
               <entry>flagged messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="f"/></entry>
+              <entry><muttng-doc:pattern full="1" name="f"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages originating from EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="g"/></entry>
+              <entry><muttng-doc:pattern full="1" name="g"/></entry>
               <entry><literal></literal></entry>
               <entry>cryptographically signed messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="G"/></entry>
+              <entry><muttng-doc:pattern full="1" name="G"/></entry>
               <entry><literal></literal></entry>
               <entry>cryptographically encrypted messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="H"/></entry>
+              <entry><muttng-doc:pattern full="1" name="H"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages with a spam attribute matching EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="h"/></entry>
+              <entry><muttng-doc:pattern full="1" name="h"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the message header</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="k"/></entry>
+              <entry><muttng-doc:pattern full="1" name="k"/></entry>
               <entry><literal></literal></entry>
               <entry>message contains PGP key material</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="i"/></entry>
+              <entry><muttng-doc:pattern full="1" name="i"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>message which match ID in the ``Message-ID'' field</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="L"/></entry>
+              <entry><muttng-doc:pattern full="1" name="L"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>message is either originated or received by EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="l"/></entry>
+              <entry><muttng-doc:pattern full="1" name="l"/></entry>
               <entry><literal></literal></entry>
               <entry>message is addressed to a known mailing list</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="m"/></entry>
+              <entry><muttng-doc:pattern full="1" name="m"/></entry>
               <entry><literal>[MIN]-[MAX]</literal></entry>
               <entry>message in the range MIN to MAX *)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="M"/></entry>
+              <entry><muttng-doc:pattern full="1" name="M"/></entry>
               <entry><literal></literal></entry>
               <entry>multipart messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="n"/></entry>
+              <entry><muttng-doc:pattern full="1" name="n"/></entry>
               <entry><literal>[MIN]-[MAX]</literal></entry>
               <entry>messages with a score in the range MIN to MAX *)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="N"/></entry>
+              <entry><muttng-doc:pattern full="1" name="N"/></entry>
               <entry><literal></literal></entry>
               <entry>new messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="O"/></entry>
+              <entry><muttng-doc:pattern full="1" name="O"/></entry>
               <entry><literal></literal></entry>
               <entry>old messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="p"/></entry>
+              <entry><muttng-doc:pattern full="1" name="p"/></entry>
               <entry><literal></literal></entry>
               <entry>message is addressed to you (consults alternates)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="P"/></entry>
+              <entry><muttng-doc:pattern full="1" name="P"/></entry>
               <entry><literal></literal></entry>
               <entry>message is from you (consults alternates)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="Q"/></entry>
+              <entry><muttng-doc:pattern full="1" name="Q"/></entry>
               <entry><literal></literal></entry>
               <entry>messages which have been replied to</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="R"/></entry>
+              <entry><muttng-doc:pattern full="1" name="R"/></entry>
               <entry><literal></literal></entry>
               <entry>read messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="r"/></entry>
+              <entry><muttng-doc:pattern full="1" name="r"/></entry>
               <entry><literal>[MIN]-[MAX]</literal></entry>
               <entry>messages with ``date-received'' in a Date range</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="S"/></entry>
+              <entry><muttng-doc:pattern full="1" name="S"/></entry>
               <entry><literal></literal></entry>
               <entry>superseded messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="s"/></entry>
+              <entry><muttng-doc:pattern full="1" name="s"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages having EXPR in the ``Subject'' field.</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="T"/></entry>
+              <entry><muttng-doc:pattern full="1" name="T"/></entry>
               <entry><literal></literal></entry>
               <entry>tagged messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="t"/></entry>
+              <entry><muttng-doc:pattern full="1" name="t"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages addressed to EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="U"/></entry>
+              <entry><muttng-doc:pattern full="1" name="U"/></entry>
               <entry><literal></literal></entry>
               <entry>unread messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="u"/></entry>
+              <entry><muttng-doc:pattern full="1" name="u"/></entry>
               <entry><literal></literal></entry>
               <entry>message is addressed to a subscribed mailing list</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="v"/></entry>
+              <entry><muttng-doc:pattern full="1" name="v"/></entry>
               <entry><literal></literal></entry>
               <entry>message is part of a collapsed thread.</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="V"/></entry>
+              <entry><muttng-doc:pattern full="1" name="V"/></entry>
               <entry><literal></literal></entry>
               <entry>cryptographically verified messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="w"/></entry>
+              <entry><muttng-doc:pattern full="1" name="w"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the `Newsgroups' field (if compiled with NNTP support)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="x"/></entry>
+              <entry><muttng-doc:pattern full="1" name="x"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the `References' field</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="y"/></entry>
+              <entry><muttng-doc:pattern full="1" name="y"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the `X-Label' field</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="z"/></entry>
+              <entry><muttng-doc:pattern full="1" name="z"/></entry>
               <entry><literal>[MIN]-[MAX]</literal></entry>
               <entry>messages with a size in the range MIN to MAX *)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="="/></entry>
+              <entry><muttng-doc:pattern full="1" name="="/></entry>
               <entry><literal></literal></entry>
               <entry>duplicated messages (see $duplicate_threads)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="$"/></entry>
+              <entry><muttng-doc:pattern full="1" name="$"/></entry>
               <entry><literal></literal></entry>
               <entry>unreferenced messages (requires threaded view)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern name="*"/></entry>
+              <entry><muttng-doc:pattern full="1" name="*"/></entry>
               <entry><literal></literal></entry>
               <entry>``From'' contains realname and (syntactically) valid address
                 (excluded are addresses matching against alternates or any alias)</entry>
@@ -10066,18 +9936,11 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       </para>
       
       <para>
-        *) The forms <literal>&lt;]MAX[</literal>, <literal>
-          &gt;]MIN[
-        </literal>
-        ,
-        <literal>]MIN[-</literal> and <literal>-]MAX[</literal>
+        *) The forms <literal>&lt;[MAX]</literal>, <literal>&gt;[MIN]</literal>,
+        <literal>[MIN]-</literal> and <literal>-[MAX]</literal>
         are allowed, too.
       </para>
       
-      <para>
-        
-      </para>
-      
     </sect1>
     
     <sect1 id="commands">
@@ -10093,521 +9956,326 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="account"/>
-              </literal>
-              <emphasis>pattern</emphasis> <emphasis>command</emphasis>
+              <literal><muttng-doc:hook name="account"/></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="alias">alias</link>
-              </literal>
-              <emphasis>key</emphasis> <emphasis>address</emphasis> ] , <emphasis>
-                address
-              </emphasis>
-              ,... [
+              <literal><muttng-doc:command name="alias"/></literal> <emphasis>key</emphasis> <emphasis>address</emphasis> [, <emphasis>address</emphasis>, ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="alias">alias</link>
-              </literal>
-              ] * | <emphasis>key</emphasis> ... [
+              <literal><muttng-doc:command name="unalias"/></literal> [ * | <emphasis>key</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="alternates">alternates</link>
-              </literal>
-              <emphasis>regexp</emphasis> ] <emphasis>regexp</emphasis>
-              ... [
+              <literal><muttng-doc:command name="alternates"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="alternates">alternates</link>
-              </literal>
-              ] * | <emphasis>regexp</emphasis> ... [
+              <literal><muttng-doc:command name="unalternates"/></literal> [ * | <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="alternative-order">alternative-order</link>
-              </literal>
-              <emphasis>mimetype</emphasis> ] <emphasis>mimetype</emphasis> ... [
+              <literal><muttng-doc:command name="alternative-order"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="alternative-order">alternative-order</link>
-              </literal>
-              <emphasis>mimetype</emphasis> ] <emphasis>mimetype</emphasis> ... [
+              <literal><muttng-doc:command name="unalternative-order"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="append"/>
-              </literal>
-              <emphasis>regexp</emphasis> <emphasis>command</emphasis>
+              <literal><muttng-doc:hook name="append"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="auto-view">auto-view</link>
-              </literal>
-              <emphasis>mimetype</emphasis> ] <emphasis>mimetype</emphasis> ... [
+              <literal><muttng-doc:command name="auto-view"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="auto-view">auto-view</link>
-              </literal>
-              <emphasis>mimetype</emphasis> ] <emphasis>mimetype</emphasis> ... [
+              <literal><muttng-doc:command name="unauto-view"/></literal><emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="bind">bind</link>
-              </literal>
-              <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>
-                function
-              </emphasis>
+              <literal><muttng-doc:command name="bind"/></literal> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>function</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="charset"/>
-              </literal>
-              <emphasis>alias</emphasis> <emphasis>charset</emphasis>
+              <literal><muttng-doc:hook name="charset"/></literal> <emphasis>alias</emphasis> <emphasis>charset</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="close"/>
-              </literal>
-              <emphasis>regexp</emphasis> <emphasis>command</emphasis>
+              <literal><muttng-doc:hook name="close"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="color">color</link>
-              </literal>
-              <emphasis>object</emphasis> <emphasis>foreground</emphasis> <emphasis>
-                background
-              </emphasis>
-              ] <emphasis>regexp</emphasis> [
+              <literal><muttng-doc:command name="color"/></literal> <emphasis>object</emphasis> <emphasis>foreground</emphasis> <emphasis>background</emphasis> [ <emphasis>regexp</emphasis> ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="color">color</link>
-              </literal>
-              <emphasis>index</emphasis> <emphasis>pattern</emphasis> ] <emphasis>
-                pattern
-              </emphasis>
-              ... [
+              <literal><muttng-doc:command name="uncolor"/></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="exec">exec</link>
-              </literal>
-              <emphasis>function</emphasis> ] <emphasis>function</emphasis> ... [
+              <literal><muttng-doc:command name="exec"/></literal> <emphasis>function</emphasis> [ <emphasis>function</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="fcc"/>
-              </literal>
-              <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+              <literal><muttng-doc:hook name="fcc"/></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="fcc-save"/>
-              </literal>
-              <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+              <literal><muttng-doc:hook name="fcc-save"/></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="folder"/>
-              </literal>
-              <emphasis>pattern</emphasis> <emphasis>command</emphasis>
+              <literal><muttng-doc:hook name="folder"/></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="hdr-order">hdr-order</link>
-              </literal>
-              <emphasis>header</emphasis> ] <emphasis>header</emphasis>
-              ... [
+              <literal><muttng-doc:command name="hdr-order"/></literal> <emphasis>header</emphasis> [ <emphasis>header</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="hdr-order">hdr-order</link>
-              </literal>
-              <emphasis>header</emphasis> ] <emphasis>header</emphasis>
-              ... [
+              <literal><muttng-doc:command name="unhdr-order"/></literal> <emphasis>header</emphasis> [ <emphasis>header</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="charset"/>
-              </literal>
-              <emphasis>charset</emphasis> <emphasis>local-charset</emphasis>
+              <literal><muttng-doc:hook name="charset"/></literal> <emphasis>charset</emphasis> <emphasis>local-charset</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="ignore">ignore</link>
-              </literal>
-              <emphasis>pattern</emphasis> ] <emphasis>pattern</emphasis>
-              ... [
+              <literal><muttng-doc:command name="ignore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="ignore">ignore</link>
-              </literal>
-              <emphasis>pattern</emphasis> ] <emphasis>pattern</emphasis>
-              ... [
+              <literal><muttng-doc:command name="unignore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="lists">lists</link>
-              </literal>
-              <emphasis>regexp</emphasis> ] <emphasis>regexp</emphasis>
-              ... [ 
+              <literal><muttng-doc:command name="lists"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="lists">lists</link>
-              </literal>
-              <emphasis>regexp</emphasis> ] <emphasis>regexp</emphasis>
-              ... [ 
+              <literal><muttng-doc:command name="unlists"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="macro">macro</link>
-              </literal>
-              <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>
-                sequence
-              </emphasis>
-              ] <emphasis>description</emphasis> [ 
+              <literal><muttng-doc:command name="macro"/></literal> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>sequence</emphasis> [ <emphasis>description</emphasis> ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="mailboxes">mailboxes</link>
-              </literal>
-              <emphasis>filename</emphasis> ] <emphasis>filename</emphasis> ... [
+              <literal><muttng-doc:command name="mailboxes"/></literal> <emphasis>filename</emphasis> [ <emphasis>filename</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="mbox"/>
-              </literal>
-              <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+              <literal><muttng-doc:hook name="mbox"/></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="message"/>
-              </literal>
-              <emphasis>pattern</emphasis> <emphasis>command</emphasis>
+              <literal><muttng-doc:hook name="message"/></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="mime-lookup">mime-lookup</link>
-              </literal>
-              <emphasis>mimetype</emphasis> ] <emphasis>mimetype</emphasis> ... [
+              <literal><muttng-doc:command name="mime-lookup"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
               <literal>
-                <link linkend="mime-lookup">mime-lookup</link>
-              </literal>
-              <emphasis>mimetype</emphasis> ] <emphasis>mimetype</emphasis> ... [
+                <muttng-doc:command name="unmime-lookup"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="color">color</link>
-              </literal>
-              <emphasis>object attribute</emphasis> ] <emphasis>regexp</emphasis> [
+              <literal><muttng-doc:command name="mono"/></literal> <emphasis>object attribute</emphasis> [ <emphasis>regexp</emphasis> ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="color">color</link>
-              </literal>
-              <emphasis>index</emphasis> <emphasis>pattern</emphasis> ] <emphasis>
-                pattern
-              </emphasis>
-              ... [
+              <literal><muttng-doc:command name="unmono"/></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="my-hdr">my-hdr</link>
-              </literal>
-              <emphasis>string</emphasis>
+              <literal><muttng-doc:command name="my-hdr"/></literal> <emphasis>string</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="my-hdr">my-hdr</link>
-              </literal>
-              <emphasis>field</emphasis> ] <emphasis>field</emphasis> ...
-              [
+              <literal><muttng-doc:command name="unmy-hdr"/></literal> <emphasis>field</emphasis> [ <emphasis>field</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="open"/>
-              </literal>
-              <emphasis>regexp</emphasis> <emphasis>command</emphasis>
+              <literal><muttng-doc:hook name="open"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="crypt"/>
-              </literal>
-              <emphasis>pattern</emphasis> <emphasis>key-id</emphasis>
+              <literal><muttng-doc:hook name="crypt"/></literal> <emphasis>pattern</emphasis> <emphasis>key-id</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="push">push</link>
-              </literal>
-              <emphasis>string</emphasis>
+              <literal><muttng-doc:command name="push"/></literal> <emphasis>string</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="set">set</link>
-              </literal>
-              <emphasis>variable</emphasis> ]<emphasis>variable</emphasis>
-              ... [
+              <literal><muttng-doc:command name="reset"/> </literal><emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="save"/>
-              </literal>
-              <emphasis>regexp</emphasis> <emphasis>filename</emphasis>
+              <literal><muttng-doc:hook name="save"/></literal> <emphasis>regexp</emphasis> <emphasis>filename</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="score-command">score-command</link>
-              </literal>
-              <emphasis>pattern</emphasis> <emphasis>value</emphasis>
+              <literal><muttng-doc:command name="score"/> </literal> <emphasis>pattern</emphasis> <emphasis>value</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="score-command">score-command</link>
-              </literal>
-              <emphasis>pattern</emphasis> ] <emphasis>pattern</emphasis>
-              ... [
+              <literal><muttng-doc:command name="unscore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="send"/>
-              </literal>
-              <emphasis>regexp</emphasis> <emphasis>command</emphasis>
+              <literal><muttng-doc:hook name="send"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <muttng-doc:hook name="reply"/>
-              </literal>
-              <emphasis>regexp</emphasis> <emphasis>command</emphasis>
+              <literal><muttng-doc:hook name="reply"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="set">set</link>
-              </literal>
-              ]no|inv[<emphasis>variable</emphasis>]=<emphasis>
-                value
-              </emphasis>
-              [ ] <emphasis>variable</emphasis> ... [
+              <literal><muttng-doc:command name="set"/></literal> [no|inv]<emphasis>variable</emphasis>[ =<emphasis>value</emphasis> ] [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="set">set</link>
-              </literal>
-              <emphasis>variable</emphasis> ]<emphasis>variable</emphasis>
-              ... [
+              <literal><muttng-doc:command name="unset"/></literal> <emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="source">source</link>
-              </literal>
-              <emphasis>filename</emphasis>
+              <literal><muttng-doc:command name="source"/></literal> <emphasis>filename</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="spam">spam</link>
-              </literal>
-              <emphasis>pattern</emphasis> <emphasis>format</emphasis>
+              <literal><muttng-doc:command name="spam"/></literal> <emphasis>pattern</emphasis> <emphasis>format</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="spam">spam</link>
-              </literal>
-              <emphasis>pattern</emphasis>
+              <literal><muttng-doc:command name="nospam"/></literal> <emphasis>pattern</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="lists">lists</link>
-              </literal>
-              <emphasis>regexp</emphasis> ] <emphasis>regexp</emphasis>
-              ... [ 
+              <literal><muttng-doc:command name="subscribe"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ] 
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="lists">lists</link>
-              </literal>
-              <emphasis>regexp</emphasis> ] <emphasis>regexp</emphasis>
-              ... [ 
+              <literal><muttng-doc:command name="unsubscribe"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ] 
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="set">set</link>
-              </literal>
-              <emphasis>variable</emphasis> ]<emphasis>variable</emphasis>
-              ... [
+              <literal><muttng-doc:command name="toggle"/></literal> <emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal>
-                <link linkend="unhook">unhook</link>
-              </literal>
-              <emphasis>hook-type</emphasis>
+              <literal><muttng-doc:command name="unhook"/></literal> <emphasis>hook-type</emphasis>
             </para>
           </listitem>
           
@@ -10630,8 +10298,8 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       <para>
         <anchor id="sect-obsolete"/>
 
-        <table>
-          <title>Obsolete Variables</title>
+        <table frame="none" rowsep="1">
+          <title>Reference: Obsolete Variables</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
             <row>
@@ -10642,167 +10310,167 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <tbody>
             <row>
               <entry><literal>edit_hdrs</literal></entry>
-              <entry><muttng-doc:varref name="edit_headers" link="edit-headers"/></entry>
+              <entry><muttng-doc:varref name="edit-headers"/></entry>
             </row>
             <row>
               <entry><literal>forw_decode</literal></entry>
-              <entry><muttng-doc:varref name="forward_decode" link="forward-decode"/></entry>
+              <entry><muttng-doc:varref name="forward-decode"/></entry>
               </row>
             <row>
               <entry><literal>forw_format</literal></entry>
-              <entry><muttng-doc:varref name="forward_format" link="forward-format"/></entry>
+              <entry><muttng-doc:varref name="forward-format"/></entry>
               </row>
             <row>
               <entry><literal>forw_quote</literal></entry>
-              <entry><muttng-doc:varref name="forward_quote" link="forward-quote"/></entry>
+              <entry><muttng-doc:varref name="forward-quote"/></entry>
               </row>
             <row>
               <entry><literal>hdr_format</literal></entry>
-              <entry><muttng-doc:varref name="index_format" link="index-format"/></entry>
+              <entry><muttng-doc:varref name="index-format"/></entry>
               </row>
             <row>
               <entry><literal>indent_str</literal></entry>
-              <entry><muttng-doc:varref name="indent_string" link="indent-string"/></entry>
+              <entry><muttng-doc:varref name="indent-string"/></entry>
               </row>
             <row>
               <entry><literal>mime_fwd</literal></entry>
-              <entry><muttng-doc:varref name="mime_forward" link="mime-forward"/></entry>
+              <entry><muttng-doc:varref name="mime-forward"/></entry>
               </row>
             <row>
               <entry><literal>msg_format</literal></entry>
-              <entry><muttng-doc:varref name="message_format" link="message-format"/></entry>
+              <entry><muttng-doc:varref name="message-format"/></entry>
               </row>
             <row>
               <entry><literal>pgp_autosign</literal></entry>
-              <entry><muttng-doc:varref name="crypt_autosign" link="crypt-autosign"/></entry>
+              <entry><muttng-doc:varref name="crypt-autosign"/></entry>
               </row>
             <row>
               <entry><literal>pgp_autoencrypt</literal></entry>
-              <entry><muttng-doc:varref name="crypt_autoencrypt" link="crypt-autoencrypt"/></entry>
+              <entry><muttng-doc:varref name="crypt-autoencrypt"/></entry>
               </row>
             <row>
               <entry><literal>pgp_replyencrypt</literal></entry>
-              <entry><muttng-doc:varref name="crypt_replyencrypt" link="crypt-replyencrypt"/></entry>
+              <entry><muttng-doc:varref name="crypt-replyencrypt"/></entry>
               </row>
             <row>
               <entry><literal>pgp_replysign</literal></entry>
-              <entry><muttng-doc:varref name="crypt_replysign" link="crypt-replysign"/></entry>
+              <entry><muttng-doc:varref name="crypt-replysign"/></entry>
               </row>
             <row>
               <entry><literal>pgp_replysignencrypted</literal></entry>
-              <entry><muttng-doc:varref name="crypt-replysignencrypted" link="crypt_replysignencrypted"/></entry>
+              <entry><muttng-doc:varref name="crypt-replysignencrypted"/></entry>
               </row>
             <row>
               <entry><literal>pgp_verify_sig</literal></entry>
-              <entry><muttng-doc:varref name="crypt_verify_sig" link="crypt-verify-sig"/></entry>
+              <entry><muttng-doc:varref name="crypt-verify-sig"/></entry>
               </row>
             <row>
               <entry><literal>pgp_create_traditional</literal></entry>
-              <entry><muttng-doc:varref name="pgp_autoinline" link="pgp-autoinline"/></entry>
+              <entry><muttng-doc:varref name="pgp-autoinline"/></entry>
               </row>
             <row>
               <entry><literal>pgp_auto_traditional</literal></entry>
-              <entry><muttng-doc:varref name="pgp_replyinline" link="pgp-replyinline"/></entry>
+              <entry><muttng-doc:varref name="pgp-replyinline"/></entry>
               </row>
             <row>
               <entry><literal>forw_decrypt</literal></entry>
-              <entry><muttng-doc:varref name="forward_decrypt" link="forward-decrypt"/></entry>
+              <entry><muttng-doc:varref name="forward-decrypt"/></entry>
               </row>
             <row>
               <entry><literal>smime_sign_as</literal></entry>
-              <entry><muttng-doc:varref name="smime_default_key" link="smime-default-key"/></entry>
+              <entry><muttng-doc:varref name="smime-default-key"/></entry>
               </row>
             <row>
               <entry><literal>post_indent_str</literal></entry>
-              <entry><muttng-doc:varref name="post_indent_string" link="post-indent-string"/></entry>
+              <entry><muttng-doc:varref name="post-indent-string"/></entry>
               </row>
             <row>
               <entry><literal>print_cmd</literal></entry>
-              <entry><muttng-doc:varref name="print_command" link="print-command"/></entry>
+              <entry><muttng-doc:varref name="print-command"/></entry>
               </row>
             <row>
               <entry><literal>shorten_hierarchy</literal></entry>
-              <entry><muttng-doc:varref name="sidebar-shorten-hierarchy" link="sidebar_shorten_hierarchy"/></entry>
+              <entry><muttng-doc:varref name="sidebar-shorten-hierarchy"/></entry>
               </row>
             <row>
               <entry><literal>ask_followup_to</literal></entry>
-              <entry><muttng-doc:varref name="nntp_ask_followup_to" link="nntp-ask-followup-to"/></entry>
+              <entry><muttng-doc:varref name="nntp-ask-followup-to"/></entry>
               </row>
             <row>
               <entry><literal>ask_x_comment_to</literal></entry>
-              <entry><muttng-doc:varref name="nntp_ask_x_comment_to" link="nntp-ask-x-comment-to"/></entry>
+              <entry><muttng-doc:varref name="nntp-ask-x-comment-to"/></entry>
               </row>
             <row>
               <entry><literal>catchup_newsgroup</literal></entry>
-              <entry><muttng-doc:varref name="nntp_catchup" link="nntp-catchup"/></entry>
+              <entry><muttng-doc:varref name="nntp-catchup"/></entry>
             </row>
             <row>
               <entry><literal>followup_to_poster</literal></entry>
-              <entry><muttng-doc:varref name="nntp_followup_to_poster" link="nntp-followup-to-poster"/></entry>
+              <entry><muttng-doc:varref name="nntp-followup-to-poster"/></entry>
             </row>
             <row>
               <entry><literal>group_index_format</literal></entry>
-              <entry><muttng-doc:varref name="nntp_group_index_format" link="nntp-group-index-format"/></entry>
+              <entry><muttng-doc:varref name="nntp-group-index-format"/></entry>
             </row>
             <row>
               <entry><literal>inews</literal></entry>
-              <entry><muttng-doc:varref name="nntp_inews" link="nntp-inews"/></entry>
+              <entry><muttng-doc:varref name="nntp-inews"/></entry>
             </row>
             <row>
               <entry><literal>mime_subject</literal></entry>
-              <entry><muttng-doc:varref name="nntp_mime_subject" link="nntp-mime-subject"/></entry>
+              <entry><muttng-doc:varref name="nntp-mime-subject"/></entry>
             </row>
             <row>
               <entry><literal>news_cache_dir</literal></entry>
-              <entry><muttng-doc:varref name="nntp_cache_dir" link="nntp-cache-dir"/></entry>
+              <entry><muttng-doc:varref name="nntp-cache-dir"/></entry>
             </row>
             <row>
               <entry><literal>news_server</literal></entry>
-              <entry><muttng-doc:varref name="nntp_host" link="nntp-host"/></entry>
+              <entry><muttng-doc:varref name="nntp-host"/></entry>
             </row>
             <row>
               <entry><literal>newsrc</literal></entry>
-              <entry><muttng-doc:varref name="nntp_newsrc" link="nntp-newsrc"/></entry>
+              <entry><muttng-doc:varref name="nntp-newsrc"/></entry>
             </row>
             <row>
               <entry><literal>nntp_poll</literal></entry>
-              <entry><muttng-doc:varref name="nntp_mail_check" link="nntp-mail-check"/></entry>
+              <entry><muttng-doc:varref name="nntp-mail-check"/></entry>
             </row>
             <row>
               <entry><literal>pop_checkinterval</literal></entry>
-              <entry><muttng-doc:varref name="pop_mail_check" link="pop-mail-check"/></entry>
+              <entry><muttng-doc:varref name="pop-mail-check"/></entry>
             </row>
             <row>
               <entry><literal>post_moderated</literal></entry>
-              <entry><muttng-doc:varref name="nntp_post_moderated" link="nntp-post-moderated"/></entry>
+              <entry><muttng-doc:varref name="nntp-post-moderated"/></entry>
             </row>
             <row>
               <entry><literal>save_unsubscribed</literal></entry>
-              <entry><muttng-doc:varref name="nntp_save_unsubscribed" link="nntp-save-unsubscribed"/></entry>
+              <entry><muttng-doc:varref name="nntp-save-unsubscribed"/></entry>
             </row>
             <row>
               <entry><literal>show_new_news</literal></entry>
-              <entry><muttng-doc:varref name="nntp_show_new_news" link="nntp-show-new-news"/></entry>
+              <entry><muttng-doc:varref name="nntp-show-new-news"/></entry>
             </row>
             <row>
               <entry><literal>show_only_unread</literal></entry>
-              <entry><muttng-doc:varref name="nntp_show_only_unread" link="nntp-show-only-unread"/></entry>
+              <entry><muttng-doc:varref name="nntp-show-only-unread"/></entry>
             </row>
             <row>
               <entry><literal>x_comment_to</literal></entry>
-              <entry><muttng-doc:varref name="nntp_x_comment_to" link="nntp-x-comment-to"/></entry>
+              <entry><muttng-doc:varref name="nntp-x-comment-to"/></entry>
             </row>
             <row>
               <entry><literal>smtp_auth_username</literal></entry>
-              <entry><muttng-doc:varref name="smtp_user" link="smtp-user"/></entry>
+              <entry><muttng-doc:varref name="smtp-user"/></entry>
             </row>
             <row>
               <entry><literal>smtp_auth_password</literal></entry>
-              <entry><muttng-doc:varref name="smtp_pass" link="smtp-pass"/></entry>
+              <entry><muttng-doc:varref name="smtp-pass"/></entry>
             </row>
             <row>
               <entry><literal>user_agent</literal></entry>
-              <entry><muttng-doc:varref name="agent_string" link="agent-string"/></entry>
+              <entry><muttng-doc:varref name="agent-string"/></entry>
             </row>
           </tbody>
         </tgroup>