From: Felix Meinhold <felix.meinhold@gmx.net>
[apps/madmutt.git] / doc / manual.xml.head
index c121d1b..67b8c14 100644 (file)
@@ -1,10 +1,10 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <book>
 
-<bookinfo>
+<bookinfo> <!--{{{-->
   <title>The Mutt Next Generation E-Mail Client</title>
   <author>
     <firstname>Andreas</firstname><surname>Krennmair</surname>
       Sven Guckes on mutt, ca. 2003: ``But it still sucks!''
     </para>
   </abstract>
-</bookinfo>
+</bookinfo> <!--}}}-->
 
-<chapter> <!--{{{-->
-  <title>Introduction  </title>
-  
-  <sect1>
-    <title>Overview  </title>
+<chapter id="introduction"> <!--{{{-->
+  <title>Introduction</title>
+
+  <sect1 id="overview">
+    <title>Overview</title>
     
     <para>
       <emphasis role="bold">Mutt-ng</emphasis> is a small but very
@@ -58,8 +58,8 @@
     
   </sect1>
   
-  <sect1>
-    <title>Mutt-ng Home Page  </title>
+  <sect1 id="homepage">
+    <title>Mutt-ng Home Page</title>
     
     <para>
       <ulink url="http://www.muttng.org/">http://www.muttng.org</ulink>
@@ -71,8 +71,8 @@
     
   </sect1>
   
-  <sect1>
-    <title>Mailing Lists  </title>
+  <sect1 id="mailinglists">
+    <title>Mailing Lists</title>
     
     <para>
       
     
   </sect1>
   
-  <sect1>
-    <title>Software Distribution Sites  </title>
+  <sect1 id="distrib-sites">
+    <title>Software Distribution Sites</title>
     
     <para>
       So far, there are no official releases of Mutt-ng, but you can
     
   </sect1>
   
-  <sect1>
-    <title>IRC  </title>
+  <sect1 id="irc">
+    <title>IRC</title>
     
     <para>
       Visit channel <emphasis>#muttng</emphasis> on <ulink
     
   </sect1>
   
-  <sect1>
-    <title>Weblog  </title>
+  <sect1 id="weblog">
+    <title>Weblog</title>
     
     <para>
       If you want to read fresh news about the latest development in
     
   </sect1>
   
-  <sect1>
-    <title>Copyright  </title>
+  <sect1 id="copyright">
+    <title>Copyright</title>
     
     <para>
       Mutt is Copyright (C) 1996-2000 Michael R. Elkins
   </sect1>
   
 </chapter>
-  <!--}}}-->
+<!--}}}-->
 
-<chapter>
-  <title>Getting Started    </title>
+<chapter id="getting-started"> <!--{{{-->
+  <title>Getting Started</title>
   
-  <sect1> <!--{{{-->
-    <title>Basic Concepts      </title>
+  <sect1 id="basic-concepts"> <!--{{{-->
+    <title>Basic Concepts</title>
     
-    <sect2> <!--{{{-->
-      <title>Screens and Menus        </title>
+    <sect2 id="concept-screens-and-menus"> <!--{{{-->
+      <title>Screens and Menus</title>
       
       <para>
         mutt-ng offers different screens of which every has its special
     </sect2>
       <!--}}}-->
     
-    <sect2> <!--{{{-->
-      <title>Configuration        </title>
+    <sect2 id="concept-configuration"> <!--{{{-->
+      <title>Configuration</title>
       
       <para>
         Mutt-ng does <emphasis>not</emphasis> feature an internal
     </sect2>
       <!--}}}-->
     
-    <sect2> <!--{{{-->
-      <title>Functions        </title>
+    <sect2 id="concept-functions"> <!--{{{-->
+      <title>Functions</title>
       
       <para>
         Mutt-ng offers great flexibility due to the use of functions:
     </sect2>
       <!--}}}-->
     
-    <sect2> <!--{{{-->
-      <title>Interaction        </title>
+    <sect2 id="concept-interaction"> <!--{{{-->
+      <title>Interaction</title>
       
       <para>
         Mutt-ng has two basic concepts of user interaction:
     </sect2>
       <!--}}}-->
     
-    <sect2> <!--{{{-->
-      <title>Modularization        </title>
+    <sect2 id="concept-modularization"> <!--{{{-->
+      <title>Modularization</title>
       
       <para>
         Although mutt-ng has many functionality built-in, many
     </sect2>
       <!--}}}-->
     
-    <sect2> <!--{{{-->
-      <title>Patterns        </title>
+    <sect2 id="concept-patterns"> <!--{{{-->
+      <title>Patterns</title>
       
       <para>
         Mutt-ng has a built-in pattern matching ``language'' which is
   
   <!--}}}-->
   
-  <sect1> <!--{{{-->
-    <title>Screens and Menus      </title>
+  <sect1 id="screens-and-menus"> <!--{{{-->
+    <title>Screens and Menus</title>
     
-    <sect2>
-      <title>Index       </title>
+    <sect2 id="intro-index">
+      <title>Index</title>
       
       <para>
         The index is the screen that you usually see first when you
       
     </sect2>
     
-    <sect2>
-      <title>Pager       </title>
+    <sect2 id="intro-pager">
+      <title>Pager</title>
       
       <para>
         The pager is responsible for showing the email content. On the
       
     </sect2>
     
-    <sect2>
-      <title>File Browser        </title>
+    <sect2 id="intro-browser">
+      <title>File Browser</title>
       
       <para>
         The file browser is the interface to the local or remote
       
     </sect2>
     
-    <sect2>
-      <title>Sidebar        </title>
+    <sect2 id="intro-sidebar">
+      <title>Sidebar</title>
       
       <para>
         The sidebar comes in handy to manage mails which are spread
       
     </sect2>
     
-    <sect2>
-      <title>Help        </title>
+    <sect2 id="intro-help">
+      <title>Help</title>
       
       <para>
         The help screen is meant to offer a quick help to the user. It
       
     </sect2>
     
-    <sect2>
-      <title>Compose Menu          </title>
+    <sect2 id="intro-compose">
+      <title>Compose Menu</title>
       
       <para>
         The compose menu features a split screen containing the
       
     </sect2>
     
-    <sect2>
-      <title>Alias Menu          </title>
+    <sect2 id="intro-alias">
+      <title>Alias Menu</title>
       
       <para>
         The alias menu is used to help users finding the recipients
       
     </sect2>
     
-    <sect2>
-      <title>Attachment Menu          </title>
+    <sect2 id="intro-attach">
+      <title>Attachment Menu</title>
       
       <para>
         As will be later discussed in detail, mutt-ng features a good
       
     </sect2>
     
-    <sect2>
-      <title>Key Menu          </title>
+    <sect2 id="intro-keysel">
+      <title>Key Menu</title>
       
       <para>
         <literal>FIXME</literal>
   </sect1>
     <!--}}}-->
   
-  <sect1> <!--{{{-->
-    <title>Moving Around in Menus  </title>
+  <sect1 id="moving"> <!--{{{-->
+    <title>Moving Around in Menus</title>
     
     <para>
       Information is presented in menus, very similar to ELM.  Here is a
         </thead>
         <tbody>
           <row>
-            <entry><code>j</code> or <code>Down</code></entry>
-            <entry><code>next-entry</code></entry>
+            <entry><literal>j</literal> or <literal>Down</literal></entry>
+            <entry><literal>next-entry</literal></entry>
             <entry>move to the next entry</entry>
           </row>
           <row>
-            <entry><code>k</code> or <code>Up</code></entry>
-            <entry><code>previous-entry</code></entry>
+            <entry><literal>k</literal> or <literal>Up</literal></entry>
+            <entry><literal>previous-entry</literal></entry>
             <entry>move to the previous entry</entry>
           </row>
           <row>
-            <entry><code>z</code> or <code>PageDn</code></entry>
-            <entry><code>page-down</code></entry>
+            <entry><literal>z</literal> or <literal>PageDn</literal></entry>
+            <entry><literal>page-down</literal></entry>
             <entry>go to the next page</entry>
           </row>
           <row>
-            <entry><code>Z</code> or <code>PageUp</code></entry>
-            <entry><code>page-up</code></entry>
+            <entry><literal>Z</literal> or <literal>PageUp</literal></entry>
+            <entry><literal>page-up</literal></entry>
             <entry>go to the previous page</entry>
           </row>
           <row>
-            <entry><code>=</code> or <code>Home</code></entry>
-            <entry><code>first-entry</code></entry>
+            <entry><literal>=</literal> or <literal>Home</literal></entry>
+            <entry><literal>first-entry</literal></entry>
             <entry>jump to the first entry</entry>
           </row>
           <row>
-            <entry><code>*</code> or <code>End</code></entry>
-            <entry><code>last-entry</code></entry>
+            <entry><literal>*</literal> or <literal>End</literal></entry>
+            <entry><literal>last-entry</literal></entry>
             <entry>jump to the last entry</entry>
           </row>
           <row>
-            <entry><code>q</code></entry>
-            <entry><code>quit</code></entry>
+            <entry><literal>q</literal></entry>
+            <entry><literal>quit</literal></entry>
             <entry>exit the current menu</entry>
           </row>
           <row>
-            <entry><code>?</code></entry>
-            <entry><code>help</code></entry>
+            <entry><literal>?</literal></entry>
+            <entry><literal>help</literal></entry>
             <entry>list all key bindings for the current menu</entry>
           </row>
         </tbody>
     <!--}}}-->
   
   <sect1 id="editing"> <!--{{{-->
-    <title>Editing Input Fields  </title>
+    <title>Editing Input Fields</title>
     
     <para>
       Mutt-ng has a builtin line editor which is used as the primary way to
         </thead>
         <tbody>
           <row>
-            <entry><code>^A or &#60;Home&#62;  </code></entry>
-            <entry><code>bol     </code></entry>
+            <entry><literal>^A or &#60;Home&#62;  </literal></entry>
+            <entry><literal>bol     </literal></entry>
             <entry>move to the start of the line</entry>
           </row>
           <row>
-            <entry><code>^B or &#60;Left&#62;   </code></entry>
-            <entry><code>backward-char </code>
+            <entry><literal>^B or &#60;Left&#62;   </literal></entry>
+            <entry><literal>backward-char </literal>
             </entry><entry>move back one char</entry>
           </row>
           <row>
-            <entry><code>Esc B  </code></entry>
-            <entry><code>backward-word    </code></entry>
+            <entry><literal>Esc B  </literal></entry>
+            <entry><literal>backward-word    </literal></entry>
             <entry>move back one word</entry>
           </row>
           <row>
-            <entry><code>^D or &#60;Delete&#62;  </code></entry>
-            <entry><code>delete-char    </code></entry>
+            <entry><literal>^D or &#60;Delete&#62;  </literal></entry>
+            <entry><literal>delete-char    </literal></entry>
             <entry>delete the char under the cursor</entry>
           </row>
           <row>
-            <entry><code>^E or &#60;End&#62;   </code></entry>
-            <entry><code>eol          </code></entry>
+            <entry><literal>^E or &#60;End&#62;   </literal></entry>
+            <entry><literal>eol          </literal></entry>
             <entry>move to the end of the line</entry>
           </row>
           <row>
-            <entry><code>^F or &#60;Right&#62;  </code></entry>
-            <entry><code>forward-char   </code></entry>
+            <entry><literal>^F or &#60;Right&#62;  </literal></entry>
+            <entry><literal>forward-char   </literal></entry>
             <entry>move forward one char</entry>
           </row>
           <row>
-            <entry><code>Esc F </code></entry>
-            <entry><code>forward-word      </code></entry>
+            <entry><literal>Esc F </literal></entry>
+            <entry><literal>forward-word      </literal></entry>
             <entry>move forward one word</entry>
           </row>
           <row>
-            <entry><code>&#60;Tab&#62;   </code></entry>
-            <entry><code>complete     </code></entry>
+            <entry><literal>&#60;Tab&#62;   </literal></entry>
+            <entry><literal>complete     </literal></entry>
             <entry>complete filename or alias</entry>
           </row>
           <row>
-            <entry><code>^T         </code></entry>
-            <entry><code>complete-query   </code></entry>
+            <entry><literal>^T         </literal></entry>
+            <entry><literal>complete-query   </literal></entry>
             <entry>complete address with query</entry>
           </row>
           <row>
-            <entry><code>^K          </code></entry>
-            <entry><code>kill-eol      </code></entry>
+            <entry><literal>^K          </literal></entry>
+            <entry><literal>kill-eol      </literal></entry>
             <entry>delete to the end of the line</entry>
           </row>
           <row>
-            <entry><code>ESC d </code></entry>
-            <entry><code>kill-eow    </code></entry>
+            <entry><literal>ESC d </literal></entry>
+            <entry><literal>kill-eow    </literal></entry>
             <entry>delete to the end of the word</entry>
           </row>
           <row>
-            <entry><code>^W     </code></entry>
-            <entry><code>kill-word     </code></entry>
+            <entry><literal>^W     </literal></entry>
+            <entry><literal>kill-word     </literal></entry>
             <entry>kill the word in front of the cursor</entry>
           </row>
           <row>
-            <entry><code>^U      </code></entry>
-            <entry><code>kill-line      </code></entry>
+            <entry><literal>^U      </literal></entry>
+            <entry><literal>kill-line      </literal></entry>
             <entry>delete entire line</entry>
           </row>
           <row>
-            <entry><code>^V       </code></entry>
-            <entry><code>quote-char    </code></entry>
+            <entry><literal>^V       </literal></entry>
+            <entry><literal>quote-char    </literal></entry>
             <entry>quote the next typed key</entry>
           </row>
           <row>
-            <entry><code>&#60;Up&#62;   </code></entry>
-            <entry><code>history-up   </code></entry>
+            <entry><literal>&#60;Up&#62;   </literal></entry>
+            <entry><literal>history-up   </literal></entry>
             <entry>recall previous string from history</entry>
           </row>
           <row>
-            <entry><code>&#60;Down&#62;      </code></entry>
-            <entry><code>history-down   </code></entry>
+            <entry><literal>&#60;Down&#62;      </literal></entry>
+            <entry><literal>history-down   </literal></entry>
             <entry>recall next string from history</entry>
           </row>
           <row>
-            <entry><code>&#60;BackSpace&#62;  </code></entry>
-            <entry><code>backspace     </code></entry>
+            <entry><literal>&#60;BackSpace&#62;  </literal></entry>
+            <entry><literal>backspace     </literal></entry>
             <entry>kill the char in front of the cursor</entry>
           </row>
           <row>
-            <entry><code>Esc u        </code></entry>
-            <entry><code>upcase-word      </code></entry>
+            <entry><literal>Esc u        </literal></entry>
+            <entry><literal>upcase-word      </literal></entry>
             <entry>convert word to upper case</entry>
           </row>
           <row>
-            <entry><code>Esc l        </code></entry>
-            <entry><code>downcase-word      </code></entry>
+            <entry><literal>Esc l        </literal></entry>
+            <entry><literal>downcase-word      </literal></entry>
             <entry>convert word to lower case</entry>
           </row>
           <row>
-            <entry><code>Esc c        </code></entry>
-            <entry><code>capitalize-word    </code></entry>
+            <entry><literal>Esc c        </literal></entry>
+            <entry><literal>capitalize-word    </literal></entry>
             <entry>capitalize the word</entry>
           </row>
           <row>
-            <entry><code>^G           </code></entry>
-            <entry><code>n/a    </code></entry>
+            <entry><literal>^G           </literal></entry>
+            <entry><literal>n/a    </literal></entry>
             <entry>abort</entry>
           </row>
           <row>
-            <entry><code>&#60;Return&#62;     </code></entry>
-            <entry><code>n/a    </code></entry>
+            <entry><literal>&#60;Return&#62;     </literal></entry>
+            <entry><literal>n/a    </literal></entry>
             <entry>finish editing</entry>
           </row>
         </tbody>
   </sect1>
     <!--}}}-->
   
-  <sect1>
-    <title>Reading Mail - The Index and Pager  </title> <!--{{{-->
+  <sect1 id="reading"> <!--{{{-->
+    <title>Reading Mail - The Index and Pager</title>
     
     <para>
       Similar to many other mail clients, there are two modes in which mail
       modes.
     </para>
     
-    <sect2>
-      <title>The Message Index</title> <!--{{{-->
+    <sect2 id="reading-index">
+      <title>The Message Index</title>
       
       <para>
 
           </row>
         </thead>
         <tbody>
-          <row><entry><code>c      </code></entry><entry><code></code></entry><entry>change to a different mailbox</entry></row>
-          <row><entry><code>ESC c    </code></entry><entry><code></code></entry><entry>change to a folder in read-only mode</entry></row>
-          <row><entry><code>C        </code></entry><entry><code></code></entry><entry>copy the current message to another mailbox</entry></row>
-          <row><entry><code>ESC C     </code></entry><entry><code></code></entry><entry>decode a message and copy it to a folder</entry></row>
-          <row><entry><code>ESC s    </code></entry><entry><code></code></entry><entry>decode a message and save it to a folder</entry></row>
-          <row><entry><code>D       </code></entry><entry><code></code></entry><entry>delete messages matching a pattern</entry></row>
-          <row><entry><code>d     </code></entry><entry><code></code></entry><entry>delete the current message</entry></row>
-          <row><entry><code>F      </code></entry><entry><code></code></entry><entry>mark as important</entry></row>
-          <row><entry><code>l      </code></entry><entry><code></code></entry><entry>show messages matching a pattern</entry></row>
-          <row><entry><code>N       </code></entry><entry><code></code></entry><entry>mark message as new</entry></row>
-          <row><entry><code>o       </code></entry><entry><code></code></entry><entry>change the current sort method</entry></row>
-          <row><entry><code>O       </code></entry><entry><code></code></entry><entry>reverse sort the mailbox</entry></row>
-          <row><entry><code>q       </code></entry><entry><code></code></entry><entry>save changes and exit</entry></row>
-          <row><entry><code>s        </code></entry><entry><code></code></entry><entry>save-message</entry></row>
-          <row><entry><code>T       </code></entry><entry><code></code></entry><entry>tag messages matching a pattern</entry></row>
-          <row><entry><code>t       </code></entry><entry><code></code></entry><entry>toggle the tag on a message</entry></row>
-          <row><entry><code>ESC t  </code></entry><entry><code></code></entry><entry>toggle tag on entire message thread</entry></row>
-          <row><entry><code>U       </code></entry><entry><code></code></entry><entry>undelete messages matching a pattern</entry></row>
-          <row><entry><code>u        </code></entry><entry><code></code></entry><entry>undelete-message</entry></row>
-          <row><entry><code>v        </code></entry><entry><code></code></entry><entry>view-attachments</entry></row>
-          <row><entry><code>x       </code></entry><entry><code></code></entry><entry>abort changes and exit</entry></row>
-          <row><entry><code>&#60;Return&#62;  </code></entry><entry><code></code></entry><entry>display-message</entry></row>
-          <row><entry><code>&#60;Tab&#62;      </code></entry><entry><code></code></entry><entry>jump to the next new message</entry></row>
-          <row><entry><code>@      </code></entry><entry><code></code></entry><entry>show the author's full e-mail address</entry></row>
-          <row><entry><code>$       </code></entry><entry><code></code></entry><entry>save changes to mailbox</entry></row>
-          <row><entry><code>/       </code></entry><entry><code></code></entry><entry>search</entry></row>
-          <row><entry><code>ESC /     </code></entry><entry><code></code></entry><entry>search-reverse</entry></row>
-          <row><entry><code>^L       </code></entry><entry><code></code></entry><entry>clear and redraw the screen</entry></row>
-          <row><entry><code>^T        </code></entry><entry><code></code></entry><entry>untag messages matching a pattern</entry></row>
+          <row><entry><literal>c      </literal></entry><entry><literal></literal></entry><entry>change to a different mailbox</entry></row>
+          <row><entry><literal>ESC c    </literal></entry><entry><literal></literal></entry><entry>change to a folder in read-only mode</entry></row>
+          <row><entry><literal>C        </literal></entry><entry><literal></literal></entry><entry>copy the current message to another mailbox</entry></row>
+          <row><entry><literal>ESC C     </literal></entry><entry><literal></literal></entry><entry>decode a message and copy it to a folder</entry></row>
+          <row><entry><literal>ESC s    </literal></entry><entry><literal></literal></entry><entry>decode a message and save it to a folder</entry></row>
+          <row><entry><literal>D       </literal></entry><entry><literal></literal></entry><entry>delete messages matching a pattern</entry></row>
+          <row><entry><literal>d     </literal></entry><entry><literal></literal></entry><entry>delete the current message</entry></row>
+          <row><entry><literal>F      </literal></entry><entry><literal></literal></entry><entry>mark as important</entry></row>
+          <row><entry><literal>l      </literal></entry><entry><literal></literal></entry><entry>show messages matching a pattern</entry></row>
+          <row><entry><literal>N       </literal></entry><entry><literal></literal></entry><entry>mark message as new</entry></row>
+          <row><entry><literal>o       </literal></entry><entry><literal></literal></entry><entry>change the current sort method</entry></row>
+          <row><entry><literal>O       </literal></entry><entry><literal></literal></entry><entry>reverse sort the mailbox</entry></row>
+          <row><entry><literal>q       </literal></entry><entry><literal></literal></entry><entry>save changes and exit</entry></row>
+          <row><entry><literal>s        </literal></entry><entry><literal></literal></entry><entry>save-message</entry></row>
+          <row><entry><literal>T       </literal></entry><entry><literal></literal></entry><entry>tag messages matching a pattern</entry></row>
+          <row><entry><literal>t       </literal></entry><entry><literal></literal></entry><entry>toggle the tag on a message</entry></row>
+          <row><entry><literal>ESC t  </literal></entry><entry><literal></literal></entry><entry>toggle tag on entire message thread</entry></row>
+          <row><entry><literal>U       </literal></entry><entry><literal></literal></entry><entry>undelete messages matching a pattern</entry></row>
+          <row><entry><literal>u        </literal></entry><entry><literal></literal></entry><entry>undelete-message</entry></row>
+          <row><entry><literal>v        </literal></entry><entry><literal></literal></entry><entry>view-attachments</entry></row>
+          <row><entry><literal>x       </literal></entry><entry><literal></literal></entry><entry>abort changes and exit</entry></row>
+          <row><entry><literal>&#60;Return&#62;  </literal></entry><entry><literal></literal></entry><entry>display-message</entry></row>
+          <row><entry><literal>&#60;Tab&#62;      </literal></entry><entry><literal></literal></entry><entry>jump to the next new or unread message</entry></row>
+          <row><entry><literal>@      </literal></entry><entry><literal></literal></entry><entry>show the author's full e-mail address</entry></row>
+          <row><entry><literal>$       </literal></entry><entry><literal></literal></entry><entry>save changes to mailbox</entry></row>
+          <row><entry><literal>/       </literal></entry><entry><literal></literal></entry><entry>search</entry></row>
+          <row><entry><literal>ESC /     </literal></entry><entry><literal></literal></entry><entry>search-reverse</entry></row>
+          <row><entry><literal>^L       </literal></entry><entry><literal></literal></entry><entry>clear and redraw the screen</entry></row>
+          <row><entry><literal>^T        </literal></entry><entry><literal></literal></entry><entry>untag messages matching a pattern</entry></row>
         </tbody>
       </tgroup>
     </table>
           </variablelist>
         </para>
         
-        <!--}}}-->
       </sect3>
       
-      <!--}}}-->
     </sect2>
     
-    <sect2>
-      <title>The Pager</title> <!--{{{-->
+    <sect2 id="reading-pager">
+      <title>The Pager</title>
       
       <para>
         By default, Mutt-ng uses its builtin pager to display the body of
           </row>
         </thead>
         <tbody>
-          <row><entry><code>&#60;Return&#62;   </code></entry><entry><code></code></entry><entry>go down one line</entry></row>
-          <row><entry><code>&#60;Space&#62;   </code></entry><entry><code></code></entry><entry>display the next page (or next message if at the end of a message)</entry></row>
-          <row><entry><code>-           </code></entry><entry><code></code></entry><entry>go back to the previous page</entry></row>
-          <row><entry><code>n            </code></entry><entry><code></code></entry><entry>search for next match</entry></row>
-          <row><entry><code>S         </code></entry><entry><code></code></entry><entry>skip beyond quoted text</entry></row>
-          <row><entry><code>T         </code></entry><entry><code></code></entry><entry>toggle display of quoted text</entry></row>
-          <row><entry><code>?        </code></entry><entry><code></code></entry><entry>show key bindings</entry></row>
-          <row><entry><code>/        </code></entry><entry><code></code></entry><entry>search for a regular expression (pattern)</entry></row>
-          <row><entry><code>ESC /   </code></entry><entry><code></code></entry><entry>search backwards for a regular expression</entry></row>
-          <row><entry><code>\       </code></entry><entry><code></code></entry><entry>toggle search pattern coloring</entry></row>
-          <row><entry><code>^      </code></entry><entry><code></code></entry><entry>jump to the top of the message</entry></row>
+          <row><entry><literal>&#60;Return&#62;   </literal></entry><entry><literal></literal></entry><entry>go down one line</entry></row>
+          <row><entry><literal>&#60;Space&#62;   </literal></entry><entry><literal></literal></entry><entry>display the next page (or next message if at the end of a message)</entry></row>
+          <row><entry><literal>-           </literal></entry><entry><literal></literal></entry><entry>go back to the previous page</entry></row>
+          <row><entry><literal>n            </literal></entry><entry><literal></literal></entry><entry>search for next match</entry></row>
+          <row><entry><literal>S         </literal></entry><entry><literal></literal></entry><entry>skip beyond quoted text</entry></row>
+          <row><entry><literal>T         </literal></entry><entry><literal></literal></entry><entry>toggle display of quoted text</entry></row>
+          <row><entry><literal>?        </literal></entry><entry><literal></literal></entry><entry>show key bindings</entry></row>
+          <row><entry><literal>/        </literal></entry><entry><literal></literal></entry><entry>search for a regular expression (pattern)</entry></row>
+          <row><entry><literal>ESC /   </literal></entry><entry><literal></literal></entry><entry>search backwards for a regular expression</entry></row>
+          <row><entry><literal>\       </literal></entry><entry><literal></literal></entry><entry>toggle search pattern coloring</entry></row>
+          <row><entry><literal>^      </literal></entry><entry><literal></literal></entry><entry>jump to the top of the message</entry></row>
         </tbody>
       </tgroup>
     </table>
@@ -1201,7 +1199,7 @@ linkend="color">color</link>
         into the correct color and character settings.  The sequences
         Mutt-ng supports are: <literal>ESC [ Ps;Ps;Ps;...;Ps
           m</literal> (see table below for possible values for
-        <code>Ps</code>).
+        <literal>Ps</literal>).
       </para>
       
       <para>
@@ -1216,13 +1214,13 @@ linkend="color">color</link>
           </row>
         </thead>
         <tbody>
-          <row><entry><code>0  </code></entry><entry>All Attributes Off</entry></row>
-          <row><entry><code>1  </code></entry><entry>Bold on</entry></row>
-          <row><entry><code>4  </code></entry><entry>Underline on</entry></row>
-          <row><entry><code>5  </code></entry><entry>Blink on</entry></row>
-          <row><entry><code>7 </code></entry><entry>Reverse video on</entry></row>
-          <row><entry><code>3x  </code></entry><entry>Foreground color is x (see table below)</entry></row>
-          <row><entry><code>4x </code></entry><entry>Background color is x (see table below)</entry></row>
+          <row><entry><literal>0  </literal></entry><entry>All Attributes Off</entry></row>
+          <row><entry><literal>1  </literal></entry><entry>Bold on</entry></row>
+          <row><entry><literal>4  </literal></entry><entry>Underline on</entry></row>
+          <row><entry><literal>5  </literal></entry><entry>Blink on</entry></row>
+          <row><entry><literal>7 </literal></entry><entry>Reverse video on</entry></row>
+          <row><entry><literal>3x  </literal></entry><entry>Foreground color is x (see table below)</entry></row>
+          <row><entry><literal>4x </literal></entry><entry>Background color is x (see table below)</entry></row>
         </tbody>
       </tgroup>
     </table>
@@ -1238,14 +1236,14 @@ linkend="color">color</link>
           </row>
         </thead>
         <tbody>
-          <row><entry><code>0   </code></entry><entry>black</entry></row>
-          <row><entry><code>1  </code></entry><entry>red</entry></row>
-          <row><entry><code>2  </code></entry><entry>green</entry></row>
-          <row><entry><code>3  </code></entry><entry>yellow</entry></row>
-          <row><entry><code>4  </code></entry><entry>blue</entry></row>
-          <row><entry><code>5 </code></entry><entry>magenta</entry></row>
-          <row><entry><code>6  </code></entry><entry>cyan</entry></row>
-          <row><entry><code>7 </code></entry><entry>white</entry></row>
+          <row><entry><literal>0   </literal></entry><entry>black</entry></row>
+          <row><entry><literal>1  </literal></entry><entry>red</entry></row>
+          <row><entry><literal>2  </literal></entry><entry>green</entry></row>
+          <row><entry><literal>3  </literal></entry><entry>yellow</entry></row>
+          <row><entry><literal>4  </literal></entry><entry>blue</entry></row>
+          <row><entry><literal>5 </literal></entry><entry>magenta</entry></row>
+          <row><entry><literal>6  </literal></entry><entry>cyan</entry></row>
+          <row><entry><literal>7 </literal></entry><entry>white</entry></row>
         </tbody>
       </tgroup>
     </table>
@@ -1263,11 +1261,10 @@ linkend="color">color</link>
           your xterm, then that color will be used instead of green.
         </para>
         
-        <!--}}}-->
       </sect2>
       
       <sect2 id="threads">
-        <title>Threaded Mode</title> <!--{{{-->
+        <title>Threaded Mode</title>
         
         <para>
           When the mailbox is <link linkend="sort">sorted</link> by <emphasis>
@@ -1293,20 +1290,20 @@ linkend="color">color</link>
             </row>
           </thead>
           <tbody>
-            <row><entry><code>^D   </code></entry><entry><code>delete-thread       </code></entry><entry>delete all messages in the current  thread</entry></row>
-            <row><entry><code>^U   </code></entry><entry><code>undelete-thread     </code></entry><entry>undelete all messages in the current thread</entry></row>
-            <row><entry><code>^N   </code></entry><entry><code>next-thread         </code></entry><entry>jump to the start of the next thread</entry></row>
-            <row><entry><code>^P   </code></entry><entry><code>previous-thread     </code></entry><entry>jump to the start of the previous thread</entry></row>
-            <row><entry><code>^R    </code></entry><entry><code>read-thread         </code></entry><entry>mark the current thread as read</entry></row>
-            <row><entry><code>ESC d </code></entry><entry><code>delete-subthread    </code></entry><entry>delete all messages in the current subthread</entry></row>
-            <row><entry><code>ESC u </code></entry><entry><code>undelete-subthread  </code></entry><entry>undelete all messages in the current subthread</entry></row>
-            <row><entry><code>ESC n </code></entry><entry><code>next-subthread      </code></entry><entry>jump to the start of the next subthread</entry></row>
-            <row><entry><code>ESC p </code></entry><entry><code>previous-subthread  </code></entry><entry>jump to the start of the previous subthread</entry></row>
-            <row><entry><code>ESC r </code></entry><entry><code>read-subthread      </code></entry><entry>mark the current subthread as read </entry></row>
-            <row><entry><code>ESC t </code></entry><entry><code>tag-thread          </code></entry><entry>toggle the tag on the current thread</entry></row>
-            <row><entry><code>ESC v </code></entry><entry><code>collapse-thread    </code></entry><entry>toggle collapse for the current thread</entry></row>
-            <row><entry><code>ESC V </code></entry><entry><code>collapse-all      </code></entry><entry>toggle collapse for all threads</entry></row>
-            <row><entry><code>P    </code></entry><entry><code>parent-message        </code></entry><entry>jump to parent message in thread</entry></row>
+            <row><entry><literal>^D   </literal></entry><entry><literal>delete-thread       </literal></entry><entry>delete all messages in the current  thread</entry></row>
+            <row><entry><literal>^U   </literal></entry><entry><literal>undelete-thread     </literal></entry><entry>undelete all messages in the current thread</entry></row>
+            <row><entry><literal>^N   </literal></entry><entry><literal>next-thread         </literal></entry><entry>jump to the start of the next thread</entry></row>
+            <row><entry><literal>^P   </literal></entry><entry><literal>previous-thread     </literal></entry><entry>jump to the start of the previous thread</entry></row>
+            <row><entry><literal>^R    </literal></entry><entry><literal>read-thread         </literal></entry><entry>mark the current thread as read</entry></row>
+            <row><entry><literal>ESC d </literal></entry><entry><literal>delete-subthread    </literal></entry><entry>delete all messages in the current subthread</entry></row>
+            <row><entry><literal>ESC u </literal></entry><entry><literal>undelete-subthread  </literal></entry><entry>undelete all messages in the current subthread</entry></row>
+            <row><entry><literal>ESC n </literal></entry><entry><literal>next-subthread      </literal></entry><entry>jump to the start of the next subthread</entry></row>
+            <row><entry><literal>ESC p </literal></entry><entry><literal>previous-subthread  </literal></entry><entry>jump to the start of the previous subthread</entry></row>
+            <row><entry><literal>ESC r </literal></entry><entry><literal>read-subthread      </literal></entry><entry>mark the current subthread as read </entry></row>
+            <row><entry><literal>ESC t </literal></entry><entry><literal>tag-thread          </literal></entry><entry>toggle the tag on the current thread</entry></row>
+            <row><entry><literal>ESC v </literal></entry><entry><literal>collapse-thread    </literal></entry><entry>toggle collapse for the current thread</entry></row>
+            <row><entry><literal>ESC V </literal></entry><entry><literal>collapse-all      </literal></entry><entry>toggle collapse for all threads</entry></row>
+            <row><entry><literal>P    </literal></entry><entry><literal>parent-message        </literal></entry><entry>jump to parent message in thread</entry></row>
           </tbody>
         </tgroup>
       </table>
@@ -1336,11 +1333,10 @@ linkend="color">color</link>
           See also: <link linkend="strict-threads">strict-threads</link>.
         </para>
         
-        <!--}}}-->
       </sect2>
       
-      <sect2>
-        <title>Miscellaneous Functions</title> <!--{{{-->
+      <sect2 id="pager-functions">
+        <title>Miscellaneous Functions</title>
         
         <para>
           <emphasis role="bold">create-alias</emphasis><anchor id="create-alias"/>
@@ -1586,14 +1582,13 @@ linkend="color">color</link>
           
         </para>
         
-        <!--}}}-->
       </sect2>
       
-      <!--}}}-->
     </sect1>
+    <!--}}}-->
     
-    <sect1>
-      <title>Sending Mail  </title> <!--{{{-->
+    <sect1 id="sending"> <!--{{{-->
+      <title>Sending Mail</title>
       
       <para>
         The following bindings are available in the <emphasis>index</emphasis>
@@ -1614,13 +1609,13 @@ linkend="color">color</link>
             </row>
           </thead>
           <tbody>
-            <row><entry><code>m    </code></entry><entry><code>compose    </code></entry><entry>compose a new message</entry></row>
-            <row><entry><code>r     </code></entry><entry><code>reply       </code></entry><entry>reply to sender</entry></row>
-            <row><entry><code>g     </code></entry><entry><code>group-reply </code></entry><entry>reply to all recipients</entry></row>
-            <row><entry><code>L     </code></entry><entry><code>list-reply  </code></entry><entry>reply to mailing list address</entry></row>
-            <row><entry><code>f     </code></entry><entry><code>forward     </code></entry><entry>forward message</entry></row>
-            <row><entry><code>b     </code></entry><entry><code>bounce      </code></entry><entry>bounce (remail) message</entry></row>
-            <row><entry><code>ESC k  </code></entry><entry><code>mail-key    </code></entry><entry>mail a PGP public key to someone</entry></row>
+            <row><entry><literal>m    </literal></entry><entry><literal>compose    </literal></entry><entry>compose a new message</entry></row>
+            <row><entry><literal>r     </literal></entry><entry><literal>reply       </literal></entry><entry>reply to sender</entry></row>
+            <row><entry><literal>g     </literal></entry><entry><literal>group-reply </literal></entry><entry>reply to all recipients</entry></row>
+            <row><entry><literal>L     </literal></entry><entry><literal>list-reply  </literal></entry><entry>reply to mailing list address</entry></row>
+            <row><entry><literal>f     </literal></entry><entry><literal>forward     </literal></entry><entry>forward message</entry></row>
+            <row><entry><literal>b     </literal></entry><entry><literal>bounce      </literal></entry><entry>bounce (remail) message</entry></row>
+            <row><entry><literal>ESC k  </literal></entry><entry><literal>mail-key    </literal></entry><entry>mail a PGP public key to someone</entry></row>
           </tbody>
         </tgroup>
       </table>
@@ -1637,8 +1632,8 @@ linkend="color">color</link>
         .
       </para>
       
-      <sect2>
-        <title>Composing new messages  </title> <!--{{{-->
+      <sect2 id="sending-compose">
+        <title>Composing new messages</title>
         
         <para>
           When you want to send an email using mutt-ng, simply press <literal>m</literal> on
@@ -1756,26 +1751,26 @@ set edit_headers</screen>
             </row>
           </thead>
           <tbody>
-            <row><entry><code>a    </code></entry><entry><code>attach-file  </code></entry><entry>attach a file</entry></row>
-            <row><entry><code>A    </code></entry><entry><code>attach-message  </code></entry><entry>attach message(s) to the message</entry></row>
-            <row><entry><code>ESC k  </code></entry><entry><code>attach-key       </code></entry><entry>attach a PGP public key</entry></row>
-            <row><entry><code>d    </code></entry><entry><code>edit-description  </code></entry><entry>edit description on attachment</entry></row>
-            <row><entry><code>D  </code></entry><entry><code>detach-file     </code></entry><entry>detach a file</entry></row>
-            <row><entry><code>t </code></entry><entry><code>edit-to         </code></entry><entry>edit the To field</entry></row>
-            <row><entry><code>ESC f </code></entry><entry><code>edit-from       </code></entry><entry>edit the From field</entry></row>
-            <row><entry><code>r  </code></entry><entry><code>edit-reply-to   </code></entry><entry>edit the Reply-To field</entry></row>
-            <row><entry><code>c </code></entry><entry><code>edit-cc         </code></entry><entry>edit the Cc field</entry></row>
-            <row><entry><code>b      </code></entry><entry><code>edit-bcc        </code></entry><entry>edit the Bcc field</entry></row>
-            <row><entry><code>y     </code></entry><entry><code>send-message    </code></entry><entry>send the message</entry></row>
-            <row><entry><code>s    </code></entry><entry><code>edit-subject    </code></entry><entry>edit the Subject</entry></row>
-            <row><entry><code>S   </code></entry><entry><code>smime-menu        </code></entry><entry>select S/MIME options</entry></row>
-            <row><entry><code>f      </code></entry><entry><code>edit-fcc        </code></entry><entry>specify an ``Fcc'' mailbox</entry></row>
-            <row><entry><code>p     </code></entry><entry><code>pgp-menu        </code></entry><entry>select PGP options</entry></row>
-            <row><entry><code>P    </code></entry><entry><code>postpone-message </code></entry><entry>postpone this message until later</entry></row>
-            <row><entry><code>q   </code></entry><entry><code>quit            </code></entry><entry>quit (abort) sending the message</entry></row>
-            <row><entry><code>w  </code></entry><entry><code>write-fcc      </code></entry><entry>write the message to a folder</entry></row>
-            <row><entry><code>i </code></entry><entry><code>ispell          </code></entry><entry>check spelling (if available on your system)</entry></row>
-            <row><entry><code>^F  </code></entry><entry><code>forget-passphrase   </code></entry><entry>wipe passphrase(s) from memory</entry></row>
+            <row><entry><literal>a    </literal></entry><entry><literal>attach-file  </literal></entry><entry>attach a file</entry></row>
+            <row><entry><literal>A    </literal></entry><entry><literal>attach-message  </literal></entry><entry>attach message(s) to the message</entry></row>
+            <row><entry><literal>ESC k  </literal></entry><entry><literal>attach-key       </literal></entry><entry>attach a PGP public key</entry></row>
+            <row><entry><literal>d    </literal></entry><entry><literal>edit-description  </literal></entry><entry>edit description on attachment</entry></row>
+            <row><entry><literal>D  </literal></entry><entry><literal>detach-file     </literal></entry><entry>detach a file</entry></row>
+            <row><entry><literal>t </literal></entry><entry><literal>edit-to         </literal></entry><entry>edit the To field</entry></row>
+            <row><entry><literal>ESC f </literal></entry><entry><literal>edit-from       </literal></entry><entry>edit the From field</entry></row>
+            <row><entry><literal>r  </literal></entry><entry><literal>edit-reply-to   </literal></entry><entry>edit the Reply-To field</entry></row>
+            <row><entry><literal>c </literal></entry><entry><literal>edit-cc         </literal></entry><entry>edit the Cc field</entry></row>
+            <row><entry><literal>b      </literal></entry><entry><literal>edit-bcc        </literal></entry><entry>edit the Bcc field</entry></row>
+            <row><entry><literal>y     </literal></entry><entry><literal>send-message    </literal></entry><entry>send the message</entry></row>
+            <row><entry><literal>s    </literal></entry><entry><literal>edit-subject    </literal></entry><entry>edit the Subject</entry></row>
+            <row><entry><literal>S   </literal></entry><entry><literal>smime-menu        </literal></entry><entry>select S/MIME options</entry></row>
+            <row><entry><literal>f      </literal></entry><entry><literal>edit-fcc        </literal></entry><entry>specify an ``Fcc'' mailbox</entry></row>
+            <row><entry><literal>p     </literal></entry><entry><literal>pgp-menu        </literal></entry><entry>select PGP options</entry></row>
+            <row><entry><literal>P    </literal></entry><entry><literal>postpone-message </literal></entry><entry>postpone this message until later</entry></row>
+            <row><entry><literal>q   </literal></entry><entry><literal>quit            </literal></entry><entry>quit (abort) sending the message</entry></row>
+            <row><entry><literal>w  </literal></entry><entry><literal>write-fcc      </literal></entry><entry>write the message to a folder</entry></row>
+            <row><entry><literal>i </literal></entry><entry><literal>ispell          </literal></entry><entry>check spelling (if available on your system)</entry></row>
+            <row><entry><literal>^F  </literal></entry><entry><literal>forget-passphrase   </literal></entry><entry>wipe passphrase(s) from memory</entry></row>
           </tbody>
         </tgroup>
       </table>
@@ -1800,14 +1795,13 @@ set edit_headers</screen>
           
         </para>
         
-        <!--}}}-->
       </sect2>
       
-      <sect2>
-        <title>Replying      </title> <!--{{{-->
+      <sect2 id="sending-reply">
+        <title>Replying</title>
         
-        <sect3>
-          <title>Simple Replies       </title> <!--{{{-->
+        <sect3 id="sending-simple-reply">
+          <title>Simple Replies</title>
           
           <para>
             When you want to reply to an email message, select it in the index
@@ -1887,11 +1881,10 @@ set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</screen>
             
           </para>
           
-          <!--}}}-->
         </sect3>
         
-        <sect3>
-          <title>Group Replies      </title> <!--{{{-->
+        <sect3 id="sending-group-reply">
+          <title>Group Replies</title>
           
           <para>
             In the situation where a group of people uses email as a
@@ -1908,11 +1901,10 @@ set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</screen>
             
           </para>
           
-          <!--}}}-->
         </sect3>
         
-        <sect3>
-          <title>List Replies      </title> <!--{{{-->
+        <sect3 id="sending-list-reply">
+          <title>List Replies</title>
           
           <para>
             When you use mailing lists, it's generally better to send your
@@ -1955,14 +1947,12 @@ lists linuxevent@luga\.at vuln-dev@ mutt-ng-users@</screen>
             
           </para>
           
-          <!--}}}-->
         </sect3>
         
-        <!--}}}-->
       </sect2>
       
-      <sect2>
-        <title>Editing the message header  </title>
+      <sect2 id="sending-edit-header">
+        <title>Editing the message header</title>
         
         <para>
           When editing the header of your outgoing message, there are a couple
@@ -2011,8 +2001,8 @@ lists linuxevent@luga\.at vuln-dev@ mutt-ng-users@</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Using Mutt-ng with PGP  </title>
+      <sect2 id="sending-crypto">
+        <title>Using Mutt-ng with PGP</title>
         
         <para>
           If you want to use PGP, you can specify 
@@ -2083,10 +2073,10 @@ lists linuxevent@luga\.at vuln-dev@ mutt-ng-users@</screen>
             </row>
           </thead>
           <tbody>
-            <row><entry><code>R      </code></entry><entry>The key has been revoked and can't be used.</entry></row>
-            <row><entry><code>X     </code></entry><entry>The key is expired and can't be used.</entry></row>
-            <row><entry><code>d     </code></entry><entry>You have marked the key as disabled.</entry></row>
-            <row><entry><code>c     </code></entry><entry>There are unknown critical self-signature packets.</entry></row>
+            <row><entry><literal>R      </literal></entry><entry>The key has been revoked and can't be used.</entry></row>
+            <row><entry><literal>X     </literal></entry><entry>The key is expired and can't be used.</entry></row>
+            <row><entry><literal>d     </literal></entry><entry>You have marked the key as disabled.</entry></row>
+            <row><entry><literal>c     </literal></entry><entry>There are unknown critical self-signature packets.</entry></row>
           </tbody>
         </tgroup>
       </table>
@@ -2139,8 +2129,8 @@ lists linuxevent@luga\.at vuln-dev@ mutt-ng-users@</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Sending anonymous messages via mixmaster  </title>
+      <sect2 id="sending-mixmaster">
+        <title>Sending anonymous messages via mixmaster</title>
         
         <para>
           You may also have configured mutt to co-operate with Mixmaster, an
@@ -2212,7 +2202,7 @@ lists linuxevent@luga\.at vuln-dev@ mutt-ng-users@</screen>
     </sect1>
     
     <sect1 id="forwarding-mail">
-      <title>Forwarding and Bouncing Mail  </title>
+      <title>Forwarding and Bouncing Mail</title>
       
       <para>
         Often, it is necessary to forward mails to other people.
@@ -2282,7 +2272,7 @@ a horrible death.
     </sect1>
     
     <sect1 id="postponing-mail">
-      <title>Postponing Mail  </title>
+      <title>Postponing Mail</title>
       
       <para>
         At times it is desirable to delay sending a message that you have
@@ -2328,14 +2318,17 @@ a horrible death.
       </para>
       
     </sect1>
+
+    <!--}}}-->
     
-  </chapter>
+</chapter>
+<!--}}}-->
   
-  <chapter>
-    <title>Configuration  </title>
+<chapter id="configuration"> <!--{{{-->
+    <title>Configuration</title>
     
-    <sect1>
-      <title>Locations of Configuration Files  </title>
+    <sect1 id="configuration-files">
+      <title>Locations of Configuration Files</title>
       
       <para>
         While the default configuration (or ``preferences'') make Mutt-ng
@@ -2379,8 +2372,8 @@ a horrible death.
       
     </sect1>
     
-    <sect1 id="muttrc-syntax">
-      <title>Basic Syntax of Initialization Files  </title>
+    <sect1 id="configuration-syntax">
+      <title>Basic Syntax of Initialization Files</title>
       
       <para>
         An initialization file consists of a series of <link linkend="commands">
@@ -2510,16 +2503,16 @@ line5</screen>
       
     </sect1>
     
-    <sect1>
-      <title>Expansion within variables    </title>
+    <sect1 id="configuration-expansion">
+      <title>Expansion within variables</title>
       
       <para>
         Besides just assign static content to variables, there's plenty of
         ways of adding external and more or less dynamic content.
       </para>
       
-      <sect2>
-        <title>Commands' Output     </title>
+      <sect2 id="configuration-expansion-commands">
+        <title>Commands' Output</title>
         
         <para>
           It is possible to substitute the output of a Unix command in an
@@ -2543,8 +2536,8 @@ my_hdr X-Operating-System: `uname -a`</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Environment Variables     </title>
+      <sect2 id="configuration-expansion-environment">
+        <title>Environment Variables</title>
         
         <para>
           UNIX environments can be accessed like the way it is done in
@@ -2574,8 +2567,8 @@ set record=+sent_on_$HOSTNAME</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Configuration Variables     </title>
+      <sect2 id="configuration-expansion-config">
+        <title>Configuration Variables</title>
         
         <para>
           As for environment variables, the values of all configuration
@@ -2617,8 +2610,8 @@ set imap_home_namespace = $folder</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Self-Defined Variables     </title>
+      <sect2 id="configuration-expansion-self">
+        <title>Self-Defined Variables</title>
         
         <para>
           Mutt-ng flexibly allows users to define their own variables. To
@@ -2744,8 +2737,8 @@ unset user_foo</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Pre-Defined Variables     </title>
+      <sect2 id="configuration-expansion-predef">
+        <title>Pre-Defined Variables</title>
         
         <para>
           In order to allow users to share one setup over a number of
@@ -2868,8 +2861,8 @@ folder-hook . 'source ~/.mutt/score-$muttng_folder_name'</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Type Conversions     </title>
+      <sect2 id="configuration-expansion-typeconv">
+        <title>Type Conversions</title>
         
         <para>
           A note about variable's types during conversion: internally
@@ -2896,13 +2889,12 @@ set folder = $user_magic_number</screen>
     </sect1>
     
     <sect1 id="alias">
-      <title>Defining/Using aliases  </title>
+      <title>Defining/Using aliases</title>
       
       <para>
-        Usage: <literal>alias</literal> <emphasis>key</emphasis> <emphasis>
-          address
-        </emphasis>
-        &lsqb; , <emphasis>address</emphasis>, ... &rsqb;
+        <literallayout>
+Usage: <literal>alias</literal> <emphasis>key</emphasis> <emphasis>address</emphasis>&lsqb; , <emphasis>address</emphasis>, ... &rsqb;
+        </literallayout>
       </para>
       
       <para>
@@ -3018,12 +3010,12 @@ set alias_file=~/.mail_aliases</screen>
     </sect1>
     
     <sect1 id="bind">
-      <title>Changing the default key bindings  </title>
+      <title>Changing the default key bindings</title>
       
       <para>
-        Usage: <literal>bind</literal> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>
-          function
-        </emphasis>
+        <literallayout>
+Usage: <literal>bind</literal> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>function</emphasis>
+        </literallayout>
       </para>
       
       <para>
@@ -3183,29 +3175,29 @@ set alias_file=~/.mail_aliases</screen>
             </row>
           </thead>
           <tbody>
-            <row><entry><code>\t     </code></entry><entry>tab</entry></row>
-            <row><entry><code>&#60;tab&#62;      </code></entry><entry>tab</entry></row>
-            <row><entry><code>&#60;backtab&#62;   </code></entry><entry>backtab / shift-tab</entry></row>
-            <row><entry><code>\r    </code></entry><entry>carriage return</entry></row>
-            <row><entry><code>\n     </code></entry><entry>newline</entry></row>
-            <row><entry><code>\e      </code></entry><entry>escape</entry></row>
-            <row><entry><code>&#60;esc&#62;   </code></entry><entry>escape</entry></row>
-            <row><entry><code>&#60;up&#62;     </code></entry><entry>up arrow</entry></row>
-            <row><entry><code>&#60;down&#62;     </code></entry><entry>down arrow</entry></row>
-            <row><entry><code>&#60;left&#62;     </code></entry><entry>left arrow</entry></row>
-            <row><entry><code>&#60;right&#62;    </code></entry><entry>right arrow</entry></row>
-            <row><entry><code>&#60;pageup&#62;   </code></entry><entry>Page Up</entry></row>
-            <row><entry><code>&#60;pagedown&#62;  </code></entry><entry>Page Down</entry></row>
-            <row><entry><code>&#60;backspace&#62;  </code></entry><entry>Backspace</entry></row>
-            <row><entry><code>&#60;delete&#62;    </code></entry><entry>Delete</entry></row>
-            <row><entry><code>&#60;insert&#62;     </code></entry><entry>Insert</entry></row>
-            <row><entry><code>&#60;enter&#62;    </code></entry><entry>Enter</entry></row>
-            <row><entry><code>&#60;return&#62;   </code></entry><entry>Return</entry></row>
-            <row><entry><code>&#60;home&#62;     </code></entry><entry>Home</entry></row>
-            <row><entry><code>&#60;end&#62;      </code></entry><entry>End</entry></row>
-            <row><entry><code>&#60;space&#62;    </code></entry><entry>Space bar</entry></row>
-            <row><entry><code>&#60;f1&#62;       </code></entry><entry>function key 1</entry></row>
-            <row><entry><code>&#60;f10&#62;       </code></entry><entry>function key 10</entry></row>
+            <row><entry><literal>\t     </literal></entry><entry>tab</entry></row>
+            <row><entry><literal>&#60;tab&#62;      </literal></entry><entry>tab</entry></row>
+            <row><entry><literal>&#60;backtab&#62;   </literal></entry><entry>backtab / shift-tab</entry></row>
+            <row><entry><literal>\r    </literal></entry><entry>carriage return</entry></row>
+            <row><entry><literal>\n     </literal></entry><entry>newline</entry></row>
+            <row><entry><literal>\e      </literal></entry><entry>escape</entry></row>
+            <row><entry><literal>&#60;esc&#62;   </literal></entry><entry>escape</entry></row>
+            <row><entry><literal>&#60;up&#62;     </literal></entry><entry>up arrow</entry></row>
+            <row><entry><literal>&#60;down&#62;     </literal></entry><entry>down arrow</entry></row>
+            <row><entry><literal>&#60;left&#62;     </literal></entry><entry>left arrow</entry></row>
+            <row><entry><literal>&#60;right&#62;    </literal></entry><entry>right arrow</entry></row>
+            <row><entry><literal>&#60;pageup&#62;   </literal></entry><entry>Page Up</entry></row>
+            <row><entry><literal>&#60;pagedown&#62;  </literal></entry><entry>Page Down</entry></row>
+            <row><entry><literal>&#60;backspace&#62;  </literal></entry><entry>Backspace</entry></row>
+            <row><entry><literal>&#60;delete&#62;    </literal></entry><entry>Delete</entry></row>
+            <row><entry><literal>&#60;insert&#62;     </literal></entry><entry>Insert</entry></row>
+            <row><entry><literal>&#60;enter&#62;    </literal></entry><entry>Enter</entry></row>
+            <row><entry><literal>&#60;return&#62;   </literal></entry><entry>Return</entry></row>
+            <row><entry><literal>&#60;home&#62;     </literal></entry><entry>Home</entry></row>
+            <row><entry><literal>&#60;end&#62;      </literal></entry><entry>End</entry></row>
+            <row><entry><literal>&#60;space&#62;    </literal></entry><entry>Space bar</entry></row>
+            <row><entry><literal>&#60;f1&#62;       </literal></entry><entry>function key 1</entry></row>
+            <row><entry><literal>&#60;f10&#62;       </literal></entry><entry>function key 10</entry></row>
           </tbody>
         </tgroup>
       </table>
@@ -3237,16 +3229,13 @@ set alias_file=~/.mail_aliases</screen>
     </sect1>
     
     <sect1 id="charset-hook">
-      <title>Defining aliases for character sets   </title>
+      <title>Defining aliases for character sets</title>
       
       <para>
-        Usage: <literal>charset-hook</literal> <emphasis>alias</emphasis> <emphasis>
-          charset
-        </emphasis>
-        
-        Usage: <literal>iconv-hook</literal> <emphasis>charset</emphasis> <emphasis>
-          local-charset
-        </emphasis>
+        <literallayout>
+Usage: <literal>charset-hook</literal> <emphasis>alias</emphasis> <emphasis> charset</emphasis>
+Usage: <literal>iconv-hook</literal> <emphasis>charset</emphasis> <emphasis> local-charset </emphasis>
+        </literallayout>
       </para>
       
       <para>
@@ -3271,12 +3260,13 @@ set alias_file=~/.mail_aliases</screen>
     </sect1>
     
     <sect1 id="folder-hook">
-      <title>Setting variables based upon mailbox  </title>
+      <title>Setting variables based upon mailbox</title>
       
       <para>
-        Usage: <literal>folder-hook</literal> &lsqb;!&rsqb;<emphasis>regexp</emphasis> <emphasis>
-          command
-        </emphasis>
+        <literallayout>
+Usage: <literal>folder-hook</literal> &lsqb;!&rsqb;<emphasis>regexp</emphasis> <emphasis>command</emphasis>
+        </literallayout>
+
       </para>
       
       <para>
@@ -3335,13 +3325,12 @@ folder-hook . set sort=date-sent</screen>
     </sect1>
     
     <sect1 id="macro">
-      <title>Keyboard macros  </title>
+      <title>Keyboard macros</title>
       
       <para>
-        Usage: <literal>macro</literal> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>
-          sequence
-        </emphasis>
-        &lsqb; <emphasis>description</emphasis> &rsqb;
+        <literallayout>
+Usage: <literal>macro</literal> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>sequence</emphasis> &lsqb; <emphasis>description</emphasis> &rsqb;
+        </literallayout>
       </para>
       
       <para>
@@ -3412,23 +3401,14 @@ folder-hook . set sort=date-sent</screen>
     </sect1>
     
     <sect1 id="color">
-      <title>Using color and mono video attributes  </title>
+      <title>Using color and mono video attributes</title>
       
       <para>
-        Usage: <literal>color</literal> <emphasis>object</emphasis> <emphasis>
-          foreground
-        </emphasis>
-        <emphasis>background</emphasis> &lsqb; <emphasis>regexp</emphasis>
-        &rsqb;
-        
-        Usage: <literal>color</literal> index <emphasis>foreground</emphasis> <emphasis>
-          background
-        </emphasis>
-        <emphasis>pattern</emphasis>
-        
-        Usage: <literal>uncolor</literal> index <emphasis>pattern</emphasis>
-        &lsqb; <emphasis>pattern</emphasis> ...  &rsqb;
-        
+        <literallayout>
+Usage: <literal>color</literal> <emphasis>object</emphasis> <emphasis>foreground</emphasis><emphasis>background</emphasis> &lsqb; <emphasis>regexp</emphasis>&rsqb;
+Usage: <literal>color</literal> index <emphasis>foreground</emphasis> <emphasis>background</emphasis><emphasis>pattern</emphasis>
+Usage: <literal>uncolor</literal> index <emphasis>pattern</emphasis>&lsqb; <emphasis>pattern</emphasis> ...  &rsqb;
+      </literallayout>
       </para>
       
       <para>
@@ -3711,18 +3691,11 @@ export COLORFGBG</screen>
       </para>
       
       <para>
-        Usage: <literal>mono</literal> <emphasis>&lt;object&gt;
-          &lt;attribute&gt;
-        </emphasis>
-        &lsqb; <emphasis>regexp</emphasis> &rsqb;
-        
-        Usage: <literal>mono</literal> index <emphasis>attribute</emphasis> <emphasis>
-          pattern
-        </emphasis>
-        
-        Usage: <literal>unmono</literal> index <emphasis>pattern</emphasis>
-        &lsqb; <emphasis>pattern</emphasis> ...  &rsqb;
-        
+        <literallayout>
+Usage: <literal>mono</literal> <emphasis>&lt;object&gt; &lt;attribute&gt;</emphasis>&lsqb; <emphasis>regexp</emphasis> &rsqb;
+Usage: <literal>mono</literal> index <emphasis>attribute</emphasis> <emphasis>pattern</emphasis>
+Usage: <literal>unmono</literal> index <emphasis>pattern</emphasis>&lsqb; <emphasis>pattern</emphasis> ...  &rsqb;
+        </literallayout>
       </para>
       
       <para>
@@ -3774,13 +3747,12 @@ export COLORFGBG</screen>
     </sect1>
     
     <sect1 id="ignore">
-      <title>Ignoring (weeding) unwanted message headers  </title>
+      <title>Ignoring (weeding) unwanted message headers</title>
       
       <para>
-        Usage: <literal>&lsqb;un&rsqb;ignore</literal> <emphasis>pattern</emphasis> &lsqb; <emphasis>
-          pattern
-        </emphasis>
-        ... &rsqb;
+        <literallayout>
+Usage: <literal>&lsqb;un&rsqb;ignore</literal> <emphasis>pattern</emphasis> &lsqb; <emphasis>pattern</emphasis>... &rsqb;
+        </literallayout>
       </para>
       
       <para>
@@ -3830,7 +3802,7 @@ unignore posted-to:</screen>
     </sect1>
     
     <sect1 id="alternates">
-      <title>Alternative addresses  </title>
+      <title>Alternative addresses</title>
       
       <para>
         Usage: <literal>&lsqb;un&rsqb;alternates</literal> <emphasis>regexp</emphasis> &lsqb; <emphasis>
@@ -3845,7 +3817,7 @@ unignore posted-to:</screen>
         depending on whether you sent them or whether you received them from
         someone else.  For instance, when replying to a message that you
         sent to a different party, mutt will automatically suggest to send
-        the response to the original message's recipients -- responding to
+        the response to the original message's recipients--responding to
         yourself won't make much sense in many cases.  (See <link linkend="reply-to">
           reply-to
         </link>
@@ -3898,11 +3870,11 @@ unignore posted-to:</screen>
       
     </sect1>
     
-    <sect1>
-      <title>Format = Flowed    </title>
+    <sect1 id="format-flowed">
+      <title>Format = Flowed</title>
       
-      <sect2>
-        <title>Introduction      </title>
+      <sect2 id="format-flowed-intro">
+        <title>Introduction</title>
         
         <para>
           Mutt-ng contains support for so-called <literal>format=flowed</literal> messages.
@@ -3925,8 +3897,8 @@ unignore posted-to:</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Receiving: Display Setup      </title>
+      <sect2 id="format-flowed-display">
+        <title>Receiving: Display Setup</title>
         
         <para>
           When you receive emails that are marked as <literal>format=flowed</literal>
@@ -4010,8 +3982,8 @@ set stuff_quoted</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Sending      </title>
+      <sect2 id="format-flowed-send">
+        <title>Sending</title>
         
         <para>
           If you want mutt-ng to send emails with <literal>format=flowed</literal> set, you
@@ -4085,7 +4057,7 @@ set text_flowed</screen>
         
       </sect2>
       
-      <sect2>
+      <sect2 id="format-flowed-notes">
         <title>Additional Notes</title>
         
         <para>
@@ -4114,18 +4086,13 @@ set text_flowed</screen>
     </sect1>
     
     <sect1 id="lists">
-      <title>Mailing lists  </title>
+      <title>Mailing lists</title>
       
       <para>
-        Usage: <literal>&lsqb;un&rsqb;lists</literal> <emphasis>regexp</emphasis> &lsqb; <emphasis>
-          regexp
-        </emphasis>
-        ... &rsqb;
-        
-        Usage: <literal>&lsqb;un&rsqb;subscribe</literal> <emphasis>regexp</emphasis> &lsqb; <emphasis>
-          regexp
-        </emphasis>
-        ... &rsqb;
+        <literallayout>
+Usage: <literal>&lsqb;un&rsqb;lists</literal> <emphasis>regexp</emphasis> &lsqb; <emphasis>regexp</emphasis>... &rsqb;
+Usage: <literal>&lsqb;un&rsqb;subscribe</literal> <emphasis>regexp</emphasis> &lsqb; <emphasis>regexp</emphasis>... &rsqb;
+        </literallayout>
       </para>
       
       <para>
@@ -4200,12 +4167,12 @@ set text_flowed</screen>
     </sect1>
     
     <sect1 id="mbox-hook">
-      <title>Using Multiple spool mailboxes  </title>
+      <title>Using Multiple spool mailboxes</title>
       
       <para>
-        Usage: <literal>mbox-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>
-          mailbox
-        </emphasis>
+        <literallayout>
+Usage: <literal>mbox-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+        </literallayout>
       </para>
       
       <para>
@@ -4235,13 +4202,12 @@ set text_flowed</screen>
     </sect1>
     
     <sect1 id="mailboxes">
-      <title>Defining mailboxes which receive mail  </title>
+      <title>Defining mailboxes which receive mail</title>
       
       <para>
-        Usage: <literal>&lsqb;un&rsqb;mailboxes</literal> &lsqb;!&rsqb;<emphasis>
-          filename
-        </emphasis>
-        &lsqb; <emphasis>filename</emphasis> ... &rsqb;
+        <literallayout>
+Usage: <literal>&lsqb;un&rsqb;mailboxes</literal> &lsqb;!&rsqb;<emphasis>filename</emphasis>&lsqb; <emphasis>filename</emphasis> ... &rsqb;
+        </literallayout>
       </para>
       
       <para>
@@ -4308,17 +4274,13 @@ set text_flowed</screen>
     </sect1>
     
     <sect1 id="my-hdr">
-      <title>User defined headers  </title>
+      <title>User defined headers</title>
       
       <para>
-        Usage:
-        
-        <literal>my&lowbar;hdr</literal> <emphasis>string</emphasis>
-        
-        <literal>unmy&lowbar;hdr</literal> <emphasis>field</emphasis> &lsqb; <emphasis>
-          field
-        </emphasis>
-        ... &rsqb;
+        <literallayout>
+Usage: <literal>my&lowbar;hdr</literal> <emphasis>string</emphasis>
+Usage: <literal>unmy&lowbar;hdr</literal> <emphasis>field</emphasis> &lsqb; <emphasis>field</emphasis>... &rsqb;
+        </literallayout>
       </para>
       
       <para>
@@ -4378,11 +4340,12 @@ unmy&lowbar;hdr to cc</screen>
     </sect1>
     
     <sect1 id="hdr-order">
-      <title>Defining the order of headers when viewing messages  </title>
+      <title>Defining the order of headers when viewing messages</title>
       
       <para>
-        Usage: <literal>hdr&lowbar;order</literal> <emphasis>header1</emphasis>
-        <emphasis>header2</emphasis> <emphasis>header3</emphasis>
+        <literallayout>
+Usage: <literal>hdr&lowbar;order</literal> <emphasis>header1</emphasis><emphasis>header2</emphasis> <emphasis>header3</emphasis>
+        </literallayout>
       </para>
       
       <para>
@@ -4411,12 +4374,12 @@ hdr&lowbar;order From Date: From: To: Cc: Subject:</screen>
     </sect1>
     
     <sect1 id="save-hook">
-      <title>Specify default save filename  </title>
+      <title>Specify default save filename</title>
       
       <para>
-        Usage: <literal>save-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>
-          filename
-        </emphasis>
+        <literallayout>
+Usage: <literal>save-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>filename</emphasis>
+        </literallayout>
       </para>
       
       <para>
@@ -4459,12 +4422,12 @@ save-hook aol\\.com$ +spam</screen>
     </sect1>
     
     <sect1 id="fcc-hook">
-      <title>Specify default Fcc: mailbox when composing  </title>
+      <title>Specify default Fcc: mailbox when composing</title>
       
       <para>
-        Usage: <literal>fcc-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>
-          mailbox
-        </emphasis>
+        <literallayout>
+Usage: <literal>fcc-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+        </literallayout>
       </para>
       
       <para>
@@ -4505,12 +4468,12 @@ save-hook aol\\.com$ +spam</screen>
     </sect1>
     
     <sect1 id="fcc-save-hook">
-      <title>Specify default save filename and default Fcc: mailbox at once  </title>
+      <title>Specify default save filename and default Fcc: mailbox at once</title>
       
       <para>
-        Usage: <literal>fcc-save-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>
-          mailbox
-        </emphasis>
+        <literallayout>
+Usage: <literal>fcc-save-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+        </literallayout>
       </para>
       
       <para>
@@ -4527,20 +4490,15 @@ save-hook aol\\.com$ +spam</screen>
     </sect1>
     
     <sect1 id="send-hook">
-      <title>Change settings based upon message recipients  </title>
-      
+      <title>Change settings based upon message recipients</title>
+
+      <anchor id="reply-hook"/>
       <para>
-        Usage: <literal>reply-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>
-          command
-        </emphasis>
-        
-        Usage: <literal>send-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>
-          command
-        </emphasis>
-        
-        Usage: <literal>send2-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>
-          command
-        </emphasis>
+        <literallayout>
+Usage: <literal>reply-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>command</emphasis>
+Usage: <literal>send-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>command</emphasis>
+Usage: <literal>send2-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>command</emphasis>
+        </literallayout>v
       </para>
       
       <para>
@@ -4632,12 +4590,12 @@ save-hook aol\\.com$ +spam</screen>
     </sect1>
     
     <sect1 id="message-hook">
-      <title>Change settings before formatting a message  </title>
+      <title>Change settings before formatting a message</title>
       
       <para>
-        Usage: <literal>message-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>
-          command
-        </emphasis>
+        <literallayout>
+Usage: <literal>message-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>command</emphasis>
+        </literallayout>
       </para>
       
       <para>
@@ -4671,12 +4629,12 @@ message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</screen>
     </sect1>
     
     <sect1 id="crypt-hook">
-      <title>Choosing the cryptographic key of the recipient  </title>
+      <title>Choosing the cryptographic key of the recipient</title>
       
       <para>
-        Usage: <literal>crypt-hook</literal> <emphasis>pattern</emphasis> <emphasis>
-          keyid
-        </emphasis>
+        <literallayout>
+Usage: <literal>crypt-hook</literal> <emphasis>pattern</emphasis> <emphasis>keyid</emphasis>
+        </literallayout>
       </para>
       
       <para>
@@ -4704,21 +4662,28 @@ message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</screen>
     </sect1>
     
     <sect1 id="push">
-      <title>Adding key sequences to the keyboard buffer  </title>
+      <title>Adding key sequences to the keyboard buffer</title>
       
       <para>
-        Usage: <literal>push</literal> <emphasis>string</emphasis>
+        <literallayout>
+Usage: <literal>push</literal> <emphasis>string</emphasis>
+        </literallayout>
       </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
-        automatically run a sequence of commands at startup, or when entering
-        certain folders.
+
+        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
+        automatically run a sequence of commands at startup, or when
+        entering certain folders. For example, the following command
+        will automatically collapse all threads when entering a folder:
+
+        <screen>
+folder-hook . 'push &lt;collapse-all&gt;'
+        </screen>
+
       </para>
       
       <para>
@@ -4728,13 +4693,12 @@ message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</screen>
     </sect1>
     
     <sect1 id="exec">
-      <title>Executing functions  </title>
+      <title>Executing functions</title>
       
       <para>
-        Usage: <literal>exec</literal> <emphasis>function</emphasis> &lsqb; <emphasis>
-          function
-        </emphasis>
-        ... &rsqb;
+        <literallayout>
+Usage: <literal>exec</literal> <emphasis>function</emphasis> &lsqb; <emphasis>function</emphasis> ... &rsqb;
+        </literallayout>
       </para>
       
       <para>
@@ -4750,17 +4714,13 @@ message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</screen>
     </sect1>
     
     <sect1 id="score-command">
-      <title>Message Scoring  </title>
+      <title>Message Scoring</title>
       
       <para>
-        Usage: <literal>score</literal> <emphasis>pattern</emphasis> <emphasis>
-          value
-        </emphasis>
-        
-        Usage: <literal>unscore</literal> <emphasis>pattern</emphasis> &lsqb; <emphasis>
-          pattern
-        </emphasis>
-        ... &rsqb;
+        <literallayout>
+Usage: <literal>score</literal> <emphasis>pattern</emphasis> <emphasis>value</emphasis>
+Usage: <literal>unscore</literal> <emphasis>pattern</emphasis> &lsqb; <emphasis>pattern</emphasis>... &rsqb;
+        </literallayout>
       </para>
       
       <para>
@@ -4894,15 +4854,14 @@ color index  red     yellow  "~n 100-"</screen>
     </sect1>
     
     <sect1 id="spam">
-      <title>Spam detection  </title>
+      <title>Spam detection</title>
       
       <para>
-        Usage: <literal>spam</literal> <emphasis>pattern</emphasis> <emphasis>
-          format
-        </emphasis>
-        
-        Usage: <literal>nospam</literal> <emphasis>pattern</emphasis>
-      </para>
+        <literallayout>
+Usage: <literal>spam</literal> <emphasis>pattern</emphasis> <emphasis>format </emphasis>
+Usage: <literal>nospam</literal> <emphasis>pattern</emphasis>
+        </literallayout>
+        </para>
       
       <para>
         Mutt-ng has generalized support for external spam-scoring filters.
@@ -5071,28 +5030,16 @@ spam "^From: .*MAILER-DAEMON"       "999"</screen>
     </sect1>
     
     <sect1 id="set">
-      <title>Setting variables  </title>
+      <title>Setting variables</title>
       
       <para>
-        Usage: <literal>set</literal> &lsqb;no&verbar;inv&rsqb;<emphasis>
-          variable
-        </emphasis>
-        &lsqb;=<emphasis>value</emphasis>&rsqb; &lsqb; <emphasis>variable</emphasis> ... &rsqb;
-        
-        Usage: <literal>toggle</literal> <emphasis>variable</emphasis> &lsqb;<emphasis>
-          variable
-        </emphasis>
-        ... &rsqb;
-        
-        Usage: <literal>unset</literal> <emphasis>variable</emphasis> &lsqb;<emphasis>
-          variable
-        </emphasis>
-        ... &rsqb;
-        
-        Usage: <literal>reset</literal> <emphasis>variable</emphasis> &lsqb;<emphasis>
-          variable
-        </emphasis>
-        ... &rsqb;
+        <literallayout>
+Usage: <literal>set</literal> &lsqb;no&verbar;inv&rsqb;<emphasis>variable</emphasis>&lsqb;=<emphasis>value</emphasis>&rsqb; &lsqb; <emphasis>variable</emphasis> ... &rsqb;
+Usage: <literal>toggle</literal> <emphasis>variable</emphasis> &lsqb;<emphasis>variable</emphasis>... &rsqb;
+Usage: <literal>unset</literal> <emphasis>variable</emphasis> &lsqb;<emphasis>variable</emphasis>... &rsqb;
+Usage: <literal>reset</literal> <emphasis>variable</emphasis> &lsqb;<emphasis>variable</emphasis>... &rsqb;
+      </literallayout>
+
       </para>
       
       <para>
@@ -5208,13 +5155,12 @@ set ?allow_8bit</screen>
     </sect1>
     
     <sect1 id="source">
-      <title>Reading initialization commands from another file  </title>
+      <title>Reading initialization commands from another file</title>
       
       <para>
-        Usage: <literal>source</literal> <emphasis>filename</emphasis> &lsqb; <emphasis>
-          filename
-        </emphasis>
-        ... &rsqb;
+        <literallayout>
+Usage: <literal>source</literal> <emphasis>filename</emphasis> &lsqb; <emphasis>filename</emphasis>... &rsqb;
+        </literallayout>
       </para>
       
       <para>
@@ -5247,11 +5193,13 @@ set ?allow_8bit</screen>
     </sect1>
     
     <sect1 id="unhook">
-      <title>Removing hooks  </title>
+      <title>Removing hooks</title>
       
       <para>
-        Usage: <literal>unhook</literal> &lsqb; * &verbar; <emphasis>hook-type</emphasis> &rsqb;
-      </para>
+        <literallayout>
+Usage: <literal>unhook</literal> &lsqb; * &verbar; <emphasis>hook-type</emphasis> &rsqb;
+        </literallayout>
+        </para>
       
       <para>
         This command permits you to flush hooks you have previously defined.
@@ -5266,11 +5214,11 @@ set ?allow_8bit</screen>
       
     </sect1>
     
-    <sect1 id="sect:sharingsetups">
-      <title>Sharing Setups      </title>
+    <sect1 id="share">
+      <title>Sharing Setups</title>
       
-      <sect2>
-        <title>Character Sets      </title>
+      <sect2 id="share-charset">
+        <title>Character Sets</title>
         
         <para>
           As users may run mutt-ng on different systems, the configuration
@@ -5319,8 +5267,8 @@ set config_charset = "..."</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Modularization        </title>
+      <sect2 id="share-modularization">
+        <title>Modularization</title>
         
         <para>
           ``Modularization'' means to divide the setup into several files
@@ -5340,8 +5288,8 @@ set config_charset = "..."</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Conditional parts      </title>
+      <sect2 id="share-conditional">
+        <title>Conditional parts</title>
         
         <para>
           When using a configuration on different systems, the user may not
@@ -5507,8 +5455,8 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
       
     </sect1>
     
-    <sect1>
-      <title>Obsolete Variables  </title>
+    <sect1 id="vars-obsolete">
+      <title>Obsolete Variables</title>
       
       <para>
         In the process of ensuring and creating more consistency, many
@@ -5528,16 +5476,17 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
     </sect1>
     
   </chapter>
+  <!--}}}-->
   
-  <chapter>
-    <title>Advanced Usage  </title>
+  <chapter id="advanced-usage"> <!--{{{-->
+    <title>Advanced Usage</title>
     
-    <sect1 id="regexp">
-      <title>Regular Expressions  </title>
+    <sect1 id="advanced-regexp">
+      <title>Regular Expressions</title>
       
       <para>
         All string patterns in Mutt-ng including those in more complex
-        <link linkend="patterns">patterns</link> must be specified
+        <link linkend="tab-patterns">patterns</link> must be specified
         using regular expressions (regexp) in the ``POSIX extended'' syntax
         (which
         is more or less the syntax used by egrep and GNU awk).  For your
@@ -5561,7 +5510,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
         Note that the regular expression can be enclosed/delimited by either
         &quot;
         or ' which is useful if the regular expression includes a white-space
-        character.  See <link linkend="muttrc-syntax">muttrc-syntax</link>
+        character.  See <link linkend="configuration-syntax">muttrc-syntax</link>
         for more information on &quot; and ' delimiter processing.  To match a
         literal &quot; or ' you must preface it with \ (backslash).
       </para>
@@ -5952,27 +5901,27 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
       
     </sect1>
     
-    <sect1>
-      <title>Patterns  </title>
+    <sect1 id="advanced-patterns">
+      <title>Patterns</title>
       
       <para>
         Mutt-ng's pattern language provides a simple yet effective way to
         set up rules to match messages, e.g. for operations like tagging and
         scoring. A pattern consists of one or more sub-pattern, which can be
         logically grouped, ORed, and negated. For a complete listing of
-        these patterns, please refer to table <link linkend="patterns">patterns</link> in the Reference chapter.
+        these patterns, please refer to table <link linkend="tab-patterns">patterns</link> in the Reference chapter.
       </para>
       
       <para>
         It must be noted that in this table, <literal>EXPR</literal> is
         a regular expression. For ranges, the forms
         <literal>&lt;[MAX]</literal>, <literal>&gt;&#62;[MIN]</literal>,
-        <literal> [MIN]- </literal> and <literal>-[MAX]</literal> are
+        <literal> [MIN]-</literal> and <literal>-[MAX]</literal> are
         also possible.
       </para>
       
-      <sect2>
-        <title>Complex Patterns </title>
+      <sect2 id="patterns-complex">
+        <title>Complex Patterns</title>
         
         <para>
           It is possible to combine several sub-patterns to a more complex
@@ -6021,8 +5970,8 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Patterns and Dates </title>
+      <sect2 sect="patterns-dates">
+        <title>Patterns and Dates</title>
         
         <para>
           When using dates in patterns, the dates must be specified in a
@@ -6089,11 +6038,11 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</screen>
       
     </sect1>
     
-    <sect1>
-      <title>Format Strings      </title>
+    <sect1 id="formatstrings">
+      <title>Format Strings</title>
       
-      <sect2>
-        <title>Introduction        </title>
+      <sect2 id="formatstrings-intro">
+        <title>Introduction</title>
         
         <para>
           The so called <emphasis>Format Strings</emphasis> offer great
@@ -6246,8 +6195,8 @@ Mutt-ng 1.5.9i on mailhost: Inbox: ...</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Conditional Expansion        </title>
+      <sect2 id="formatstrings-conditional">
+        <title>Conditional Expansion</title>
         
         <para>
           To only print the number of messages if there are new messages in
@@ -6368,8 +6317,8 @@ set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages ...</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Modifications and Padding        </title>
+      <sect2 id="formatstrings-padding">
+        <title>Modifications and Padding</title>
         
         <para>
           Besides the information given so far, there're even more features of
@@ -6482,8 +6431,8 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&#62; (%v on %h)"</screen>
       
     </sect1>
     
-    <sect1>
-      <title>Using Tags  </title>
+    <sect1 id="using-tags">
+      <title>Using Tags</title>
       
       <para>
         Sometimes it is desirable to perform an operation on a group of
@@ -6493,7 +6442,7 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&#62; (%v on %h)"</screen>
         matching a pattern, use the tag-pattern function, which is bound to
         ``shift-T'' by default.  Or you can select individual messages by
         hand using the ``tag-message'' function, which is bound to ``t'' by
-        default.  See <link linkend="patterns">patterns</link> for Mutt-ng's
+        default.  See <link linkend="tab-patterns">patterns</link> for Mutt-ng's
         pattern
         matching syntax.
       </para>
@@ -6528,7 +6477,7 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&#62; (%v on %h)"</screen>
     </sect1>
     
     <sect1 id="hooks">
-      <title>Using Hooks  </title>
+      <title>Using Hooks</title>
       
       <para>
         A <emphasis>hook</emphasis> is a concept borrowed from the EMACS editor
@@ -6540,8 +6489,8 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&#62; (%v on %h)"</screen>
         reading, or to whom you are sending mail.  In the Mutt-ng world, a <emphasis>
           hook
         </emphasis>
-        consists of a <link linkend="regexp">regexp</link> or
-        <link linkend="patterns">patterns</link> along with a
+        consists of a <link linkend="advanced-regexp">regexp</link> or
+        <link linkend="tab-patterns">patterns</link> along with a
         configuration option/command.  See
         
         <itemizedlist>
@@ -6621,14 +6570,14 @@ send-hook ~C'^b@b\.b$' my_hdr from: c@c.c</screen>
             fcc-hook,message-hook
           </literal>
           )are evaluated in a slightly different manner.  For the other
-          types of hooks, a <link linkend="regexp">regexp</link> is
+          types of hooks, a <link linkend="advanced-regexp">regexp</link> is
           sufficient.  But in dealing with messages a finer grain of control is
           needed for matching since for different purposes you want to match
           different criteria.
         </para>
         
         <para>
-          Mutt-ng allows the use of the <link linkend="patterns">patterns</link>
+          Mutt-ng allows the use of the <link linkend="tab-patterns">patterns</link>
           language for matching messages in hook commands.  This works in
           exactly the same way as it would when <emphasis>limiting</emphasis>
           or<emphasis>searching</emphasis> the mailbox, except that you are
@@ -6675,7 +6624,7 @@ send-hook '~t ^me@cs\.hmc\.edu$' 'my_hdr From: Mutt-ng User &#60;user@host&#62;'
     </sect1>
     
     <sect1 id="sidebar">
-      <title>Using the sidebar  </title>
+      <title>Using the sidebar</title>
       
       <para>
         The sidebar, a feature specific to Mutt-ng, allows you to use a mailbox
@@ -6727,12 +6676,12 @@ color sidebar white black</screen>
             </row>
           </thead>
           <tbody>
-            <row><entry><code>none</code></entry><entry><code>sidebar-scroll-up    </code></entry><entry>Scrolls the mailbox list up 1 page</entry></row>
-            <row><entry><code>none</code></entry><entry><code>sidebar-scroll-down </code></entry><entry>Scrolls the mailbox list down 1 page</entry></row>
-            <row><entry><code>none</code></entry><entry><code>sidebar-next       </code></entry><entry>Highlights the next mailbox</entry></row>
-            <row><entry><code>none</code></entry><entry><code>sidebar-next-new  </code></entry><entry>Highlights the next mailbox with new mail</entry></row>
-            <row><entry><code>none</code></entry><entry><code>sidebar-previous  </code></entry><entry>Highlights the previous mailbox</entry></row>
-            <row><entry><code>none</code></entry><entry><code>sidebar-open      </code></entry><entry>Opens the currently highlighted mailbox</entry></row>
+            <row><entry><literal>none</literal></entry><entry><literal>sidebar-scroll-up    </literal></entry><entry>Scrolls the mailbox list up 1 page</entry></row>
+            <row><entry><literal>none</literal></entry><entry><literal>sidebar-scroll-down </literal></entry><entry>Scrolls the mailbox list down 1 page</entry></row>
+            <row><entry><literal>none</literal></entry><entry><literal>sidebar-next       </literal></entry><entry>Highlights the next mailbox</entry></row>
+            <row><entry><literal>none</literal></entry><entry><literal>sidebar-next-new  </literal></entry><entry>Highlights the next mailbox with new mail</entry></row>
+            <row><entry><literal>none</literal></entry><entry><literal>sidebar-previous  </literal></entry><entry>Highlights the previous mailbox</entry></row>
+            <row><entry><literal>none</literal></entry><entry><literal>sidebar-open      </literal></entry><entry>Opens the currently highlighted mailbox</entry></row>
           </tbody>
         </tgroup>
       </table>
@@ -6767,7 +6716,7 @@ macro pager B ':toggle sidebar_visible^M'</screen>
     </sect1>
     
     <sect1 id="query">
-      <title>External Address Queries  </title>
+      <title>External Address Queries</title>
       
       <para>
         Mutt-ng supports connecting to external directory databases such as
@@ -6839,8 +6788,8 @@ roessler@guug.de        Thomas Roessler mutt pgp</screen>
       
     </sect1>
     
-    <sect1>
-      <title>Mailbox Formats  </title>
+    <sect1 id="mailbox-formats">
+      <title>Mailbox Formats</title>
       
       <para>
         Mutt-ng supports reading and writing of four different mailbox formats:
@@ -6922,7 +6871,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
     </sect1>
     
     <sect1 id="shortcuts">
-      <title>Mailbox Shortcuts  </title>
+      <title>Mailbox Shortcuts</title>
       
       <para>
         There are a number of built in shortcuts which refer to specific
@@ -7000,7 +6949,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
     </sect1>
     
     <sect1 id="using-lists">
-      <title>Handling Mailing Lists  </title>
+      <title>Handling Mailing Lists</title>
       
       <para>
         Mutt-ng has a few configuration options that make dealing with large
@@ -7125,8 +7074,8 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
       
     </sect1>
     
-    <sect1>
-      <title>Editing threads  </title>
+    <sect1 id="editing-threads">
+      <title>Editing threads</title>
       
       <para>
         Mutt-ng has the ability to dynamically restructure threads that are
@@ -7136,7 +7085,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         annoyances which make it hard to follow a discussion.
       </para>
       
-      <sect2>
+      <sect2 id="editing-threads-link">
         <title>Linking threads</title>
         
         <para>
@@ -7161,7 +7110,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         
       </sect2>
       
-      <sect2>
+      <sect2 id="editing-threads-break">
         <title>Breaking threads</title>
         
         <para>
@@ -7184,7 +7133,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
     </sect1>
     
     <sect1 id="dsn">
-      <title>Delivery Status Notification (DSN) Support  </title>
+      <title>Delivery Status Notification (DSN) Support</title>
       
       <para>
         RFC1894 defines a set of MIME content types for relaying information
@@ -7260,8 +7209,8 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
       
     </sect1>
     
-    <sect1>
-      <title>POP3 Support (OPTIONAL)  </title>
+    <sect1 id="pop3">
+      <title>POP3 Support (OPTIONAL)</title>
       
       <para>
         If Mutt-ng was compiled with POP3 support (by running the <emphasis>
@@ -7334,8 +7283,8 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
       
     </sect1>
     
-    <sect1>
-      <title>IMAP Support (OPTIONAL)  </title>
+    <sect1 id="imap">
+      <title>IMAP Support (OPTIONAL)</title>
       
       <para>
         If Mutt-ng was compiled with IMAP support (by running the <emphasis>
@@ -7417,7 +7366,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         selects the same folder.
       </para>
       
-      <sect2>
+      <sect2 id="imap-browser">
         <title>The Folder Browser</title>
         
         <para>
@@ -7470,7 +7419,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         
       </sect2>
       
-      <sect2>
+      <sect2 id="imap-auth">
         <title>Authentication</title>
         
         <para>
@@ -7557,8 +7506,8 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
       
     </sect1>
     
-    <sect1 id="reading-news">
-      <title>NNTP Support (OPTIONAL)  </title>
+    <sect1 id="nntp">
+      <title>NNTP Support (OPTIONAL)</title>
       
       <para>
         If compiled with ``--enable-nntp'' option, Mutt-ng can read news from
@@ -7579,8 +7528,8 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</screen>
         maildir/IMAP.
       </para>
       
-      <sect2>
-        <title>Again: Scoring    </title>
+      <sect2 id="nntp-scoring">
+        <title>Again: Scoring</title>
         
         <para>
           Especially for Usenet, people often ask for advanced filtering
@@ -7674,8 +7623,8 @@ score !~* =42</screen>
       
     </sect1>
     
-    <sect1>
-      <title>SMTP Support (OPTIONAL)  </title>
+    <sect1 id="smtp">
+      <title>SMTP Support (OPTIONAL)</title>
       
       <para>
         Mutt-ng can be built using a library called ``libESMTP'' which
@@ -7732,7 +7681,7 @@ score !~* =42</screen>
     </sect1>
     
     <sect1 id="account-hook">
-      <title>Managing multiple IMAP/POP/NNTP accounts (OPTIONAL)  </title>
+      <title>Managing multiple IMAP/POP/NNTP accounts (OPTIONAL)</title>
       
       <para>
         If you happen to have accounts on multiple IMAP and/or POP servers,
@@ -7763,7 +7712,7 @@ account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"'</screen>
     </sect1>
     
     <sect1 id="urlview">
-      <title>Start a WWW Browser on URLs (EXTERNAL)  </title>
+      <title>Start a WWW Browser on URLs (EXTERNAL)</title>
       
       <para>
         If a message contains URLs (<emphasis>unified resource locator</emphasis> = address in the
@@ -7787,8 +7736,8 @@ macro pager \cb |urlview\n</screen>
       
     </sect1>
     
-    <sect1>
-      <title>Compressed folders Support (OPTIONAL)  </title>
+    <sect1 id="compressed-folders">
+      <title>Compressed folders Support (OPTIONAL)</title>
       
       <para>
         If Mutt-ng was compiled with compressed folders support (by running the
@@ -7870,8 +7819,9 @@ append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </screen>
         <title>Open a compressed mailbox for reading</title>
         
         <para>
-          Usage: <literal>open-hook</literal> <emphasis>regexp</emphasis>
-          &quot;<emphasis>command</emphasis>&quot;
+          <literallayout>
+Usage: <literal>open-hook</literal> <emphasis>regexp</emphasis> &quot;<emphasis>command</emphasis>&quot;
+          </literallayout>
         </para>
         
         <para>
@@ -7926,8 +7876,9 @@ open-hook \\.gz$ "gzip -cd %f &#62; %t"
         <title>Write a compressed mailbox</title>
         
         <para>
-          Usage: <literal>close-hook</literal> <emphasis>regexp</emphasis>
-          &quot;<emphasis>command</emphasis>&quot;
+          <literallayout>
+Usage: <literal>close-hook</literal> <emphasis>regexp</emphasis>&quot;<emphasis>command</emphasis>&quot;
+        </literallayout>
         </para>
         
         <para>
@@ -7986,8 +7937,9 @@ close-hook \\.gz$ "gzip -c %t &#62; %f"</screen>
         <title>Append a message to a compressed mailbox</title>
         
         <para>
-          Usage: <literal>append-hook</literal> <emphasis>regexp</emphasis>
-          &quot;<emphasis>command</emphasis>&quot;
+          <literallayout>
+Usage: <literal>append-hook</literal> <emphasis>regexp</emphasis>&quot;<emphasis>command</emphasis>&quot;
+        </literallayout>
         </para>
         
         <para>
@@ -8053,7 +8005,7 @@ append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </screen>
         
       </sect2>
       
-      <sect2>
+      <sect2 id="encrypted-folders">
         <title>Encrypted folders</title>
         
         <para>
@@ -8096,9 +8048,10 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &#60; %t &#62; %f"
     </sect1>
     
   </chapter>
+  <!--}}}-->
   
-  <chapter>
-    <title>Mutt-ng's MIME Support  </title>
+  <chapter id="mime-support"> <!--{{{-->
+    <title>Mutt-ng's MIME Support</title>
     
     <para>
       Quite a bit of effort has been made to make Mutt-ng the premier text-mode
@@ -8113,8 +8066,8 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &#60; %t &#62; %f"
       the external commands to use for handling specific MIME types.
     </para>
     
-    <sect1>
-      <title>Using MIME in Mutt  </title>
+    <sect1 id="mime">
+      <title>Using MIME in Mutt</title>
       
       <para>
         There are three areas/menus in Mutt-ng which deal with MIME, they are
@@ -8123,7 +8076,7 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &#60; %t &#62; %f"
         menu.
       </para>
       
-      <sect2>
+      <sect2 id="mime-view">
         <title>Viewing MIME messages in the pager</title>
         
         <para>
@@ -8247,7 +8200,7 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &#60; %t &#62; %f"
       
     </sect1>
     
-    <sect1>
+    <sect1 id="mime-types">
       <title>
         MIME Type configuration with <literal>mime.types</literal>  
       </title>
@@ -8313,7 +8266,7 @@ audio/x-aiff                    aif aifc aiff</screen>
       
     </sect1>
     
-    <sect1>
+    <sect1 id="mime-mailcap">
       <title>
         MIME Viewer configuration with <literal>mailcap</literal>  
       </title>
@@ -8346,7 +8299,7 @@ ${HOME}/.mailcap:/usr/local/share/mutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/et
         entries.
       </para>
       
-      <sect2>
+      <sect2 id="mime-mailcap-basics">
         <title>The Basics of the mailcap file</title>
         
         <para>
@@ -8374,7 +8327,7 @@ ${HOME}/.mailcap:/usr/local/share/mutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/et
           The content type is specified in the MIME standard type/subtype
           method.
           For example,
-          <literal>text/plain, text/html, image/gif, </literal>
+          <literal>text/plain, text/html, image/gif,</literal>
           etc.  In addition, the mailcap format includes two formats for
           wildcards, one using the special '*' subtype, the other is the
           implicit
@@ -8456,7 +8409,7 @@ text/*; more</screen>
         
       </sect2>
       
-      <sect2>
+      <sect2 id="mime-mailcap-security">
         <title>Secure use of mailcap</title>
         
         <para>
@@ -8510,10 +8463,10 @@ text/test-mailcap-bug; cat %s; copiousoutput; test=charset=%{charset} \
         
       </sect2>
       
-      <sect2>
+      <sect2 id="mime-mailcap-advanced">
         <title>Advanced mailcap Usage</title>
         
-        <sect3>
+        <sect3 id="mime-mailcap-advanced-fields">
           <title>Optional Fields</title>
           
           <para>
@@ -8687,7 +8640,7 @@ text/html; lynx %s</screen>
           
         </sect3>
         
-        <sect3>
+        <sect3 id="mime-mailcap-advanced-searchorder">
           <title>Search Order</title>
           
           <para>
@@ -8740,7 +8693,7 @@ text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput</screen>
           
         </sect3>
         
-        <sect3>
+        <sect3 id="mime-mailcap-advanced-expansion">
           <title>Command Expansion</title>
           
           <para>
@@ -8825,7 +8778,7 @@ Content-Type: text/plain; charset=iso-8859-1</screen>
         
       </sect2>
       
-      <sect2>
+      <sect2 id="mime-mailcap-examples">
         <title>Example mailcap files</title>
         
         <para>
@@ -8893,7 +8846,7 @@ application/ms-excel; open.pl %s</screen>
     </sect1>
     
     <sect1 id="auto-view">
-      <title>MIME Autoview  </title>
+      <title>MIME Autoview</title>
       
       <para>
         In addition to explicitly telling Mutt-ng to view an attachment with
@@ -8952,7 +8905,7 @@ application/postscript; ps2ascii %s; copiousoutput</screen>
     </sect1>
     
     <sect1 id="alternative-order">
-      <title>MIME Multipart/Alternative  </title>
+      <title>MIME Multipart/Alternative</title>
       
       <para>
         Mutt-ng has some heuristics for determining which attachment of a
@@ -8988,7 +8941,7 @@ application/postscript image/*</screen>
     </sect1>
     
     <sect1 id="mime-lookup">
-      <title>MIME Lookup  </title>
+      <title>MIME Lookup</title>
       
       <para>
         Mutt-ng's mime&lowbar;lookup list specifies a list of mime-types that
@@ -9030,9 +8983,10 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</screen>
     </sect1>
     
   </chapter>
+  <!--}}}-->
   
-  <chapter>
-    <title>Security Considerations    </title>
+  <chapter id="security"> <!--{{{-->
+    <title>Security Considerations</title>
     
     <para>
       First of all, mutt-ng contains no security holes included by
@@ -9058,8 +9012,8 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</screen>
       of setup, please read this chapter carefully.
     </para>
     
-    <sect1>
-      <title>Passwords      </title>
+    <sect1 id="security-passwords">
+      <title>Passwords</title>
       
       <para>
         Although mutt-ng can be told the various passwords for accounts,
@@ -9073,8 +9027,8 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</screen>
       
     </sect1>
     
-    <sect1>
-      <title>Temporary Files      </title>
+    <sect1 id="security-tempfiles">
+      <title>Temporary Files</title>
       
       <para>
         Mutt-ng uses many temporary files for viewing messages, verifying
@@ -9087,11 +9041,11 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</screen>
       
     </sect1>
     
-    <sect1>
-      <title>Information Leaks    </title>
+    <sect1 id="security-leaks">
+      <title>Information Leaks</title>
       
-      <sect2>
-        <title>Message-ID: headers      </title>
+      <sect2 id="security-leaks-mid">
+        <title>Message-ID: headers</title>
         
         <para>
           In the default configuration, mutt-ng will leak some information
@@ -9109,8 +9063,8 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</screen>
         
       </sect2>
       
-      <sect2>
-        <title>mailto:-style links      </title>
+      <sect2 id="security-leaks-mailto">
+        <title>mailto:-style links</title>
         
         <para>
           As mutt-ng be can be set up to be the mail client to handle
@@ -9180,8 +9134,8 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       
     </sect1>
     
-    <sect1>
-      <title>External applications      </title>
+    <sect1 id="security-external">
+      <title>External applications</title>
       
       <para>
         Mutt-ng in many places has to rely on external applications or
@@ -9189,8 +9143,8 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
         applications.
       </para>
       
-      <sect2>
-        <title>mailcap        </title>
+      <sect2 id="security-external-mailcap">
+        <title>mailcap</title>
         
         <para>
           One of these is the <literal>mailcap</literal> mechanism as defined
@@ -9254,8 +9208,8 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
         
       </sect2>
       
-      <sect2>
-        <title>Other        </title>
+      <sect2 id="security-external-other">
+        <title>Other</title>
         
         <para>
           Besides the mailcap mechanism, mutt-ng uses a number of other
@@ -9279,12 +9233,13 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
     </sect1>
     
   </chapter>
+  <!--}}}-->
   
-  <chapter>
-    <title>Reference  </title>
+  <chapter id="reference"> <!--{{{-->
+    <title>Reference</title>
     
     <sect1 id="commandline">
-      <title>Command line options  </title>
+      <title>Command line options</title>
       
       <para>
         Running <literal>mutt</literal> with no arguments will make Mutt-ng
@@ -9305,29 +9260,29 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
             </row>
           </thead>
           <tbody>
-            <row><entry><code>-A   </code></entry><entry>expand an alias</entry></row>
-            <row><entry><code>-a  </code></entry><entry>attach a file to a message</entry></row>
-            <row><entry><code>-b  </code></entry><entry>specify a blind carbon-copy (BCC) address</entry></row>
-            <row><entry><code>-c   </code></entry><entry>specify a carbon-copy (Cc) address</entry></row>
-            <row><entry><code>-e  </code></entry><entry>specify a config command to be run after initialization files are read</entry></row>
-            <row><entry><code>-f   </code></entry><entry>specify a mailbox to load</entry></row>
-            <row><entry><code>-F   </code></entry><entry>specify an alternate file to read initialization commands</entry></row>
-            <row><entry><code>-h   </code></entry><entry>print help on command line options</entry></row>
-            <row><entry><code>-H   </code></entry><entry>specify a draft file from which to read a header and body</entry></row>
-            <row><entry><code>-i   </code></entry><entry>specify a file to include in a message composition</entry></row>
-            <row><entry><code>-m   </code></entry><entry>specify a default mailbox type</entry></row>
-            <row><entry><code>-n   </code></entry><entry>do not read the system Muttngrc</entry></row>
-            <row><entry><code>-p   </code></entry><entry>recall a postponed message</entry></row>
-            <row><entry><code>-Q   </code></entry><entry>query a configuration variable</entry></row>
-            <row><entry><code>-R   </code></entry><entry>open mailbox in read-only mode</entry></row>
-            <row><entry><code>-s   </code></entry><entry>specify a subject (enclose in quotes if it contains spaces)</entry></row>
-            <row><entry><code>-t    </code></entry><entry>dump the value of all variables to stdout</entry></row>
-            <row><entry><code>-T   </code></entry><entry>dump the value of all changed variables to stdout</entry></row>
-            <row><entry><code>-v   </code></entry><entry>show version number and compile-time definitions</entry></row>
-            <row><entry><code>-x   </code></entry><entry>simulate the mailx(1) compose mode</entry></row>
-            <row><entry><code>-y    </code></entry><entry>show a menu containing the files specified by the mailboxes command</entry></row>
-            <row><entry><code>-z    </code></entry><entry>exit immediately if there are no messages in the mailbox</entry></row>
-            <row><entry><code>-Z   </code></entry><entry>open the first folder with new message,exit immediately if none</entry></row>
+            <row><entry><literal>-A   </literal></entry><entry>expand an alias</entry></row>
+            <row><entry><literal>-a  </literal></entry><entry>attach a file to a message</entry></row>
+            <row><entry><literal>-b  </literal></entry><entry>specify a blind carbon-copy (BCC) address</entry></row>
+            <row><entry><literal>-c   </literal></entry><entry>specify a carbon-copy (Cc) address</entry></row>
+            <row><entry><literal>-e  </literal></entry><entry>specify a config command to be run after initialization files are read</entry></row>
+            <row><entry><literal>-f   </literal></entry><entry>specify a mailbox to load</entry></row>
+            <row><entry><literal>-F   </literal></entry><entry>specify an alternate file to read initialization commands</entry></row>
+            <row><entry><literal>-h   </literal></entry><entry>print help on command line options</entry></row>
+            <row><entry><literal>-H   </literal></entry><entry>specify a draft file from which to read a header and body</entry></row>
+            <row><entry><literal>-i   </literal></entry><entry>specify a file to include in a message composition</entry></row>
+            <row><entry><literal>-m   </literal></entry><entry>specify a default mailbox type</entry></row>
+            <row><entry><literal>-n   </literal></entry><entry>do not read the system Muttngrc</entry></row>
+            <row><entry><literal>-p   </literal></entry><entry>recall a postponed message</entry></row>
+            <row><entry><literal>-Q   </literal></entry><entry>query a configuration variable</entry></row>
+            <row><entry><literal>-R   </literal></entry><entry>open mailbox in read-only mode</entry></row>
+            <row><entry><literal>-s   </literal></entry><entry>specify a subject (enclose in quotes if it contains spaces)</entry></row>
+            <row><entry><literal>-t    </literal></entry><entry>dump the value of all variables to stdout</entry></row>
+            <row><entry><literal>-T   </literal></entry><entry>dump the value of all changed variables to stdout</entry></row>
+            <row><entry><literal>-v   </literal></entry><entry>show version number and compile-time definitions</entry></row>
+            <row><entry><literal>-x   </literal></entry><entry>simulate the mailx(1) compose mode</entry></row>
+            <row><entry><literal>-y    </literal></entry><entry>show a menu containing the files specified by the mailboxes command</entry></row>
+            <row><entry><literal>-z    </literal></entry><entry>exit immediately if there are no messages in the mailbox</entry></row>
+            <row><entry><literal>-Z   </literal></entry><entry>open the first folder with new message,exit immediately if none</entry></row>
           </tbody>
         </tgroup>
       </table>
@@ -9390,11 +9345,11 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
     </sect1>
     
     <sect1 id="patterns">
-      <title>Patterns  </title>
+      <title>Patterns</title>
 
       <para>
 
-        <table>
+        <table id="tab-patterns">
           <title>Patterns</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
@@ -9405,50 +9360,50 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
             </row>
           </thead>
           <tbody>
-            <row><entry><code>~A </code></entry><entry><code></code></entry><entry>all messages</entry></row>
-            <row><entry><code>~b </code></entry><entry><code>EXPR      </code></entry><entry>messages which contain EXPR in the message body</entry></row>
-            <row><entry><code>~B </code></entry><entry><code>EXPR        </code></entry><entry>messages which contain EXPR in the whole message</entry></row>
-            <row><entry><code>~c </code></entry><entry><code>EXPR       </code></entry><entry>messages carbon-copied to EXPR</entry></row>
-            <row><entry><code>~C </code></entry><entry><code>EXPR       </code></entry><entry>message is either to: or cc: EXPR</entry></row>
-            <row><entry><code>~D </code></entry><entry><code></code></entry><entry>deleted messages</entry></row>
-            <row><entry><code>~d </code></entry><entry><code>[MIN]-[MAX] </code></entry><entry>messages with ``date-sent'' in a Date range</entry></row>
-            <row><entry><code>~E </code></entry><entry><code></code></entry><entry>expired messages</entry></row>
-            <row><entry><code>~e </code></entry><entry><code>EXPR       </code></entry><entry>message which contains EXPR in the ``Sender'' field</entry></row>
-            <row><entry><code>~F </code></entry><entry><code></code></entry><entry>flagged messages</entry></row>
-            <row><entry><code>~f </code></entry><entry><code>EXPR       </code></entry><entry>messages originating from EXPR</entry></row>
-            <row><entry><code>~g </code></entry><entry><code></code></entry><entry>cryptographically signed messages</entry></row>
-            <row><entry><code>~G </code></entry><entry><code></code></entry><entry>cryptographically encrypted messages</entry></row>
-            <row><entry><code>~H </code></entry><entry><code>EXPR       </code></entry><entry>messages with a spam attribute matching EXPR</entry></row>
-            <row><entry><code>~h </code></entry><entry><code>EXPR       </code></entry><entry>messages which contain EXPR in the message header</entry></row>
-            <row><entry><code>~k </code></entry><entry><code></code></entry><entry>message contains PGP key material</entry></row>
-            <row><entry><code>~i </code></entry><entry><code>EXPR         </code></entry><entry>message which match ID in the ``Message-ID'' field</entry></row>
-            <row><entry><code>~L </code></entry><entry><code>EXPR       </code></entry><entry>message is either originated or received by EXPR</entry></row>
-            <row><entry><code>~l </code></entry><entry><code></code></entry><entry>message is addressed to a known mailing list</entry></row>
-            <row><entry><code>~m </code></entry><entry><code>[MIN]-[MAX] </code></entry><entry>message in the range MIN to MAX *)</entry></row>
-            <row><entry><code>~M </code></entry><entry><code></code></entry><entry>multipart messages</entry></row>
-            <row><entry><code>~n </code></entry><entry><code>[MIN]-[MAX] </code></entry><entry>messages with a score in the range MIN to MAX *)</entry></row>
-            <row><entry><code>~N </code></entry><entry><code></code></entry><entry>new messages</entry></row>
-            <row><entry><code>~O </code></entry><entry><code></code></entry><entry>old messages</entry></row>
-            <row><entry><code>~p </code></entry><entry><code></code></entry><entry>message is addressed to you (consults alternates)</entry></row>
-            <row><entry><code>~P </code></entry><entry><code></code></entry><entry>message is from you (consults alternates)</entry></row>
-            <row><entry><code>~Q </code></entry><entry><code></code></entry><entry>messages which have been replied to</entry></row>
-            <row><entry><code>~R </code></entry><entry><code></code></entry><entry>read messages</entry></row>
-            <row><entry><code>~r </code></entry><entry><code>[MIN]-[MAX] </code></entry><entry>messages with ``date-received'' in a Date range</entry></row>
-            <row><entry><code>~S </code></entry><entry><code></code></entry><entry>superseded messages</entry></row>
-            <row><entry><code>~s </code></entry><entry><code>EXPR    </code></entry><entry>messages having EXPR in the ``Subject'' field.</entry></row>
-            <row><entry><code>~T </code></entry><entry><code></code></entry><entry>tagged messages</entry></row>
-            <row><entry><code>~t </code></entry><entry><code>EXPR       </code></entry><entry>messages addressed to EXPR</entry></row>
-            <row><entry><code>~U </code></entry><entry><code></code></entry><entry>unread messages</entry></row>
-            <row><entry><code>~u </code></entry><entry><code></code></entry><entry>message is addressed to a subscribed mailing list</entry></row>
-            <row><entry><code>~v </code></entry><entry><code></code></entry><entry>message is part of a collapsed thread.</entry></row>
-            <row><entry><code>~V </code></entry><entry><code></code></entry><entry>cryptographically verified messages</entry></row>
-            <row><entry><code>~w </code></entry><entry><code>EXPR    </code></entry><entry>messages which contain EXPR in the `Newsgroups' field (if compiled with NNTP support)</entry></row>
-            <row><entry><code>~x </code></entry><entry><code>EXPR  </code></entry><entry>messages which contain EXPR in the `References' field</entry></row>
-            <row><entry><code>~y </code></entry><entry><code>EXPR        </code></entry><entry>messages which contain EXPR in the `X-Label' field</entry></row>
-            <row><entry><code>~z </code></entry><entry><code>[MIN]-[MAX] </code></entry><entry>messages with a size in the range MIN to MAX *)</entry></row>
-            <row><entry><code>~= </code></entry><entry><code></code></entry><entry>duplicated messages (see $duplicate_threads)</entry></row>
-            <row><entry><code>~$ </code></entry><entry><code></code></entry><entry>unreferenced messages (requires threaded view)</entry></row>
-            <row><entry><code>~* </code></entry><entry><code></code></entry><entry>``From'' contains realname and (syntactically) valid address (excluded are addresses matching against alternates or any alias)</entry></row>
+            <row><entry><literal>~A </literal></entry><entry><literal></literal></entry><entry>all messages</entry></row>
+            <row><entry><literal>~b </literal></entry><entry><literal>EXPR      </literal></entry><entry>messages which contain EXPR in the message body</entry></row>
+            <row><entry><literal>~B </literal></entry><entry><literal>EXPR        </literal></entry><entry>messages which contain EXPR in the whole message</entry></row>
+            <row><entry><literal>~c </literal></entry><entry><literal>EXPR       </literal></entry><entry>messages carbon-copied to EXPR</entry></row>
+            <row><entry><literal>~C </literal></entry><entry><literal>EXPR       </literal></entry><entry>message is either to: or cc: EXPR</entry></row>
+            <row><entry><literal>~D </literal></entry><entry><literal></literal></entry><entry>deleted messages</entry></row>
+            <row><entry><literal>~d </literal></entry><entry><literal>[MIN]-[MAX] </literal></entry><entry>messages with ``date-sent'' in a Date range</entry></row>
+            <row><entry><literal>~E </literal></entry><entry><literal></literal></entry><entry>expired messages</entry></row>
+            <row><entry><literal>~e </literal></entry><entry><literal>EXPR       </literal></entry><entry>message which contains EXPR in the ``Sender'' field</entry></row>
+            <row><entry><literal>~F </literal></entry><entry><literal></literal></entry><entry>flagged messages</entry></row>
+            <row><entry><literal>~f </literal></entry><entry><literal>EXPR       </literal></entry><entry>messages originating from EXPR</entry></row>
+            <row><entry><literal>~g </literal></entry><entry><literal></literal></entry><entry>cryptographically signed messages</entry></row>
+            <row><entry><literal>~G </literal></entry><entry><literal></literal></entry><entry>cryptographically encrypted messages</entry></row>
+            <row><entry><literal>~H </literal></entry><entry><literal>EXPR       </literal></entry><entry>messages with a spam attribute matching EXPR</entry></row>
+            <row><entry><literal>~h </literal></entry><entry><literal>EXPR       </literal></entry><entry>messages which contain EXPR in the message header</entry></row>
+            <row><entry><literal>~k </literal></entry><entry><literal></literal></entry><entry>message contains PGP key material</entry></row>
+            <row><entry><literal>~i </literal></entry><entry><literal>EXPR         </literal></entry><entry>message which match ID in the ``Message-ID'' field</entry></row>
+            <row><entry><literal>~L </literal></entry><entry><literal>EXPR       </literal></entry><entry>message is either originated or received by EXPR</entry></row>
+            <row><entry><literal>~l </literal></entry><entry><literal></literal></entry><entry>message is addressed to a known mailing list</entry></row>
+            <row><entry><literal>~m </literal></entry><entry><literal>[MIN]-[MAX] </literal></entry><entry>message in the range MIN to MAX *)</entry></row>
+            <row><entry><literal>~M </literal></entry><entry><literal></literal></entry><entry>multipart messages</entry></row>
+            <row><entry><literal>~n </literal></entry><entry><literal>[MIN]-[MAX] </literal></entry><entry>messages with a score in the range MIN to MAX *)</entry></row>
+            <row><entry><literal>~N </literal></entry><entry><literal></literal></entry><entry>new messages</entry></row>
+            <row><entry><literal>~O </literal></entry><entry><literal></literal></entry><entry>old messages</entry></row>
+            <row><entry><literal>~p </literal></entry><entry><literal></literal></entry><entry>message is addressed to you (consults alternates)</entry></row>
+            <row><entry><literal>~P </literal></entry><entry><literal></literal></entry><entry>message is from you (consults alternates)</entry></row>
+            <row><entry><literal>~Q </literal></entry><entry><literal></literal></entry><entry>messages which have been replied to</entry></row>
+            <row><entry><literal>~R </literal></entry><entry><literal></literal></entry><entry>read messages</entry></row>
+            <row><entry><literal>~r </literal></entry><entry><literal>[MIN]-[MAX] </literal></entry><entry>messages with ``date-received'' in a Date range</entry></row>
+            <row><entry><literal>~S </literal></entry><entry><literal></literal></entry><entry>superseded messages</entry></row>
+            <row><entry><literal>~s </literal></entry><entry><literal>EXPR    </literal></entry><entry>messages having EXPR in the ``Subject'' field.</entry></row>
+            <row><entry><literal>~T </literal></entry><entry><literal></literal></entry><entry>tagged messages</entry></row>
+            <row><entry><literal>~t </literal></entry><entry><literal>EXPR       </literal></entry><entry>messages addressed to EXPR</entry></row>
+            <row><entry><literal>~U </literal></entry><entry><literal></literal></entry><entry>unread messages</entry></row>
+            <row><entry><literal>~u </literal></entry><entry><literal></literal></entry><entry>message is addressed to a subscribed mailing list</entry></row>
+            <row><entry><literal>~v </literal></entry><entry><literal></literal></entry><entry>message is part of a collapsed thread.</entry></row>
+            <row><entry><literal>~V </literal></entry><entry><literal></literal></entry><entry>cryptographically verified messages</entry></row>
+            <row><entry><literal>~w </literal></entry><entry><literal>EXPR    </literal></entry><entry>messages which contain EXPR in the `Newsgroups' field (if compiled with NNTP support)</entry></row>
+            <row><entry><literal>~x </literal></entry><entry><literal>EXPR  </literal></entry><entry>messages which contain EXPR in the `References' field</entry></row>
+            <row><entry><literal>~y </literal></entry><entry><literal>EXPR        </literal></entry><entry>messages which contain EXPR in the `X-Label' field</entry></row>
+            <row><entry><literal>~z </literal></entry><entry><literal>[MIN]-[MAX] </literal></entry><entry>messages with a size in the range MIN to MAX *)</entry></row>
+            <row><entry><literal>~= </literal></entry><entry><literal></literal></entry><entry>duplicated messages (see $duplicate_threads)</entry></row>
+            <row><entry><literal>~$ </literal></entry><entry><literal></literal></entry><entry>unreferenced messages (requires threaded view)</entry></row>
+            <row><entry><literal>~* </literal></entry><entry><literal></literal></entry><entry>``From'' contains realname and (syntactically) valid address (excluded are addresses matching against alternates or any alias)</entry></row>
           </tbody>
         </tgroup>
       </table>
@@ -9456,7 +9411,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       
       <para>
         Where EXPR are 
-        <link linkend="regexp">regexp</link>.  Special attention has to be
+        <link linkend="advanced-regexp">regexp</link>.  Special attention has to be
         made when using regular expressions inside of patterns.  Specifically,
         Mutt-ng's parser for these patterns will strip one level of backslash
         (\),
@@ -9482,7 +9437,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
     </sect1>
     
     <sect1 id="commands">
-      <title>Configuration Commands  </title>
+      <title>Configuration Commands</title>
       
       <para>
         The following are the commands understood by mutt.
@@ -10041,47 +9996,47 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
             </row>
           </thead>
           <tbody>
-            <row><entry><code>edit_hdrs</code></entry><entry><code>edit_headers</code></entry></row>
-            <row><entry><code>forw_decode</code></entry><entry><code>forward_decode</code></entry></row>
-            <row><entry><code>forw_format</code></entry><entry><code>forward_format</code></entry></row>
-            <row><entry><code>forw_quote</code></entry><entry><code>forward_quote</code></entry></row>
-            <row><entry><code>hdr_format</code></entry><entry><code>index_format</code></entry></row>
-            <row><entry><code>indent_str</code></entry><entry><code>indent_string</code></entry></row>
-            <row><entry><code>mime_fwd</code></entry><entry><code>mime_forward</code></entry></row>
-            <row><entry><code>msg_format</code></entry><entry><code>message_format</code></entry></row>
-            <row><entry><code>pgp_autosign</code></entry><entry><code>crypt_autosign</code></entry></row>
-            <row><entry><code>pgp_autoencrypt</code></entry><entry><code>crypt_autoencrypt</code></entry></row>
-            <row><entry><code>pgp_replyencrypt</code></entry><entry><code>crypt_replyencrypt</code></entry></row>
-            <row><entry><code>pgp_replysign</code></entry><entry><code>crypt_replysign</code></entry></row>
-            <row><entry><code>pgp_replysignencrypted</code></entry><entry><code>crypt_replysignencrypted</code></entry></row>
-            <row><entry><code>pgp_verify_sig</code></entry><entry><code>crypt_verify_sig</code></entry></row>
-            <row><entry><code>pgp_create_traditional</code></entry><entry><code>pgp_autoinline</code></entry></row>
-            <row><entry><code>pgp_auto_traditional</code></entry><entry><code>pgp_replyinline</code></entry></row>
-            <row><entry><code>forw_decrypt</code></entry><entry><code>forward_decrypt</code></entry></row>
-            <row><entry><code>smime_sign_as</code></entry><entry><code>smime_default_key</code></entry></row>
-            <row><entry><code>post_indent_str</code></entry><entry><code>post_indent_string</code></entry></row>
-            <row><entry><code>print_cmd</code></entry><entry><code>print_command</code></entry></row>
-            <row><entry><code>shorten_hierarchy</code></entry><entry><code>sidebar_shorten_hierarchy</code></entry></row>
-            <row><entry><code>ask_followup_to</code></entry><entry><code>nntp_ask_followup_to</code></entry></row>
-            <row><entry><code>ask_x_comment_to</code></entry><entry><code>nntp_ask_x_comment_to</code></entry></row>
-            <row><entry><code>catchup_newsgroup</code></entry><entry><code>nntp_catchup</code></entry></row>
-            <row><entry><code>followup_to_poster</code></entry><entry><code>nntp_followup_to_poster</code></entry></row>
-            <row><entry><code>group_index_format</code></entry><entry><code>nntp_group_index_format</code></entry></row>
-            <row><entry><code>inews</code></entry><entry><code>nntp_inews</code></entry></row>
-            <row><entry><code>mime_subject</code></entry><entry><code>nntp_mime_subject</code></entry></row>
-            <row><entry><code>news_cache_dir</code></entry><entry><code>nntp_cache_dir</code></entry></row>
-            <row><entry><code>news_server</code></entry><entry><code>nntp_host</code></entry></row>
-            <row><entry><code>newsrc</code></entry><entry><code>nntp_newsrc</code></entry></row>
-            <row><entry><code>nntp_poll</code></entry><entry><code>nntp_mail_check</code></entry></row>
-            <row><entry><code>pop_checkinterval</code></entry><entry><code>pop_mail_check</code></entry></row>
-            <row><entry><code>post_moderated</code></entry><entry><code>nntp_post_moderated</code></entry></row>
-            <row><entry><code>save_unsubscribed</code></entry><entry><code>nntp_save_unsubscribed</code></entry></row>
-            <row><entry><code>show_new_news</code></entry><entry><code>nntp_show_new_news</code></entry></row>
-            <row><entry><code>show_only_unread</code></entry><entry><code>nntp_show_only_unread</code></entry></row>
-            <row><entry><code>x_comment_to</code></entry><entry><code>nntp_x_comment_to</code></entry></row>
-            <row><entry><code>smtp_auth_username</code></entry><entry><code>smtp_user</code></entry></row>
-            <row><entry><code>smtp_auth_password</code></entry><entry><code>smtp_pass</code></entry></row>
-            <row><entry><code>user_agent</code></entry><entry><code>agent_string</code></entry></row>
+            <row><entry><literal>edit_hdrs</literal></entry><entry><literal>edit_headers</literal></entry></row>
+            <row><entry><literal>forw_decode</literal></entry><entry><literal>forward_decode</literal></entry></row>
+            <row><entry><literal>forw_format</literal></entry><entry><literal>forward_format</literal></entry></row>
+            <row><entry><literal>forw_quote</literal></entry><entry><literal>forward_quote</literal></entry></row>
+            <row><entry><literal>hdr_format</literal></entry><entry><literal>index_format</literal></entry></row>
+            <row><entry><literal>indent_str</literal></entry><entry><literal>indent_string</literal></entry></row>
+            <row><entry><literal>mime_fwd</literal></entry><entry><literal>mime_forward</literal></entry></row>
+            <row><entry><literal>msg_format</literal></entry><entry><literal>message_format</literal></entry></row>
+            <row><entry><literal>pgp_autosign</literal></entry><entry><literal>crypt_autosign</literal></entry></row>
+            <row><entry><literal>pgp_autoencrypt</literal></entry><entry><literal>crypt_autoencrypt</literal></entry></row>
+            <row><entry><literal>pgp_replyencrypt</literal></entry><entry><literal>crypt_replyencrypt</literal></entry></row>
+            <row><entry><literal>pgp_replysign</literal></entry><entry><literal>crypt_replysign</literal></entry></row>
+            <row><entry><literal>pgp_replysignencrypted</literal></entry><entry><literal>crypt_replysignencrypted</literal></entry></row>
+            <row><entry><literal>pgp_verify_sig</literal></entry><entry><literal>crypt_verify_sig</literal></entry></row>
+            <row><entry><literal>pgp_create_traditional</literal></entry><entry><literal>pgp_autoinline</literal></entry></row>
+            <row><entry><literal>pgp_auto_traditional</literal></entry><entry><literal>pgp_replyinline</literal></entry></row>
+            <row><entry><literal>forw_decrypt</literal></entry><entry><literal>forward_decrypt</literal></entry></row>
+            <row><entry><literal>smime_sign_as</literal></entry><entry><literal>smime_default_key</literal></entry></row>
+            <row><entry><literal>post_indent_str</literal></entry><entry><literal>post_indent_string</literal></entry></row>
+            <row><entry><literal>print_cmd</literal></entry><entry><literal>print_command</literal></entry></row>
+            <row><entry><literal>shorten_hierarchy</literal></entry><entry><literal>sidebar_shorten_hierarchy</literal></entry></row>
+            <row><entry><literal>ask_followup_to</literal></entry><entry><literal>nntp_ask_followup_to</literal></entry></row>
+            <row><entry><literal>ask_x_comment_to</literal></entry><entry><literal>nntp_ask_x_comment_to</literal></entry></row>
+            <row><entry><literal>catchup_newsgroup</literal></entry><entry><literal>nntp_catchup</literal></entry></row>
+            <row><entry><literal>followup_to_poster</literal></entry><entry><literal>nntp_followup_to_poster</literal></entry></row>
+            <row><entry><literal>group_index_format</literal></entry><entry><literal>nntp_group_index_format</literal></entry></row>
+            <row><entry><literal>inews</literal></entry><entry><literal>nntp_inews</literal></entry></row>
+            <row><entry><literal>mime_subject</literal></entry><entry><literal>nntp_mime_subject</literal></entry></row>
+            <row><entry><literal>news_cache_dir</literal></entry><entry><literal>nntp_cache_dir</literal></entry></row>
+            <row><entry><literal>news_server</literal></entry><entry><literal>nntp_host</literal></entry></row>
+            <row><entry><literal>newsrc</literal></entry><entry><literal>nntp_newsrc</literal></entry></row>
+            <row><entry><literal>nntp_poll</literal></entry><entry><literal>nntp_mail_check</literal></entry></row>
+            <row><entry><literal>pop_checkinterval</literal></entry><entry><literal>pop_mail_check</literal></entry></row>
+            <row><entry><literal>post_moderated</literal></entry><entry><literal>nntp_post_moderated</literal></entry></row>
+            <row><entry><literal>save_unsubscribed</literal></entry><entry><literal>nntp_save_unsubscribed</literal></entry></row>
+            <row><entry><literal>show_new_news</literal></entry><entry><literal>nntp_show_new_news</literal></entry></row>
+            <row><entry><literal>show_only_unread</literal></entry><entry><literal>nntp_show_only_unread</literal></entry></row>
+            <row><entry><literal>x_comment_to</literal></entry><entry><literal>nntp_x_comment_to</literal></entry></row>
+            <row><entry><literal>smtp_auth_username</literal></entry><entry><literal>smtp_user</literal></entry></row>
+            <row><entry><literal>smtp_auth_password</literal></entry><entry><literal>smtp_pass</literal></entry></row>
+            <row><entry><literal>user_agent</literal></entry><entry><literal>agent_string</literal></entry></row>
           </tbody>
         </tgroup>
       </table>