lintian clean, removed the deprecated dh_clean -k

[software/mutt-debian.git] / doc / manual.xml.head

diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index b751aaf0ddcd48a35ce0fa3d940ac21f81cc05f9..012eaeb9afa761340e70ba0efc1bccf32e9a01d3 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -4,18 +4,18 @@
 <book>
 
 <bookinfo>
 <book>
 
 <bookinfo>

-  <title>The Mutt E-Mail Client</title>
-  <author>
-    <firstname>Michael</firstname><surname>Elkins</surname>
-    <email>me@cs.hmc.edu</email>
-  </author>
-  <releaseinfo>version @VERSION@</releaseinfo>
-
-  <abstract>
-    <para>
-    ``All mail clients suck.  This one just sucks less.'' -me, circa 1995
-    </para>
-  </abstract>
+<title>The Mutt E-Mail Client</title>
+<author>
+<firstname>Michael</firstname><surname>Elkins</surname>
+<email>me@cs.hmc.edu</email>
+</author>
+<releaseinfo>version @VERSION@</releaseinfo>
+
+<abstract>
+<para>
+<quote>All mail clients suck.  This one just sucks less.</quote> -me, circa 1995
+</para>
+</abstract>

 </bookinfo>
 
 <chapter id="intro">
 </bookinfo>
 
 <chapter id="intro">


@@ -33,10 +33,8 @@ groups of messages.
 <title>Mutt Home Page</title>
 
 <para>
 <title>Mutt Home Page</title>
 
 <para>

-<ulink
-url="http://www.mutt.org/"
->http://www.mutt.org/</ulink
->
+The official homepage can be found at
+<ulink url="http://www.mutt.org/">http://www.mutt.org/</ulink>.

 </para>
 
 </sect1>
 </para>
 
 </sect1>


@@ -50,8 +48,6 @@ word <emphasis>subscribe</emphasis> in the body to
 <literal>list-name</literal><emphasis>-request</emphasis><literal>@mutt.org</literal>.
 </para>
 
 <literal>list-name</literal><emphasis>-request</emphasis><literal>@mutt.org</literal>.
 </para>
 

-<para>
-

 <itemizedlist>
 <listitem>
 
 <itemizedlist>
 <listitem>
 


@@ -74,13 +70,14 @@ word <emphasis>subscribe</emphasis> in the body to
 
 </itemizedlist>
 
 
 </itemizedlist>
 

-</para>
-
+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> all messages posted to <emphasis>mutt-announce</emphasis> are automatically
-forwarded to <emphasis>mutt-users</emphasis>, so you do not need to be subscribed to both
-lists.
+All messages posted to
+<emphasis>mutt-announce</emphasis> are automatically forwarded to
+<emphasis>mutt-users</emphasis>, so you do not need to be subscribed to
+both lists.

 </para>
 </para>

+</note>

 
 </sect1>
 
 
 </sect1>
 


@@ -88,50 +85,127 @@ lists.
 <title>Software Distribution Sites</title>
 
 <para>
 <title>Software Distribution Sites</title>
 
 <para>

+Mutt releases can be downloaded from
+<ulink url="ftp://ftp.mutt.org/mutt/">ftp://ftp.mutt.org/mutt/</ulink>.
+For a list of mirror sites, please refer to
+<ulink url="http://www.mutt.org/download.html">http://www.mutt.org/download.html</ulink>.
+</para>

 
 

-<itemizedlist>
-<listitem>
+</sect1>
+
+<sect1 id="irc">
+<title>Mutt online resources</title>
+
+<variablelist>

 
 

+<varlistentry>
+<term>Bug Tracking System</term>
+<listitem>

 <para>
 <para>

-<ulink
-url="ftp://ftp.mutt.org/mutt/"
->ftp://ftp.mutt.org/mutt/</ulink
->
+The official mutt bug tracking system can be found at
+<ulink url="http://dev.mutt.org/">http://dev.mutt.org/</ulink>

 </para>
 </listitem>
 </para>
 </listitem>

+</varlistentry>

 
 

-</itemizedlist>
+<varlistentry>
+<term>Wiki</term>
+<listitem>
+<para>
+An (unofficial) wiki can be found
+at <ulink url="http://wiki.mutt.org/">http://wiki.mutt.org/</ulink>.
+</para>
+</listitem>
+</varlistentry>

 
 

+<varlistentry>
+<term>IRC</term>
+<listitem>
+<para>
+For the IRC user community, visit channel <emphasis>&num;mutt</emphasis> on
+<ulink url="http://www.freenode.net/">irc.freenode.net</ulink>.

 </para>
 </para>

+</listitem>
+</varlistentry>

 
 

+<varlistentry>
+<term>USENET</term>
+<listitem>

 <para>
 <para>

-For a list of mirror sites, please refer to <ulink
-url="http://www.mutt.org/download.html"
->http://www.mutt.org/download.html</ulink
->.
+For USENET, see the newsgroup <ulink url="news:comp.mail.mutt">comp.mail.mutt</ulink>.

 </para>
 </para>

+</listitem>
+</varlistentry>
+
+</variablelist>

 
 </sect1>
 
 
 </sect1>
 

-<sect1 id="irc">
-<title>IRC</title>
+<sect1 id="contrib">
+<title>Contributing to Mutt</title>
+
+<para>
+There are various ways to contribute to the Mutt project.
+</para>

 
 <para>
 
 <para>

-Visit channel <emphasis>&num;mutt</emphasis> on
-<ulink url="http://www.freenode.net/">irc.freenode.net</ulink> to chat with
-other people interested in Mutt.
+Especially for new users it may be helpful to meet other new and
+experienced users to chat about Mutt, talk about problems and share
+tricks.
+</para>
+
+<para>
+Since translations of Mutt into other languages are highly appreciated,
+the mutt developers always look for skilled translators that help
+improve and continue to maintain stale translations.
+</para>
+
+<para>
+For contributing code patches for new features and bug fixes, please
+refer to the developer pages at
+<ulink url="http://dev.mutt.org/">http://dev.mutt.org/</ulink> for more details.

 </para>
 
 </sect1>
 
 </para>
 
 </sect1>
 

-<sect1 id="usenet">
-<title>USENET</title>
+<sect1 id="typo">
+<title>Typograhical conventions</title>
+
+<para>
+This section lists typographical conventions followed throughout this
+manual. See table <xref linkend="tab-typo"/> for typographical
+conventions for special terms.
+</para>
+
+<table id="tab-typo">
+<title>Typographical conventions for special terms</title>
+<tgroup cols="2">
+<thead>
+<row><entry>Item</entry><entry>Refers to...</entry></row>
+</thead>
+<tbody>
+<row><entry><literal>printf(3)</literal></entry><entry>UNIX manual pages, execute <literal>man 3 printf</literal></entry></row>
+<row><entry><literal>&lt;PageUp&gt;</literal></entry><entry>named keys</entry></row>
+<row><entry><literal>&lt;create-alias&gt;</literal></entry><entry>named Mutt function</entry></row>
+<row><entry><literal>&circ;G</literal></entry><entry>Control+G key combination</entry></row>
+<row><entry><literal>&dollar;mail&lowbar;check</literal></entry><entry>Mutt configuration option</entry></row>
+</tbody>
+</tgroup>
+</table>
+
+<para>
+Examples are presented as:
+</para>
+
+<screen>
+mutt -v
+</screen>

 
 <para>
 
 <para>

-See the newsgroup <ulink
-url="news:comp.mail.mutt"
->comp.mail.mutt</ulink
->.
+Within command synopsis, curly brackets (<quote>&lcub;&rcub;</quote>) denote a set
+of options of which one is mandatory, square brackets
+(<quote>&lsqb;&rsqb;</quote>) denote optional arguments, three dots
+denote that the argument may be repeated arbitrary times.

 </para>
 
 </sect1>
 </para>
 
 </sect1>


@@ -140,8 +214,8 @@ url="news:comp.mail.mutt"
 <title>Copyright</title>
 
 <para>
 <title>Copyright</title>
 
 <para>

-Mutt is Copyright (C) 1996-2005 Michael R. Elkins
-<email>me@cs.hmc.edu</email> and others
+Mutt is Copyright (C) 1996-2009 Michael R. Elkins
+<email>me@mutt.org</email> and others.

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


@@ -175,33 +249,81 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 This section is intended as a brief overview of how to use Mutt.  There are
 many other features which are described elsewhere in the manual.  There
 is even more information available in the Mutt FAQ and various web
 This section is intended as a brief overview of how to use Mutt.  There are
 many other features which are described elsewhere in the manual.  There
 is even more information available in the Mutt FAQ and various web

-pages.  See the <ulink
-url="http://www.mutt.org/mutt/"
->Mutt Page</ulink
-> for more details.
+pages. See the <ulink url="http://www.mutt.org/">Mutt homepage</ulink> for more details.

 </para>
 
 <para>
 The keybindings described in this section are the defaults as distributed.
 Your local system administrator may have altered the defaults for your site.
 </para>
 
 <para>
 The keybindings described in this section are the defaults as distributed.
 Your local system administrator may have altered the defaults for your site.

-You can always type ``?'' in any menu to display the current bindings.
+You can always type <quote>?</quote> in any menu to display the current bindings.

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

-The first thing you need to do is invoke mutt, simply by typing mutt
-at the command line.  There are various command-line options, see 
+The first thing you need to do is invoke mutt, simply by typing <literal>mutt</literal>
+at the command line.  There are various command-line options, see

 either the mutt man page or the <link linkend="commandline">reference</link>.
 </para>
 
 either the mutt man page or the <link linkend="commandline">reference</link>.
 </para>
 

-<sect1 id="menus">
-<title>Moving Around in Menus</title>
+<sect1 id="core-concepts">
+<title>Core concepts</title>
+
+<para>
+Mutt is a text-based application which interacts with users through
+different menus which are mostly line-/entry-based or page-based. A
+line-based menu is the so-called <quote>index</quote> menu (listing all messages of
+the currently opened folder) or the <quote>alias</quote> menu (allowing you to
+select recipients from a list). Examples for page-based menus are the
+<quote>pager</quote> (showing one message at a time) or the <quote>help</quote> menu listing
+all available key bindings.
+</para>
+
+<para>
+The user interface consists of a context sensitive help line at the top,
+the menu's contents followed by a context sensitive status line and
+finally the command line. The command line is used to display
+informational and error messages as well as for prompts and for entering
+interactive commands.
+</para>
+
+<para>
+Because Mutt allows for customizing almost all key bindings, there are
+so-called <quote>functions</quote> which can be executed manually (using the
+command line) or in macros. Macros allow the user to bind a sequence of
+commands to a single key or a short key sequence instead of repeating a
+sequence of actions over and over.
+</para>
+
+<para>
+Many commands (such as saving or copying a message to another folder)
+can be applied to a single message or a set of messages (so-called
+<quote>tagged</quote> messages). To help selecting messages, Mutt provides a rich
+set of message patterns (such as recipients, sender, body contents, date
+sent/received, etc.) which can be combined into complex expressions
+using the boolean <emphasis>and</emphasis> and <emphasis>or</emphasis>
+operations as well as negating. These patterns can also be used to (for
+example) search for messages or to limit the index to show only matching
+messages.
+</para>

 
 <para>
 
 <para>

-Information is presented in menus, very similar to ELM, see <xref linkend="tab-keys-nav"/>
-for common keys used to navigate menus in Mutt.
+Mutt supports a <quote>hook</quote> concept which allows the user to execute
+arbitrary configuration commands and functions in certain situations
+such as entering a folder, starting a new message or replying to an
+existing one. These hooks can be used to highly customize Mutt's
+behaviour including managing multiple identities, customizing the
+display for a folder or even implementing auto-archiving based on a
+per-folder basis and much more.

 </para>
 
 </para>
 

+</sect1>
+
+<sect1 id="menus">
+<title>Moving Around in Menus</title>
+

 <para>
 <para>

+The most important navigation keys common to all menus are shown in
+<xref linkend="tab-keys-nav"/>.
+</para>

 
 <table id="tab-keys-nav">
 <title>Most common navigation keys</title>
 
 <table id="tab-keys-nav">
 <title>Most common navigation keys</title>


@@ -210,20 +332,18 @@ for common keys used to navigate menus in Mutt.
 <row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
 </thead>
 <tbody>
 <row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
 </thead>
 <tbody>

-<row><entry>j or Down</entry><entry>next-entry</entry><entry>move to the next entry</entry></row>
-<row><entry>k or Up</entry><entry>previous-entry</entry><entry>move to the previous entry</entry></row>
-<row><entry>z or PageDn</entry><entry>page-down</entry><entry>go to the next page</entry></row>
-<row><entry>Z or PageUp</entry><entry>page-up</entry><entry>go to the previous page</entry></row>
-<row><entry>= or Home</entry><entry>first-entry</entry><entry>jump to the first entry</entry></row>
-<row><entry>* or End</entry><entry>last-entry</entry><entry>jump to the last entry</entry></row>
-<row><entry>q</entry><entry>quit</entry><entry>exit the current menu</entry></row>
-<row><entry>?</entry><entry>help</entry><entry>list all keybindings for the current menu</entry></row>
+<row><entry>j or &lt;Down&gt;</entry><entry><literal>&lt;next-entry&gt;</literal></entry><entry>move to the next entry</entry></row>
+<row><entry>k or &lt;Up&gt;</entry><entry><literal>&lt;previous-entry&gt;</literal></entry><entry>move to the previous entry</entry></row>
+<row><entry>z or &lt;PageDn&gt;</entry><entry><literal>&lt;page-down&gt;</literal></entry><entry>go to the next page</entry></row>
+<row><entry>Z or &lt;PageUp&gt;</entry><entry><literal>&lt;page-up&gt;</literal></entry><entry>go to the previous page</entry></row>
+<row><entry>= or &lt;Home&gt;</entry><entry><literal>&lt;first-entry&gt;</literal></entry><entry>jump to the first entry</entry></row>
+<row><entry>* or &lt;End&gt;</entry><entry><literal>&lt;last-entry&gt;</literal></entry><entry>jump to the last entry</entry></row>
+<row><entry>q</entry><entry><literal>&lt;quit&gt;</literal></entry><entry>exit the current menu</entry></row>
+<row><entry>?</entry><entry><literal>&lt;help&gt;</literal></entry><entry>list all keybindings for the current menu</entry></row>

 </tbody>
 </tgroup>
 </table>
 
 </tbody>
 </tgroup>
 </table>
 

-</para>
-

 </sect1>
 
 <sect1 id="editing">
 </sect1>
 
 <sect1 id="editing">


@@ -240,8 +360,6 @@ reference of available functions, their default key bindings, and
 short descriptions.
 </para>
 
 short descriptions.
 </para>
 

-<para>
-

 <table id="tab-keys-editor">
 <title>Most common line editor keys</title>
 <tgroup cols="3">
 <table id="tab-keys-editor">
 <title>Most common line editor keys</title>
 <tgroup cols="3">


@@ -249,39 +367,37 @@ short descriptions.
 <row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
 </thead>
 <tbody>
 <row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
 </thead>
 <tbody>

-<row><entry>&circ;A or &lt;Home&gt;</entry><entry>bol</entry><entry>move to the start of the line</entry></row>
-<row><entry>&circ;B or &lt;Left&gt;</entry><entry>backward-char</entry><entry>move back one char</entry></row>
-<row><entry>Esc B</entry><entry>backward-word</entry><entry>move back one word</entry></row>
-<row><entry>&circ;D or &lt;Delete&gt;</entry><entry>delete-char</entry><entry>delete the char under the cursor</entry></row>
-<row><entry>&circ;E or &lt;End&gt;</entry><entry>eol</entry><entry>move to the end of the line</entry></row>
-<row><entry>&circ;F or &lt;Right&gt;</entry><entry>forward-char</entry><entry>move forward one char</entry></row>
-<row><entry>Esc F</entry><entry>forward-word</entry><entry>move forward one word</entry></row>
-<row><entry>&lt;Tab&gt;</entry><entry>complete</entry><entry>complete filename or alias</entry></row>
-<row><entry>&circ;T</entry><entry>complete-query</entry><entry>complete address with query</entry></row>
-<row><entry>&circ;K</entry><entry>kill-eol</entry><entry>delete to the end of the line</entry></row>
-<row><entry>ESC d</entry><entry>kill-eow</entry><entry>delete to the end ot the word</entry></row>
-<row><entry>&circ;W</entry><entry>kill-word</entry><entry>kill the word in front of the cursor</entry></row>
-<row><entry>&circ;U</entry><entry>kill-line</entry><entry>delete entire line</entry></row>
-<row><entry>&circ;V</entry><entry>quote-char</entry><entry>quote the next typed key</entry></row>
-<row><entry>&lt;Up&gt;</entry><entry>history-up</entry><entry>recall previous string from history</entry></row>
-<row><entry>&lt;Down&gt;</entry><entry>history-down</entry><entry>recall next string from history</entry></row>
-<row><entry>&lt;BackSpace&gt;</entry><entry>backspace</entry><entry>kill the char in front of the cursor</entry></row>
-<row><entry>Esc u</entry><entry>upcase-word</entry><entry>convert word to upper case</entry></row>
-<row><entry>Esc l</entry><entry>downcase-word</entry><entry>convert word to lower case</entry></row>
-<row><entry>Esc c</entry><entry>capitalize-word</entry><entry>capitalize the word</entry></row>
+<row><entry>&circ;A or &lt;Home&gt;</entry><entry><literal>&lt;bol&gt;</literal></entry><entry>move to the start of the line</entry></row>
+<row><entry>&circ;B or &lt;Left&gt;</entry><entry><literal>&lt;backward-char&gt;</literal></entry><entry>move back one char</entry></row>
+<row><entry>Esc B</entry><entry><literal>&lt;backward-word&gt;</literal></entry><entry>move back one word</entry></row>
+<row><entry>&circ;D or &lt;Delete&gt;</entry><entry><literal>&lt;delete-char&gt;</literal></entry><entry>delete the char under the cursor</entry></row>
+<row><entry>&circ;E or &lt;End&gt;</entry><entry><literal>&lt;eol&gt;</literal></entry><entry>move to the end of the line</entry></row>
+<row><entry>&circ;F or &lt;Right&gt;</entry><entry><literal>&lt;forward-char&gt;</literal></entry><entry>move forward one char</entry></row>
+<row><entry>Esc F</entry><entry><literal>&lt;forward-word&gt;</literal></entry><entry>move forward one word</entry></row>
+<row><entry>&lt;Tab&gt;</entry><entry><literal>&lt;complete&gt;</literal></entry><entry>complete filename or alias</entry></row>
+<row><entry>&circ;T</entry><entry><literal>&lt;complete-query&gt;</literal></entry><entry>complete address with query</entry></row>
+<row><entry>&circ;K</entry><entry><literal>&lt;kill-eol&gt;</literal></entry><entry>delete to the end of the line</entry></row>
+<row><entry>Esc d</entry><entry><literal>&lt;kill-eow&gt;</literal></entry><entry>delete to the end of the word</entry></row>
+<row><entry>&circ;W</entry><entry><literal>&lt;kill-word&gt;</literal></entry><entry>kill the word in front of the cursor</entry></row>
+<row><entry>&circ;U</entry><entry><literal>&lt;kill-line&gt;</literal></entry><entry>delete entire line</entry></row>
+<row><entry>&circ;V</entry><entry><literal>&lt;quote-char&gt;</literal></entry><entry>quote the next typed key</entry></row>
+<row><entry>&lt;Up&gt;</entry><entry><literal>&lt;history-up&gt;</literal></entry><entry>recall previous string from history</entry></row>
+<row><entry>&lt;Down&gt;</entry><entry><literal>&lt;history-down&gt;</literal></entry><entry>recall next string from history</entry></row>
+<row><entry>&lt;BackSpace&gt;</entry><entry><literal>&lt;backspace&gt;</literal></entry><entry>kill the char in front of the cursor</entry></row>
+<row><entry>Esc u</entry><entry><literal>&lt;upcase-word&gt;</literal></entry><entry>convert word to upper case</entry></row>
+<row><entry>Esc l</entry><entry><literal>&lt;downcase-word&gt;</literal></entry><entry>convert word to lower case</entry></row>
+<row><entry>Esc c</entry><entry><literal>&lt;capitalize-word&gt;</literal></entry><entry>capitalize the word</entry></row>

 <row><entry>&circ;G</entry><entry>n/a</entry><entry>abort</entry></row>
 <row><entry>&lt;Return&gt;</entry><entry>n/a</entry><entry>finish editing</entry></row>
 </tbody>
 </tgroup>
 </table>
 
 <row><entry>&circ;G</entry><entry>n/a</entry><entry>abort</entry></row>
 <row><entry>&lt;Return&gt;</entry><entry>n/a</entry><entry>finish editing</entry></row>
 </tbody>
 </tgroup>
 </table>
 

-</para>
-

 <para>
 You can remap the <emphasis>editor</emphasis> functions using the
 <link linkend="bind">bind</link> command.  For example, to make
 <para>
 You can remap the <emphasis>editor</emphasis> functions using the
 <link linkend="bind">bind</link> command.  For example, to make

-the <emphasis>Delete</emphasis> key delete the character in front of
-the cursor rather than under, you could use
+the &lt;Delete&gt; key delete the character in front of
+the cursor rather than under, you could use:

 </para>
 
 <screen>
 </para>
 
 <screen>


@@ -294,11 +410,13 @@ bind editor &lt;delete&gt; backspace
 <title>History</title>
 
 <para>
 <title>History</title>
 
 <para>

-The number of items in the built-in editor's history is controlled by
-the <link linkend="history">&dollar;history</link> variable. You may
-cycle through them at an editor prompt by using the
-<literal>history-up</literal> and/or <literal>history-down</literal>
-commands.
+Mutt maintains a history for the built-in editor.  The number of items
+is controlled by the <link linkend="history">&dollar;history</link>
+variable and can be made persistent using an external file specified
+using <link linkend="history-file">&dollar;history&lowbar;file</link>.
+You may cycle through them at an editor prompt by using the
+<literal>&lt;history-up&gt;</literal> and/or
+<literal>&lt;history-down&gt;</literal> commands.

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


@@ -306,7 +424,6 @@ Mutt maintains several distinct history lists, one for each of the
 following categories:
 </para>
 
 following categories:
 </para>
 

-<para>

 <itemizedlist>
 <listitem><para>muttrc commands</para></listitem>
 <listitem><para>addresses and aliases</para></listitem>
 <itemizedlist>
 <listitem><para>muttrc commands</para></listitem>
 <listitem><para>addresses and aliases</para></listitem>


@@ -315,17 +432,12 @@ following categories:
 <listitem><para>patterns</para></listitem>
 <listitem><para>everything else</para></listitem>
 </itemizedlist>
 <listitem><para>patterns</para></listitem>
 <listitem><para>everything else</para></listitem>
 </itemizedlist>

-</para>

 
 <para>
 Mutt automatically filters out repeated items from the history.  It
 also mimics the behavior of some shells by ignoring items starting
 
 <para>
 Mutt automatically filters out repeated items from the history.  It
 also mimics the behavior of some shells by ignoring items starting

-with a space.
-</para>
-
-<para>
-The latter feature can be useful in macros to not clobber the history's
-valuable entries with unwanted entries.
+with a space. The latter feature can be useful in macros to not clobber
+the history's valuable entries with unwanted entries.

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


@@ -338,8 +450,8 @@ valuable entries with unwanted entries.
 <para>
 Similar to many other mail clients, there are two modes in which mail is
 read in Mutt.  The first is the index of messages in the mailbox, which is
 <para>
 Similar to many other mail clients, there are two modes in which mail is
 read in Mutt.  The first is the index of messages in the mailbox, which is

-called the ``index'' in Mutt.  The second mode is the display of the
-message contents.  This is called the ``pager.''
+called the <quote>index</quote> in Mutt.  The second mode is the display of the
+message contents.  This is called the <quote>pager.</quote>

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


@@ -347,16 +459,16 @@ The next few sections describe the functions provided in each of these
 modes.
 </para>
 
 modes.
 </para>
 

-<sect2>
+<sect2 id="index-menu">

 <title>The Message Index</title>
 
 <para>
 Common keys used to navigate through and manage messages in the index
 <title>The Message Index</title>
 
 <para>
 Common keys used to navigate through and manage messages in the index

-are shown in <xref linkend="tab-key-index"/>.
+are shown in <xref linkend="tab-key-index"/>. How messages are presented
+in the index menu can be customized using the
+<link linkend="index-format">&dollar;index&lowbar;format</link> variable.

 </para>
 
 </para>
 

-<para>
-

 <table id="tab-key-index">
 <title>Most common message index keys</title>
 <tgroup cols="2">
 <table id="tab-key-index">
 <title>Most common message index keys</title>
 <tgroup cols="2">


@@ -365,10 +477,10 @@ are shown in <xref linkend="tab-key-index"/>.
 </thead>
 <tbody>
 <row><entry>c</entry><entry>change to a different mailbox</entry></row>
 </thead>
 <tbody>
 <row><entry>c</entry><entry>change to a different mailbox</entry></row>

-<row><entry>ESC c</entry><entry>change to a folder in read-only mode</entry></row>
+<row><entry>Esc c</entry><entry>change to a folder in read-only mode</entry></row>

 <row><entry>C</entry><entry>copy the current message to another mailbox</entry></row>
 <row><entry>C</entry><entry>copy the current message to another mailbox</entry></row>

-<row><entry>ESC C</entry><entry>decode a message and copy it to a folder</entry></row>
-<row><entry>ESC s</entry><entry>decode a message and save it to a folder</entry></row>
+<row><entry>Esc C</entry><entry>decode a message and copy it to a folder</entry></row>
+<row><entry>Esc s</entry><entry>decode a message and save it to a folder</entry></row>

 <row><entry>D</entry><entry>delete messages matching a pattern</entry></row>
 <row><entry>d</entry><entry>delete the current message</entry></row>
 <row><entry>F</entry><entry>mark as important</entry></row>
 <row><entry>D</entry><entry>delete messages matching a pattern</entry></row>
 <row><entry>d</entry><entry>delete the current message</entry></row>
 <row><entry>F</entry><entry>mark as important</entry></row>


@@ -380,7 +492,7 @@ are shown in <xref linkend="tab-key-index"/>.
 <row><entry>s</entry><entry>save-message</entry></row>
 <row><entry>T</entry><entry>tag messages matching a pattern</entry></row>
 <row><entry>t</entry><entry>toggle the tag on a message</entry></row>
 <row><entry>s</entry><entry>save-message</entry></row>
 <row><entry>T</entry><entry>tag messages matching a pattern</entry></row>
 <row><entry>t</entry><entry>toggle the tag on a message</entry></row>

-<row><entry>ESC t</entry><entry>toggle tag on entire message thread</entry></row>
+<row><entry>Esc t</entry><entry>toggle tag on entire message thread</entry></row>

 <row><entry>U</entry><entry>undelete messages matching a pattern</entry></row>
 <row><entry>u</entry><entry>undelete-message</entry></row>
 <row><entry>v</entry><entry>view-attachments</entry></row>
 <row><entry>U</entry><entry>undelete messages matching a pattern</entry></row>
 <row><entry>u</entry><entry>undelete-message</entry></row>
 <row><entry>v</entry><entry>view-attachments</entry></row>


@@ -390,206 +502,78 @@ are shown in <xref linkend="tab-key-index"/>.
 <row><entry>@</entry><entry>show the author's full e-mail address</entry></row>
 <row><entry>$</entry><entry>save changes to mailbox</entry></row>
 <row><entry>/</entry><entry>search</entry></row>
 <row><entry>@</entry><entry>show the author's full e-mail address</entry></row>
 <row><entry>$</entry><entry>save changes to mailbox</entry></row>
 <row><entry>/</entry><entry>search</entry></row>

-<row><entry>ESC /</entry><entry>search-reverse</entry></row>
+<row><entry>Esc /</entry><entry>search-reverse</entry></row>

 <row><entry>&circ;L</entry><entry>clear and redraw the screen</entry></row>
 <row><entry>&circ;T</entry><entry>untag messages matching a pattern</entry></row>
 </tbody>
 </tgroup>
 </table>
 
 <row><entry>&circ;L</entry><entry>clear and redraw the screen</entry></row>
 <row><entry>&circ;T</entry><entry>untag messages matching a pattern</entry></row>
 </tbody>
 </tgroup>
 </table>
 

-</para>
-
-<sect3>
-<title>Status Flags</title>
-

 <para>
 In addition to who sent the message and the subject, a short summary of
 the disposition of each message is printed beside the message number.
 <para>
 In addition to who sent the message and the subject, a short summary of
 the disposition of each message is printed beside the message number.

-Zero or more of the following ``flags'' may appear, which mean:
-</para>
-
-<para>
-<variablelist>
-
-<varlistentry>
-<term>D</term>
-<listitem>
-<para>
-message is deleted (is marked for deletion)
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>d</term>
-<listitem>
-<para>
-message have attachments marked for deletion
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>K</term>
-<listitem>
-<para>
-contains a PGP public key
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>N</term>
-<listitem>
-<para>
-message is new
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>O</term>
-<listitem>
-<para>
-message is old
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>P</term>
-<listitem>
-<para>
-message is PGP encrypted
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>r</term>
-<listitem>
-<para>
-message has been replied to
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>S</term>
-<listitem>
-<para>
-message is signed, and the signature is successfully verified
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>s</term>
-<listitem>
-<para>
-message is signed
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>!</term>
-<listitem>
-<para>
-message is flagged
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>*</term>
-<listitem>
-<para>
-message is tagged
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>
-Some of the status flags can be turned on or off using
-
-<itemizedlist>
-<listitem>
-
-<para>
-<emphasis role="bold">set-flag</emphasis> (default: w)
-</para>
-</listitem>
-<listitem>
-
-<para>
-<emphasis role="bold">clear-flag</emphasis> (default: W)
-</para>
-</listitem>
-
-</itemizedlist>
-
+Zero or more of the <quote>flags</quote> in <xref linkend="tab-msg-status-flags"/>
+may appear, some of which can be turned on or off using these functions:
+<literal>&lt;set-flag&gt;</literal> and
+<literal>&lt;clear-flag&gt;</literal>
+bound by default to <quote>w</quote> and <quote>W</quote> respectively.

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

-Furthermore, the following flags reflect who the message is addressed
-to.  They can be customized with the
+Furthermore, the flags in <xref linkend="tab-msg-recip-flags"/> reflect
+who the message is addressed to. They can be customized with the

 <link linkend="to-chars">&dollar;to&lowbar;chars</link> variable.
 </para>
 
 <link linkend="to-chars">&dollar;to&lowbar;chars</link> variable.
 </para>
 

-<para>
-<variablelist>
-
-<varlistentry>
-<term>+</term>
-<listitem>
-<para>
-message is to you and you only
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>T</term>
-<listitem>
-<para>
-message is to you, but also to or cc'ed to others
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>C</term>
-<listitem>
-<para>
-message is cc'ed to you
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>F</term>
-<listitem>
-<para>
-message is from you
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>L</term>
-<listitem>
-<para>
-message is sent to a subscribed mailing list
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</para>
+<table id="tab-msg-status-flags">
+<title>Message status flags</title>
+<tgroup cols="2">
+<thead>
+<row><entry>Flag</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>D</entry><entry>message is deleted (is marked for deletion)</entry></row>
+<row><entry>d</entry><entry>message has attachments marked for deletion</entry></row>
+<row><entry>K</entry><entry>contains a PGP public key</entry></row>
+<row><entry>N</entry><entry>message is new</entry></row>
+<row><entry>O</entry><entry>message is old</entry></row>
+<row><entry>P</entry><entry>message is PGP encrypted</entry></row>
+<row><entry>r</entry><entry>message has been replied to</entry></row>
+<row><entry>S</entry><entry>message is signed, and the signature is successfully verified</entry></row>
+<row><entry>s</entry><entry>message is signed</entry></row>
+<row><entry>!</entry><entry>message is flagged</entry></row>
+<row><entry>*</entry><entry>message is tagged</entry></row>
+</tbody>
+</tgroup>
+</table>

 
 

-</sect3>
+<table id="tab-msg-recip-flags">
+<title>Message recipient flags</title>
+<tgroup cols="2">
+<thead>
+<row><entry>Flag</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>+</entry><entry>message is to you and you only</entry></row>
+<row><entry>T</entry><entry>message is to you, but also to or cc'ed to others</entry></row>
+<row><entry>C</entry><entry>message is cc'ed to you</entry></row>
+<row><entry>F</entry><entry>message is from you</entry></row>
+<row><entry>L</entry><entry>message is sent to a subscribed mailing list</entry></row>
+</tbody>
+</tgroup>
+</table>

 
 </sect2>
 
 
 </sect2>
 

-<sect2>
+<sect2 id="pager-menu">

 <title>The Pager</title>
 
 <para>
 <title>The Pager</title>
 
 <para>

-By default, Mutt uses its builtin pager to display the body of messages.
+By default, Mutt uses its builtin pager to display the contents of messages.

 The pager is very similar to the Unix program <emphasis>less</emphasis> though not nearly as
 featureful.
 </para>
 
 The pager is very similar to the Unix program <emphasis>less</emphasis> though not nearly as
 featureful.
 </para>
 

-<para>
-

 <table id="tab-key-pager">
 <title>Most common pager keys</title>
 <tgroup cols="2">
 <table id="tab-key-pager">
 <title>Most common pager keys</title>
 <tgroup cols="2">


@@ -604,29 +588,27 @@ featureful.
 <row><entry>S</entry><entry>skip beyond quoted text</entry></row>
 <row><entry>T</entry><entry>toggle display of quoted text</entry></row>
 <row><entry>?</entry><entry>show keybindings</entry></row>
 <row><entry>S</entry><entry>skip beyond quoted text</entry></row>
 <row><entry>T</entry><entry>toggle display of quoted text</entry></row>
 <row><entry>?</entry><entry>show keybindings</entry></row>

-<row><entry>/</entry><entry>search for a regular expression (pattern)</entry></row>
-<row><entry>ESC /</entry><entry>search backwards for a regular expression</entry></row>
-<row><entry>&bsol;</entry><entry>toggle search pattern coloring</entry></row>
+<row><entry>/</entry><entry>regular expression search</entry></row>
+<row><entry>Esc /</entry><entry>backward regular expression search</entry></row>
+<row><entry>&bsol;</entry><entry>toggle highlighting of search matches</entry></row>

 <row><entry>&circ;</entry><entry>jump to the top of the message</entry></row>
 </tbody>
 </tgroup>
 </table>
 
 <row><entry>&circ;</entry><entry>jump to the top of the message</entry></row>
 </tbody>
 </tgroup>
 </table>
 

-</para>
-

 <para>
 In addition to key bindings in <xref linkend="tab-key-pager"/>,
 <para>
 In addition to key bindings in <xref linkend="tab-key-pager"/>,

-many of the functions from the <emphasis>index</emphasis> are available in
-the pager, such as <emphasis>delete-message</emphasis> or <emphasis>copy-message</emphasis> (this is one
-advantage over using an external pager to view messages).
+many of the functions from the index menu are also available in
+the pager, such as <literal>&lt;delete-message&gt;</literal> or <literal>&lt;copy-message&gt;</literal>
+(this is one advantage over using an external pager to view messages).

 </para>
 
 <para>
 Also, the internal pager supports a couple other advanced features. For
 </para>
 
 <para>
 Also, the internal pager supports a couple other advanced features. For

-one, it will accept and translate the ``standard'' nroff sequences for
+one, it will accept and translate the <quote>standard</quote> nroff sequences for

 bold and underline. These sequences are a series of either the letter,
 backspace (&circ;H), the letter again for bold or the letter, backspace,
 bold and underline. These sequences are a series of either the letter,
 backspace (&circ;H), the letter again for bold or the letter, backspace,

-``&lowbar;'' for denoting underline. Mutt will attempt to display these
+<quote>&lowbar;</quote> for denoting underline. Mutt will attempt to display these

 in bold and underline respectively if your terminal supports them. If
 not, you can use the bold and underline <link linkend="color">color</link>
 objects to specify a color or mono attribute for them.
 in bold and underline respectively if your terminal supports them. If
 not, you can use the bold and underline <link linkend="color">color</link>
 objects to specify a color or mono attribute for them.


@@ -635,8 +617,14 @@ objects to specify a color or mono attribute for them.
 <para>
 Additionally, the internal pager supports the ANSI escape sequences for
 character attributes.  Mutt translates them into the correct color and
 <para>
 Additionally, the internal pager supports the ANSI escape sequences for
 character attributes.  Mutt translates them into the correct color and

-character settings.  The sequences Mutt supports are
-'&bsol;e&lsqb;<emphasis>Ps</emphasis>;<emphasis>Ps</emphasis>;..<emphasis>Ps</emphasis>;m'
+character settings.  The sequences Mutt supports are:
+</para>
+
+<screen>
+&bsol;e&lsqb;<emphasis>Ps</emphasis>;<emphasis>Ps</emphasis>;..<emphasis>Ps</emphasis>;m
+</screen>
+
+<para>

 where <emphasis>Ps</emphasis> can be one of the codes shown in
 <xref linkend="tab-ansi-esc"/>.
 </para>
 where <emphasis>Ps</emphasis> can be one of the codes shown in
 <xref linkend="tab-ansi-esc"/>.
 </para>


@@ -648,7 +636,7 @@ where <emphasis>Ps</emphasis> can be one of the codes shown in
 <row><entry>Escape code</entry><entry>Description</entry></row>
 </thead>
 <tbody>
 <row><entry>Escape code</entry><entry>Description</entry></row>
 </thead>
 <tbody>

-<row><entry>0</entry><entry>All Attributes Off</entry></row>
+<row><entry>0</entry><entry>All attributes off</entry></row>

 <row><entry>1</entry><entry>Bold on</entry></row>
 <row><entry>4</entry><entry>Underline on</entry></row>
 <row><entry>5</entry><entry>Blink on</entry></row>
 <row><entry>1</entry><entry>Bold on</entry></row>
 <row><entry>4</entry><entry>Underline on</entry></row>
 <row><entry>5</entry><entry>Blink on</entry></row>


@@ -679,14 +667,32 @@ where <emphasis>Ps</emphasis> can be one of the codes shown in
 </table>
 
 <para>
 </table>
 
 <para>

-Mutt uses these attributes for handling text/enriched messages, and they
-can also be used by an external <link linkend="auto-view">autoview</link>
-script for highlighting purposes.  <emphasis role="bold">Note:</emphasis> If you change the colors for your
+Mutt uses these attributes for handling <literal>text/enriched</literal>
+messages, and they can also be used by an external
+<link linkend="auto-view">autoview</link> script for highlighting
+purposes.
+</para>
+
+<note>
+<para>
+If you change the colors for your

 display, for example by changing the color associated with color2 for
 your xterm, then that color will be used instead of green.
 </para>
 display, for example by changing the color associated with color2 for
 your xterm, then that color will be used instead of green.
 </para>

+</note>

 
 

-</sect2>
+<note>
+<para>
+Note that the search commands in the pager take regular expressions,
+which are not quite the same as the more
+complex <link linkend="patterns">patterns</link> used by the search
+command in the index. This is because the pager only performs simple
+text search, whereas the index provides boolean filtering on several
+aspects of messages.
+</para>
+</note>
+
+</sect2>

 
 <sect2 id="threads">
 <title>Threaded Mode</title>
 
 <sect2 id="threads">
 <title>Threaded Mode</title>


@@ -697,8 +703,6 @@ a few additional functions available in the <emphasis>index</emphasis> and <emph
 as shown in <xref linkend="tab-key-threads"/>.
 </para>
 
 as shown in <xref linkend="tab-key-threads"/>.
 </para>
 

-<para>
-

 <table id="tab-key-threads">
 <title>Most common thread mode keys</title>
 <tgroup cols="3">
 <table id="tab-key-threads">
 <title>Most common thread mode keys</title>
 <tgroup cols="3">


@@ -706,34 +710,34 @@ as shown in <xref linkend="tab-key-threads"/>.
 <row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
 </thead>
 <tbody>
 <row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
 </thead>
 <tbody>

-<row><entry>&circ;D</entry><entry>delete-thread</entry><entry>delete all messages in the current thread</entry></row>
-<row><entry>&circ;U</entry><entry>undelete-thread</entry><entry>undelete all messages in the current thread</entry></row>
-<row><entry>&circ;N</entry><entry>next-thread</entry><entry>jump to the start of the next thread</entry></row>
-<row><entry>&circ;P</entry><entry>previous-thread</entry><entry>jump to the start of the previous thread</entry></row>
-<row><entry>&circ;R</entry><entry>read-thread</entry><entry>mark the current thread as read</entry></row>
-<row><entry>ESC d</entry><entry>delete-subthread</entry><entry>delete all messages in the current subthread</entry></row>
-<row><entry>ESC u</entry><entry>undelete-subthread</entry><entry>undelete all messages in the current subthread</entry></row>
-<row><entry>ESC n</entry><entry>next-subthread</entry><entry>jump to the start of the next subthread</entry></row>
-<row><entry>ESC p</entry><entry>previous-subthread</entry><entry>jump to the start of the previous subthread</entry></row>
-<row><entry>ESC r</entry><entry>read-subthread</entry><entry>mark the current subthread as read</entry></row>
-<row><entry>ESC t</entry><entry>tag-thread</entry><entry>toggle the tag on the current thread</entry></row>
-<row><entry>ESC v</entry><entry>collapse-thread</entry><entry>toggle collapse for the current thread</entry></row>
-<row><entry>ESC V</entry><entry>collapse-all</entry><entry>toggle collapse for all threads</entry></row>
-<row><entry>P</entry><entry>parent-message</entry><entry>jump to parent message in thread</entry></row>
+<row><entry>&circ;D</entry><entry><literal>&lt;delete-thread&gt;</literal></entry><entry>delete all messages in the current thread</entry></row>
+<row><entry>&circ;U</entry><entry><literal>&lt;undelete-thread&gt;</literal></entry><entry>undelete all messages in the current thread</entry></row>
+<row><entry>&circ;N</entry><entry><literal>&lt;next-thread&gt;</literal></entry><entry>jump to the start of the next thread</entry></row>
+<row><entry>&circ;P</entry><entry><literal>&lt;previous-thread&gt;</literal></entry><entry>jump to the start of the previous thread</entry></row>
+<row><entry>&circ;R</entry><entry><literal>&lt;read-thread&gt;</literal></entry><entry>mark the current thread as read</entry></row>
+<row><entry>Esc d</entry><entry><literal>&lt;delete-subthread&gt;</literal></entry><entry>delete all messages in the current subthread</entry></row>
+<row><entry>Esc u</entry><entry><literal>&lt;undelete-subthread&gt;</literal></entry><entry>undelete all messages in the current subthread</entry></row>
+<row><entry>Esc n</entry><entry><literal>&lt;next-subthread&gt;</literal></entry><entry>jump to the start of the next subthread</entry></row>
+<row><entry>Esc p</entry><entry><literal>&lt;previous-subthread&gt;</literal></entry><entry>jump to the start of the previous subthread</entry></row>
+<row><entry>Esc r</entry><entry><literal>&lt;read-subthread&gt;</literal></entry><entry>mark the current subthread as read</entry></row>
+<row><entry>Esc t</entry><entry><literal>&lt;tag-thread&gt;</literal></entry><entry>toggle the tag on the current thread</entry></row>
+<row><entry>Esc v</entry><entry><literal>&lt;collapse-thread&gt;</literal></entry><entry>toggle collapse for the current thread</entry></row>
+<row><entry>Esc V</entry><entry><literal>&lt;collapse-all&gt;</literal></entry><entry>toggle collapse for all threads</entry></row>
+<row><entry>P</entry><entry><literal>&lt;parent-message&gt;</literal></entry><entry>jump to parent message in thread</entry></row>

 </tbody>
 </tgroup>
 </table>
 
 </tbody>
 </tgroup>
 </table>
 

-</para>
-
+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> Collapsing a thread displays only the first message
+Collapsing a thread displays only the first message

 in the thread and hides the others. This is useful when threads
 contain so many messages that you can only see a handful of threads on
 the screen. See &percnt;M in <link linkend="index-format">&dollar;index&lowbar;format</link>.
 For example, you could use "&percnt;?M?(&num;&percnt;03M)&amp;(&percnt;4l)?" in <link linkend="index-format">&dollar;index&lowbar;format</link> to optionally
 display the number of hidden messages if the thread is collapsed.
 </para>
 in the thread and hides the others. This is useful when threads
 contain so many messages that you can only see a handful of threads on
 the screen. See &percnt;M in <link linkend="index-format">&dollar;index&lowbar;format</link>.
 For example, you could use "&percnt;?M?(&num;&percnt;03M)&amp;(&percnt;4l)?" in <link linkend="index-format">&dollar;index&lowbar;format</link> to optionally
 display the number of hidden messages if the thread is collapsed.
 </para>

+</note>

 
 <para>
 See also: <link linkend="strict-threads">&dollar;strict&lowbar;threads</link>.
 
 <para>
 See also: <link linkend="strict-threads">&dollar;strict&lowbar;threads</link>.


@@ -741,65 +745,76 @@ See also: <link linkend="strict-threads">&dollar;strict&lowbar;threads</link>.
 
 </sect2>
 
 
 </sect2>
 

-<sect2>
+<sect2 id="reading-misc">

 <title>Miscellaneous Functions</title>
 
 <para>
 <title>Miscellaneous Functions</title>
 
 <para>

-<emphasis role="bold">create-alias</emphasis><anchor id="create-alias"/> (default: a)
-
+In addition, the <emphasis>index</emphasis> and <emphasis>pager</emphasis>
+menus have these interesting functions:

 </para>
 
 </para>
 

+<variablelist>
+
+<varlistentry>
+<term>
+<literal>&lt;create-alias&gt;</literal><anchor id="create-alias"/> (default: a)
+</term>
+<listitem>

 <para>
 Creates a new alias based upon the current message (or prompts for a
 new one).  Once editing is complete, an <link linkend="alias">alias</link>
 <para>
 Creates a new alias based upon the current message (or prompts for a
 new one).  Once editing is complete, an <link linkend="alias">alias</link>

-command is added to the file specified by the <link linkend="alias-file">&dollar;alias&lowbar;file</link> variable for future use. <emphasis role="bold">Note:</emphasis>
-Specifying an <link linkend="alias-file">&dollar;alias&lowbar;file</link>
-does not add the aliases specified there-in, you must also <link linkend="source">source</link> the file.
+command is added to the file specified by
+the <link linkend="alias-file">&dollar;alias&lowbar;file</link> variable
+for future use

 </para>
 
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">check-traditional-pgp</emphasis><anchor id="check-traditional-pgp"/> (default: ESC P)
-
+Mutt does not read the <link linkend="alias-file">&dollar;alias&lowbar;file</link>
+upon startup so you must explicitly <link linkend="source">source</link> the file.

 </para>
 </para>

+</note>
+</listitem>
+</varlistentry>

 
 

+<varlistentry>
+<term>
+<literal>&lt;check-traditional-pgp&gt;</literal><anchor id="check-traditional-pgp"/> (default: Esc P)
+</term>
+<listitem>

 <para>
 This function will search the current message for content signed or
 <para>
 This function will search the current message for content signed or

-encrypted with PGP the "traditional" way, that is, without proper
+encrypted with PGP the <quote>traditional</quote> way, that is, without proper

 MIME tagging.  Technically, this function will temporarily change
 the MIME content types of the body parts containing PGP data; this
 MIME tagging.  Technically, this function will temporarily change
 the MIME content types of the body parts containing PGP data; this

-is similar to the <link linkend="edit-type">edit-type</link> function's
+is similar to the <link linkend="edit-type"><literal>&lt;edit-type&gt;</literal></link> function's

 effect.
 </para>
 effect.
 </para>

+</listitem>
+</varlistentry>

 
 

+<varlistentry>
+<term>
+<literal>&lt;edit&gt;</literal><anchor id="edit"/> (default: e)
+</term>
+<listitem>

 <para>
 <para>

-<emphasis role="bold">display-toggle-weed</emphasis><anchor id="display-toggle-weed"/> (default: h)
-
-</para>
-
-<para>
-Toggles the weeding of message header fields specified by <link linkend="ignore">ignore</link> commands.
-</para>
-
-<para>
-<emphasis role="bold">edit</emphasis><anchor id="edit"/> (default: e)
-
-</para>
-
-<para>
-This command (available in the ``index'' and ``pager'') allows you to
+This command (available in the index and pager) allows you to

 edit the raw current message as it's present in the mail folder.
 After you have finished editing, the changed message will be
 appended to the current folder, and the original message will be
 edit the raw current message as it's present in the mail folder.
 After you have finished editing, the changed message will be
 appended to the current folder, and the original message will be

-marked for deletion.
-</para>
-
-<para>
-<emphasis role="bold">edit-type</emphasis><anchor id="edit-type"/>
-
-(default: &circ;E on the attachment menu, and in the pager and index menus; &circ;T on the
-compose menu)
+marked for deletion; if the message is unchanged it won't be replaced.

 </para>
 </para>

+</listitem>
+</varlistentry>

 
 

+<varlistentry>
+<term>
+<literal>&lt;edit-type&gt;</literal><anchor id="edit-type"/> (default:
+&circ;E on the attachment menu, and in the pager and index menus;
+&circ;T on the compose menu)
+</term>
+<listitem>

 <para>
 This command is used to temporarily edit an attachment's content
 type to fix, for instance, bogus character set parameters.  When
 <para>
 This command is used to temporarily edit an attachment's content
 type to fix, for instance, bogus character set parameters.  When


@@ -815,45 +830,53 @@ Note that this command is also available on the <link linkend="compose-menu">com
 menu</link>.  There, it's used to fine-tune the properties of attachments you are going
 to send.
 </para>
 menu</link>.  There, it's used to fine-tune the properties of attachments you are going
 to send.
 </para>

+</listitem>
+</varlistentry>

 
 

-<para>
-<emphasis role="bold">enter-command</emphasis><anchor id="enter-command"/> (default: ``:'')
-
-</para>
-
+<varlistentry>
+<term>
+<literal>&lt;enter-command&gt;</literal><anchor id="enter-command"/> (default: <quote>:</quote>)
+</term>
+<listitem>

 <para>
 This command is used to execute any command you would normally put in a
 configuration file.  A common use is to check the settings of variables, or
 in conjunction with <link linkend="macro">macros</link> to change settings on the
 fly.
 </para>
 <para>
 This command is used to execute any command you would normally put in a
 configuration file.  A common use is to check the settings of variables, or
 in conjunction with <link linkend="macro">macros</link> to change settings on the
 fly.
 </para>

+</listitem>
+</varlistentry>

 
 

-<para>
-<emphasis role="bold">extract-keys</emphasis><anchor id="extract-keys"/> (default: &circ;K)
-
-</para>
-
+<varlistentry>
+<term>
+<literal>&lt;extract-keys&gt;</literal><anchor id="extract-keys"/> (default: &circ;K)
+</term>
+<listitem>

 <para>
 This command extracts PGP public keys from the current or tagged
 message(s) and adds them to your PGP public key ring.
 </para>
 <para>
 This command extracts PGP public keys from the current or tagged
 message(s) and adds them to your PGP public key ring.
 </para>

+</listitem>
+</varlistentry>

 
 

-<para>
-<emphasis role="bold">forget-passphrase</emphasis><anchor id="forget-passphrase"/> (default:
+<varlistentry>
+<term>
+<literal>&lt;forget-passphrase&gt;</literal><anchor id="forget-passphrase"/> (default:

 &circ;F)
 &circ;F)

- 
-</para>
-
+</term>
+<listitem>

 <para>
 This command wipes the passphrase(s) from memory. It is useful, if
 you misspelled the passphrase.
 </para>
 <para>
 This command wipes the passphrase(s) from memory. It is useful, if
 you misspelled the passphrase.
 </para>

+</listitem>
+</varlistentry>

 
 

-<para>
-<emphasis role="bold">list-reply</emphasis><anchor id="list-reply"/> (default: L)
-
-</para>
-
+<varlistentry>
+<term>
+<literal>&lt;list-reply&gt;</literal><anchor id="list-reply"/> (default: L)
+</term>
+<listitem>

 <para>
 Reply to the current or tagged message(s) by extracting any addresses which
 match the regular expressions given by the <link linkend="lists">lists or subscribe</link>
 <para>
 Reply to the current or tagged message(s) by extracting any addresses which
 match the regular expressions given by the <link linkend="lists">lists or subscribe</link>


@@ -863,25 +886,29 @@ configuration variable is set.  Using this when replying to messages posted
 to mailing lists helps avoid duplicate copies being sent to the author of
 the message you are replying to.
 </para>
 to mailing lists helps avoid duplicate copies being sent to the author of
 the message you are replying to.
 </para>

+</listitem>
+</varlistentry>

 
 

-<para>
-<emphasis role="bold">pipe-message</emphasis><anchor id="pipe-message"/> (default: &verbar;)
-
-</para>
-
+<varlistentry>
+<term>
+<literal>&lt;pipe-message&gt;</literal><anchor id="pipe-message"/> (default: &verbar;)
+</term>
+<listitem>

 <para>
 Asks for an external Unix command and pipes the current or
 tagged message(s) to it.  The variables <link linkend="pipe-decode">&dollar;pipe&lowbar;decode</link>, <link linkend="pipe-split">&dollar;pipe&lowbar;split</link>,
 <link linkend="pipe-sep">&dollar;pipe&lowbar;sep</link> and <link linkend="wait-key">&dollar;wait&lowbar;key</link> control the exact behavior of this function.
 </para>
 <para>
 Asks for an external Unix command and pipes the current or
 tagged message(s) to it.  The variables <link linkend="pipe-decode">&dollar;pipe&lowbar;decode</link>, <link linkend="pipe-split">&dollar;pipe&lowbar;split</link>,
 <link linkend="pipe-sep">&dollar;pipe&lowbar;sep</link> and <link linkend="wait-key">&dollar;wait&lowbar;key</link> control the exact behavior of this function.
 </para>

+</listitem>
+</varlistentry>

 
 

+<varlistentry>
+<term>
+<literal>&lt;resend-message&gt;</literal><anchor id="resend-message"/> (default: Esc e)
+</term>
+<listitem>

 <para>
 <para>

-<emphasis role="bold">resend-message</emphasis><anchor id="resend-message"/> (default: ESC e)
-
-</para>
-
-<para>
-With resend-message, mutt takes the current message as a template for a
+Mutt takes the current message as a template for a

 new message.  This function is best described as "recall from arbitrary
 folders".  It can conveniently be used to forward MIME messages while
 preserving the original mail structure. Note that the amount of headers
 new message.  This function is best described as "recall from arbitrary
 folders".  It can conveniently be used to forward MIME messages while
 preserving the original mail structure. Note that the amount of headers


@@ -892,43 +919,54 @@ variable.
 <para>
 This function is also available from the attachment menu. You can use this
 to easily resend a message which was included with a bounce message
 <para>
 This function is also available from the attachment menu. You can use this
 to easily resend a message which was included with a bounce message

-as a message/rfc822 body part.
-</para>
-
-<para>
-<emphasis role="bold">shell-escape</emphasis><anchor id="shell-escape"/> (default: !)
-
+as a <literal>message/rfc822</literal> body part.

 </para>
 </para>

+</listitem>
+</varlistentry>

 
 

+<varlistentry>
+<term>
+<literal>&lt;shell-escape&gt;</literal><anchor id="shell-escape"/> (default: !)
+</term>
+<listitem>

 <para>
 Asks for an external Unix command and executes it.  The <link linkend="wait-key">&dollar;wait&lowbar;key</link> can be used to control
 whether Mutt will wait for a key to be pressed when the command returns
 (presumably to let the user read the output of the command), based on
 <para>
 Asks for an external Unix command and executes it.  The <link linkend="wait-key">&dollar;wait&lowbar;key</link> can be used to control
 whether Mutt will wait for a key to be pressed when the command returns
 (presumably to let the user read the output of the command), based on

-the return status of the named command.
-</para>
-
-<para>
-<emphasis role="bold">toggle-quoted</emphasis><anchor id="toggle-quoted"/> (default: T)
-
+the return status of the named command. If no command is given, an
+interactive shell is executed.

 </para>
 </para>

+</listitem>
+</varlistentry>

 
 

+<varlistentry>
+<term>
+<literal>&lt;toggle-quoted&gt;</literal><anchor id="toggle-quoted"/> (default: T)
+</term>
+<listitem>

 <para>
 <para>

-The <emphasis>pager</emphasis> uses the <link linkend="quote-regexp">&dollar;quote&lowbar;regexp</link> variable to detect quoted text when
+The pager uses the <link linkend="quote-regexp">&dollar;quote&lowbar;regexp</link> variable to detect quoted text when

 displaying the body of the message.  This function toggles the display
 of the quoted material in the message.  It is particularly useful when
 displaying the body of the message.  This function toggles the display
 of the quoted material in the message.  It is particularly useful when

-are interested in just the response and there is a large amount of
+being interested in just the response and there is a large amount of

 quoted text in the way.
 </para>
 quoted text in the way.
 </para>

+</listitem>
+</varlistentry>

 
 

+<varlistentry>
+<term>
+<literal>&lt;skip-quoted&gt;</literal><anchor id="skip-quoted"/> (default: S)
+</term>
+<listitem>

 <para>
 <para>

-<emphasis role="bold">skip-quoted</emphasis><anchor id="skip-quoted"/> (default: S)
-
-</para>
-
-<para>
-This function will go to the next line of non-quoted text which come
+This function will go to the next line of non-quoted text which comes

 after a line of quoted text in the internal pager.
 </para>
 after a line of quoted text in the internal pager.
 </para>

+</listitem>
+</varlistentry>
+
+</variablelist>

 
 </sect2>
 
 
 </sect2>
 


@@ -937,13 +975,14 @@ after a line of quoted text in the internal pager.
 <sect1 id="sending">
 <title>Sending Mail</title>
 
 <sect1 id="sending">
 <title>Sending Mail</title>
 

+<sect2 id="sending-intro">
+<title>Introduction</title>
+

 <para>
 The bindings shown in <xref linkend="tab-key-send"/> are available in the
 <para>
 The bindings shown in <xref linkend="tab-key-send"/> are available in the

-<emphasis>index</emphasis> for sending messages.
+<emphasis>index</emphasis> and <emphasis>pager</emphasis> to start a new message.

 </para>
 
 </para>
 

-<para>
-

 <table id="tab-key-send">
 <title>Most common mail sending keys</title>
 <tgroup cols="3">
 <table id="tab-key-send">
 <title>Most common mail sending keys</title>
 <tgroup cols="3">


@@ -951,46 +990,48 @@ The bindings shown in <xref linkend="tab-key-send"/> are available in the
 <row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
 </thead>
 <tbody>
 <row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
 </thead>
 <tbody>

-<row><entry>m</entry><entry>compose</entry><entry>compose a new message</entry></row>
-<row><entry>r</entry><entry>reply</entry><entry>reply to sender</entry></row>
-<row><entry>g</entry><entry>group-reply</entry><entry>reply to all recipients</entry></row>
-<row><entry>L</entry><entry>list-reply</entry><entry>reply to mailing list address</entry></row>
-<row><entry>f</entry><entry>forward</entry><entry>forward message</entry></row>
-<row><entry>b</entry><entry>bounce</entry><entry>bounce (remail) message</entry></row>
-<row><entry>ESC k</entry><entry>mail-key</entry><entry>mail a PGP public key to someone</entry></row>
+<row><entry>m</entry><entry><literal>&lt;compose&gt;</literal></entry><entry>compose a new message</entry></row>
+<row><entry>r</entry><entry><literal>&lt;reply&gt;</literal></entry><entry>reply to sender</entry></row>
+<row><entry>g</entry><entry><literal>&lt;group-reply&gt;</literal></entry><entry>reply to all recipients</entry></row>
+<row><entry>L</entry><entry><literal>&lt;list-reply&gt;</literal></entry><entry>reply to mailing list address</entry></row>
+<row><entry>f</entry><entry><literal>&lt;forward&gt;</literal></entry><entry>forward message</entry></row>
+<row><entry>b</entry><entry><literal>&lt;bounce&gt;</literal></entry><entry>bounce (remail) message</entry></row>
+<row><entry>Esc k</entry><entry><literal>&lt;mail-key&gt;</literal></entry><entry>mail a PGP public key to someone</entry></row>

 </tbody>
 </tgroup>
 </table>
 
 </tbody>
 </tgroup>
 </table>
 

-</para>
-

 <para>
 <para>

-Bouncing a message sends the message as is to the recipient you
-specify.  Forwarding a message allows you to add comments or
+<emphasis>Bouncing</emphasis> a message sends the message as-is to the recipient you
+specify.  <emphasis>Forwarding</emphasis> a message allows you to add comments or

 modify the message you are forwarding.  These items are discussed
 modify the message you are forwarding.  These items are discussed

-in greater detail in the next chapter ``<link linkend="forwarding-mail">Forwarding
-and Bouncing Mail</link>.''
+in greater detail in the next chapter <quote><link linkend="forwarding-mail">Forwarding
+and Bouncing Mail</link>.</quote>

 </para>
 
 <para>
 Mutt will then enter the <emphasis>compose</emphasis> menu and prompt you for the
 </para>
 
 <para>
 Mutt will then enter the <emphasis>compose</emphasis> menu and prompt you for the

-recipients to place on the ``To:'' header field.  Next, it will ask
-you for the ``Subject:'' field for the message, providing a default if
+recipients to place on the <quote>To:</quote> header field.  Next, it will ask
+you for the <quote>Subject:</quote> field for the message, providing a default if

 you are replying to or forwarding a message.  See also
 <link linkend="askcc">&dollar;askcc</link>,
 <link linkend="askbcc">&dollar;askbcc</link>,
 <link linkend="autoedit">&dollar;autoedit</link>,
 you are replying to or forwarding a message.  See also
 <link linkend="askcc">&dollar;askcc</link>,
 <link linkend="askbcc">&dollar;askbcc</link>,
 <link linkend="autoedit">&dollar;autoedit</link>,

-<link linkend="bounce">&dollar;bounce</link>, 
+<link linkend="bounce">&dollar;bounce</link>,

 <link linkend="fast-reply">&dollar;fast&lowbar;reply</link>,
 and <link linkend="include">&dollar;include</link>
 for changing how Mutt asks these questions.
 </para>
 
 <para>
 <link linkend="fast-reply">&dollar;fast&lowbar;reply</link>,
 and <link linkend="include">&dollar;include</link>
 for changing how Mutt asks these questions.
 </para>
 
 <para>

-Mutt will then automatically start your <link linkend="editor">&dollar;editor</link> on the message body.  If the <link linkend="edit-headers">&dollar;edit&lowbar;headers</link> variable is set, the headers will be at
-the top of the message in your editor.  Any messages you are replying
-to will be added in sort order to the message, with appropriate <link linkend="attribution">&dollar;attribution</link>, <link linkend="indent-string">&dollar;indent&lowbar;string</link> and <link linkend="post-indent-string">&dollar;post&lowbar;indent&lowbar;string</link>.  When forwarding a
-message, if the <link linkend="mime-forward">&dollar;mime&lowbar;forward</link>
+Mutt will then automatically start your <link linkend="editor">&dollar;editor</link>
+on the message body. If the <link linkend="edit-headers">&dollar;edit&lowbar;headers</link>
+variable is set, the headers will be at the top of the message in your editor.
+Any messages you are replying to will be added in sort order to the message,
+with appropriate <link linkend="attribution">&dollar;attribution</link>,
+<link linkend="indent-string">&dollar;indent&lowbar;string</link> and
+<link linkend="post-indent-string">&dollar;post&lowbar;indent&lowbar;string</link>.
+When forwarding a message, if the <link linkend="mime-forward">&dollar;mime&lowbar;forward</link>

 variable is unset, a copy of the forwarded message will be included.  If
 you have specified a <link linkend="signature">&dollar;signature</link>, it
 will be appended to the message.
 variable is unset, a copy of the forwarded message will be included.  If
 you have specified a <link linkend="signature">&dollar;signature</link>, it
 will be appended to the message.


@@ -999,11 +1040,10 @@ will be appended to the message.
 <para>
 Once you have finished editing the body of your mail message, you are
 returned to the <emphasis>compose</emphasis> menu providing the functions
 <para>
 Once you have finished editing the body of your mail message, you are
 returned to the <emphasis>compose</emphasis> menu providing the functions

-show in <xref linkend="tab-func-compose"/>.
+shown in <xref linkend="tab-func-compose"/> to modify, send or postpone the
+message.

 </para>
 
 </para>
 

-<para>
-

 <table id="tab-func-compose">
 <title>Most common compose menu keys</title>
 <tgroup cols="3">
 <table id="tab-func-compose">
 <title>Most common compose menu keys</title>
 <tgroup cols="3">


@@ -1011,58 +1051,75 @@ show in <xref linkend="tab-func-compose"/>.
 <row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
 </thead>
 <tbody>
 <row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
 </thead>
 <tbody>

-<row><entry>a</entry><entry>attach-file</entry><entry>attach a file</entry></row>
-<row><entry>A</entry><entry>attach-message</entry><entry>attach message(s) to the message</entry></row>
-<row><entry>ESC k</entry><entry>attach-key</entry><entry>attach a PGP public key</entry></row>
-<row><entry>d</entry><entry>edit-description</entry><entry>edit description on attachment</entry></row>
-<row><entry>D</entry><entry>detach-file</entry><entry>detach a file</entry></row>
-<row><entry>t</entry><entry>edit-to</entry><entry>edit the To field</entry></row>
-<row><entry>ESC f</entry><entry>edit-from</entry><entry>edit the From field</entry></row>
-<row><entry>r</entry><entry>edit-reply-to</entry><entry>edit the Reply-To field</entry></row>
-<row><entry>c</entry><entry>edit-cc</entry><entry>edit the Cc field</entry></row>
-<row><entry>b</entry><entry>edit-bcc</entry><entry>edit the Bcc field</entry></row>
-<row><entry>y</entry><entry>send-message</entry><entry>send the message</entry></row>
-<row><entry>s</entry><entry>edit-subject</entry><entry>edit the Subject</entry></row>
-<row><entry>S</entry><entry>smime-menu</entry><entry>select S/MIME options</entry></row>
-<row><entry>f</entry><entry>edit-fcc</entry><entry>specify an ``Fcc'' mailbox</entry></row>
-<row><entry>p</entry><entry>pgp-menu</entry><entry>select PGP options</entry></row>
-<row><entry>P</entry><entry>postpone-message</entry><entry>postpone this message until later</entry></row>
-<row><entry>q</entry><entry>quit</entry><entry>quit (abort) sending the message</entry></row>
-<row><entry>w</entry><entry>write-fcc</entry><entry>write the message to a folder</entry></row>
-<row><entry>i</entry><entry>ispell</entry><entry>check spelling (if available on your system)</entry></row>
-<row><entry>&circ;F</entry><entry>forget-passphrase</entry><entry>wipe passphrase(s) from memory</entry></row>
+<row><entry>a</entry><entry><literal>&lt;attach-file&gt;</literal></entry><entry>attach a file</entry></row>
+<row><entry>A</entry><entry><literal>&lt;attach-message&gt;</literal></entry><entry>attach message(s) to the message</entry></row>
+<row><entry>Esc k</entry><entry><literal>&lt;attach-key&gt;</literal></entry><entry>attach a PGP public key</entry></row>
+<row><entry>d</entry><entry><literal>&lt;edit-description&gt;</literal></entry><entry>edit description on attachment</entry></row>
+<row><entry>D</entry><entry><literal>&lt;detach-file&gt;</literal></entry><entry>detach a file</entry></row>
+<row><entry>t</entry><entry><literal>&lt;edit-to&gt;</literal></entry><entry>edit the To field</entry></row>
+<row><entry>Esc f</entry><entry><literal>&lt;edit-from&gt;</literal></entry><entry>edit the From field</entry></row>
+<row><entry>r</entry><entry><literal>&lt;edit-reply-to&gt;</literal></entry><entry>edit the Reply-To field</entry></row>
+<row><entry>c</entry><entry><literal>&lt;edit-cc&gt;</literal></entry><entry>edit the Cc field</entry></row>
+<row><entry>b</entry><entry><literal>&lt;edit-bcc&gt;</literal></entry><entry>edit the Bcc field</entry></row>
+<row><entry>y</entry><entry><literal>&lt;send-message&gt;</literal></entry><entry>send the message</entry></row>
+<row><entry>s</entry><entry><literal>&lt;edit-subject&gt;</literal></entry><entry>edit the Subject</entry></row>
+<row><entry>S</entry><entry><literal>&lt;smime-menu&gt;</literal></entry><entry>select S/MIME options</entry></row>
+<row><entry>f</entry><entry><literal>&lt;edit-fcc&gt;</literal></entry><entry>specify an <quote>Fcc</quote> mailbox</entry></row>
+<row><entry>p</entry><entry><literal>&lt;pgp-menu&gt;</literal></entry><entry>select PGP options</entry></row>
+<row><entry>P</entry><entry><literal>&lt;postpone-message&gt;</literal></entry><entry>postpone this message until later</entry></row>
+<row><entry>q</entry><entry><literal>&lt;quit&gt;</literal></entry><entry>quit (abort) sending the message</entry></row>
+<row><entry>w</entry><entry><literal>&lt;write-fcc&gt;</literal></entry><entry>write the message to a folder</entry></row>
+<row><entry>i</entry><entry><literal>&lt;ispell&gt;</literal></entry><entry>check spelling (if available on your system)</entry></row>
+<row><entry>&circ;F</entry><entry><literal>&lt;forget-passphrase&gt;</literal></entry><entry>wipe passphrase(s) from memory</entry></row>

 </tbody>
 </tgroup>
 </table>
 
 </tbody>
 </tgroup>
 </table>
 

+<para>
+The compose menu is also used to edit the attachments for a message which can be either files
+or other messages. The <literal>&lt;attach-message&gt;</literal> function to will prompt you for a folder to
+attach messages from. You can now tag messages in that folder and they
+will be attached to the message you are sending.

 </para>
 
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> The attach-message function will prompt you for a folder to
-attach messages from. You can now tag messages in that folder and they
-will be attached to the message you are sending. Note that certain
+Note that certain

 operations like composing a new mail, replying, forwarding, etc. are
 operations like composing a new mail, replying, forwarding, etc. are

-not permitted when you are in that folder. The &percnt;r in <link linkend="status-format">&dollar;status&lowbar;format</link> will change to
-a 'A' to indicate that you are in attach-message mode.
+not permitted when you are in that folder. The &percnt;r in
+<link linkend="status-format">&dollar;status&lowbar;format</link> will change to
+a <quote>A</quote> to indicate that you are in attach-message mode.

 </para>
 </para>

+</note>
+
+</sect2>

 
 

-<sect2>
+<sect2 id="edit-header">

 <title>Editing the message header</title>
 
 <para>
 <title>Editing the message header</title>
 
 <para>

-When editing the header of your outgoing message, there are a couple of
-special features available.
+When editing the header because of <link linkend="edit-headers">&dollar;edit&lowbar;headers</link>
+being set, there are a several pseudo headers available which
+will not be included in sent messages.

 </para>
 
 </para>
 

+<sect3 id="fcc-header">
+<title>Fcc: pseudo header</title>
+

 <para>
 If you specify
 
 <literal>Fcc:</literal> <emphasis>filename</emphasis>
 
 <para>
 If you specify
 
 <literal>Fcc:</literal> <emphasis>filename</emphasis>
 

-Mutt will pick up <emphasis>filename</emphasis>
-just as if you had used the <emphasis>edit-fcc</emphasis> function in the <emphasis>compose</emphasis> menu.
+as a header, Mutt will pick up <emphasis>filename</emphasis>
+just as if you had used the <literal>&lt;edit-fcc&gt;</literal> function in the <emphasis>compose</emphasis> menu.

 </para>
 
 </para>
 

+</sect3>
+
+<sect3 id="attach-header">
+<title>Attach: pseudo header</title>
+

 <para>
 You can also attach files to your message by specifying
 
 <para>
 You can also attach files to your message by specifying
 


@@ -1072,37 +1129,48 @@ where <emphasis>filename</emphasis> is the file to attach and <emphasis>descript
 optional string to use as the description of the attached file.
 </para>
 
 optional string to use as the description of the attached file.
 </para>
 

-<para>
-When replying to messages, if you remove the <emphasis>In-Reply-To:</emphasis> field from
-the header field, Mutt will not generate a <emphasis>References:</emphasis> field, which
-allows you to create a new message thread.
-</para>
+</sect3>
+
+<sect3 id="pgp-header">
+<title>Pgp: pseudo header</title>

 
 <para>
 
 <para>

-Also see <link linkend="edit-headers">&dollar;edit&lowbar;headers</link>.
+If you want to use PGP, you can specify

 </para>
 
 </para>
 

-</sect2>
+<para>
+<literal>Pgp:</literal> &lsqb; <literal>E</literal> &verbar; <literal>S</literal> &verbar; <literal>S</literal><emphasis>&lt;id&gt;</emphasis> &rsqb;

 
 

-<sect2>
-<title>Using Mutt with PGP</title>
+</para>

 
 <para>
 
 <para>

-If you want to use PGP, you can specify 
+<quote>E</quote> selects encryption, <quote>S</quote> selects signing and
+<quote>S&lt;id&gt;</quote> selects signing with the given key, setting
+<link linkend="pgp-sign-as">&dollar;pgp&lowbar;sign&lowbar;as</link>
+permanently.

 </para>
 
 </para>
 

-<para>
-<literal>Pgp:</literal> &lsqb; <literal>E</literal> &verbar; <literal>S</literal> &verbar; <literal>S</literal><emphasis>&lt;id&gt;</emphasis> &rsqb; 
+</sect3>

 
 

-</para>
+<sect3 id="in-reply-to-header">
+<title>In-Reply-To: header</title>

 
 <para>
 
 <para>

-``E'' encrypts, ``S'' signs and
-``S&lt;id&gt;'' signs with the given key, setting <link linkend="pgp-sign-as">&dollar;pgp&lowbar;sign&lowbar;as</link> permanently.
+When replying to messages, the <emphasis>In-Reply-To:</emphasis> header contains the
+Message-Id of the message(s) you reply to. If you remove its value, Mutt will not generate a
+<emphasis>References:</emphasis> field, which allows you to create a new message thread, for example
+to create a new message to a mailing list without having to enter the mailing list's address.

 </para>
 
 </para>
 

+</sect3>
+
+</sect2>
+
+<sect2 id="sending-crypto">
+<title>Sending cryptographically signed/encrypted messages</title>
+

 <para>
 <para>

-If you have told mutt to PGP encrypt a message, it will guide you
+If you have told mutt to PGP or S/MIME encrypt a message, it will guide you

 through a key selection process when you try to send the message.
 Mutt will not ask you any questions about keys which have a
 certified user ID matching one of the message recipients' mail
 through a key selection process when you try to send the message.
 Mutt will not ask you any questions about keys which have a
 certified user ID matching one of the message recipients' mail


@@ -1121,18 +1189,19 @@ return to the compose screen.
 
 <para>
 Once you have successfully finished the key selection, the message
 
 <para>
 Once you have successfully finished the key selection, the message

-will be encrypted using the selected public keys, and sent out.
+will be encrypted using the selected public keys when sent out.

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

-Most fields of the entries in the key selection menu (see also <link linkend="pgp-entry-format">&dollar;pgp&lowbar;entry&lowbar;format</link>) 
-have obvious meanings.  But some explanations on the capabilities, flags, 
+Most fields of the entries in the key selection menu (see also <link linkend="pgp-entry-format">&dollar;pgp&lowbar;entry&lowbar;format</link>)
+have obvious meanings.  But some explanations on the capabilities, flags,

 and validity fields are in order.
 </para>
 
 <para>
 The flags sequence (&percnt;f) will expand to one of the flags in
 <xref linkend="tab-pgp-menuflags"/>.
 and validity fields are in order.
 </para>
 
 <para>
 The flags sequence (&percnt;f) will expand to one of the flags in
 <xref linkend="tab-pgp-menuflags"/>.

+</para>

 
 <table id="tab-pgp-menuflags">
 <title>PGP key menu flags</title>
 
 <table id="tab-pgp-menuflags">
 <title>PGP key menu flags</title>


@@ -1149,44 +1218,42 @@ The flags sequence (&percnt;f) will expand to one of the flags in
 </tgroup>
 </table>
 
 </tgroup>
 </table>
 

-</para>
-

 <para>
 The capabilities field (&percnt;c) expands to a two-character sequence
 representing a key's capabilities.  The first character gives
 <para>
 The capabilities field (&percnt;c) expands to a two-character sequence
 representing a key's capabilities.  The first character gives

-the key's encryption capabilities: A minus sign (<emphasis role="bold">-</emphasis>) means 
-that the key cannot be used for encryption.  A dot (<emphasis role="bold">.</emphasis>) means that
-it's marked as a signature key in one of the user IDs, but may 
-also be used for encryption.  The letter <emphasis role="bold">e</emphasis> indicates that 
+the key's encryption capabilities: A minus sign (<quote>-</quote>) means
+that the key cannot be used for encryption.  A dot (<quote>.</quote>) means that
+it's marked as a signature key in one of the user IDs, but may
+also be used for encryption.  The letter <quote>e</quote> indicates that

 this key can be used for encryption.
 </para>
 
 <para>
 this key can be used for encryption.
 </para>
 
 <para>

-The second character indicates the key's signing capabilities.  Once 
-again, a ``<emphasis role="bold">-</emphasis>'' implies ``not for signing'', ``<emphasis role="bold">.</emphasis>'' implies
+The second character indicates the key's signing capabilities.  Once
+again, a <quote>-</quote> implies <quote>not for signing</quote>, <quote>.</quote> implies

 that the key is marked as an encryption key in one of the user-ids, and
 that the key is marked as an encryption key in one of the user-ids, and

-``<emphasis role="bold">s</emphasis>'' denotes a key which can be used for signing.
+<quote>s</quote> denotes a key which can be used for signing.

 </para>
 
 <para>
 Finally, the validity field (&percnt;t) indicates how well-certified a user-id
 </para>
 
 <para>
 Finally, the validity field (&percnt;t) indicates how well-certified a user-id

-is.  A question mark (<emphasis role="bold">?</emphasis>) indicates undefined validity, a minus 
-character (<emphasis role="bold">-</emphasis>) marks an untrusted association, a space character 
-means a partially trusted association, and a plus character (<emphasis role="bold">+</emphasis>) 
+is.  A question mark (<quote>?</quote>) indicates undefined validity, a minus
+character (<quote>-</quote>) marks an untrusted association, a space character
+means a partially trusted association, and a plus character (<quote>+</quote>)

 indicates complete validity.
 </para>
 
 </sect2>
 
 indicates complete validity.
 </para>
 
 </sect2>
 

-<sect2>
-<title>Sending anonymous messages via mixmaster.</title>
+<sect2 id="sending-mixmaster">
+<title>Sending anonymous messages via mixmaster</title>

 
 <para>
 
 <para>

-You may also have configured mutt to co-operate with Mixmaster, an
+You may also have compiled mutt to co-operate with Mixmaster, an

 anonymous remailer.  Mixmaster permits you to send your messages
 anonymous remailer.  Mixmaster permits you to send your messages

-anonymously using a chain of remailers. Mixmaster support in mutt is for 
-mixmaster version 2.04 (beta 45 appears to be the latest) and 2.03. 
-It does not support earlier versions or the later so-called version 3 betas, 
+anonymously using a chain of remailers. Mixmaster support in mutt is for
+mixmaster version 2.04 (beta 45 appears to be the latest) and 2.03.
+It does not support earlier versions or the later so-called version 3 betas,

 of which the latest appears to be called 2.9b23.
 </para>
 
 of which the latest appears to be called 2.9b23.
 </para>
 


@@ -1204,22 +1271,22 @@ the lower part, you see the currently selected chain of remailers.
 </para>
 
 <para>
 </para>
 
 <para>

-You can navigate in the chain using the <literal>chain-prev</literal> and
-<literal>chain-next</literal> functions, which are by default bound to the left
+You can navigate in the chain using the <literal>&lt;chain-prev&gt;</literal> and
+<literal>&lt;chain-next&gt;</literal> functions, which are by default bound to the left

 and right arrows and to the <literal>h</literal> and <literal>l</literal> keys (think vi
 keyboard bindings).  To insert a remailer at the current chain
 and right arrows and to the <literal>h</literal> and <literal>l</literal> keys (think vi
 keyboard bindings).  To insert a remailer at the current chain

-position, use the <literal>insert</literal> function.  To append a remailer behind
-the current chain position, use <literal>select-entry</literal> or <literal>append</literal>.
+position, use the <literal>&lt;insert&gt;</literal> function.  To append a remailer behind
+the current chain position, use <literal>&lt;select-entry&gt;</literal> or <literal>&lt;append&gt;</literal>.

 You can also delete entries from the chain, using the corresponding
 function.  Finally, to abandon your changes, leave the menu, or
 You can also delete entries from the chain, using the corresponding
 function.  Finally, to abandon your changes, leave the menu, or

-<literal>accept</literal> them pressing (by default) the <literal>Return</literal> key.
+<literal>&lt;accept&gt;</literal> them pressing (by default) the <literal>Return</literal> key.

 </para>
 
 <para>
 Note that different remailers do have different capabilities,
 indicated in the &percnt;c entry of the remailer menu lines (see
 <link linkend="mix-entry-format">&dollar;mix&lowbar;entry&lowbar;format</link>).  Most important is
 </para>
 
 <para>
 Note that different remailers do have different capabilities,
 indicated in the &percnt;c entry of the remailer menu lines (see
 <link linkend="mix-entry-format">&dollar;mix&lowbar;entry&lowbar;format</link>).  Most important is

-the ``middleman'' capability, indicated by a capital ``M'': This
+the <quote>middleman</quote> capability, indicated by a capital <quote>M</quote>: This

 means that the remailer in question cannot be used as the final
 element of a chain, but will only forward messages to other
 mixmaster remailers.  For details on the other capabilities, please
 means that the remailer in question cannot be used as the final
 element of a chain, but will only forward messages to other
 mixmaster remailers.  For details on the other capabilities, please


@@ -1228,10 +1295,10 @@ have a look at the mixmaster documentation.
 
 </sect2>
 
 
 </sect2>
 

-<sect2>
+<sect2 id="ff">

 <title>Sending format=flowed messages</title>
 
 <title>Sending format=flowed messages</title>
 

-<sect3>
+<sect3 id="ff-concept">

 <title>Concept</title>
 
 <para>
 <title>Concept</title>
 
 <para>


@@ -1239,7 +1306,8 @@ have a look at the mixmaster documentation.
 for short) are <literal>text/plain</literal> messages that consist of paragraphs which a receiver's
 mail client may reformat to its own needs which mostly means to
 customize line lengths regardless of what the sender sent. Technically this is
 for short) are <literal>text/plain</literal> messages that consist of paragraphs which a receiver's
 mail client may reformat to its own needs which mostly means to
 customize line lengths regardless of what the sender sent. Technically this is

-achieved by letting lines of a ``flowable'' paragraph end in spaces.
+achieved by letting lines of a <quote>flowable</quote> paragraph end in spaces
+except for the last line.

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


@@ -1250,17 +1318,15 @@ receiver decide completely how to view a message.
 
 </sect3>
 
 
 </sect3>
 

-<sect3>
+<sect3 id="ff-support">

 <title>Mutt support</title>
 
 <para>
 Mutt only supports setting the required <literal>format=flowed</literal>
 <title>Mutt support</title>
 
 <para>
 Mutt only supports setting the required <literal>format=flowed</literal>

-MIME parameter on outgoing messages if the <link linkend="text-flowed"
->&dollar;text&lowbar;flowed</link> variable is set. It does not add the
-trailing spaces nor does it provide any other feature related to
-composing <literal>f=f</literal> messages (like reformatting
-non-<literal>f=f</literal> parts of a reply to <literal>f=f</literal>
-before calling the editor).
+MIME parameter on outgoing messages if the <link
+linkend="text-flowed">&dollar;text&lowbar;flowed</link>
+variable is set, specifically it does not add the
+trailing spaces.

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


@@ -1272,27 +1338,30 @@ the compose menu, mutt properly space-stuffes the message.
 
 <itemizedlist>
 <listitem><para>all lines starting with a space</para></listitem>
 
 <itemizedlist>
 <listitem><para>all lines starting with a space</para></listitem>

-<listitem><para>lines starting with the word ``<literal>From</literal>''
+<listitem><para>lines starting with the word <quote><literal>From</literal></quote>

 followed by space</para></listitem>
 followed by space</para></listitem>

-<listitem><para>all lines starting with ``<literal>&gt;</literal>'' which
+<listitem><para>all lines starting with <quote><literal>&gt;</literal></quote> which

 is not intended to be a quote character</para></listitem>
 </itemizedlist>
 
 is not intended to be a quote character</para></listitem>
 </itemizedlist>
 

+<note>

 <para>
 <para>

-All leading spaces are to be removed by receiving clients to restore
-the original message.
+Mutt only supports space-stuffing
+for the first two types of lines but not for the third: It is impossible to
+safely detect whether a leading <literal>&gt;</literal> character starts a
+quote or not. Furthermore, Mutt only applies space-stuffing
+<emphasis>once</emphasis> after the initial edit is finished.

 </para>
 </para>

+</note>

 
 <para>
 
 <para>

-<emphasis role="bold">Note</emphasis> that mutt only support space-stuffing
-for the first two types of lines but not for the third: It is impossible to
-safely detect whether a leading <literal>&gt;</literal> character starts a
-quote or not.
+All leading spaces are to be removed by receiving clients to restore
+the original message prior to further processing.

 </para>
 
 </sect3>
 
 </para>
 
 </sect3>
 

-<sect3>
+<sect3 id="ff-editor">

 <title>Editor considerations</title>
 
 <para>
 <title>Editor considerations</title>
 
 <para>


@@ -1326,28 +1395,14 @@ fo-table</literal> for details.
 
 <para>
 Bouncing and forwarding let you send an existing message to recipients
 
 <para>
 Bouncing and forwarding let you send an existing message to recipients

-that you specify.  Bouncing a message uses the <link linkend="sendmail">&dollar;sendmail</link> command to send a copy to alternative addresses as if
-they were the message's original recipients.  Forwarding a message, on
-the other hand, allows you to modify the message before it is resent
-(for example, by adding your own comments). The default key bindings
-are shown in <xref linkend="tab-key-fwd"/>.
-</para>
-
-<para>
-
-<table id="tab-key-fwd">
-<title>Message forwarding/bouncing keys</title>
-<tgroup cols="3">
-<thead>
-<row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
-</thead>
-<tbody>
-<row><entry>f</entry><entry>forward</entry><entry>forward message</entry></row>
-<row><entry>b</entry><entry>bounce</entry><entry>bounce (remail) message</entry></row>
-</tbody>
-</tgroup>
-</table>
-
+that you specify. Bouncing a message sends a verbatim copy of a message
+to alternative addresses as if they were the message's original
+recipients specified in the Bcc header.
+Forwarding a message, on the other hand, allows you to modify the message
+before it is resent (for example, by adding your own comments). Bouncing
+is done using the <literal>&lt;bounce&gt;</literal> function and forwarding
+using the <literal>&lt;forward&gt;</literal> function bound to <quote>b</quote> and <quote>f</quote>
+respectively.

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


@@ -1357,7 +1412,7 @@ attachment, depending on the value of the <link linkend="mime-forward">&dollar;m
 like in the pager, can be controlled by the <link linkend="forward-decode">&dollar;forward&lowbar;decode</link> and <link linkend="mime-forward-decode">&dollar;mime&lowbar;forward&lowbar;decode</link> variables,
 respectively.  The desired forwarding format may depend on the content,
 therefore <emphasis>&dollar;mime&lowbar;forward</emphasis> is a quadoption which, for
 like in the pager, can be controlled by the <link linkend="forward-decode">&dollar;forward&lowbar;decode</link> and <link linkend="mime-forward-decode">&dollar;mime&lowbar;forward&lowbar;decode</link> variables,
 respectively.  The desired forwarding format may depend on the content,
 therefore <emphasis>&dollar;mime&lowbar;forward</emphasis> is a quadoption which, for

-example, can be set to ``ask-no''.
+example, can be set to <quote>ask-no</quote>.

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


@@ -1377,7 +1432,7 @@ replying to a message does.
 
 <para>
 At times it is desirable to delay sending a message that you have
 
 <para>
 At times it is desirable to delay sending a message that you have

-already begun to compose.  When the <emphasis>postpone-message</emphasis> function is
+already begun to compose.  When the <literal>&lt;postpone-message&gt;</literal> function is

 used in the <emphasis>compose</emphasis> menu, the body of your message and attachments
 are stored in the mailbox specified by the <link linkend="postponed">&dollar;postponed</link> variable.  This means that you can recall the
 message even if you exit Mutt and then restart it at a later time.
 used in the <emphasis>compose</emphasis> menu, the body of your message and attachments
 are stored in the mailbox specified by the <link linkend="postponed">&dollar;postponed</link> variable.  This means that you can recall the
 message even if you exit Mutt and then restart it at a later time.


@@ -1385,19 +1440,21 @@ message even if you exit Mutt and then restart it at a later time.
 
 <para>
 Once a message is postponed, there are several ways to resume it.  From the
 
 <para>
 Once a message is postponed, there are several ways to resume it.  From the

-command line you can use the ``-p'' option, or if you <emphasis>compose</emphasis> a new
+command line you can use the <quote>-p</quote> option, or if you compose a new

 message from the <emphasis>index</emphasis> or <emphasis>pager</emphasis> you will be prompted if postponed
 messages exist.  If multiple messages are currently postponed, the
 <emphasis>postponed</emphasis> menu will pop up and you can select which message you would
 like to resume.
 </para>
 
 message from the <emphasis>index</emphasis> or <emphasis>pager</emphasis> you will be prompted if postponed
 messages exist.  If multiple messages are currently postponed, the
 <emphasis>postponed</emphasis> menu will pop up and you can select which message you would
 like to resume.
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> If you postpone a reply to a message, the reply setting of
+If you postpone a reply to a message, the reply setting of

 the message is only updated when you actually finish the message and
 send it.  Also, you must be in the same folder with the message you
 replied to for the status of the message to be updated.
 </para>
 the message is only updated when you actually finish the message and
 send it.  Also, you must be in the same folder with the message you
 replied to for the status of the message to be updated.
 </para>

+</note>

 
 <para>
 See also the <link linkend="postpone">&dollar;postpone</link> quad-option.
 
 <para>
 See also the <link linkend="postpone">&dollar;postpone</link> quad-option.


@@ -1410,17 +1467,20 @@ See also the <link linkend="postpone">&dollar;postpone</link> quad-option.
 <chapter id="configuration">
 <title>Configuration</title>
 
 <chapter id="configuration">
 <title>Configuration</title>
 

+<sect1 id="configuration-files">
+<title>Location of initialization files</title>
+

 <para>
 <para>

-While the default configuration (or ``preferences'') make Mutt
+While the default configuration (or <quote>preferences</quote>) make Mutt

 usable right out of the box, it is often desirable to tailor Mutt to
 suit your own tastes. When Mutt is first invoked, it will attempt to
 usable right out of the box, it is often desirable to tailor Mutt to
 suit your own tastes. When Mutt is first invoked, it will attempt to

-read the ``system'' configuration file (defaults set by your local
-system administrator), unless the ``-n'' <link linkend="commandline">command line</link> option is specified.  This file is typically
+read the <quote>system</quote> configuration file (defaults set by your local
+system administrator), unless the <quote>-n</quote> <link linkend="commandline">command line</link> option is specified.  This file is typically

 <literal>/usr/local/share/mutt/Muttrc</literal> or <literal>/etc/Muttrc</literal>. Mutt
 will next look for a file named <literal>.muttrc</literal> in your home
 directory.  If this file does not exist and your home directory has
 a subdirectory named <literal>.mutt</literal>, mutt try to load a file named
 <literal>/usr/local/share/mutt/Muttrc</literal> or <literal>/etc/Muttrc</literal>. Mutt
 will next look for a file named <literal>.muttrc</literal> in your home
 directory.  If this file does not exist and your home directory has
 a subdirectory named <literal>.mutt</literal>, mutt try to load a file named

-<literal>.mutt/muttrc</literal>. 
+<literal>.mutt/muttrc</literal>.

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


@@ -1436,34 +1496,41 @@ sourced instead of the <literal>Muttrc</literal> file.  The same is true of the
 configuration file, if you have a file <literal>.muttrc-0.88.6</literal> in your home
 directory, when you run mutt version 0.88.6, it will source this file
 instead of the default <literal>.muttrc</literal> file.  The version number is the
 configuration file, if you have a file <literal>.muttrc-0.88.6</literal> in your home
 directory, when you run mutt version 0.88.6, it will source this file
 instead of the default <literal>.muttrc</literal> file.  The version number is the

-same which is visible using the ``-v'' <link linkend="commandline">command line</link> switch or using the <literal>show-version</literal> key (default:
+same which is visible using the <quote>-v</quote> <link linkend="commandline">command line</link> switch or using the <literal>show-version</literal> key (default:

 V) from the index menu.
 </para>
 
 V) from the index menu.
 </para>
 

+</sect1>
+

 <sect1 id="muttrc-syntax" xreflabel="Syntax of Initialization Files">
 <title>Syntax of Initialization Files</title>
 
 <para>
 An initialization file consists of a series of <link linkend="commands">commands</link>.  Each line of the file may contain one or more commands.
 <sect1 id="muttrc-syntax" xreflabel="Syntax of Initialization Files">
 <title>Syntax of Initialization Files</title>
 
 <para>
 An initialization file consists of a series of <link linkend="commands">commands</link>.  Each line of the file may contain one or more commands.

-When multiple commands are used, they must be separated by a semicolon (;).
+When multiple commands are used, they must be separated by a semicolon
+(;).
+</para>

 
 

+<example id="ex-rc-multiple-cmds">
+<title>Multiple configuration commands per line</title>

 <screen>
 set realname='Mutt user' ; ignore x-
 </screen>
 <screen>
 set realname='Mutt user' ; ignore x-
 </screen>

+</example>

 
 

+<para>

 The hash mark, or pound sign
 The hash mark, or pound sign

-(``&num;''), is used as a ``comment'' character. You can use it to
+(<quote>&num;</quote>), is used as a <quote>comment</quote> character. You can use it to

 annotate your initialization file. All text after the comment character
 to the end of the line is ignored. For example,
 </para>
 
 annotate your initialization file. All text after the comment character
 to the end of the line is ignored. For example,
 </para>
 

-<para>
-
+<example id="ex-ec-comment">
+<title>Commenting configuration files</title>

 <screen>
 my_hdr X-Disclaimer: Why are you listening to me? &num; This is a comment
 </screen>
 <screen>
 my_hdr X-Disclaimer: Why are you listening to me? &num; This is a comment
 </screen>

-
-</para>
+</example>

 
 <para>
 Single quotes (') and double quotes (&quot;) can be used to quote strings
 
 <para>
 Single quotes (') and double quotes (&quot;) can be used to quote strings


@@ -1472,25 +1539,27 @@ the two types of quotes is similar to that of many popular shell programs,
 namely that a single quote is used to specify a literal string (one that is
 not interpreted for shell variables or quoting with a backslash &lsqb;see
 next paragraph&rsqb;), while double quotes indicate a string for which
 namely that a single quote is used to specify a literal string (one that is
 not interpreted for shell variables or quoting with a backslash &lsqb;see
 next paragraph&rsqb;), while double quotes indicate a string for which

-should be evaluated.  For example, backtics are evaluated inside of double
+should be evaluated.  For example, backticks are evaluated inside of double

 quotes, but <emphasis role="bold">not</emphasis> for single quotes.
 </para>
 
 <para>
 &bsol; quotes the next character, just as in shells such as bash and zsh.
 quotes, but <emphasis role="bold">not</emphasis> for single quotes.
 </para>
 
 <para>
 &bsol; quotes the next character, just as in shells such as bash and zsh.

-For example, if want to put quotes ``&quot;'' inside of a string, you can use
-``&bsol;'' to force the next character to be a literal instead of interpreted
+For example, if want to put quotes <quote>&quot;</quote> inside of a string, you can use
+<quote>&bsol;</quote> to force the next character to be a literal instead of interpreted

 character.
 character.

+</para>

 
 

+<example id="ex-rc-quote">
+<title>Escaping quotes in congfiguration files</title>

 <screen>
 set realname="Michael \"MuttDude\" Elkins"
 </screen>
 <screen>
 set realname="Michael \"MuttDude\" Elkins"
 </screen>

-
-</para>
+</example>

 
 <para>
 
 <para>

-``&bsol;&bsol;'' means to insert a literal ``&bsol;'' into the line.
-``&bsol;n'' and ``&bsol;r'' have their usual C meanings of linefeed and
+<quote>&bsol;&bsol;</quote> means to insert a literal <quote>&bsol;</quote> into the line.
+<quote>&bsol;n</quote> and <quote>&bsol;r</quote> have their usual C meanings of linefeed and

 carriage-return, respectively.
 </para>
 
 carriage-return, respectively.
 </para>
 


@@ -1503,30 +1572,44 @@ middle of command names.
 <para>
 It is also possible to substitute the output of a Unix command in an
 initialization file.  This is accomplished by enclosing the command in
 <para>
 It is also possible to substitute the output of a Unix command in an
 initialization file.  This is accomplished by enclosing the command in

-backquotes (``).  For example,
+backticks (``).  For example,
+</para>

 
 

+<example id="ex-rc-backtick">
+<title>Using external command's output in configuration files</title>

 <screen>
 my_hdr X-Operating-System: `uname -a`
 </screen>
 <screen>
 my_hdr X-Operating-System: `uname -a`
 </screen>

+</example>

 
 

-The output of the Unix command ``uname -a'' will be substituted before the
-line is parsed.  Note that since initialization files are line oriented, only
+<para>
+The output of the Unix command <quote>uname -a</quote> will be substituted before the
+line is parsed.
+</para>
+
+<note>
+<para>
+Since initialization files are line oriented, only

 the first line of output from the Unix command will be substituted.
 </para>
 the first line of output from the Unix command will be substituted.
 </para>

+</note>

 
 <para>
 Both environment variables and mutt variables can be accessed by
 
 <para>
 Both environment variables and mutt variables can be accessed by

-prepending ``&dollar;'' to the name of the variable. For example,
+prepending <quote>&dollar;</quote> to the name of the variable. For example,

 </para>
 
 </para>
 

+<example id="ex-rc-env">
+<title>Using environment variables in configuration files</title>

 <screen>
 set record=+sent_on_$HOSTNAME
 </screen>
 <screen>
 set record=+sent_on_$HOSTNAME
 </screen>

+</example>

 
 <para>
 will cause mutt to save outgoing messages to a folder named
 
 <para>
 will cause mutt to save outgoing messages to a folder named

-``sent_on_kremvax'' if the environment variable HOSTNAME is set to
-``kremvax.'' (See <link linkend="record">&dollar;record</link> for
+<quote>sent_on_kremvax</quote> if the environment variable HOSTNAME is set to
+<quote>kremvax.</quote> (See <link linkend="record">&dollar;record</link> for

 details.)
 </para>
 
 details.)
 </para>
 


@@ -1542,14 +1625,84 @@ The commands understood by mutt are explained in the next paragraphs.
 For a complete list, see the <link linkend="commands">command reference</link>.
 </para>
 
 For a complete list, see the <link linkend="commands">command reference</link>.
 </para>
 

+<para>
+All configuration files are expected to be in the current locale as
+specified by the <link linkend="charset">&dollar;charset</link> variable
+which doesn't have a default value since it's determined by Mutt at startup.
+If a configuration file is not encoded in the same character set the
+<link linkend="config-charset">&dollar;config&lowbar;charset</link>
+variable should be used: all lines starting with the next are recoded
+from &dollar;config&lowbar;charset to &dollar;charset.
+</para>
+
+<para>
+This mechanism should be avoided if possible as it has the
+following implications:
+</para>
+
+<itemizedlist>
+
+<listitem><para>These variables should be set early in a configuration
+file with &dollar;charset preceding &dollar;config&lowbar;charset so Mutt
+know what character set to convert to.</para></listitem>
+
+<listitem><para>If &dollar;config&lowbar;charset is set, it should be set
+in each configuration file because the value is global and <emphasis>not</emphasis>
+per configuration file.</para></listitem>
+
+<listitem><para>Because Mutt first recodes a line before it attempts to parse it,
+a conversion introducing question marks or other characters as
+part of errors (unconvertable characters, transliteration) may introduce syntax
+errors or silently change the meaning of certain tokens (e.g. inserting
+question marks into regular expressions).</para></listitem>
+
+</itemizedlist>
+

 </sect1>
 
 <sect1 id="addrgroup">
 <title>Address groups</title>
 
 </sect1>
 
 <sect1 id="addrgroup">
 <title>Address groups</title>
 

-<para>
-Usage: <literal>group</literal> &lsqb; <literal>-group</literal> <emphasis>name</emphasis> &lsqb; ... &rsqb; &rsqb; &lsqb; <literal>-rx</literal> <emphasis>EXPR</emphasis> &lsqb; ... &rsqb; &rsqb; &lsqb; <literal>-addr</literal> <emphasis>EXPR</emphasis> &lsqb; ... &rsqb; &rsqb;
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>group</command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain" rep="repeat">
+<option>-rx</option>
+<replaceable class="parameter">expr</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<option>-addr</option>
+<replaceable class="parameter">expr</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>ungroup</command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<option>-rx</option>
+<replaceable class="parameter">expr</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<option>-addr</option>
+<replaceable class="parameter">expr</replaceable>
+</arg>
+</group>
+</cmdsynopsis>

 
 <para>
 <literal>group</literal> is used to directly add either addresses or
 
 <para>
 <literal>group</literal> is used to directly add either addresses or


@@ -1562,7 +1715,7 @@ expression or an email address, respectively.
 </para>
 
 <para>
 </para>
 
 <para>

-These address groups can also be created implicitely by the
+These address groups can also be created implicitly by the

 <link linkend="alias">alias</link>, <link linkend="lists">lists</link>,
 <link linkend="lists">subscribe</link> and
 <link linkend="alternates">alternates</link> commands by specifying the
 <link linkend="alias">alias</link>, <link linkend="lists">lists</link>,
 <link linkend="lists">subscribe</link> and
 <link linkend="alternates">alternates</link> commands by specifying the


@@ -1575,10 +1728,6 @@ Once defined, these address groups can be used in
 display to messages matching a group.
 </para>
 
 display to messages matching a group.
 </para>
 

-<para>
-Usage: <literal>ungroup</literal> &lsqb; <literal>-group</literal> <emphasis>name</emphasis> &lsqb; ... &rsqb; &rsqb; &lsqb; * | &lsqb; &lsqb; <literal>-rx</literal> <emphasis>EXPR</emphasis> &lsqb; ... &rsqb; &rsqb; &lsqb; <literal>-addr</literal> <emphasis>EXPR</emphasis> &lsqb; ... &rsqb; &rsqb; &rsqb;
-</para>
-

 <para>
 <literal>ungroup</literal> is used to remove addresses or regular
 expressions from the specified group or groups. The syntax is similar to
 <para>
 <literal>ungroup</literal> is used to remove addresses or regular
 expressions from the specified group or groups. The syntax is similar to


@@ -1592,20 +1741,37 @@ contents.
 <sect1 id="alias">
 <title>Defining/Using aliases</title>
 
 <sect1 id="alias">
 <title>Defining/Using aliases</title>
 

-<para>
-Usage: <literal>alias</literal> &lsqb; <literal>-group</literal> <emphasis>name</emphasis> &lsqb; ... &rsqb; &rsqb; <emphasis>key</emphasis> <emphasis>address</emphasis> &lsqb; , <emphasis>address</emphasis>, ... &rsqb;
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>alias</command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">key</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">address</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">address</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 It's usually very cumbersome to remember or type out the address of someone
 
 <para>
 It's usually very cumbersome to remember or type out the address of someone

-you are communicating with.  Mutt allows you to create ``aliases'' which map
+you are communicating with.  Mutt allows you to create <quote>aliases</quote> which map

 a short string to a full address.
 </para>
 
 a short string to a full address.
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> if you want to create an alias for more than
-one address, you <emphasis role="bold">must</emphasis> separate the addresses with a comma (``,'').
+If you want to create an alias for more than
+one address, you <emphasis role="bold">must</emphasis> separate the addresses with a comma (<quote>,</quote>).

 </para>
 </para>

+</note>

 
 <para>
 The optional <literal>-group</literal> argument to
 
 <para>
 The optional <literal>-group</literal> argument to


@@ -1614,22 +1780,30 @@ the named <emphasis>group</emphasis>.
 </para>
 
 <para>
 </para>
 
 <para>

-To remove an alias or aliases (``*'' means all aliases):
+To remove an alias or aliases (<quote>*</quote> means all aliases):

 </para>
 
 </para>
 

-<para>
-<literal>unalias</literal> &lsqb; * &verbar; <emphasis>key</emphasis> <emphasis>...</emphasis> &rsqb;
-</para>
-
-<para>
+<cmdsynopsis>
+<command>unalias</command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable>name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">key</replaceable>
+</arg>
+</group>
+</cmdsynopsis>

 
 <screen>
 alias muttdude me@cs.hmc.edu (Michael Elkins)
 alias theguys manny, moe, jack
 </screen>
 
 
 <screen>
 alias muttdude me@cs.hmc.edu (Michael Elkins)
 alias theguys manny, moe, jack
 </screen>
 

-</para>
-

 <para>
 Unlike other mailers, Mutt doesn't require aliases to be defined
 in a special file.  The <literal>alias</literal> command can appear anywhere in
 <para>
 Unlike other mailers, Mutt doesn't require aliases to be defined
 in a special file.  The <literal>alias</literal> command can appear anywhere in


@@ -1638,7 +1812,7 @@ you can have all aliases defined in your muttrc.
 </para>
 
 <para>
 </para>
 
 <para>

-On the other hand, the <link linkend="create-alias">create-alias</link>
+On the other hand, the <link linkend="create-alias"><literal>&lt;create-alias&gt;</literal></link>

 function can use only one file, the one pointed to by the <link linkend="alias-file">&dollar;alias&lowbar;file</link> variable (which is
 <literal>&tilde;/.muttrc</literal> by default). This file is not special either,
 in the sense that Mutt will happily append aliases to any file, but in
 function can use only one file, the one pointed to by the <link linkend="alias-file">&dollar;alias&lowbar;file</link> variable (which is
 <literal>&tilde;/.muttrc</literal> by default). This file is not special either,
 in the sense that Mutt will happily append aliases to any file, but in


@@ -1649,15 +1823,14 @@ order for the new aliases to take effect you need to explicitly <link linkend="s
 For example:
 </para>
 
 For example:
 </para>
 

-<para>
-
+<example id="ex-alias-external">
+<title>Configuring external alias files</title>

 <screen>
 source /usr/local/share/Mutt.aliases
 source ~/.mail_aliases
 set alias_file=~/.mail_aliases
 </screen>
 <screen>
 source /usr/local/share/Mutt.aliases
 source ~/.mail_aliases
 set alias_file=~/.mail_aliases
 </screen>

-
-</para>
+</example>

 
 <para>
 To use aliases, you merely use the alias at any place in mutt where mutt
 
 <para>
 To use aliases, you merely use the alias at any place in mutt where mutt


@@ -1677,8 +1850,8 @@ multiple addresses.
 
 <para>
 In the alias menu, you can select as many aliases as you want with the
 
 <para>
 In the alias menu, you can select as many aliases as you want with the

-<emphasis>select-entry</emphasis> key (default: RET), and use the <emphasis>exit</emphasis> key
-(default: q) to return to the address prompt.
+<literal>select-entry</literal> key (default: &lt;Return&gt;), and use the
+<emphasis>exit</emphasis> key (default: q) to return to the address prompt.

 </para>
 
 </sect1>
 </para>
 
 </sect1>


@@ -1686,9 +1859,20 @@ In the alias menu, you can select as many aliases as you want with the
 <sect1 id="bind">
 <title>Changing the default key bindings</title>
 
 <sect1 id="bind">
 <title>Changing the default key bindings</title>
 

-<para>
-Usage: <literal>bind</literal> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>function</emphasis>
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>bind</command>
+<arg choice="plain">
+<replaceable class="parameter">map</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">key</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">function</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 This command allows you to change the default key bindings (operation
 
 <para>
 This command allows you to change the default key bindings (operation


@@ -1701,7 +1885,6 @@ be specified by separating them with commas (no additional whitespace is
 allowed). The currently defined maps are:
 </para>
 
 allowed). The currently defined maps are:
 </para>
 

-<para>

 <anchor id="maps"/>
 <variablelist>
 
 <anchor id="maps"/>
 <variablelist>
 


@@ -1781,7 +1964,16 @@ listings.
 <term>pgp</term>
 <listitem>
 <para>
 <term>pgp</term>
 <listitem>
 <para>

-The pgp menu is used to select the OpenPGP keys used for encrypting outgoing
+The pgp menu is used to select the OpenPGP keys used to encrypt outgoing
+messages.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>smime</term>
+<listitem>
+<para>
+The smime menu is used to select the OpenSSL certificates used to encrypt outgoing

 messages.
 </para>
 </listitem>
 messages.
 </para>
 </listitem>


@@ -1795,23 +1987,38 @@ recalling a message the user was composing, but saved until later.
 </para>
 </listitem>
 </varlistentry>
 </para>
 </listitem>
 </varlistentry>

-</variablelist>
+<varlistentry>
+<term>query</term>
+<listitem>
+<para>
+The query menu is the browser for results returned by
+<link linkend="query-command">&dollar;query&lowbar;command</link>.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>mix</term>
+<listitem>
+<para>
+The mixmaster screen is used to select remailer options for outgoing
+messages (if Mutt is compiled with Mixmaster support).

 </para>
 </para>

+</listitem>
+</varlistentry>
+</variablelist>

 
 <para>
 <emphasis>key</emphasis> is the key (or key sequence) you wish to bind.  To specify a
 control character, use the sequence <emphasis>&bsol;Cx</emphasis>, where <emphasis>x</emphasis> is the
 letter of the control character (for example, to specify control-A use
 
 <para>
 <emphasis>key</emphasis> is the key (or key sequence) you wish to bind.  To specify a
 control character, use the sequence <emphasis>&bsol;Cx</emphasis>, where <emphasis>x</emphasis> is the
 letter of the control character (for example, to specify control-A use

-``&bsol;Ca'').  Note that the case of <emphasis>x</emphasis> as well as <emphasis>&bsol;C</emphasis> is
+<quote>&bsol;Ca</quote>).  Note that the case of <emphasis>x</emphasis> as well as <emphasis>&bsol;C</emphasis> is

 ignored, so that <emphasis>&bsol;CA</emphasis>, <emphasis>&bsol;Ca</emphasis>, <emphasis>&bsol;cA</emphasis> and <emphasis>&bsol;ca</emphasis> are all
 equivalent.  An alternative form is to specify the key as a three digit
 ignored, so that <emphasis>&bsol;CA</emphasis>, <emphasis>&bsol;Ca</emphasis>, <emphasis>&bsol;cA</emphasis> and <emphasis>&bsol;ca</emphasis> are all
 equivalent.  An alternative form is to specify the key as a three digit

-octal number prefixed with a ``&bsol;'' (for example <emphasis>&bsol;177</emphasis> is
+octal number prefixed with a <quote>&bsol;</quote> (for example <emphasis>&bsol;177</emphasis> is

 equivalent to <emphasis>&bsol;c?</emphasis>). In addition, <emphasis>key</emphasis> may
 be a symbolic name as shown in <xref linkend="tab-key-names"/>.
 </para>
 
 equivalent to <emphasis>&bsol;c?</emphasis>). In addition, <emphasis>key</emphasis> may
 be a symbolic name as shown in <xref linkend="tab-key-names"/>.
 </para>
 

-<para>
-

 <table id="tab-key-names">
 <title>Symbolic key names</title>
 <tgroup cols="2">
 <table id="tab-key-names">
 <title>Symbolic key names</title>
 <tgroup cols="2">


@@ -1846,16 +2053,14 @@ be a symbolic name as shown in <xref linkend="tab-key-names"/>.
 </tgroup>
 </table>
 
 </tgroup>
 </table>
 

-</para>
-

 <para>
 <emphasis>key</emphasis> does not need to be enclosed in quotes unless it contains a
 <para>
 <emphasis>key</emphasis> does not need to be enclosed in quotes unless it contains a

-space (`` '').
+space (<quote>&puncsp;</quote>) or semi-colon (<quote>;</quote>).

 </para>
 
 <para>
 <emphasis>function</emphasis> specifies which action to take when <emphasis>key</emphasis> is pressed.
 </para>
 
 <para>
 <emphasis>function</emphasis> specifies which action to take when <emphasis>key</emphasis> is pressed.

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

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


@@ -1864,12 +2069,27 @@ sequence.
 <sect1 id="charset-hook">
 <title>Defining aliases for character sets </title>
 
 <sect1 id="charset-hook">
 <title>Defining aliases for character sets </title>
 

-<para>
-<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>Usage:</para>
+
+<cmdsynopsis>
+<command>charset-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">alias</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">charset</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>iconv-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">charset</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">local-charset</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 The <literal>charset-hook</literal> command defines an alias for a character set.
 
 <para>
 The <literal>charset-hook</literal> command defines an alias for a character set.


@@ -1889,9 +2109,17 @@ for character sets.
 <sect1 id="folder-hook">
 <title>Setting variables based upon mailbox</title>
 
 <sect1 id="folder-hook">
 <title>Setting variables based upon mailbox</title>
 

-<para>
-Usage: <literal>folder-hook</literal> &lsqb;!&rsqb;<emphasis>regexp</emphasis> <emphasis>command</emphasis>
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>folder-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;regexp</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">command</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 It is often desirable to change settings based on which mailbox you are
 
 <para>
 It is often desirable to change settings based on which mailbox you are


@@ -1902,68 +2130,87 @@ matches multiple folder-hook's, they are executed in the order given in the
 muttrc.
 </para>
 
 muttrc.
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> if you use the ``!'' shortcut for <link linkend="spoolfile">&dollar;spoolfile</link> at the beginning of the pattern, you must place it
+If you use the <quote>!</quote> shortcut for <link linkend="spoolfile">&dollar;spoolfile</link> at the beginning of the pattern, you must place it

 inside of double or single quotes in order to distinguish it from the
 logical <emphasis>not</emphasis> operator for the expression.
 </para>
 inside of double or single quotes in order to distinguish it from the
 logical <emphasis>not</emphasis> operator for the expression.
 </para>

+</note>

 
 

+<note>

 <para>
 <para>

-Note that the settings are <emphasis>not</emphasis> restored when you leave the mailbox.
+Settings are <emphasis>not</emphasis> restored when you leave the mailbox.

 For example, a command action to perform is to change the sorting method
 based upon the mailbox being read:
 </para>
 For example, a command action to perform is to change the sorting method
 based upon the mailbox being read:
 </para>

-
-<para>
+</note>

 
 <screen>
 folder-hook mutt set sort=threads
 </screen>
 
 
 <screen>
 folder-hook mutt set sort=threads
 </screen>
 

-</para>
-

 <para>
 However, the sorting method is not restored to its previous value when
 reading a different mailbox.  To specify a <emphasis>default</emphasis> command, use the
 <para>
 However, the sorting method is not restored to its previous value when
 reading a different mailbox.  To specify a <emphasis>default</emphasis> command, use the

-pattern ``.'':
+pattern <quote>.</quote> before other folder-hooks adjusting a value on a per-folder basis
+because folder-hooks are evaluated in the order given in the configuration file.
+The following example will set the <link linkend="sort">sort</link> variable
+to <literal>date-sent</literal> for all folders but to <literal>threads</literal>
+for all folders containing <quote>mutt</quote> in their name.

 </para>
 
 </para>
 

-<para>
-
+<example id="ex-folder-sorting">
+<title>Setting sort method based on mailbox name</title>

 <screen>
 folder-hook . set sort=date-sent
 <screen>
 folder-hook . set sort=date-sent

+folder-hook mutt set sort=threads

 </screen>
 </screen>

-
-</para>
+</example>

 
 </sect1>
 
 <sect1 id="macro">
 <title>Keyboard macros</title>
 
 
 </sect1>
 
 <sect1 id="macro">
 <title>Keyboard macros</title>
 

-<para>
-Usage: <literal>macro</literal> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>sequence</emphasis> &lsqb; <emphasis>description</emphasis> &rsqb;
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>macro</command>
+<arg choice="plain">
+<replaceable class="parameter">menu</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">key</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">sequence</replaceable>
+</arg>
+<arg choice="opt">
+<replaceable class="parameter">description</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 Macros are useful when you would like a single key to perform a series of
 actions.  When you press <emphasis>key</emphasis> in menu <emphasis>menu</emphasis>, Mutt will behave as if
 you had typed <emphasis>sequence</emphasis>.  So if you have a common sequence of commands
 you type, you can create a macro to execute those commands with a single
 
 <para>
 Macros are useful when you would like a single key to perform a series of
 actions.  When you press <emphasis>key</emphasis> in menu <emphasis>menu</emphasis>, Mutt will behave as if
 you had typed <emphasis>sequence</emphasis>.  So if you have a common sequence of commands
 you type, you can create a macro to execute those commands with a single

-key.
+key or fewer keys.

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

-<emphasis>menu</emphasis> is the <link linkend="maps">map</link> which the macro will be bound.
+<emphasis>menu</emphasis> is the <link linkend="maps">map</link> which the macro will be bound in.

 Multiple maps may be specified by separating multiple menu arguments by
 commas. Whitespace may not be used in between the menu arguments and the
 commas separating them.
 </para>
 
 <para>
 Multiple maps may be specified by separating multiple menu arguments by
 commas. Whitespace may not be used in between the menu arguments and the
 commas separating them.
 </para>
 
 <para>

-<emphasis>key</emphasis> and <emphasis>sequence</emphasis> are expanded by the same rules as the <link linkend="bind">key bindings</link>.  There are some additions however.  The
+<emphasis>key</emphasis> and <emphasis>sequence</emphasis> are expanded by the same rules as the
+<link linkend="bind">key bindings</link> with some additions.  The

 first is that control characters in <emphasis>sequence</emphasis> can also be specified
 first is that control characters in <emphasis>sequence</emphasis> can also be specified

-as <emphasis>&circ;x</emphasis>.  In order to get a caret (`&circ;'') you need to use
+as <emphasis>&circ;x</emphasis>.  In order to get a caret (<quote>&circ;</quote>) you need to use

 <emphasis>&circ;&circ;</emphasis>.  Secondly, to specify a certain key such as <emphasis>up</emphasis>
 or to invoke a function directly, you can use the format
 <emphasis>&lt;key name&gt;</emphasis> and <emphasis>&lt;function name&gt;</emphasis>.  For a listing of key
 <emphasis>&circ;&circ;</emphasis>.  Secondly, to specify a certain key such as <emphasis>up</emphasis>
 or to invoke a function directly, you can use the format
 <emphasis>&lt;key name&gt;</emphasis> and <emphasis>&lt;function name&gt;</emphasis>.  For a listing of key


@@ -1984,23 +2231,84 @@ Optionally you can specify a descriptive text after <emphasis>sequence</emphasis
 which is shown in the help screens.
 </para>
 
 which is shown in the help screens.
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> Macro definitions (if any) listed in the help screen(s), are
+Macro definitions (if any) listed in the help screen(s), are

 silently truncated at the screen width, and are not wrapped.
 </para>
 silently truncated at the screen width, and are not wrapped.
 </para>

+</note>

 
 </sect1>
 
 <sect1 id="color">
 <title>Using color and mono video attributes</title>
 
 
 </sect1>
 
 <sect1 id="color">
 <title>Using color and mono video attributes</title>
 

-<para>
-<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>Usage:</para>
+
+<cmdsynopsis>
+<command>color</command>
+<arg choice="plain">
+<replaceable class="parameter">object</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">foreground</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">background</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>color</command>
+<group choice="req">
+<arg choice="plain">
+<option>header</option>
+</arg>
+<arg choice="plain">
+<option>body</option>
+</arg>
+</group>
+<arg choice="plain">
+<replaceable class="parameter">foreground</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">background</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>color</command>
+<arg choice="plain">
+<option>index</option>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">foreground</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">background</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>uncolor</command>
+<arg choice="plain">
+<option>index</option>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>pattern</replaceable>
+</arg>
+</group>
+</cmdsynopsis>

 
 <para>
 If your terminal supports color, you can spice up Mutt by creating your own
 
 <para>
 If your terminal supports color, you can spice up Mutt by creating your own


@@ -2010,203 +2318,51 @@ possible to only specify one or the other).
 </para>
 
 <para>
 </para>
 
 <para>

-<emphasis>object</emphasis> can be one of:
-</para>
-
-<para>
-
-<itemizedlist>
-<listitem>
-
-<para>
-attachment
-</para>
-</listitem>
-<listitem>
-
-<para>
-body (match <emphasis>regexp</emphasis> in the body of messages)
-</para>
-</listitem>
-<listitem>
-
-<para>
-bold (hiliting bold patterns in the body of messages)
-</para>
-</listitem>
-<listitem>
-
-<para>
-error (error messages printed by Mutt)
-</para>
-</listitem>
-<listitem>
-
-<para>
-header (match <emphasis>regexp</emphasis> in the message header)
-</para>
-</listitem>
-<listitem>
-
-<para>
-hdrdefault (default color of the message header in the pager)
-</para>
-</listitem>
-<listitem>
-
-<para>
-index (match <emphasis>pattern</emphasis> in the message index)
-</para>
-</listitem>
-<listitem>
-
-<para>
-indicator (arrow or bar used to indicate the current item in a menu)
-</para>
-</listitem>
-<listitem>
-
-<para>
-markers (the ``+'' markers at the beginning of wrapped lines in the pager)
-</para>
-</listitem>
-<listitem>
-
-<para>
-message (informational messages)
-</para>
-</listitem>
-<listitem>
-
-<para>
-normal
-</para>
-</listitem>
-<listitem>
-
-<para>
-quoted (text matching <link linkend="quote-regexp">&dollar;quote&lowbar;regexp</link> in the body of a message)
-</para>
-</listitem>
-<listitem>
-
-<para>
-quoted1, quoted2, ..., quoted<emphasis role="bold">N</emphasis> (higher levels of quoting)
-</para>
-</listitem>
-<listitem>
-
-<para>
-search (hiliting of words in the pager)
-</para>
-</listitem>
-<listitem>
-
-<para>
-signature
-</para>
-</listitem>
-<listitem>
-
-<para>
-status (mode lines used to display info about the mailbox or message)
-</para>
-</listitem>
-<listitem>
-
-<para>
-tilde (the ``&tilde;'' used to pad blank lines in the pager)
-</para>
-</listitem>
-<listitem>
-
-<para>
-tree (thread tree drawn in the message index and attachment menu)
+<emphasis>header</emphasis> and <emphasis>body</emphasis> match <emphasis>regexp</emphasis>
+in the header/body of a message, <emphasis>index</emphasis> matches <emphasis>pattern</emphasis>
+(see <xref linkend="patterns"/>) in the message index.

 </para>
 </para>

-</listitem>
-<listitem>

 
 <para>
 
 <para>

-underline (hiliting underlined patterns in the body of messages)
+<emphasis>object</emphasis> can be one of:

 </para>
 </para>

-</listitem>

 
 

+<itemizedlist>
+<listitem><para>attachment</para></listitem>
+<listitem><para>bold (hiliting bold patterns in the body of messages)</para></listitem>
+<listitem><para>error (error messages printed by Mutt)</para></listitem>
+<listitem><para>hdrdefault (default color of the message header in the pager)</para></listitem>
+<listitem><para>indicator (arrow or bar used to indicate the current item in a menu)</para></listitem>
+<listitem><para>markers (the <quote>+</quote> markers at the beginning of wrapped lines in the pager)</para></listitem>
+<listitem><para>message (informational messages)</para></listitem>
+<listitem><para>normal</para></listitem>
+<listitem><para>quoted (text matching <link linkend="quote-regexp">&dollar;quote&lowbar;regexp</link> in the body of a message)</para></listitem>
+<listitem><para>quoted1, quoted2, ..., quoted<emphasis role="bold">N</emphasis> (higher levels of quoting)</para></listitem>
+<listitem><para>search (hiliting of words in the pager)</para></listitem>
+<listitem><para>signature</para></listitem><listitem><para>status (mode lines used to display info about the mailbox or message)</para></listitem>
+<listitem><para>tilde (the <quote>&tilde;</quote> used to pad blank lines in the pager)</para></listitem>
+<listitem><para>tree (thread tree drawn in the message index and attachment menu)</para></listitem>
+<listitem><para>underline (hiliting underlined patterns in the body of messages)</para></listitem>

 </itemizedlist>
 
 </itemizedlist>
 

-</para>
-

 <para>
 <emphasis>foreground</emphasis> and <emphasis>background</emphasis> can be one of the following:
 </para>
 
 <para>
 <emphasis>foreground</emphasis> and <emphasis>background</emphasis> can be one of the following:
 </para>
 

-<para>
-

 <itemizedlist>
 <itemizedlist>

-<listitem>
-
-<para>
-white
-</para>
-</listitem>
-<listitem>
-
-<para>
-black
-</para>
-</listitem>
-<listitem>
-
-<para>
-green
-</para>
-</listitem>
-<listitem>
-
-<para>
-magenta
-</para>
-</listitem>
-<listitem>
-
-<para>
-blue
-</para>
-</listitem>
-<listitem>
-
-<para>
-cyan
-</para>
-</listitem>
-<listitem>
-
-<para>
-yellow
-</para>
-</listitem>
-<listitem>
-
-<para>
-red
-</para>
-</listitem>
-<listitem>
-
-<para>
-default
-</para>
-</listitem>
-<listitem>
-
-<para>
-color<emphasis>x</emphasis>
-</para>
+<listitem><para>white</para></listitem>
+<listitem><para>black</para></listitem>
+<listitem><para>green</para></listitem>
+<listitem><para>magenta</para></listitem>
+<listitem><para>blue</para></listitem>
+<listitem><para>cyan</para></listitem>
+<listitem><para>yellow</para></listitem>
+<listitem><para>red</para></listitem>
+<listitem><para>default</para></listitem>
+<listitem><para>color<emphasis>x</emphasis></para>

 </listitem>
 </listitem>

-

 </itemizedlist>
 
 </itemizedlist>
 

-</para>
-

 <para>
 <emphasis>foreground</emphasis> can optionally be prefixed with the keyword <literal>bright</literal> to make
 the foreground color boldfaced (e.g., <literal>brightred</literal>).
 <para>
 <emphasis>foreground</emphasis> can optionally be prefixed with the keyword <literal>bright</literal> to make
 the foreground color boldfaced (e.g., <literal>brightred</literal>).


@@ -2220,27 +2376,27 @@ the <emphasis>COLORFGBG</emphasis> environment variable to the default colors of
 terminal for this to work; for example (for Bourne-like shells):
 </para>
 
 terminal for this to work; for example (for Bourne-like shells):
 </para>
 

-<para>
-

 <screen>
 set COLORFGBG="green;black"
 export COLORFGBG
 </screen>
 
 <screen>
 set COLORFGBG="green;black"
 export COLORFGBG
 </screen>
 

-</para>
-
+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> The <emphasis>S-Lang</emphasis> library requires you to use the <emphasis>lightgray</emphasis>
+The <emphasis>S-Lang</emphasis> library requires you to use the <emphasis>lightgray</emphasis>

 and <emphasis>brown</emphasis> keywords instead of <emphasis>white</emphasis> and <emphasis>yellow</emphasis> when
 setting this variable.
 </para>
 and <emphasis>brown</emphasis> keywords instead of <emphasis>white</emphasis> and <emphasis>yellow</emphasis> when
 setting this variable.
 </para>

+</note>

 
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> The uncolor command can be applied to the index object only.  It
+The uncolor command can be applied to the index object only.  It

 removes entries from the list. You <emphasis role="bold">must</emphasis> specify the same pattern
 removes entries from the list. You <emphasis role="bold">must</emphasis> specify the same pattern

-specified in the color command for it to be removed.  The pattern ``*'' is
+specified in the color command for it to be removed.  The pattern <quote>*</quote> is

 a special token which means to clear the color index list of all entries.
 </para>
 a special token which means to clear the color index list of all entries.
 </para>

+</note>

 
 <para>
 Mutt also recognizes the keywords <emphasis>color0</emphasis>, <emphasis>color1</emphasis>, &hellip;,
 
 <para>
 Mutt also recognizes the keywords <emphasis>color0</emphasis>, <emphasis>color1</emphasis>, &hellip;,


@@ -2252,93 +2408,138 @@ for your xterm), since color names may then lose their normal meaning.
 
 <para>
 If your terminal does not support color, it is still possible change the video
 
 <para>
 If your terminal does not support color, it is still possible change the video

-attributes through the use of the ``mono'' command:
-</para>
-
-<para>
-<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>
-where <emphasis>attribute</emphasis> is one of the following:
+attributes through the use of the <quote>mono</quote> command:
+</para>
+
+<anchor id="mono"/>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>mono</command>
+<arg choice="plain">
+<replaceable class="parameter">object</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">attribute</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>mono</command>
+<group choice="req">
+<arg choice="plain">
+<option>header</option>
+</arg>
+<arg choice="plain">
+<option>body</option>
+</arg>
+</group>
+<arg choice="plain">
+<replaceable class="parameter">attribute</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>mono</command>
+<arg choice="plain">
+<option>index</option>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">attribute</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>unmono</command>
+<arg choice="plain">
+<option>index</option>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>pattern</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+
+<para>
+For <emphasis>object</emphasis>, see the color command. <emphasis>attribute</emphasis>
+can be one of the following:

 </para>
 
 </para>
 

-<para>
-

 <itemizedlist>
 <itemizedlist>

-<listitem>
-
-<para>
-none
-</para>
-</listitem>
-<listitem>
-
-<para>
-bold
-</para>
-</listitem>
-<listitem>
-
-<para>
-underline
-</para>
-</listitem>
-<listitem>
-
-<para>
-reverse
-</para>
-</listitem>
-<listitem>
-
-<para>
-standout
-</para>
-</listitem>
-
+<listitem><para>none</para></listitem>
+<listitem><para>bold</para></listitem>
+<listitem><para>underline</para></listitem>
+<listitem><para>reverse</para></listitem>
+<listitem><para>standout</para></listitem>

 </itemizedlist>
 
 </itemizedlist>
 

-</para>
-

 </sect1>
 
 <sect1 id="ignore">
 </sect1>
 
 <sect1 id="ignore">

-<title>Ignoring (weeding) unwanted message headers</title>
-
-<para>
-Usage: <literal>&lsqb;un&rsqb;ignore</literal> <emphasis>pattern</emphasis> &lsqb; <emphasis>pattern</emphasis> ... &rsqb;
-</para>
+<title>Message header display</title>
+
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>ignore</command>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>unignore</command>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>pattern</replaceable>
+</arg>
+</group>
+</cmdsynopsis>

 
 <para>
 Messages often have many header fields added by automatic processing systems,
 or which may not seem useful to display on the screen.  This command allows
 
 <para>
 Messages often have many header fields added by automatic processing systems,
 or which may not seem useful to display on the screen.  This command allows

-you to specify header fields which you don't normally want to see.
+you to specify header fields which you don't normally want to see in the pager.

 </para>
 
 <para>
 You do not need to specify the full header field name.  For example,
 </para>
 
 <para>
 You do not need to specify the full header field name.  For example,

-``ignore content-'' will ignore all header fields that begin with the pattern
-``content-''. ``ignore *'' will ignore all headers.
+<quote>ignore content-</quote> will ignore all header fields that begin with the pattern
+<quote>content-</quote>. <quote>ignore *</quote> will ignore all headers.

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

-To remove a previously added token from the list, use the ``unignore'' command.
-The ``unignore'' command will make Mutt display headers with the given pattern.
-For example, if you do ``ignore x-'' it is possible to ``unignore x-mailer''.
+To remove a previously added token from the list, use the <quote>unignore</quote> command.
+The <quote>unignore</quote> command will make Mutt display headers with the given pattern.
+For example, if you do <quote>ignore x-</quote> it is possible to <quote>unignore x-mailer</quote>.

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

-``unignore *'' will remove all tokens from the ignore list.
+<quote>unignore *</quote> will remove all tokens from the ignore list.

 </para>
 
 <para>
 For example:
 </para>
 
 <para>
 For example:

+</para>

 
 

+<example id="ex-header-weeding">
+<title>Header weeding</title>

 <screen>
 # Sven's draconian header weeding
 ignore *
 <screen>
 # Sven's draconian header weeding
 ignore *


@@ -2346,18 +2547,86 @@ unignore from date subject to cc
 unignore organization organisation x-mailer: x-newsreader: x-mailing-list:
 unignore posted-to:
 </screen>
 unignore organization organisation x-mailer: x-newsreader: x-mailing-list:
 unignore posted-to:
 </screen>

+</example>
+
+<anchor id="hdr-order"/>
+<para>Usage:</para>

 
 

+<cmdsynopsis>
+<command>hdr&lowbar;order</command>
+<arg choice="plain">
+<replaceable class="parameter">header</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">header</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>unhdr&lowbar;order</command>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>header</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+
+<para>
+With the <literal>hdr&lowbar;order</literal> command you can specify an order in
+which mutt will attempt to present these headers to you when viewing messages.
+</para>
+
+<para>
+<quote>unhdr&lowbar;order *</quote> will clear all previous headers from the order list,
+thus removing the header order effects set by the system-wide startup file.

 </para>
 
 </para>
 

+<example id="ex-hdr-order">
+<title>Configuring header display order</title>
+<screen>
+hdr&lowbar;order From Date: From: To: Cc: Subject:
+</screen>
+</example>
+

 </sect1>
 
 <sect1 id="alternates">
 <title>Alternative addresses</title>
 
 </sect1>
 
 <sect1 id="alternates">
 <title>Alternative addresses</title>
 

-<para>
-Usage: <literal>&lsqb;un&rsqb;alternates</literal> &lsqb; <literal>-group</literal> <emphasis>name</emphasis> &lsqb; ... &rsqb; &rsqb; <emphasis>regexp</emphasis> &lsqb; <emphasis>regexp</emphasis> ... &rsqb;
-
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>alternates</command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable>name</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable>regexp</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable>regexp</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>unalternates</command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable>name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>regexp</replaceable>
+</arg>
+</group>
+</cmdsynopsis>

 
 <para>
 With various functions, mutt will treat messages differently,
 
 <para>
 With various functions, mutt will treat messages differently,


@@ -2388,7 +2657,7 @@ alternates user@example
 </screen>
 
 <para>
 </screen>
 
 <para>

-mutt will consider ``<literal>some-user@example</literal>'' as
+mutt will consider <quote><literal>some-user@example</literal></quote> as

 being your address, too which may not be desired. As a solution, in such
 cases addresses should be specified as:
 </para>
 being your address, too which may not be desired. As a solution, in such
 cases addresses should be specified as:
 </para>


@@ -2416,7 +2685,7 @@ To remove a regular expression from the <literal>alternates</literal> list, use
 Likewise, if the <emphasis>regexp</emphasis> for an <literal>alternates</literal> command matches
 an entry on the <literal>unalternates</literal> list, that <literal>unalternates</literal>
 entry will be removed. If the <emphasis>regexp</emphasis> for <literal>unalternates</literal>
 Likewise, if the <emphasis>regexp</emphasis> for an <literal>alternates</literal> command matches
 an entry on the <literal>unalternates</literal> list, that <literal>unalternates</literal>
 entry will be removed. If the <emphasis>regexp</emphasis> for <literal>unalternates</literal>

-is ``*'', <emphasis>all entries</emphasis> on <literal>alternates</literal> will be removed.
+is <quote>*</quote>, <emphasis>all entries</emphasis> on <literal>alternates</literal> will be removed.

 </para>
 
 </sect1>
 </para>
 
 </sect1>


@@ -2424,38 +2693,101 @@ is ``*'', <emphasis>all entries</emphasis> on <literal>alternates</literal> will
 <sect1 id="lists">
 <title>Mailing lists</title>
 
 <sect1 id="lists">
 <title>Mailing lists</title>
 

-<para>
-<literallayout>
-Usage: <literal>&lsqb;un&rsqb;lists</literal> &lsqb; <literal>-group</literal> <emphasis>name</emphasis> &lsqb; ... &rsqb; &rsqb; <emphasis>regexp</emphasis> &lsqb; <emphasis>regexp</emphasis> ... &rsqb;
-Usage: <literal>&lsqb;un&rsqb;subscribe</literal> &lsqb; <literal>-group</literal> <emphasis>name</emphasis> &lsqb; ... &rsqb; &rsqb; <emphasis>regexp</emphasis> &lsqb; <emphasis>regexp</emphasis> ... &rsqb;
-</literallayout>
-</para>
+<anchor id="subscribe"/>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>lists</command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>unlists</command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>subscribe</command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>unsubscribe</command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+</group>
+</cmdsynopsis>

 
 <para>
 Mutt has a few nice features for <link linkend="using-lists">handling mailing lists</link>.  In order to take advantage of them, you must
 specify which addresses belong to mailing lists, and which mailing
 
 <para>
 Mutt has a few nice features for <link linkend="using-lists">handling mailing lists</link>.  In order to take advantage of them, you must
 specify which addresses belong to mailing lists, and which mailing

-lists you are subscribed to.  Once you have done this, the <link linkend="list-reply">list-reply</link> function will work for all known lists.
+lists you are subscribed to.  Once you have done this, the <link linkend="list-reply"><literal>&lt;list-reply&gt;</literal></link> function will work for all known lists.

 Additionally, when you send a message to a subscribed list, mutt will
 add a Mail-Followup-To header to tell other users' mail user agents
 Additionally, when you send a message to a subscribed list, mutt will
 add a Mail-Followup-To header to tell other users' mail user agents

-not to send copies of replies to your personal address.   Note that
-the Mail-Followup-To header is a non-standard extension which is not
+not to send copies of replies to your personal address.
+</para>
+
+<note>
+<para>
+The Mail-Followup-To header is a non-standard extension which is not

 supported by all mail user agents.  Adding it is not bullet-proof against
 receiving personal CCs of list messages.  Also note that the generation
 supported by all mail user agents.  Adding it is not bullet-proof against
 receiving personal CCs of list messages.  Also note that the generation

-of the Mail-Followup-To header is controlled by the <link linkend="followup-to">&dollar;followup&lowbar;to</link> configuration variable.
+of the Mail-Followup-To header is controlled by the
+<link linkend="followup-to">&dollar;followup&lowbar;to</link>
+configuration variable.

 </para>
 </para>

+</note>

 
 <para>
 More precisely, Mutt maintains lists of patterns for the addresses
 of known and subscribed mailing lists.  Every subscribed mailing
 
 <para>
 More precisely, Mutt maintains lists of patterns for the addresses
 of known and subscribed mailing lists.  Every subscribed mailing

-list is known. To mark a mailing list as known, use the ``lists''
-command.  To mark it as subscribed, use ``subscribe''.
+list is known. To mark a mailing list as known, use the <quote>lists</quote>
+command.  To mark it as subscribed, use <quote>subscribe</quote>.

 </para>
 
 <para>
 You can use regular expressions with both commands.  To mark all
 messages sent to a specific bug report's address on mutt's bug
 tracking system as list mail, for instance, you could say
 </para>
 
 <para>
 You can use regular expressions with both commands.  To mark all
 messages sent to a specific bug report's address on mutt's bug
 tracking system as list mail, for instance, you could say

-``subscribe &lsqb;0-9&rsqb;*@bugs.guug.de''.  Often, it's sufficient to just
+<quote>subscribe &lsqb;0-9&rsqb;*@bugs.guug.de</quote>.  Often, it's sufficient to just

 give a portion of the list's e-mail address.
 </para>
 
 give a portion of the list's e-mail address.
 </para>
 


@@ -2463,13 +2795,13 @@ give a portion of the list's e-mail address.
 Specify as much of the address as you need to to remove ambiguity.  For
 example, if you've subscribed to the Mutt mailing list, you will receive mail
 addressed to <emphasis>mutt-users@mutt.org</emphasis>.  So, to tell Mutt
 Specify as much of the address as you need to to remove ambiguity.  For
 example, if you've subscribed to the Mutt mailing list, you will receive mail
 addressed to <emphasis>mutt-users@mutt.org</emphasis>.  So, to tell Mutt

-that this is a mailing list, you could add ``lists mutt-users@'' to your
+that this is a mailing list, you could add <quote>lists mutt-users@</quote> to your

 initialization file.  To tell mutt that you are subscribed to it,
 initialization file.  To tell mutt that you are subscribed to it,

-add ``subscribe mutt-users'' to your initialization file instead.
+add <quote>subscribe mutt-users</quote> to your initialization file instead.

 If you also happen to get mail from someone whose address is
 <emphasis>mutt-users@example.com</emphasis>, you could use
 If you also happen to get mail from someone whose address is
 <emphasis>mutt-users@example.com</emphasis>, you could use

-``lists ^mutt-users@mutt&bsol;&bsol;.org$'' 
-or ``subscribe ^mutt-users@mutt&bsol;&bsol;.org$'' to
+<quote>lists ^mutt-users@mutt&bsol;&bsol;.org$</quote>
+or <quote>subscribe ^mutt-users@mutt&bsol;&bsol;.org$</quote> to

 match only mail from the actual list.
 </para>
 
 match only mail from the actual list.
 </para>
 


@@ -2479,14 +2811,14 @@ to the named group.
 </para>
 
 <para>
 </para>
 
 <para>

-The ``unlists'' command is used to remove a token from the list of
-known and subscribed mailing-lists. Use ``unlists *'' to remove all
+The <quote>unlists</quote> command is used to remove a token from the list of
+known and subscribed mailing-lists. Use <quote>unlists *</quote> to remove all

 tokens.
 </para>
 
 <para>
 To remove a mailing list from the list of subscribed mailing lists,
 tokens.
 </para>
 
 <para>
 To remove a mailing list from the list of subscribed mailing lists,

-but keep it on the list of known mailing lists, use ``unsubscribe''.
+but keep it on the list of known mailing lists, use <quote>unsubscribe</quote>.

 </para>
 
 </sect1>
 </para>
 
 </sect1>


@@ -2494,15 +2826,23 @@ but keep it on the list of known mailing lists, use ``unsubscribe''.
 <sect1 id="mbox-hook">
 <title>Using Multiple spool mailboxes</title>
 
 <sect1 id="mbox-hook">
 <title>Using Multiple spool mailboxes</title>
 

-<para>
-Usage: <literal>mbox-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>mbox-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 This command is used to move read messages from a specified mailbox to a
 different mailbox automatically when you quit or change folders.
 <emphasis>pattern</emphasis> is a regular expression specifying the mailbox to treat as a
 
 <para>
 This command is used to move read messages from a specified mailbox to a
 different mailbox automatically when you quit or change folders.
 <emphasis>pattern</emphasis> is a regular expression specifying the mailbox to treat as a

-``spool'' mailbox and <emphasis>mailbox</emphasis> specifies where mail should be saved when
+<quote>spool</quote> mailbox and <emphasis>mailbox</emphasis> specifies where mail should be saved when

 read.
 </para>
 
 read.
 </para>
 


@@ -2517,68 +2857,86 @@ mailbox).
 <sect1 id="mailboxes">
 <title>Monitoring incoming mail</title>
 
 <sect1 id="mailboxes">
 <title>Monitoring incoming mail</title>
 

-<para>
-Usage: <literal>&lsqb;un&rsqb;mailboxes</literal> <emphasis>folder</emphasis> &lsqb; <emphasis>folder</emphasis> ... &rsqb;
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>mailboxes</command>
+<arg choice="plain">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>unmailboxes</command>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</group>
+</cmdsynopsis>

 
 <para>
 This command specifies folders which can receive mail and
 
 <para>
 This command specifies folders which can receive mail and

-which will be checked for new messages.  By default, the
-main menu status bar displays how many of these folders have
-new messages.
+which will be checked for new messages periodically.

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

-<literal>folder</literal> can either be a local file or directory
+<emphasis>folder</emphasis> can either be a local file or directory

 (Mbox/Mmdf or Maildir/Mh). If Mutt was built with POP and/or IMAP
 (Mbox/Mmdf or Maildir/Mh). If Mutt was built with POP and/or IMAP

-support, <literal>folder</literal> can also be a POP/IMAP folder
+support, <emphasis>folder</emphasis> can also be a POP/IMAP folder

 URL. The URL syntax is described in <xref linkend="url-syntax"/>,
 POP and IMAP are described in <xref linkend="pop"/> and <xref linkend="imap"/>
 respectively.
 </para>
 
 <para>
 URL. The URL syntax is described in <xref linkend="url-syntax"/>,
 POP and IMAP are described in <xref linkend="pop"/> and <xref linkend="imap"/>
 respectively.
 </para>
 
 <para>

-When changing folders, pressing <emphasis>space</emphasis> will cycle
-through folders with new mail.
-</para>
-
-<para>
-Pressing TAB in the directory browser will bring up a menu showing the files
-specified by the <literal>mailboxes</literal> command, and indicate which contain new
-messages.  Mutt will automatically enter this mode when invoked from the
-command line with the <literal>-y</literal> option.
+Mutt provides a number of advanced features for handling (possibly many)
+folders and new mail within them, please refer to
+<xref linkend="handling-folders"/> for details (including in what
+situations and how often Mutt checks for new mail).

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

-The ``unmailboxes'' command is used to remove a token from the list
-of folders which receive mail. Use ``unmailboxes *'' to remove all
+The <quote>unmailboxes</quote> command is used to remove a token from the list
+of folders which receive mail. Use <quote>unmailboxes *</quote> to remove all

 tokens.
 </para>
 
 tokens.
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> the folders in the <literal>mailboxes</literal> command are resolved when
-the command is executed, so if these names contain <link linkend="shortcuts">shortcut characters</link> (such as ``='' and ``!''), any variable
-definition that affect these characters (like <link linkend="folder">&dollar;folder</link> and <link linkend="spoolfile">&dollar;spoolfile</link>)
-should be executed before the <literal>mailboxes</literal> command. If
+The folders in the <literal>mailboxes</literal> command are resolved when
+the command is executed, so if these names contain <link linkend="shortcuts">shortcut characters</link> (such as <quote>=</quote> and <quote>!</quote>), any variable
+definition that affects these characters (like <link linkend="folder">&dollar;folder</link> and <link linkend="spoolfile">&dollar;spoolfile</link>)
+should be set before the <literal>mailboxes</literal> command. If

 none of these shorcuts are used, a local path should be absolute as
 none of these shorcuts are used, a local path should be absolute as

-otherwise mutt tries to find it within the current working directory
+otherwise mutt tries to find it relative to the directory

 from where mutt was started which may not always be desired.
 </para>
 from where mutt was started which may not always be desired.
 </para>

+</note>

 
 <para>
 
 <para>

-For local folders, new mail is detected by comparing access and/or
-modification times of files and folders. The interval in which Mutt
-checks for new mail is defined by
-<link linkend="mail-check">&dollar;mail&lowbar;check</link>.
-</para>
-
-<para>
-Special care is required with Mbox and Mmdf
-folders as Mutt assumes such a folder has new mail if it wasn't
+For Mbox and Mmdf folders, new mail is detected by comparing access and/or
+modification times of files: Mutt assumes a folder has new mail if it wasn't

 accessed after it was last modified. Utilities like <literal>biff</literal> or
 <literal>frm</literal> or any other program which accesses the mailbox might cause
 Mutt to never detect new mail for that mailbox if they do not properly reset the
 accessed after it was last modified. Utilities like <literal>biff</literal> or
 <literal>frm</literal> or any other program which accesses the mailbox might cause
 Mutt to never detect new mail for that mailbox if they do not properly reset the

-access time.  Backup tools are another common reason for updated access times.
+access time. Other possible causes of Mutt not detecting new mail in these folders
+are backup tools (updating access times) or filesystems mounted without
+access time update support.
+</para>
+
+<para>
+In cases where new mail detection for Mbox or Mmdf folders appears to be
+unreliable, the
+<link linkend="check-mbox-size">&dollar;check&lowbar;mbox&lowbar;size</link>
+option can be used to make Mutt track and consult file sizes for new
+mail detection instead.

 </para>
 
 </sect1>
 </para>
 
 </sect1>


@@ -2586,96 +2944,90 @@ access time.  Backup tools are another common reason for updated access times.
 <sect1 id="my-hdr">
 <title>User defined headers</title>
 
 <sect1 id="my-hdr">
 <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;
-</para>
-
-<para>
-The ``my&lowbar;hdr'' command allows you to create your own header
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>my&lowbar;hdr</command>
+<arg choice="plain">
+<replaceable class="parameter">string</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>unmy&lowbar;hdr</command>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">field</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+
+<para>
+The <literal>my&lowbar;hdr</literal> command allows you to create your own header

 fields which will be added to every message you send.
 </para>
 
 <para>
 fields which will be added to every message you send.
 </para>
 
 <para>

-For example, if you would like to add an ``Organization:'' header field to
+For example, if you would like to add an <quote>Organization:</quote> header field to

 all of your outgoing messages, you can put the command
 </para>
 
 all of your outgoing messages, you can put the command
 </para>
 

-<para>
-<quote
->my&lowbar;hdr Organization: A Really Big Company, Anytown, USA</quote
->
-</para>
+<example id="ex-my-hdr">
+<title>Defining custom headers</title>
+<screen>
+my&lowbar;hdr Organization: A Really Big Company, Anytown, USA
+</screen>
+</example>

 
 <para>
 in your <literal>.muttrc</literal>.
 </para>
 
 
 <para>
 in your <literal>.muttrc</literal>.
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis>  space characters are <emphasis>not</emphasis> allowed between the keyword and
-the colon (``:'').  The standard for electronic mail (RFC822) says that
+Space characters are <emphasis>not</emphasis> allowed between the keyword and
+the colon (<quote>:</quote>). The standard for electronic mail (RFC2822) says that

 space is illegal there, so Mutt enforces the rule.
 </para>
 space is illegal there, so Mutt enforces the rule.
 </para>

+</note>

 
 <para>
 If you would like to add a header field to a single message, you should
 either set the <link linkend="edit-headers">&dollar;edit&lowbar;headers</link> variable,
 
 <para>
 If you would like to add a header field to a single message, you should
 either set the <link linkend="edit-headers">&dollar;edit&lowbar;headers</link> variable,

-or use the <emphasis>edit-headers</emphasis> function (default: ``E'') in the send-menu so
+or use the <literal>&lt;edit-headers&gt;</literal> function (default: <quote>E</quote>) in the compose menu so

 that you can edit the header of your message along with the body.
 </para>
 
 <para>
 that you can edit the header of your message along with the body.
 </para>
 
 <para>

-To remove user defined header fields, use the ``unmy&lowbar;hdr''
-command.  You may specify an asterisk (``*'') to remove all header
-fields, or the fields to remove.  For example, to remove all ``To'' and
-``Cc'' header fields, you could use:
+To remove user defined header fields, use the <literal>unmy&lowbar;hdr</literal>
+command. You may specify an asterisk (<quote>*</quote>) to remove all header
+fields, or the fields to remove. For example, to remove all <quote>To</quote> and
+<quote>Cc</quote> header fields, you could use:

 </para>
 
 </para>
 

-<para>
-<quote
->unmy&lowbar;hdr to cc</quote
->
-</para>
+<screen>
+unmy&lowbar;hdr to cc
+</screen>

 
 </sect1>
 
 
 </sect1>
 

-<sect1 id="hdr-order">
-<title>Defining the order of headers when viewing messages</title>
+<sect1 id="save-hook">
+<title>Specify default save mailbox</title>

 
 

-<para>
-Usage: <literal>hdr&lowbar;order</literal> <emphasis>header1</emphasis> <emphasis>header2</emphasis> <emphasis>header3</emphasis>
-</para>
-
-<para>
-With this command, you can specify an order in which mutt will attempt
-to present headers to you when viewing messages.
-</para>
-
-<para>
-``unhdr&lowbar;order *'' will clear all previous headers from the order list,
-thus removing the header order effects set by the system-wide startup
-file.
-</para>
-
-<para>
-
-<screen>
-hdr&lowbar;order From Date: From: To: Cc: Subject:
-</screen>
-
-</para>
+<para>Usage:</para>

 
 

-</sect1>
-
-<sect1 id="save-hook">
-<title>Specify default save mailbox</title>
-
-<para>
-Usage: <literal>save-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
-</para>
+<cmdsynopsis>
+<command>save-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 This command is used to override the default mailbox used when saving
 
 <para>
 This command is used to override the default mailbox used when saving


@@ -2694,18 +3046,19 @@ expandos of <link linkend="index-format">&dollar;index&lowbar;format</link> to
 Examples:
 </para>
 
 Examples:
 </para>
 

-<para>
-
+<example id="ex-save-hook-exando">
+<title>Using %-expandos in <literal>save-hook</literal></title>

 <screen>
 # default: save all to ~/Mail/&lt;author name&gt;
 save-hook . ~/Mail/%F
 <screen>
 # default: save all to ~/Mail/&lt;author name&gt;
 save-hook . ~/Mail/%F

-# save from me@turing.cs.hmc.edu/me@cs.hmc.edu to $folder/elinks
+
+# save from me@turing.cs.hmc.edu and me@cs.hmc.edu to $folder/elkins

 save-hook me@(turing\\.)?cs\\.hmc\\.edu$ +elkins
 save-hook me@(turing\\.)?cs\\.hmc\\.edu$ +elkins

+

 # save from aol.com to $folder/spam
 save-hook aol\\.com$ +spam
 </screen>
 # save from aol.com to $folder/spam
 save-hook aol\\.com$ +spam
 </screen>

-
-</para>
+</example>

 
 <para>
 Also see the <link linkend="fcc-save-hook">fcc-save-hook</link> command.
 
 <para>
 Also see the <link linkend="fcc-save-hook">fcc-save-hook</link> command.


@@ -2716,9 +3069,17 @@ Also see the <link linkend="fcc-save-hook">fcc-save-hook</link> command.
 <sect1 id="fcc-hook">
 <title>Specify default Fcc: mailbox when composing</title>
 
 <sect1 id="fcc-hook">
 <title>Specify default Fcc: mailbox when composing</title>
 

-<para>
-Usage: <literal>fcc-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>fcc-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 This command is used to save outgoing mail in a mailbox other than
 
 <para>
 This command is used to save outgoing mail in a mailbox other than


@@ -2752,9 +3113,17 @@ the `+spammers' mailbox by default.  Also see the <link linkend="fcc-save-hook">
 <sect1 id="fcc-save-hook">
 <title>Specify default save filename and default Fcc: mailbox at once</title>
 
 <sect1 id="fcc-save-hook">
 <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>
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>fcc-save-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 This command is a shortcut, equivalent to doing both a <link linkend="fcc-hook">fcc-hook</link>
 
 <para>
 This command is a shortcut, equivalent to doing both a <link linkend="fcc-hook">fcc-hook</link>


@@ -2768,28 +3137,61 @@ to <link linkend="index-format">&dollar;index&lowbar;format</link>.
 <sect1 id="send-hook">
 <title>Change settings based upon message recipients</title>
 
 <sect1 id="send-hook">
 <title>Change settings based upon message recipients</title>
 

+<anchor id="reply-hook"/>
+<anchor id="send2-hook"/>
+
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>reply-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">command</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>send-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">command</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>send2-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">command</replaceable>
+</arg>
+</cmdsynopsis>
+

 <para>
 <para>

-<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>
+These commands can be used to execute arbitrary configuration commands based
+upon recipients of the message.  <emphasis>pattern</emphasis> is used to match
+the message, see <xref linkend="pattern-hook"/> for details. <emphasis>command</emphasis>
+is executed when <emphasis>pattern</emphasis> matches.

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

-These commands can be used to execute arbitrary configuration commands based
-upon recipients of the message.  <emphasis>pattern</emphasis> is a regular expression
-matching the desired address.  <emphasis>command</emphasis> is executed when <emphasis>regexp</emphasis>
-matches recipients of the message.
+<literal>reply-hook</literal> is matched against the message you are <emphasis>replying to</emphasis>,
+instead of the message you are <emphasis>sending</emphasis>.  <literal>send-hook</literal> is
+matched against all messages, both <emphasis>new</emphasis>
+and <emphasis>replies</emphasis>.

 </para>
 
 </para>
 

+<note>

 <para>
 <para>

-<literal>reply-hook</literal> is matched against the message you are <emphasis>replying</emphasis>
-<emphasis role="bold">to</emphasis>, instead of the message you are <emphasis>sending</emphasis>.  <literal>send-hook</literal> is
-matched against all messages, both <emphasis>new</emphasis> and <emphasis>replies</emphasis>.  <emphasis role="bold">Note:</emphasis>

 <literal>reply-hook</literal>s are matched <emphasis role="bold">before</emphasis> the <literal>send-hook</literal>, <emphasis role="bold">regardless</emphasis>
 of the order specified in the user's configuration file.
 </para>
 <literal>reply-hook</literal>s are matched <emphasis role="bold">before</emphasis> the <literal>send-hook</literal>, <emphasis role="bold">regardless</emphasis>
 of the order specified in the user's configuration file.
 </para>

+</note>

 
 <para>
 <literal>send2-hook</literal> is matched every time a message is changed, either
 
 <para>
 <literal>send2-hook</literal> is matched every time a message is changed, either


@@ -2805,10 +3207,6 @@ occur, commands are executed in the order they are specified in the muttrc
 (for that type of hook).
 </para>
 
 (for that type of hook).
 </para>
 

-<para>
-See <xref linkend="pattern-hook"/> for information on the exact format of <emphasis>pattern</emphasis>.
-</para>
-

 <para>
 Example: <literal>send-hook mutt &quot;set mime&lowbar;forward signature=''&quot;</literal>
 </para>
 <para>
 Example: <literal>send-hook mutt &quot;set mime&lowbar;forward signature=''&quot;</literal>
 </para>


@@ -2820,23 +3218,33 @@ variables in order to change the language of the attributions and
 signatures based upon the recipients.
 </para>
 
 signatures based upon the recipients.
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> the send-hook's are only executed ONCE after getting the initial
+send-hook's are only executed once after getting the initial

 list of recipients.  Adding a recipient after replying or editing the
 list of recipients.  Adding a recipient after replying or editing the

-message will NOT cause any send-hook to be executed.  Also note that
-my&lowbar;hdr commands which modify recipient headers, or the message's
+message will not cause any send-hook to be executed.  Also note that
+<literal>my&lowbar;hdr</literal> commands which modify recipient headers, or the message's

 subject, don't have any effect on the current message when executed
 from a send-hook.
 </para>
 subject, don't have any effect on the current message when executed
 from a send-hook.
 </para>

+</note>

 
 </sect1>
 
 <sect1 id="message-hook">
 <title>Change settings before formatting a message</title>
 
 
 </sect1>
 
 <sect1 id="message-hook">
 <title>Change settings before formatting a message</title>
 

-<para>
-Usage: <literal>message-hook</literal> &lsqb;!&rsqb;<emphasis>pattern</emphasis> <emphasis>command</emphasis>
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>message-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">command</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 This command can be used to execute arbitrary configuration commands
 
 <para>
 This command can be used to execute arbitrary configuration commands


@@ -2853,35 +3261,42 @@ information on the exact format of <emphasis>pattern</emphasis>.
 
 <para>
 Example:
 
 <para>
 Example:

+</para>

 
 <screen>
 message-hook ~A 'set pager=builtin'
 message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject: .*\""'
 </screen>
 
 
 <screen>
 message-hook ~A 'set pager=builtin'
 message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject: .*\""'
 </screen>
 

-</para>
-

 </sect1>
 
 <sect1 id="crypt-hook">
 <title>Choosing the cryptographic key of the recipient</title>
 
 </sect1>
 
 <sect1 id="crypt-hook">
 <title>Choosing the cryptographic key of the recipient</title>
 

-<para>
-Usage: <literal>crypt-hook</literal> <emphasis>pattern</emphasis> <emphasis>keyid</emphasis>
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>crypt-hook</command>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">keyid</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 
 <para>

-When encrypting messages with PGP or OpenSSL, you may want to associate a certain
+When encrypting messages with PGP/GnuPG or OpenSSL, you may want to associate a certain

 key with a given e-mail address automatically, either because the
 recipient's public key can't be deduced from the destination address,
 or because, for some reasons, you need to override the key Mutt would
 key with a given e-mail address automatically, either because the
 recipient's public key can't be deduced from the destination address,
 or because, for some reasons, you need to override the key Mutt would

-normally use.  The crypt-hook command provides a method by which you can
-specify the ID of the public key to be used when encrypting messages to
-a certain recipient.
+normally use.  The <literal>crypt-hook</literal> command provides a
+method by which you can specify the ID of the public key to be used
+when encrypting messages to a certain recipient.

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

-The meaning of "key id" is to be taken broadly in this context:  You
+The meaning of <emphasis>keyid</emphasis> is to be taken broadly in this context:  You

 can either put a numerical key ID here, an e-mail address, or even
 just a real name.
 </para>
 can either put a numerical key ID here, an e-mail address, or even
 just a real name.
 </para>


@@ -2891,9 +3306,14 @@ just a real name.
 <sect1 id="push">
 <title>Adding key sequences to the keyboard buffer</title>
 
 <sect1 id="push">
 <title>Adding key sequences to the keyboard buffer</title>
 

-<para>
-Usage: <literal>push</literal> <emphasis>string</emphasis>
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>push</command>
+<arg choice="plain">
+<replaceable class="parameter">string</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 This command adds the named string to the keyboard buffer. The string may
 
 <para>
 This command adds the named string to the keyboard buffer. The string may


@@ -2902,25 +3322,36 @@ string in the <link linkend="macro">macro</link> command. You may use it to
 automatically run a sequence of commands at startup, or when entering
 certain folders. For example, the following command will automatically
 collapse all threads when entering a folder:
 automatically run a sequence of commands at startup, or when entering
 certain folders. For example, the following command will automatically
 collapse all threads when entering a folder:

+</para>

 
 

+<example id="ex-folder-hook-push">
+<title>Embedding <literal>push</literal> in <literal>folder-hook</literal></title>

 <screen>
 folder-hook . 'push &lt;collapse-all&gt;'
 </screen>
 <screen>
 folder-hook . 'push &lt;collapse-all&gt;'
 </screen>

-</para>
+</example>

 
 </sect1>
 
 <sect1 id="exec">
 <title>Executing functions</title>
 
 
 </sect1>
 
 <sect1 id="exec">
 <title>Executing functions</title>
 

-<para>
-Usage: <literal>exec</literal> <emphasis>function</emphasis> &lsqb; <emphasis>function</emphasis> ... &rsqb;
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>exec</command>
+<arg choice="plain">
+<replaceable class="parameter">function</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">function</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 This command can be used to execute any function. Functions are
 listed in the <link linkend="functions">function reference</link>.
 
 <para>
 This command can be used to execute any function. Functions are
 listed in the <link linkend="functions">function reference</link>.

-``exec function'' is equivalent to ``push &lt;function&gt;''.
+<quote>exec function</quote> is equivalent to <quote>push &lt;function&gt;</quote>.

 </para>
 
 </sect1>
 </para>
 
 </sect1>


@@ -2928,12 +3359,29 @@ listed in the <link linkend="functions">function reference</link>.
 <sect1 id="score-command">
 <title>Message Scoring</title>
 
 <sect1 id="score-command">
 <title>Message Scoring</title>
 

-<para>
-<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>Usage:</para>
+
+<cmdsynopsis>
+<command>score</command>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">value</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>unscore</command>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</group>
+</cmdsynopsis>

 
 <para>
 The <literal>score</literal> commands adds <emphasis>value</emphasis> to a message's score if <emphasis>pattern</emphasis>
 
 <para>
 The <literal>score</literal> commands adds <emphasis>value</emphasis> to a message's score if <emphasis>pattern</emphasis>


@@ -2949,7 +3397,7 @@ a match.  Negative final scores are rounded up to 0.
 <para>
 The <literal>unscore</literal> command removes score entries from the list.  You <emphasis role="bold">must</emphasis>
 specify the same pattern specified in the <literal>score</literal> command for it to be
 <para>
 The <literal>unscore</literal> command removes score entries from the list.  You <emphasis role="bold">must</emphasis>
 specify the same pattern specified in the <literal>score</literal> command for it to be

-removed.  The pattern ``*'' is a special token which means to clear the list
+removed.  The pattern <quote>*</quote> is a special token which means to clear the list

 of all score entries.
 </para>
 
 of all score entries.
 </para>
 


@@ -2958,12 +3406,29 @@ of all score entries.
 <sect1 id="spam">
 <title>Spam detection</title>
 
 <sect1 id="spam">
 <title>Spam detection</title>
 

-<para>
-<literallayout>
-Usage: <literal>spam</literal> <emphasis>pattern</emphasis> <emphasis>format</emphasis>
-Usage: <literal>nospam</literal> <emphasis>pattern</emphasis>
-</literallayout>
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>spam</command>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">format</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>nospam</command>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</group>
+</cmdsynopsis>

 
 <para>
 Mutt has generalized support for external spam-scoring filters.
 
 <para>
 Mutt has generalized support for external spam-scoring filters.


@@ -2979,12 +3444,12 @@ to display spam tags only when they are defined for a given message.)
 Your first step is to define your external filter's spam patterns using
 the <literal>spam</literal> command. <emphasis>pattern</emphasis> should be a regular expression
 that matches a header in a mail message. If any message in the mailbox
 Your first step is to define your external filter's spam patterns using
 the <literal>spam</literal> command. <emphasis>pattern</emphasis> should be a regular expression
 that matches a header in a mail message. If any message in the mailbox

-matches this regular expression, it will receive a ``spam tag'' or
-``spam attribute'' (unless it also matches a <literal>nospam</literal> pattern -- see
+matches this regular expression, it will receive a <quote>spam tag</quote> or
+<quote>spam attribute</quote> (unless it also matches a <literal>nospam</literal> pattern -- see

 below.) The appearance of this attribute is entirely up to you, and is
 governed by the <emphasis>format</emphasis> parameter. <emphasis>format</emphasis> can be any static
 text, but it also can include back-references from the <emphasis>pattern</emphasis>
 below.) The appearance of this attribute is entirely up to you, and is
 governed by the <emphasis>format</emphasis> parameter. <emphasis>format</emphasis> can be any static
 text, but it also can include back-references from the <emphasis>pattern</emphasis>

-expression. (A regular expression ``back-reference'' refers to a
+expression. (A regular expression <quote>back-reference</quote> refers to a

 sub-expression contained within parentheses.) <literal>&percnt;1</literal> is replaced with
 the first back-reference in the regex, <literal>&percnt;2</literal> with the second, etc.
 </para>
 sub-expression contained within parentheses.) <literal>&percnt;1</literal> is replaced with
 the first back-reference in the regex, <literal>&percnt;2</literal> with the second, etc.
 </para>


@@ -3002,22 +3467,24 @@ them.
 <para>
 For example, suppose I use DCC, SpamAssassin, and PureMessage. I might
 define these spam settings:
 <para>
 For example, suppose I use DCC, SpamAssassin, and PureMessage. I might
 define these spam settings:

+</para>

 
 

+<example id="ex-spam">
+<title>Configuring spam detection</title>

 <screen>
 spam "X-DCC-.*-Metrics:.*(....)=many"         "90+/DCC-%1"
 spam "X-Spam-Status: Yes"                     "90+/SA"
 spam "X-PerlMX-Spam: .*Probability=([0-9]+)%" "%1/PM"
 set spam_separator=", "
 </screen>
 <screen>
 spam "X-DCC-.*-Metrics:.*(....)=many"         "90+/DCC-%1"
 spam "X-Spam-Status: Yes"                     "90+/SA"
 spam "X-PerlMX-Spam: .*Probability=([0-9]+)%" "%1/PM"
 set spam_separator=", "
 </screen>

-
-</para>
+</example>

 
 <para>
 
 <para>

-If I then received a message that DCC registered with ``many'' hits
-under the ``Fuz2'' checksum, and that PureMessage registered with a
+If I then received a message that DCC registered with <quote>many</quote> hits
+under the <quote>Fuz2</quote> checksum, and that PureMessage registered with a

 97&percnt; probability of being spam, that message's spam tag would read
 97&percnt; probability of being spam, that message's spam tag would read

-<literal>90+/DCC-Fuz2, 97/PM</literal>. (The four characters before ``=many'' in a
-DCC report indicate the checksum used -- in this case, ``Fuz2''.)
+<literal>90+/DCC-Fuz2, 97/PM</literal>. (The four characters before <quote>=many</quote> in a
+DCC report indicate the checksum used -- in this case, <quote>Fuz2</quote>.)

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


@@ -3030,7 +3497,7 @@ joined <emphasis>format</emphasis> strings, you'll get only the last one to matc
 The spam tag is what will be displayed in the index when you use
 <literal>&percnt;H</literal> in the <literal>&dollar;index&lowbar;format</literal> variable. It's also the
 string that the <literal>&tilde;H</literal> pattern-matching expression matches against for
 The spam tag is what will be displayed in the index when you use
 <literal>&percnt;H</literal> in the <literal>&dollar;index&lowbar;format</literal> variable. It's also the
 string that the <literal>&tilde;H</literal> pattern-matching expression matches against for

-<emphasis>search</emphasis> and <emphasis>limit</emphasis> functions. And it's what sorting by spam
+<literal>&lt;search&gt;</literal> and <literal>&lt;limit&gt;</literal> functions. And it's what sorting by spam

 attribute will use as a sort key.
 </para>
 
 attribute will use as a sort key.
 </para>
 


@@ -3049,8 +3516,8 @@ only when two numbers are equal in value. (This is like UNIX's
 <literal>sort -n</literal>.) A message with no spam attributes at all -- that is, one
 that didn't match <emphasis>any</emphasis> of your <literal>spam</literal> patterns -- is sorted at
 lowest priority. Numbers are sorted next, beginning with 0 and ranging
 <literal>sort -n</literal>.) A message with no spam attributes at all -- that is, one
 that didn't match <emphasis>any</emphasis> of your <literal>spam</literal> patterns -- is sorted at
 lowest priority. Numbers are sorted next, beginning with 0 and ranging

-upward. Finally, non-numeric strings are sorted, with ``a'' taking lower
-priority than ``z''. Clearly, in general, sorting by spam tags is most
+upward. Finally, non-numeric strings are sorted, with <quote>a</quote> taking lower
+priority than <quote>z</quote>. Clearly, in general, sorting by spam tags is most

 effective when you can coerce your filter to give you a raw number. But
 in case you can't, mutt can still do something useful.
 </para>
 effective when you can coerce your filter to give you a raw number. But
 in case you can't, mutt can still do something useful.
 </para>


@@ -3068,7 +3535,7 @@ If the <emphasis>pattern</emphasis> given to <literal>nospam</literal> is exactl
 remove the entry from the spam list, instead of adding an exception.
 Likewise, if the <emphasis>pattern</emphasis> for a <literal>spam</literal> command matches an entry
 on the <literal>nospam</literal> list, that <literal>nospam</literal> entry will be removed. If the
 remove the entry from the spam list, instead of adding an exception.
 Likewise, if the <emphasis>pattern</emphasis> for a <literal>spam</literal> command matches an entry
 on the <literal>nospam</literal> list, that <literal>nospam</literal> entry will be removed. If the

-<emphasis>pattern</emphasis> for <literal>nospam</literal> is ``*'', <emphasis>all entries on both lists</emphasis>
+<emphasis>pattern</emphasis> for <literal>nospam</literal> is <quote>*</quote>, <emphasis>all entries on both lists</emphasis>

 will be removed. This might be the default action if you use <literal>spam</literal>
 and <literal>nospam</literal> in conjunction with a <literal>folder-hook</literal>.
 </para>
 will be removed. This might be the default action if you use <literal>spam</literal>
 and <literal>nospam</literal> in conjunction with a <literal>folder-hook</literal>.
 </para>


@@ -3080,14 +3547,10 @@ example, if you consider all mail from <literal>MAILER-DAEMON</literal> to be sp
 you can use a <literal>spam</literal> command like this:
 </para>
 
 you can use a <literal>spam</literal> command like this:
 </para>
 

-<para>
-

 <screen>
 spam "^From: .*MAILER-DAEMON"       "999"
 </screen>
 
 <screen>
 spam "^From: .*MAILER-DAEMON"       "999"
 </screen>
 

-</para>
-

 </sect1>
 
 <sect1 id="set">
 </sect1>
 
 <sect1 id="set">


@@ -3100,41 +3563,74 @@ spam "^From: .*MAILER-DAEMON"       "999"
 The following commands are available to manipulate and query variables:
 </para>
 
 The following commands are available to manipulate and query variables:
 </para>
 

-<para>
-<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>Usage:</para>
+
+<cmdsynopsis>
+<command>set</command>
+<group choice="req">
+<arg choice="plain">
+<group choice="opt">
+<arg choice="plain"><option>no</option></arg>
+<arg choice="plain"><option>inv</option></arg>
+</group>
+<replaceable class="parameter">variable</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">variable=value</replaceable>
+</arg>
+</group>
+<arg choice="opt" rep="repeat"/>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>toggle</command>
+<arg choice="plain">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>unset</command>
+<arg choice="plain">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+</cmdsynopsis>
+
+<cmdsynopsis>
+<command>reset</command>
+<arg choice="plain">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 This command is used to set (and unset) <link linkend="variables">configuration variables</link>.  There are four basic types of variables:
 boolean, number, string and quadoption.  <emphasis>boolean</emphasis> variables can be
 <emphasis>set</emphasis> (true) or <emphasis>unset</emphasis> (false).  <emphasis>number</emphasis> variables can be
 assigned a positive integer value.
 
 <para>
 This command is used to set (and unset) <link linkend="variables">configuration variables</link>.  There are four basic types of variables:
 boolean, number, string and quadoption.  <emphasis>boolean</emphasis> variables can be
 <emphasis>set</emphasis> (true) or <emphasis>unset</emphasis> (false).  <emphasis>number</emphasis> variables can be
 assigned a positive integer value.

-</para>
-
-<para>
-<emphasis>string</emphasis> variables consist of any number of printable characters.
-<emphasis>strings</emphasis> must be enclosed in quotes if they contain spaces or tabs.  You
-may also use the ``C'' escape sequences <emphasis role="bold">&bsol;n</emphasis> and <emphasis role="bold">&bsol;t</emphasis> for
-newline and tab, respectively.
-</para>
-
-<para>
+<emphasis>string</emphasis> variables consist of any number of printable characters and
+must be enclosed in quotes if they contain spaces or tabs.  You
+may also use the escape sequences <quote>&bsol;n</quote> and <quote>&bsol;t</quote> for newline and tab, respectively.

 <emphasis>quadoption</emphasis> variables are used to control whether or not to be prompted
 for certain actions, or to specify a default action.  A value of <emphasis>yes</emphasis>
 will cause the action to be carried out automatically as if you had answered
 yes to the question.  Similarly, a value of <emphasis>no</emphasis> will cause the
 <emphasis>quadoption</emphasis> variables are used to control whether or not to be prompted
 for certain actions, or to specify a default action.  A value of <emphasis>yes</emphasis>
 will cause the action to be carried out automatically as if you had answered
 yes to the question.  Similarly, a value of <emphasis>no</emphasis> will cause the

-action to be carried out as if you had answered ``no.''  A value of
-<emphasis>ask-yes</emphasis> will cause a prompt with a default answer of ``yes'' and
-<emphasis>ask-no</emphasis> will provide a default answer of ``no.''
+action to be carried out as if you had answered <quote>no.</quote>  A value of
+<emphasis>ask-yes</emphasis> will cause a prompt with a default answer of <quote>yes</quote> and
+<emphasis>ask-no</emphasis> will provide a default answer of <quote>no.</quote>

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

-Prefixing a variable with ``no'' will unset it.  Example: <literal>set noaskbcc</literal>.
+Prefixing a variable with <quote>no</quote> will unset it.  Example: <literal>set noaskbcc</literal>.

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


@@ -3154,33 +3650,29 @@ specified variables.
 </para>
 
 <para>
 </para>
 
 <para>

-Using the enter-command function in the <emphasis>index</emphasis> menu, you can query the
+Using the <literal>&lt;enter-command&gt;</literal> function in the <emphasis>index</emphasis> menu, you can query the

 value of a variable by prefixing the name of the variable with a question
 mark:
 </para>
 
 value of a variable by prefixing the name of the variable with a question
 mark:
 </para>
 

-<para>
-

 <screen>
 set ?allow_8bit
 </screen>
 
 <screen>
 set ?allow_8bit
 </screen>
 

-</para>
-

 <para>
 <para>

-The question mark is actually only required for boolean and quadoption 
+The question mark is actually only required for boolean and quadoption

 variables.
 </para>
 
 <para>
 The <literal>reset</literal> command resets all given variables to the compile time
 defaults (hopefully mentioned in this manual). If you use the command
 variables.
 </para>
 
 <para>
 The <literal>reset</literal> command resets all given variables to the compile time
 defaults (hopefully mentioned in this manual). If you use the command

-<literal>set</literal> and prefix the variable with ``&amp;'' this has the same
+<literal>set</literal> and prefix the variable with <quote>&amp;</quote> this has the same

 behavior as the reset command.
 </para>
 
 <para>
 behavior as the reset command.
 </para>
 
 <para>

-With the <literal>reset</literal> command there exists the special variable ``all'',
+With the <literal>reset</literal> command there exists the special variable <quote>all</quote>,

 which allows you to reset all variables to their system defaults.
 </para>
 
 which allows you to reset all variables to their system defaults.
 </para>
 


@@ -3201,17 +3693,18 @@ example, <literal>my&lowbar;cfgdir</literal>.
 </para>
 
 <para>
 </para>
 
 <para>

-The <literal>set</literal> command creates a
-custom <literal>$my&lowbar;</literal> variable and changes its
-value. The <literal>unset</literal> and <literal>reset</literal>
+The <literal>set</literal> command either creates a
+custom <literal>my&lowbar;</literal> variable or changes its
+value if it does exist already. The <literal>unset</literal> and <literal>reset</literal>

 commands remove the variable entirely.
 </para>
 
 <para>
 Since user-defined variables are expanded in the same way that
 environment variables are (except for
 commands remove the variable entirely.
 </para>
 
 <para>
 Since user-defined variables are expanded in the same way that
 environment variables are (except for

-the <link linkend="shell-escape">shell-escape</link> command), this
-feature can be used to make configuration files more readable.
+the <link linkend="shell-escape">shell-escape</link> command and
+backtick expansion), this feature can be used to make configuration
+files more readable.

 </para>
 
 </sect3>
 </para>
 
 </sect3>


@@ -3220,11 +3713,12 @@ feature can be used to make configuration files more readable.
 <title>Examples</title>
 
 <para>
 <title>Examples</title>
 
 <para>

-The following example defines and uses the variable <literal>my&lowbar;cfgdir</literal> 
+The following example defines and uses the variable <literal>my&lowbar;cfgdir</literal>

 to abbreviate the calls of the <link linkend="source">source</link> command:
 </para>
 
 to abbreviate the calls of the <link linkend="source">source</link> command:
 </para>
 

-<para>
+<example id="ex-myvar1">
+<title>Using user-defined variables for config file readability</title>

 <screen>
 set my_cfgdir = $HOME/mutt/config
 
 <screen>
 set my_cfgdir = $HOME/mutt/config
 


@@ -3232,18 +3726,19 @@ source $my_cfgdir/hooks
 source $my_cfgdir/macros
 # more source commands...
 </screen>
 source $my_cfgdir/macros
 # more source commands...
 </screen>

-</para>
+</example>

 
 <para>
 A custom variable can also be used in macros to backup the current value
 
 <para>
 A custom variable can also be used in macros to backup the current value

-of another variable. In the following example, the value of the 
+of another variable. In the following example, the value of the

 <link linkend="delete">&dollar;delete</link> is changed temporarily
 while its original value is saved as <literal>my&lowbar;delete</literal>.
 After the macro has executed all commands, the original value of <link
 linkend="delete">&dollar;delete</link> is restored.
 </para>
 
 <link linkend="delete">&dollar;delete</link> is changed temporarily
 while its original value is saved as <literal>my&lowbar;delete</literal>.
 After the macro has executed all commands, the original value of <link
 linkend="delete">&dollar;delete</link> is restored.
 </para>
 

-<para>
+<example id="ex-myvar2">
+<title>Using user-defined variables for backing up other config option values</title>

 <screen>
 macro pager ,x '&bsol;
 &lt;enter-command&gt;set my_delete=$delete&lt;enter&gt;&bsol;
 <screen>
 macro pager ,x '&bsol;
 &lt;enter-command&gt;set my_delete=$delete&lt;enter&gt;&bsol;


@@ -3251,7 +3746,7 @@ macro pager ,x '&bsol;
 ...&bsol;
 &lt;enter-command&gt;set delete=$my_delete&lt;enter&gt;'
 </screen>
 ...&bsol;
 &lt;enter-command&gt;set delete=$my_delete&lt;enter&gt;'
 </screen>

-</para>
+</example>

 
 <para>
 Since mutt expands such values already when parsing the configuration
 
 <para>
 Since mutt expands such values already when parsing the configuration


@@ -3265,7 +3760,8 @@ be deferred to runtime, as shown in the next example, when escaping the
 dollar sign.
 </para>
 
 dollar sign.
 </para>
 

-<para>
+<example id="ex-myvar3">
+<title>Deferring user-defined variable expansion to runtime</title>

 <screen>
 macro pager &lt;PageDown&gt; "&bsol;
 &lt;enter-command&gt; set my&lowbar;old&lowbar;pager&lowbar;stop=&bsol;&dollar;pager&lowbar;stop pager&lowbar;stop&lt;Enter&gt;&bsol;
 <screen>
 macro pager &lt;PageDown&gt; "&bsol;
 &lt;enter-command&gt; set my&lowbar;old&lowbar;pager&lowbar;stop=&bsol;&dollar;pager&lowbar;stop pager&lowbar;stop&lt;Enter&gt;&bsol;


@@ -3273,7 +3769,7 @@ macro pager &lt;PageDown&gt; "&bsol;
 &lt;enter-command&gt; set pager&lowbar;stop=&bsol;&dollar;my&lowbar;old&lowbar;pager&lowbar;stop&lt;Enter&gt;&bsol;
 &lt;enter-command&gt; unset my&lowbar;old&lowbar;pager&lowbar;stop&lt;Enter&gt;"
 </screen>
 &lt;enter-command&gt; set pager&lowbar;stop=&bsol;&dollar;my&lowbar;old&lowbar;pager&lowbar;stop&lt;Enter&gt;&bsol;
 &lt;enter-command&gt; unset my&lowbar;old&lowbar;pager&lowbar;stop&lt;Enter&gt;"
 </screen>

-</para>
+</example>

 
 <para>
 Note that there is a space
 
 <para>
 Note that there is a space


@@ -3291,9 +3787,14 @@ recording the macro's commands into its history.
 <sect1 id="source">
 <title>Reading initialization commands from another file</title>
 
 <sect1 id="source">
 <title>Reading initialization commands from another file</title>
 

-<para>
-Usage: <literal>source</literal> <emphasis>filename</emphasis>
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>source</command>
+<arg choice="plain">
+<replaceable class="parameter">filename</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 This command allows the inclusion of initialization commands
 
 <para>
 This command allows the inclusion of initialization commands


@@ -3303,7 +3804,7 @@ from other files.  For example, I place all of my aliases in
 </para>
 
 <para>
 </para>
 
 <para>

-If the filename begins with a tilde (``&tilde;''), it will be expanded to the
+If the filename begins with a tilde (<quote>&tilde;</quote>), it will be expanded to the

 path of your home directory.
 </para>
 
 path of your home directory.
 </para>
 


@@ -3318,13 +3819,23 @@ considered to be an executable program from which to read input (eg.
 <sect1 id="unhook">
 <title>Removing hooks</title>
 
 <sect1 id="unhook">
 <title>Removing hooks</title>
 

-<para>
-Usage: <literal>unhook</literal> &lsqb; * &verbar; <emphasis>hook-type</emphasis> &rsqb;
-</para>
+<para>Usage:</para>
+
+<cmdsynopsis>
+<command>unhook</command>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">hook-type</replaceable>
+</arg>
+</group>
+</cmdsynopsis>

 
 <para>
 This command permits you to flush hooks you have previously defined.
 
 <para>
 This command permits you to flush hooks you have previously defined.

-You can either remove all hooks by giving the ``*'' character as an
+You can either remove all hooks by giving the <quote>*</quote> character as an

 argument, or you can remove all hooks of a specific type by saying
 something like <literal>unhook send-hook</literal>.
 </para>
 argument, or you can remove all hooks of a specific type by saying
 something like <literal>unhook send-hook</literal>.
 </para>


@@ -3334,16 +3845,16 @@ something like <literal>unhook send-hook</literal>.
 <sect1 id="formatstrings">
 <title>Format Strings</title>
 
 <sect1 id="formatstrings">
 <title>Format Strings</title>
 

-<sect2>
+<sect2 id="formatstrings-basics">

 <title>Basic usage</title>
 
 <para>
 Format strings are a general concept you'll find in several locations
 through the mutt configuration, especially in the
 <title>Basic usage</title>
 
 <para>
 Format strings are a general concept you'll find in several locations
 through the mutt configuration, especially in the

-<link linkend="index-format">&dollar;index&lowbar;format"</link>,
-<link linkend="pager-format">&dollar;pager&lowbar;format"</link>,
-<link linkend="status-format">&dollar;status&lowbar;format"</link>,
-and other ``*_format'' variables. These can be very straightforward,
+<link linkend="index-format">&dollar;index&lowbar;format</link>,
+<link linkend="pager-format">&dollar;pager&lowbar;format</link>,
+<link linkend="status-format">&dollar;status&lowbar;format</link>,
+and other <quote>*_format</quote> variables. These can be very straightforward,

 and it's quite possible you already know how to use them.
 </para>
 
 and it's quite possible you already know how to use them.
 </para>
 


@@ -3351,19 +3862,19 @@ and it's quite possible you already know how to use them.
 The most basic format string element is a percent symbol followed
 by another character. For example, <literal>%s</literal>
 represents a message's Subject: header in the <link
 The most basic format string element is a percent symbol followed
 by another character. For example, <literal>%s</literal>
 represents a message's Subject: header in the <link

-linkend="index-format">&dollar;index&lowbar;format"</link> variable. The
-``expandos'' available are documented with each format variable, but
+linkend="index-format">&dollar;index&lowbar;format</link> variable. The
+<quote>expandos</quote> available are documented with each format variable, but

 there are general modifiers available with all formatting expandos,
 too. Those are our concern here.
 </para>
 
 <para>
 there are general modifiers available with all formatting expandos,
 too. Those are our concern here.
 </para>
 
 <para>

-Some of the modifers are borrowed right out of C (though you might
-know them from Perl, Python, shell, or another langugage). These are
+Some of the modifiers are borrowed right out of C (though you might
+know them from Perl, Python, shell, or another language). These are

 the [-]m.n modifiers, as in <literal>%-12.12s</literal>. As with
 such programming languages, these modifiers allow you to specify the
 the [-]m.n modifiers, as in <literal>%-12.12s</literal>. As with
 such programming languages, these modifiers allow you to specify the

-minumum and maximum size of the resulting string, as well as its
-justification. If the ``-'' sign follows the percent, the string will
+minimum and maximum size of the resulting string, as well as its
+justification. If the <quote>-</quote> sign follows the percent, the string will

 be left-justified instead of right-justified. If there's a number
 immediately following that, it's the minimum amount of space the
 formatted string will occupy -- if it's naturally smaller than that, it
 be left-justified instead of right-justified. If there's a number
 immediately following that, it's the minimum amount of space the
 formatted string will occupy -- if it's naturally smaller than that, it


@@ -3387,24 +3898,24 @@ characters for the %y expansion -- that's the X-Label: header, in
 <literal>&dollar;index&lowbar;format</literal>. If the expansion
 results in a string less than 14 characters, it will be centered in a
 14-character space.  If the X-Label for a message were "test", that
 <literal>&dollar;index&lowbar;format</literal>. If the expansion
 results in a string less than 14 characters, it will be centered in a
 14-character space.  If the X-Label for a message were "test", that

-expansion would look like ``     test     ''.
+expansion would look like <quote>     test     </quote>.

 </para>
 
 <para>
 There are two very little-known modifiers that affect the way that an
 </para>
 
 <para>
 There are two very little-known modifiers that affect the way that an

-expando is replaced. If there is an underline (``&lowbar;'') character
+expando is replaced. If there is an underline (<quote>&lowbar;</quote>) character

 between any format modifiers (as above) and the expando letter, it will
 between any format modifiers (as above) and the expando letter, it will

-expands in all lower case. And if you use a colon (``:''), it will
+expands in all lower case. And if you use a colon (<quote>:</quote>), it will

 replace all decimal points with underlines.
 </para>
 
 </sect2>
 
 replace all decimal points with underlines.
 </para>
 
 </sect2>
 

-<sect2>
+<sect2 id="formatstrings-filters">

 <title>Filters</title>
 
 <para>
 <title>Filters</title>
 
 <para>

-Any format string ending in a vertical bar (``&verbar;'') will be
+Any format string ending in a vertical bar (<quote>&verbar;</quote>) will be

 expanded and piped through the first word in the string, using spaces
 as separator. The string returned will be used for display.
 If the returned string ends in &percnt;, it will be passed through
 expanded and piped through the first word in the string, using spaces
 as separator. The string returned will be used for display.
 If the returned string ends in &percnt;, it will be passed through


@@ -3417,9 +3928,12 @@ All &percnt; expandos in a format string are expanded before the script
 is called so that:
 </para>
 
 is called so that:
 </para>
 

+<example id="ex-fmtpipe">
+<title>Using external filters in format strings</title>

 <screen>
 set status_format="script.sh '%r %f (%L)'|"
 </screen>
 <screen>
 set status_format="script.sh '%r %f (%L)'|"
 </screen>

+</example>

 
 <para>
 will make mutt expand <literal>&percnt;r</literal>,
 
 <para>
 will make mutt expand <literal>&percnt;r</literal>,


@@ -3452,17 +3966,23 @@ terminal's title, if supported.
 <para>
 All string patterns in Mutt including those in more complex
 <link linkend="patterns">patterns</link> must be specified
 <para>
 All string patterns in Mutt including those in more complex
 <link linkend="patterns">patterns</link> must be specified

-using regular expressions (regexp) in the ``POSIX extended'' syntax (which
+using regular expressions (regexp) in the <quote>POSIX extended</quote> syntax (which

 is more or less the syntax used by egrep and GNU awk).  For your
 convenience, we have included below a brief description of this syntax.
 </para>
 
 <para>
 The search is case sensitive if the pattern contains at least one upper
 is more or less the syntax used by egrep and GNU awk).  For your
 convenience, we have included below a brief description of this syntax.
 </para>
 
 <para>
 The search is case sensitive if the pattern contains at least one upper

-case letter, and case insensitive otherwise. Note that ``&bsol;''
+case letter, and case insensitive otherwise.
+</para>
+
+<note>
+<para>
+Note that <quote>&bsol;</quote>

 must be quoted if used for a regular expression in an initialization
 must be quoted if used for a regular expression in an initialization

-command: ``&bsol;&bsol;''.
+command: <quote>&bsol;&bsol;</quote>.

 </para>
 </para>

+</note>

 
 <para>
 A regular expression is a pattern that describes a set of strings.
 
 <para>
 A regular expression is a pattern that describes a set of strings.


@@ -3470,6 +3990,7 @@ Regular expressions are constructed analogously to arithmetic
 expressions, by using various operators to combine smaller expressions.
 </para>
 
 expressions, by using various operators to combine smaller expressions.
 </para>
 

+<note>

 <para>
 Note that the regular expression can be enclosed/delimited by either &quot;
 or ' which is useful if the regular expression includes a white-space
 <para>
 Note that the regular expression can be enclosed/delimited by either &quot;
 or ' which is useful if the regular expression includes a white-space


@@ -3477,6 +3998,7 @@ character.  See <xref linkend="muttrc-syntax"/>
 for more information on &quot; and ' delimiter processing.  To match a
 literal &quot; or ' you must preface it with \ (backslash).
 </para>
 for more information on &quot; and ' delimiter processing.  To match a
 literal &quot; or ' you must preface it with \ (backslash).
 </para>

+</note>

 
 <para>
 The fundamental building blocks are the regular expressions that match
 
 <para>
 The fundamental building blocks are the regular expressions that match


@@ -3486,142 +4008,68 @@ special meaning may be quoted by preceding it with a backslash.
 </para>
 
 <para>
 </para>
 
 <para>

-The period ``.'' matches any single character.  The caret ``&circ;'' and
-the dollar sign ``&dollar;'' are metacharacters that respectively match
+The period <quote>.</quote> matches any single character.  The caret <quote>&circ;</quote> and
+the dollar sign <quote>&dollar;</quote> are metacharacters that respectively match

 the empty string at the beginning and end of a line.
 </para>
 
 <para>
 the empty string at the beginning and end of a line.
 </para>
 
 <para>

-A list of characters enclosed by ``&lsqb;'' and ``&rsqb;'' matches any
+A list of characters enclosed by <quote>&lsqb;</quote> and <quote>&rsqb;</quote> matches any

 single character in that list; if the first character of the list
 single character in that list; if the first character of the list

-is a caret ``&circ;'' then it matches any character <emphasis role="bold">not</emphasis> in the
+is a caret <quote>&circ;</quote> then it matches any character <emphasis role="bold">not</emphasis> in the

 list.  For example, the regular expression <emphasis role="bold">&lsqb;0123456789&rsqb;</emphasis>
 matches any single digit.  A range of ASCII characters may be specified
 by giving the first and last characters, separated by a hyphen
 list.  For example, the regular expression <emphasis role="bold">&lsqb;0123456789&rsqb;</emphasis>
 matches any single digit.  A range of ASCII characters may be specified
 by giving the first and last characters, separated by a hyphen

-``-''.  Most metacharacters lose their special meaning inside
-lists.  To include a literal ``&rsqb;'' place it first in the list.
-Similarly, to include a literal ``&circ;'' place it anywhere but first.
-Finally, to include a literal hyphen ``-'' place it last.
+<quote>-</quote>.  Most metacharacters lose their special meaning inside
+lists.  To include a literal <quote>&rsqb;</quote> place it first in the list.
+Similarly, to include a literal <quote>&circ;</quote> place it anywhere but first.
+Finally, to include a literal hyphen <quote>-</quote> place it last.

 </para>
 
 <para>
 Certain named classes of characters are predefined.  Character classes
 </para>
 
 <para>
 Certain named classes of characters are predefined.  Character classes

-consist of ``&lsqb;:'', a keyword denoting the class, and ``:&rsqb;''.
-The following classes are defined by the POSIX standard:
+consist of <quote>&lsqb;:</quote>, a keyword denoting the class, and <quote>:&rsqb;</quote>.
+The following classes are defined by the POSIX standard in
+<xref linkend="posix-regex-char-classes"/>

 </para>
 
 </para>
 

-<para>
-<variablelist>
+<table id="posix-regex-char-classes">
+<title>POSIX regular expression character classes</title>
+<tgroup cols="2">
+<thead>
+<row><entry>Character class</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>&lsqb;:alnum:&rsqb;</entry><entry>Alphanumeric characters</entry></row>
+<row><entry>&lsqb;:alpha:&rsqb;</entry><entry>Alphabetic characters</entry></row>
+<row><entry>&lsqb;:blank:&rsqb;</entry><entry>Space or tab characters</entry></row>
+<row><entry>&lsqb;:cntrl:&rsqb;</entry><entry>Control characters</entry></row>
+<row><entry>&lsqb;:digit:&rsqb;</entry><entry>Numeric characters</entry></row>
+<row><entry>&lsqb;:graph:&rsqb;</entry><entry>Characters that are both printable and visible. (A space is printable, but not visible, while an <quote>a</quote> is both)</entry></row>
+<row><entry>&lsqb;:lower:&rsqb;</entry><entry>Lower-case alphabetic characters</entry></row>
+<row><entry>&lsqb;:print:&rsqb;</entry><entry>Printable characters (characters that are not control characters)</entry></row>
+<row><entry>&lsqb;:punct:&rsqb;</entry><entry>Punctuation characters (characters that are not letter, digits, control characters, or space characters)</entry></row>
+<row><entry>&lsqb;:space:&rsqb;</entry><entry>Space characters (such as space, tab and formfeed, to name a few)</entry></row>
+<row><entry>&lsqb;:upper:&rsqb;</entry><entry>Upper-case alphabetic characters</entry></row>
+<row><entry>&lsqb;:xdigit:&rsqb;</entry><entry>Characters that are hexadecimal digits</entry></row>
+</tbody>
+</tgroup>
+</table>

 
 

-<varlistentry>
-<term>&lsqb;:alnum:&rsqb;</term>
-<listitem>
-<para>
-Alphanumeric characters.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lsqb;:alpha:&rsqb;</term>
-<listitem>
-<para>
-Alphabetic characters.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lsqb;:blank:&rsqb;</term>
-<listitem>
-<para>
-Space or tab characters.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lsqb;:cntrl:&rsqb;</term>
-<listitem>
-<para>
-Control characters.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lsqb;:digit:&rsqb;</term>
-<listitem>
-<para>
-Numeric characters.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lsqb;:graph:&rsqb;</term>
-<listitem>
-<para>
-Characters that are both printable and visible.  (A space is printable,
-but not visible, while an ``a'' is both.)
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lsqb;:lower:&rsqb;</term>
-<listitem>
-<para>
-Lower-case alphabetic characters.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lsqb;:print:&rsqb;</term>
-<listitem>
-<para>
-Printable characters (characters that are not control characters.)
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lsqb;:punct:&rsqb;</term>
-<listitem>
-<para>
-Punctuation characters (characters that are not letter, digits, control
-characters, or space characters).
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lsqb;:space:&rsqb;</term>
-<listitem>
-<para>
-Space characters (such as space, tab and formfeed, to name a few).
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lsqb;:upper:&rsqb;</term>
-<listitem>

 <para>
 <para>

-Upper-case alphabetic characters.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lsqb;:xdigit:&rsqb;</term>
-<listitem>
-<para>
-Characters that are hexadecimal digits.
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
+A character class is only valid in a regular expression inside the
+brackets of a character list.

 </para>
 
 </para>
 

+<note>

 <para>
 <para>

-A character class is only valid in a regular expression inside the
-brackets of a character list.  Note that the brackets in these
+Note that the brackets in these

 class names are part of the symbolic names, and must be included
 class names are part of the symbolic names, and must be included

-in addition to the brackets delimiting the bracket list.  For
+in addition to the brackets delimiting the bracket list. For

 example, <emphasis role="bold">&lsqb;&lsqb;:digit:&rsqb;&rsqb;</emphasis> is equivalent to
 <emphasis role="bold">&lsqb;0-9&rsqb;</emphasis>.
 </para>
 example, <emphasis role="bold">&lsqb;&lsqb;:digit:&rsqb;&rsqb;</emphasis> is equivalent to
 <emphasis role="bold">&lsqb;0-9&rsqb;</emphasis>.
 </para>

+</note>

 
 <para>
 Two additional special sequences can appear in character lists.  These
 
 <para>
 Two additional special sequences can appear in character lists.  These


@@ -3631,7 +4079,6 @@ as well as several characters that are equivalent for collating or
 sorting purposes:
 </para>
 
 sorting purposes:
 </para>
 

-<para>

 <variablelist>
 
 <varlistentry>
 <variablelist>
 
 <varlistentry>


@@ -3639,10 +4086,10 @@ sorting purposes:
 <listitem>
 <para>
 A collating symbol is a multi-character collating element enclosed in
 <listitem>
 <para>
 A collating symbol is a multi-character collating element enclosed in

-``&lsqb;.'' and ``.&rsqb;''.  For example, if ``ch'' is a collating
+<quote>&lsqb;.</quote> and <quote>.&rsqb;</quote>.  For example, if <quote>ch</quote> is a collating

 element, then <emphasis role="bold">&lsqb;&lsqb;.ch.&rsqb;&rsqb;</emphasis> is a regexp that matches
 this collating element, while <emphasis role="bold">&lsqb;ch&rsqb;</emphasis> is a regexp that
 element, then <emphasis role="bold">&lsqb;&lsqb;.ch.&rsqb;&rsqb;</emphasis> is a regexp that matches
 this collating element, while <emphasis role="bold">&lsqb;ch&rsqb;</emphasis> is a regexp that

-matches either ``c'' or ``h''.
+matches either <quote>c</quote> or <quote>h</quote>.

 </para>
 </listitem>
 </varlistentry>
 </para>
 </listitem>
 </varlistentry>


@@ -3651,84 +4098,38 @@ matches either ``c'' or ``h''.
 <listitem>
 <para>
 An equivalence class is a locale-specific name for a list of
 <listitem>
 <para>
 An equivalence class is a locale-specific name for a list of

-characters that are equivalent. The name is enclosed in ``&lsqb;=''
-and ``=&rsqb;''.  For example, the name ``e'' might be used to
-represent all of ``&egrave;'' ``&eacute;'' and ``e''.  In this case,
+characters that are equivalent. The name is enclosed in <quote>&lsqb;=</quote>
+and <quote>=&rsqb;</quote>.  For example, the name <quote>e</quote> might be used to
+represent all of <quote>&egrave;</quote> <quote>&eacute;</quote> and <quote>e</quote>.  In this case,

 <emphasis role="bold">&lsqb;&lsqb;=e=&rsqb;&rsqb;</emphasis> is a regexp that matches any of
 <emphasis role="bold">&lsqb;&lsqb;=e=&rsqb;&rsqb;</emphasis> is a regexp that matches any of

-``&egrave;'', ``&eacute;'' and ``e''.
+<quote>&egrave;</quote>, <quote>&eacute;</quote> and <quote>e</quote>.

 </para>
 </listitem>
 </varlistentry>
 </variablelist>
 </para>
 </listitem>
 </varlistentry>
 </variablelist>

-</para>

 
 <para>
 A regular expression matching a single character may be followed by one
 
 <para>
 A regular expression matching a single character may be followed by one

-of several repetition operators:
+of several repetition operators described in <xref linkend="regex-repeat"/>.

 </para>
 
 </para>
 

-<para>
-<variablelist>
-
-<varlistentry>
-<term>?</term>
-<listitem>
-<para>
-The preceding item is optional and matched at most once.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>*</term>
-<listitem>
-<para>
-The preceding item will be matched zero or more times.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>+</term>
-<listitem>
-<para>
-The preceding item will be matched one or more times.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lcub;n&rcub;</term>
-<listitem>
-<para>
-The preceding item is matched exactly <emphasis>n</emphasis> times.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lcub;n,&rcub;</term>
-<listitem>
-<para>
-The preceding item is matched <emphasis>n</emphasis> or more times.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lcub;,m&rcub;</term>
-<listitem>
-<para>
-The preceding item is matched at most <emphasis>m</emphasis> times.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&lcub;n,m&rcub;</term>
-<listitem>
-<para>
-The preceding item is matched at least <emphasis>n</emphasis> times, but no more than
-<emphasis>m</emphasis> times.
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</para>
+<table id="regex-repeat">
+<title>Regular expression repetition operators</title>
+<tgroup cols="2">
+<thead>
+<row><entry>Operator</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>?</entry><entry>The preceding item is optional and matched at most once</entry></row>
+<row><entry>*</entry><entry>The preceding item will be matched zero or more times</entry></row>
+<row><entry>+</entry><entry>The preceding item will be matched one or more times</entry></row>
+<row><entry>&lcub;n&rcub;</entry><entry>The preceding item is matched exactly <emphasis>n</emphasis> times</entry></row>
+<row><entry>&lcub;n,&rcub;</entry><entry>The preceding item is matched <emphasis>n</emphasis> or more times</entry></row>
+<row><entry>&lcub;,m&rcub;</entry><entry>The preceding item is matched at most <emphasis>m</emphasis> times</entry></row>
+<row><entry>&lcub;n,m&rcub;</entry><entry>The preceding item is matched at least <emphasis>n</emphasis> times, but no more than <emphasis>m</emphasis> times</entry></row>
+</tbody>
+</tgroup>
+</table>

 
 <para>
 Two regular expressions may be concatenated; the resulting regular
 
 <para>
 Two regular expressions may be concatenated; the resulting regular


@@ -3737,7 +4138,7 @@ that respectively match the concatenated subexpressions.
 </para>
 
 <para>
 </para>
 
 <para>

-Two regular expressions may be joined by the infix operator ``&verbar;'';
+Two regular expressions may be joined by the infix operator <quote>&verbar;</quote>;

 the resulting regular expression matches any string matching either
 subexpression.
 </para>
 the resulting regular expression matches any string matching either
 subexpression.
 </para>


@@ -3748,84 +4149,35 @@ precedence over alternation.  A whole subexpression may be enclosed in
 parentheses to override these precedence rules.
 </para>
 
 parentheses to override these precedence rules.
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> If you compile Mutt with the GNU <emphasis>rx</emphasis> package, the
-following operators may also be used in regular expressions:
+If you compile Mutt with the GNU <emphasis>rx</emphasis> package, the
+following operators may also be used in regular expressions as described in <xref linkend="regex-gnu-ext"/>.

 </para>
 </para>

+</note>

 
 

-<para>
-<variablelist>
+<table id="regex-gnu-ext">
+<title>GNU regular expression extensions</title>
+<tgroup cols="2">
+<thead>
+<row><entry>Expression</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>&bsol;&bsol;y</entry><entry>Matches the empty string at either the beginning or the end of a word</entry></row>
+<row><entry>&bsol;&bsol;B</entry><entry>Matches the empty string within a word</entry></row>
+<row><entry>&bsol;&bsol;&lt;</entry><entry>Matches the empty string at the beginning of a word</entry></row>
+<row><entry>&bsol;&bsol;&gt;</entry><entry>Matches the empty string at the end of a word</entry></row>
+<row><entry>&bsol;&bsol;w</entry><entry>Matches any word-constituent character (letter, digit, or underscore)</entry></row>
+<row><entry>&bsol;&bsol;W</entry><entry>Matches any character that is not word-constituent</entry></row>
+<row><entry>&bsol;&bsol;`</entry><entry>Matches the empty string at the beginning of a buffer (string)</entry></row>
+<row><entry>&bsol;&bsol;'</entry><entry>Matches the empty string at the end of a buffer</entry></row>
+</tbody>
+</tgroup>
+</table>

 
 

-<varlistentry>
-<term>&bsol;&bsol;y</term>
-<listitem>
-<para>
-Matches the empty string at either the beginning or the end of a word.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&bsol;&bsol;B</term>
-<listitem>

 <para>
 <para>

-Matches the empty string within a word.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&bsol;&bsol;&lt;</term>
-<listitem>
-<para>
-Matches the empty string at the beginning of a word.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&bsol;&bsol;&gt;</term>
-<listitem>
-<para>
-Matches the empty string at the end of a word.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&bsol;&bsol;w</term>
-<listitem>
-<para>
-Matches any word-constituent character (letter, digit, or underscore).
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&bsol;&bsol;W</term>
-<listitem>
-<para>
-Matches any character that is not word-constituent.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&bsol;&bsol;`</term>
-<listitem>
-<para>
-Matches the empty string at the beginning of a buffer (string).
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>&bsol;&bsol;'</term>
-<listitem>
-<para>
-Matches the empty string at the end of a buffer.
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>
-Please note however that these operators are not defined by POSIX, so
-they may or may not be available in stock libraries on various systems.
+Please note however that these operators are not defined by POSIX, so
+they may or may not be available in stock libraries on various systems.

 </para>
 
 </sect1>
 </para>
 
 </sect1>


@@ -3835,12 +4187,11 @@ they may or may not be available in stock libraries on various systems.
 
 <para>
 Many of Mutt's commands allow you to specify a pattern to match
 
 <para>
 Many of Mutt's commands allow you to specify a pattern to match

-(limit, tag-pattern, delete-pattern, etc.). <xref linkend="tab-patterns"/>
+(<literal>limit</literal>, <literal>tag-pattern</literal>,
+<literal>delete-pattern</literal>, etc.). <xref linkend="tab-patterns"/>

 shows several ways to select messages.
 </para>
 
 shows several ways to select messages.
 </para>
 

-<para>
-

 <table id="tab-patterns">
 <title>Pattern modifiers</title>
 <tgroup cols="2">
 <table id="tab-patterns">
 <title>Pattern modifiers</title>
 <tgroup cols="2">


@@ -3849,76 +4200,74 @@ shows several ways to select messages.
 </thead>
 <tbody>
 <row><entry>~A</entry><entry>all messages</entry></row>
 </thead>
 <tbody>
 <row><entry>~A</entry><entry>all messages</entry></row>

-<row><entry>~b EXPR</entry><entry>messages which contain EXPR in the message body</entry></row>
-<row><entry>=b STRING</entry><entry>messages which contain STRING in the message body. If IMAP is enabled, searches for STRING on the server, rather than downloading each message and searching it locally.</entry></row>
-<row><entry>~B EXPR</entry><entry>messages which contain EXPR in the whole message</entry></row>
-<row><entry>~c EXPR</entry><entry>messages carbon-copied to EXPR</entry></row>
-<row><entry>%c GROUP</entry><entry>messages carbon-copied to any member of GROUP</entry></row>
-<row><entry>~C EXPR</entry><entry>message is either to: or cc: EXPR</entry></row>
-<row><entry>%C GROUP</entry><entry>message is either to: or cc: to any member of GROUP</entry></row>
-<row><entry>~d &lsqb;MIN&rsqb;-&lsqb;MAX&rsqb;</entry><entry>messages with ``date-sent'' in a Date range</entry></row>
+<row><entry>~b <emphasis>EXPR</emphasis></entry><entry>messages which contain <emphasis>EXPR</emphasis> in the message body</entry></row>
+<row><entry>=b <emphasis>STRING</emphasis></entry><entry>messages which contain <emphasis>STRING</emphasis> in the message body. If IMAP is enabled, searches for <emphasis>STRING</emphasis> on the server, rather than downloading each message and searching it locally.</entry></row>
+<row><entry>~B <emphasis>EXPR</emphasis></entry><entry>messages which contain <emphasis>EXPR</emphasis> in the whole message</entry></row>
+<row><entry>~c <emphasis>EXPR</emphasis></entry><entry>messages carbon-copied to <emphasis>EXPR</emphasis></entry></row>
+<row><entry>%c <emphasis>GROUP</emphasis></entry><entry>messages carbon-copied to any member of <emphasis>GROUP</emphasis></entry></row>
+<row><entry>~C <emphasis>EXPR</emphasis></entry><entry>messages either to: or cc: <emphasis>EXPR</emphasis></entry></row>
+<row><entry>%C <emphasis>GROUP</emphasis></entry><entry>messages either to: or cc: to any member of <emphasis>GROUP</emphasis></entry></row>
+<row><entry>~d &lsqb;<emphasis>MIN</emphasis>&rsqb;-&lsqb;<emphasis>MAX</emphasis>&rsqb;</entry><entry>messages with <quote>date-sent</quote> in a Date range</entry></row>

 <row><entry>~D</entry><entry>deleted messages</entry></row>
 <row><entry>~D</entry><entry>deleted messages</entry></row>

-<row><entry>~e EXPR</entry><entry>message which contains EXPR in the ``Sender'' field</entry></row>
-<row><entry>%e GROUP</entry><entry>message which contain a member of GROUP in the ``Sender'' field</entry></row>
+<row><entry>~e <emphasis>EXPR</emphasis></entry><entry>messages which contains <emphasis>EXPR</emphasis> in the <quote>Sender</quote> field</entry></row>
+<row><entry>%e <emphasis>GROUP</emphasis></entry><entry>messages which contain a member of <emphasis>GROUP</emphasis> in the <quote>Sender</quote> field</entry></row>

 <row><entry>~E</entry><entry>expired messages</entry></row>
 <row><entry>~F</entry><entry>flagged messages</entry></row>
 <row><entry>~E</entry><entry>expired messages</entry></row>
 <row><entry>~F</entry><entry>flagged messages</entry></row>

-<row><entry>~f EXPR</entry><entry>messages originating from EXPR</entry></row>
-<row><entry>%f GROUP</entry><entry>messages originating from any member of GROUP</entry></row>
+<row><entry>~f <emphasis>EXPR</emphasis></entry><entry>messages originating from <emphasis>EXPR</emphasis></entry></row>
+<row><entry>%f <emphasis>GROUP</emphasis></entry><entry>messages originating from any member of <emphasis>GROUP</emphasis></entry></row>

 <row><entry>~g</entry><entry>cryptographically signed messages</entry></row>
 <row><entry>~G</entry><entry>cryptographically encrypted messages</entry></row>
 <row><entry>~g</entry><entry>cryptographically signed messages</entry></row>
 <row><entry>~G</entry><entry>cryptographically encrypted messages</entry></row>

-<row><entry>~h EXPR</entry><entry>messages which contain EXPR in the message header</entry></row>
-<row><entry>~H EXPR</entry><entry>messages with a spam attribute matching EXPR</entry></row>
-<row><entry>~i EXPR</entry><entry>message which match EXPR in the ``Message-ID'' field</entry></row>
-<row><entry>~k</entry><entry>message contains PGP key material</entry></row>
-<row><entry>~L EXPR</entry><entry>message is either originated or received by EXPR</entry></row>
-<row><entry>%L GROUP</entry><entry>message is either originated or received by any member of GROUP</entry></row>
-<row><entry>~l</entry><entry>message is addressed to a known mailing list</entry></row>
-<row><entry>~m &lsqb;MIN&rsqb;-&lsqb;MAX&rsqb;</entry><entry>message in the range MIN to MAX *)</entry></row>
-<row><entry>~n &lsqb;MIN&rsqb;-&lsqb;MAX&rsqb;</entry><entry>messages with a score in the range MIN to MAX *)</entry></row>
+<row><entry>~h <emphasis>EXPR</emphasis></entry><entry>messages which contain <emphasis>EXPR</emphasis> in the message header</entry></row>
+<row><entry>~H <emphasis>EXPR</emphasis></entry><entry>messages with a spam attribute matching <emphasis>EXPR</emphasis></entry></row>
+<row><entry>~i <emphasis>EXPR</emphasis></entry><entry>messages which match <emphasis>EXPR</emphasis> in the <quote>Message-ID</quote> field</entry></row>
+<row><entry>~k</entry><entry>messages which contain PGP key material</entry></row>
+<row><entry>~L <emphasis>EXPR</emphasis></entry><entry>messages either originated or received by <emphasis>EXPR</emphasis></entry></row>
+<row><entry>%L <emphasis>GROUP</emphasis></entry><entry>message either originated or received by any member of <emphasis>GROUP</emphasis></entry></row>
+<row><entry>~l</entry><entry>messages addressed to a known mailing list</entry></row>
+<row><entry>~m &lsqb;<emphasis>MIN</emphasis>&rsqb;-&lsqb;<emphasis>MAX</emphasis>&rsqb;</entry><entry>messages in the range <emphasis>MIN</emphasis> to <emphasis>MAX</emphasis> *)</entry></row>
+<row><entry>~n &lsqb;<emphasis>MIN</emphasis>&rsqb;-&lsqb;<emphasis>MAX</emphasis>&rsqb;</entry><entry>messages with a score in the range <emphasis>MIN</emphasis> to <emphasis>MAX</emphasis> *)</entry></row>

 <row><entry>~N</entry><entry>new messages</entry></row>
 <row><entry>~O</entry><entry>old messages</entry></row>
 <row><entry>~N</entry><entry>new messages</entry></row>
 <row><entry>~O</entry><entry>old messages</entry></row>

-<row><entry>~p</entry><entry>message is addressed to you (consults alternates)</entry></row>
-<row><entry>~P</entry><entry>message is from you (consults alternates)</entry></row>
+<row><entry>~p</entry><entry>messages addressed to you (consults alternates)</entry></row>
+<row><entry>~P</entry><entry>messages from you (consults alternates)</entry></row>

 <row><entry>~Q</entry><entry>messages which have been replied to</entry></row>
 <row><entry>~Q</entry><entry>messages which have been replied to</entry></row>

-<row><entry>~r &lsqb;MIN&rsqb;-&lsqb;MAX&rsqb;</entry><entry>messages with ``date-received'' in a Date range</entry></row>
+<row><entry>~r &lsqb;<emphasis>MIN</emphasis>&rsqb;-&lsqb;<emphasis>MAX</emphasis>&rsqb;</entry><entry>messages with <quote>date-received</quote> in a Date range</entry></row>

 <row><entry>~R</entry><entry>read messages</entry></row>
 <row><entry>~R</entry><entry>read messages</entry></row>

-<row><entry>~s EXPR</entry><entry>messages having EXPR in the ``Subject'' field.</entry></row>
+<row><entry>~s <emphasis>EXPR</emphasis></entry><entry>messages having <emphasis>EXPR</emphasis> in the <quote>Subject</quote> field.</entry></row>

 <row><entry>~S</entry><entry>superseded messages</entry></row>
 <row><entry>~S</entry><entry>superseded messages</entry></row>

-<row><entry>~t EXPR</entry><entry>messages addressed to EXPR</entry></row>
+<row><entry>~t <emphasis>EXPR</emphasis></entry><entry>messages addressed to <emphasis>EXPR</emphasis></entry></row>

 <row><entry>~T</entry><entry>tagged messages</entry></row>
 <row><entry>~T</entry><entry>tagged messages</entry></row>

-<row><entry>~u</entry><entry>message is addressed to a subscribed mailing list</entry></row>
+<row><entry>~u</entry><entry>messages addressed to a subscribed mailing list</entry></row>

 <row><entry>~U</entry><entry>unread messages</entry></row>
 <row><entry>~U</entry><entry>unread messages</entry></row>

-<row><entry>~v</entry><entry>message is part of a collapsed thread.</entry></row>
+<row><entry>~v</entry><entry>messages part of a collapsed thread.</entry></row>

 <row><entry>~V</entry><entry>cryptographically verified messages</entry></row>
 <row><entry>~V</entry><entry>cryptographically verified messages</entry></row>

-<row><entry>~x EXPR</entry><entry>messages which contain EXPR in the `References' field</entry></row>
-<row><entry>~X &lsqb;MIN&rsqb;-&lsqb;MAX&rsqb;</entry><entry>messages with MIN to MAX attachments *)</entry></row>
-<row><entry>~y EXPR</entry><entry>messages which contain EXPR in the `X-Label' field</entry></row>
-<row><entry>~z &lsqb;MIN&rsqb;-&lsqb;MAX&rsqb;</entry><entry>messages with a size in the range MIN to MAX *)</entry></row>
-<row><entry>~=</entry><entry>duplicated messages (see $duplicate_threads)</entry></row>
+<row><entry>~x <emphasis>EXPR</emphasis></entry><entry>messages which contain <emphasis>EXPR</emphasis> in the <quote>References</quote> field</entry></row>
+<row><entry>~X &lsqb;<emphasis>MIN</emphasis>&rsqb;-&lsqb;<emphasis>MAX</emphasis>&rsqb;</entry><entry>messages with <emphasis>MIN</emphasis> to <emphasis>MAX</emphasis> attachments *)</entry></row>
+<row><entry>~y <emphasis>EXPR</emphasis></entry><entry>messages which contain <emphasis>EXPR</emphasis> in the <quote>X-Label</quote> field</entry></row>
+<row><entry>~z &lsqb;<emphasis>MIN</emphasis>&rsqb;-&lsqb;<emphasis>MAX</emphasis>&rsqb;</entry><entry>messages with a size in the range <emphasis>MIN</emphasis> to <emphasis>MAX</emphasis> *)</entry></row>
+<row><entry>~=</entry><entry>duplicated messages (see <link linkend="duplicate-threads">&dollar;duplicate&lowbar;threads</link>)</entry></row>

 <row><entry>~$</entry><entry>unreferenced messages (requires threaded view)</entry></row>
 <row><entry>~$</entry><entry>unreferenced messages (requires threaded view)</entry></row>

-<row><entry>~(PATTERN)</entry><entry>messages in threads
-containing messages matching a certain pattern, e.g. all
+<row><entry>~(<emphasis>PATTERN</emphasis>)</entry><entry>messages in threads
+containing messages matching <emphasis>PATTERN</emphasis>, e.g. all

 threads containing messages from you: ~(~P)</entry></row>
 </tbody>
 </tgroup>
 </table>
 
 threads containing messages from you: ~(~P)</entry></row>
 </tbody>
 </tgroup>
 </table>
 

-</para>
-

 <para>
 <para>

-Where EXPR is a
+Where <emphasis>EXPR</emphasis> is a

 <link linkend="regexp">regular expression</link>.  Special attention has to be
 made when using regular expressions inside of patterns.  Specifically,
 <link linkend="regexp">regular expression</link>.  Special attention has to be
 made when using regular expressions inside of patterns.  Specifically,

-Mutt's parser for these patterns will strip one level of backslash (\),
+Mutt's parser for these patterns will strip one level of backslash (<quote>\</quote>),

 which is normally used for quoting.  If it is your intention to use a
 backslash in the regular expression, you will need to use two backslashes
 which is normally used for quoting.  If it is your intention to use a
 backslash in the regular expression, you will need to use two backslashes

-instead (\\). You can force mutt to treat EXPR as a simple string
+instead (<quote>\\</quote>). You can force mutt to treat <emphasis>EXPR</emphasis> as a simple string

 instead of a regular expression by using = instead of &tilde; in the
 instead of a regular expression by using = instead of &tilde; in the

-pattern name. For example, =b *.* will find all messages that contain
-the literal string '*.*'. Simple string matches are less powerful than
+pattern name. For example, <literal>=b *.*</literal> will find all messages that contain
+the literal string <quote>*.*</quote>. Simple string matches are less powerful than

 regular expressions but can be considerably faster. This is especially
 true for IMAP folders, because string matches can be performed on the
 regular expressions but can be considerably faster. This is especially
 true for IMAP folders, because string matches can be performed on the

-server instead of by fetching every message. IMAP treats =h specially:
+server instead of by fetching every message. IMAP treats <literal>=h</literal> specially:

 it must be of the form "header: substring" and will not partially
 match header names. The substring part may be omitted if you simply
 wish to find messages containing a particular header without regard to
 it must be of the form "header: substring" and will not partially
 match header names. The substring part may be omitted if you simply
 wish to find messages containing a particular header without regard to


@@ -3926,42 +4275,40 @@ its value.
 </para>
 
 <para>
 </para>
 
 <para>

-*) The forms <literal>&lt;&lsqb;MAX&rsqb;</literal>, <literal>&gt;&lsqb;MIN&rsqb;</literal>,
-<literal>&lsqb;MIN&rsqb;-</literal> and <literal>-&lsqb;MAX&rsqb;</literal>
+*) The forms <quote>&lt;&lsqb;<emphasis>MAX</emphasis>&rsqb;</quote>, <quote>&gt;&lsqb;<emphasis>MIN</emphasis>&rsqb;</quote>,
+<quote>&lsqb;<emphasis>MIN</emphasis>&rsqb;-</quote> and <quote>-&lsqb;<emphasis>MAX</emphasis>&rsqb;</quote>

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

-<sect2>
+<sect2 id="patterns-modifier">

 <title>Pattern Modifier</title>
 
 <title>Pattern Modifier</title>
 

+<note>

 <para>
 <para>

-Note that patterns matching 'lists' of addresses (notably c,C,p,P and t)
+Note that patterns matching 'lists' of addresses (notably c, C, p, P and t)

 match if there is at least one match in the whole list. If you want to
 make sure that all elements of that list match, you need to prefix your
 match if there is at least one match in the whole list. If you want to
 make sure that all elements of that list match, you need to prefix your

-pattern with &circ;.
+pattern with <quote>&circ;</quote>.

 This example matches all mails which only has recipients from Germany.
 </para>
 This example matches all mails which only has recipients from Germany.
 </para>

-
-<para>
+</note>

 
 <screen>
 ^~C \.de$
 </screen>
 
 
 <screen>
 ^~C \.de$
 </screen>
 

-</para>
-

 </sect2>
 
 </sect2>
 

-<sect2>
+<sect2 id="simple-patterns">

 <title>Simple Patterns</title>
 
 <para>
 <title>Simple Patterns</title>
 
 <para>

-Mutt supports two versions of so called ``simple searches'' which are
+Mutt supports two versions of so called <quote>simple searches</quote> which are

 issued if the query entered for searching, limiting and similar
 operations does not seem to be a valid pattern (i.e. it does not contain
 issued if the query entered for searching, limiting and similar
 operations does not seem to be a valid pattern (i.e. it does not contain

-one of these characters: ``~'', ``='' or ``&percnt;''). If the query is
+one of these characters: <quote>&tilde;</quote>, <quote>=</quote> or <quote>&percnt;</quote>). If the query is

 supposed to contain one of these special characters, they must be escaped
 supposed to contain one of these special characters, they must be escaped

-by prepending a backslash (``\'').
+by prepending a backslash (<quote>\</quote>).

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


@@ -3970,10 +4317,10 @@ a keyword case-insensitively from <xref linkend="tab-simplesearch-keywords"/>:
 If that is the case, Mutt will use the shown pattern modifier instead.
 If a keyword would conflict with your search keyword, you need to turn
 it into a regular expression to avoid matching the keyword table. For
 If that is the case, Mutt will use the shown pattern modifier instead.
 If a keyword would conflict with your search keyword, you need to turn
 it into a regular expression to avoid matching the keyword table. For

-example, if you want to find all messages matching ``<literal>flag</literal>''
-(using <link linkend="simple-search">&dollar;simple&lowbar;search</link>,
-see below but not meaning flagged messages) simply search for
-``<literal>&lsqb;f&rsqb;lag</literal>''.
+example, if you want to find all messages matching <quote>flag</quote>
+(using <link linkend="simple-search">&dollar;simple&lowbar;search</link>)
+but don't want to match flagged messages, simply search for
+<quote><literal>&lsqb;f&rsqb;lag</literal></quote>.

 </para>
 
 <table id="tab-simplesearch-keywords">
 </para>
 
 <table id="tab-simplesearch-keywords">


@@ -4007,7 +4354,7 @@ for the composed complex query.
 
 </sect2>
 
 
 </sect2>
 

-<sect2>
+<sect2 id="complex-patterns">

 <title>Complex Patterns</title>
 
 <para>
 <title>Complex Patterns</title>
 
 <para>


@@ -4015,17 +4362,13 @@ Logical AND is performed by specifying more than one criterion.  For
 example:
 </para>
 
 example:
 </para>
 

-<para>
-

 <screen>
 ~t mutt ~f elkins
 </screen>
 
 <screen>
 ~t mutt ~f elkins
 </screen>
 

-</para>
-

 <para>
 <para>

-would select messages which contain the word ``mutt'' in the list of
-recipients <emphasis role="bold">and</emphasis> that have the word ``elkins'' in the ``From'' header
+would select messages which contain the word <quote>mutt</quote> in the list of
+recipients <emphasis role="bold">and</emphasis> that have the word <quote>elkins</quote> in the <quote>From</quote> header

 field.
 </para>
 
 field.
 </para>
 


@@ -4034,8 +4377,6 @@ Mutt also recognizes the following operators to create more complex search
 patterns:
 </para>
 
 patterns:
 </para>
 

-<para>
-

 <itemizedlist>
 <listitem>
 
 <itemizedlist>
 <listitem>
 


@@ -4058,61 +4399,48 @@ patterns:
 
 </itemizedlist>
 
 
 </itemizedlist>
 

-</para>
-

 <para>
 Here is an example illustrating a complex search pattern.  This pattern will
 <para>
 Here is an example illustrating a complex search pattern.  This pattern will

-select all messages which do not contain ``mutt'' in the ``To'' or ``Cc''
-field and which are from ``elkins''.
+select all messages which do not contain <quote>mutt</quote> in the <quote>To</quote> or <quote>Cc</quote>
+field and which are from <quote>elkins</quote>.

 </para>
 
 </para>
 

-<para>
-
+<example id="ex-pattern-bool">
+<title>Using boolean operators in patterns</title>

 <screen>
 !(~t mutt|~c mutt) ~f elkins
 </screen>
 <screen>
 !(~t mutt|~c mutt) ~f elkins
 </screen>

-
-</para>
+</example>

 
 <para>
 Here is an example using white space in the regular expression (note
 the ' and &quot; delimiters).  For this to match, the mail's subject must
 
 <para>
 Here is an example using white space in the regular expression (note
 the ' and &quot; delimiters).  For this to match, the mail's subject must

-match the ``&circ;Junk +From +Me$'' and it must be from either ``Jim +Somebody''
-or ``Ed +SomeoneElse'':
+match the <quote>&circ;Junk +From +Me$</quote> and it must be from either <quote>Jim +Somebody</quote>
+or <quote>Ed +SomeoneElse</quote>:

 </para>
 
 </para>
 

-<para>
-

 <screen>
  '~s "^Junk +From +Me$" ~f ("Jim +Somebody"|"Ed +SomeoneElse")'
 </screen>
 
 <screen>
  '~s "^Junk +From +Me$" ~f ("Jim +Somebody"|"Ed +SomeoneElse")'
 </screen>
 

-</para>
-
+<note>

 <para>
 <para>

-Note that if a regular expression contains parenthesis, or a vertical bar
+If a regular expression contains parenthesis, or a vertical bar

 ("&verbar;"), you <emphasis role="bold">must</emphasis> enclose the expression in double or single quotes since
 those characters are also used to separate different parts of Mutt's
 ("&verbar;"), you <emphasis role="bold">must</emphasis> enclose the expression in double or single quotes since
 those characters are also used to separate different parts of Mutt's

-pattern language.  For example,
-</para>
-
-<para>
-
-<screen>
-~f "me@(mutt\.org|cs\.hmc\.edu)"
-</screen>
-
+pattern language.  For example: <literal>~f "me@(mutt\.org|cs\.hmc\.edu)"</literal>

 </para>
 </para>

+</note>

 
 <para>
 Without the quotes, the parenthesis wouldn't end.
 
 <para>
 Without the quotes, the parenthesis wouldn't end.

-This would be seperated to two OR'd patterns: <emphasis>&tilde;f me@(mutt\.org</emphasis>
+This would be separated to two OR'd patterns: <emphasis>&tilde;f me@(mutt\.org</emphasis>

 and <emphasis>cs\.hmc\.edu)</emphasis>. They are never what you want.
 </para>
 
 </sect2>
 
 and <emphasis>cs\.hmc\.edu)</emphasis>. They are never what you want.
 </para>
 
 </sect2>
 

-<sect2>
+<sect2 id="date-patterns">

 <title>Searching by Date</title>
 
 <para>
 <title>Searching by Date</title>
 
 <para>


@@ -4125,27 +4453,23 @@ optional, defaulting to the current month and year).  An example of a valid
 range of dates is:
 </para>
 
 range of dates is:
 </para>
 

-<para>
-

 <screen>
 Limit to messages matching: ~d 20/1/95-31/10
 </screen>
 
 <screen>
 Limit to messages matching: ~d 20/1/95-31/10
 </screen>
 

-</para>
-

 <para>
 <para>

-If you omit the minimum (first) date, and just specify ``-DD/MM/YY'', all
+If you omit the minimum (first) date, and just specify <quote>-DD/MM/YY</quote>, all

 messages <emphasis>before</emphasis> the given date will be selected.  If you omit the maximum
 messages <emphasis>before</emphasis> the given date will be selected.  If you omit the maximum

-(second) date, and specify ``DD/MM/YY-'', all messages <emphasis>after</emphasis> the given
-date will be selected.  If you specify a single date with no dash (``-''),
-only messages sent on the given date will be selected. 
+(second) date, and specify <quote>DD/MM/YY-</quote>, all messages <emphasis>after</emphasis> the given
+date will be selected.  If you specify a single date with no dash (<quote>-</quote>),
+only messages sent on the given date will be selected.

 </para>
 
 <para>
 <emphasis role="bold">Error Margins</emphasis>.  You can add error margins to absolute dates.
 An error margin is a sign (+ or -), followed by a digit, followed by
 one of the units in <xref linkend="tab-date-units"/>. As a special case, you can replace the
 </para>
 
 <para>
 <emphasis role="bold">Error Margins</emphasis>.  You can add error margins to absolute dates.
 An error margin is a sign (+ or -), followed by a digit, followed by
 one of the units in <xref linkend="tab-date-units"/>. As a special case, you can replace the

-sign by a ``*'' character, which is equivalent to giving identical plus and minus error margins.
+sign by a <quote>*</quote> character, which is equivalent to giving identical plus and minus error margins.

 </para>
 
 <table id="tab-date-units">
 </para>
 
 <table id="tab-date-units">


@@ -4165,18 +4489,17 @@ sign by a ``*'' character, which is equivalent to giving identical plus and minu
 
 <para>
 Example: To select any messages two weeks around January 15, 2001,
 
 <para>
 Example: To select any messages two weeks around January 15, 2001,

-you'd use the following pattern: 
+you'd use the following pattern:
+</para>

 
 <screen>
 
 <screen>

- 

 Limit to messages matching: ~d 15/1/2001*2w
 </screen>
 
 Limit to messages matching: ~d 15/1/2001*2w
 </screen>
 

-</para>
-

 <para>
 <emphasis role="bold">Relative</emphasis>.  This type of date is relative to the current date, and may
 be specified as:
 <para>
 <emphasis role="bold">Relative</emphasis>.  This type of date is relative to the current date, and may
 be specified as:

+</para>

 
 <itemizedlist>
 <listitem>
 
 <itemizedlist>
 <listitem>


@@ -4200,27 +4523,26 @@ be specified as:
 
 </itemizedlist>
 
 
 </itemizedlist>
 

-</para>
-

 <para>
 <emphasis>offset</emphasis> is specified as a positive number with one of the units from <xref linkend="tab-date-units"/>.
 </para>
 
 <para>
 Example: to select messages less than 1 month old, you would use
 <para>
 <emphasis>offset</emphasis> is specified as a positive number with one of the units from <xref linkend="tab-date-units"/>.
 </para>
 
 <para>
 Example: to select messages less than 1 month old, you would use

+</para>

 
 <screen>
 Limit to messages matching: ~d &lt;1m
 </screen>
 
 
 <screen>
 Limit to messages matching: ~d &lt;1m
 </screen>
 

-</para>
-
+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> all dates used when searching are relative to the
+All dates used when searching are relative to the

 <emphasis role="bold">local</emphasis> time zone, so unless you change the setting of your <link linkend="index-format">&dollar;index&lowbar;format</link> to include a
 <literal>&percnt;&lsqb;...&rsqb;</literal> format, these are <emphasis role="bold">not</emphasis> the dates shown
 in the main index.
 </para>
 <emphasis role="bold">local</emphasis> time zone, so unless you change the setting of your <link linkend="index-format">&dollar;index&lowbar;format</link> to include a
 <literal>&percnt;&lsqb;...&rsqb;</literal> format, these are <emphasis role="bold">not</emphasis> the dates shown
 in the main index.
 </para>

+</note>

 
 </sect2>
 
 
 </sect2>
 


@@ -4234,28 +4556,28 @@ Sometimes it is desirable to perform an operation on a group of
 messages all at once rather than one at a time.  An example might be
 to save messages to a mailing list to a separate folder, or to
 delete all messages with a given subject.  To tag all messages
 messages all at once rather than one at a time.  An example might be
 to save messages to a mailing list to a separate folder, or to
 delete all messages with a given subject.  To tag all messages

-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
+matching a pattern, use the <literal>&lt;tag-pattern&gt;</literal> function, which is bound to
+<quote>shift-T</quote> by default.  Or you can select individual messages by
+hand using the <literal>&lt;tag-message&gt;</literal> function, which is bound to <quote>t</quote> by

 default.  See <link linkend="patterns">patterns</link> for Mutt's pattern
 matching syntax.
 </para>
 
 <para>
 Once you have tagged the desired messages, you can use the
 default.  See <link linkend="patterns">patterns</link> for Mutt's pattern
 matching syntax.
 </para>
 
 <para>
 Once you have tagged the desired messages, you can use the

-``tag-prefix'' operator, which is the ``;'' (semicolon) key by default.
-When the ``tag-prefix'' operator is used, the <emphasis role="bold">next</emphasis> operation will
+<quote>tag-prefix</quote> operator, which is the <quote>;</quote> (semicolon) key by default.
+When the <quote>tag-prefix</quote> operator is used, the <emphasis role="bold">next</emphasis> operation will

 be applied to all tagged messages if that operation can be used in that
 manner.  If the <link linkend="auto-tag">&dollar;auto&lowbar;tag</link>
 variable is set, the next operation applies to the tagged messages
 be applied to all tagged messages if that operation can be used in that
 manner.  If the <link linkend="auto-tag">&dollar;auto&lowbar;tag</link>
 variable is set, the next operation applies to the tagged messages

-automatically, without requiring the ``tag-prefix''.
+automatically, without requiring the <quote>tag-prefix</quote>.

 </para>
 
 <para>
 In <link linkend="macro">macros</link> or <link linkend="push">push</link> commands,
 </para>
 
 <para>
 In <link linkend="macro">macros</link> or <link linkend="push">push</link> commands,

-you can use the ``tag-prefix-cond'' operator.  If there are no tagged
+you can use the <quote>tag-prefix-cond</quote> operator.  If there are no tagged

 messages, mutt will "eat" the rest of the macro to abort it's execution.
 messages, mutt will "eat" the rest of the macro to abort it's execution.

-Mutt will stop "eating" the macro when it encounters the ``end-cond''
+Mutt will stop "eating" the macro when it encounters the <quote>end-cond</quote>

 operator;  after this operator the rest of the macro will be executed as
 normal.
 </para>
 operator;  after this operator the rest of the macro will be executed as
 normal.
 </para>


@@ -4266,7 +4588,7 @@ normal.
 <title>Using Hooks</title>
 
 <para>
 <title>Using Hooks</title>
 
 <para>

-A <emphasis>hook</emphasis> is a concept borrowed from the EMACS editor which allows you to
+A <emphasis>hook</emphasis> is a concept found in many other programs which allows you to

 execute arbitrary commands before performing some operation.  For example,
 you may wish to tailor your configuration based upon which mailbox you are
 reading, or to whom you are sending mail.  In the Mutt world, a <emphasis>hook</emphasis>
 execute arbitrary commands before performing some operation.  For example,
 you may wish to tailor your configuration based upon which mailbox you are
 reading, or to whom you are sending mail.  In the Mutt world, a <emphasis>hook</emphasis>


@@ -4323,22 +4645,23 @@ configuration option/command.  See
 for specific details on each type of <emphasis>hook</emphasis> available.
 </para>
 
 for specific details on each type of <emphasis>hook</emphasis> available.
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> if a hook changes configuration settings, these changes remain
+If a hook changes configuration settings, these changes remain

 effective until the end of the current mutt session. As this is generally
 not desired, a default hook needs to be added before all other hooks to
 restore configuration defaults. Here is an example with send-hook and the
 my&lowbar;hdr directive:
 </para>
 effective until the end of the current mutt session. As this is generally
 not desired, a default hook needs to be added before all other hooks to
 restore configuration defaults. Here is an example with send-hook and the
 my&lowbar;hdr directive:
 </para>

+</note>

 
 

-<para>
-
+<example id="ex-send-hook-my-hdr">
+<title>Combining <literal>send-hook</literal> and <literal>my&lowbar;hdr</literal></title>

 <screen>
 send-hook . 'unmy_hdr From:'
 send-hook ~C'^b@b\.b$' my_hdr from: c@c.c
 </screen>
 <screen>
 send-hook . 'unmy_hdr From:'
 send-hook ~C'^b@b\.b$' my_hdr from: c@c.c
 </screen>

-
-</para>
+</example>

 
 <sect2 id="pattern-hook" xreflabel="Message Matching in Hooks">
 <title>Message Matching in Hooks</title>
 
 <sect2 id="pattern-hook" xreflabel="Message Matching in Hooks">
 <title>Message Matching in Hooks</title>


@@ -4365,11 +4688,13 @@ the message (i.e., from, to, cc, date, subject, etc.).
 <para>
 For example, if you wanted to set your return address based upon sending
 mail to a specific address, you could do something like:
 <para>
 For example, if you wanted to set your return address based upon sending
 mail to a specific address, you could do something like:

+</para>

 
 <screen>
 send-hook '~t ^me@cs\.hmc\.edu$' 'my_hdr From: Mutt User &lt;user@host&gt;'
 </screen>
 
 
 <screen>
 send-hook '~t ^me@cs\.hmc\.edu$' 'my_hdr From: Mutt User &lt;user@host&gt;'
 </screen>
 

+<para>

 which would execute the given command when sending mail to
 <emphasis>me@cs.hmc.edu</emphasis>.
 </para>
 which would execute the given command when sending mail to
 <emphasis>me@cs.hmc.edu</emphasis>.
 </para>


@@ -4378,9 +4703,9 @@ which would execute the given command when sending mail to
 However, it is not required that you write the pattern to match using the
 full searching language.  You can still specify a simple <emphasis>regular
 expression</emphasis> like the other hooks, in which case Mutt will translate your
 However, it is not required that you write the pattern to match using the
 full searching language.  You can still specify a simple <emphasis>regular
 expression</emphasis> like the other hooks, in which case Mutt will translate your

-pattern into the full language, using the translation specified by the 
+pattern into the full language, using the translation specified by the

 <link linkend="default-hook">&dollar;default&lowbar;hook</link> variable.  The
 <link linkend="default-hook">&dollar;default&lowbar;hook</link> variable.  The

-pattern is translated at the time the hook is declared, so the value of 
+pattern is translated at the time the hook is declared, so the value of

 <link linkend="default-hook">&dollar;default&lowbar;hook</link> that is in effect
 at that time will be used.
 </para>
 <link linkend="default-hook">&dollar;default&lowbar;hook</link> that is in effect
 at that time will be used.
 </para>


@@ -4399,14 +4724,10 @@ using a simple interface.  Using the <link linkend="query-command">&dollar;query
 command to use.  For example:
 </para>
 
 command to use.  For example:
 </para>
 

-<para>
-

 <screen>
 set query_command = "mutt_ldap_query.pl '%s'"
 </screen>
 
 <screen>
 set query_command = "mutt_ldap_query.pl '%s'"
 </screen>
 

-</para>
-

 <para>
 The wrapper script should accept the query on the command-line.  It
 should return a one line message, then each matching response on a
 <para>
 The wrapper script should accept the query on the command-line.  It
 should return a one line message, then each matching response on a


@@ -4417,6 +4738,7 @@ addresses, return a non-zero exit code and a one line error message.
 
 <para>
 An example multiple response output:
 
 <para>
 An example multiple response output:

+</para>

 
 <screen>
 Searching database ... 20 entries ... 3 matching:
 
 <screen>
 Searching database ... 20 entries ... 3 matching:


@@ -4425,11 +4747,9 @@ blong@fiction.net       Brandon Long    mutt and more
 roessler@does-not-exist.org        Thomas Roessler mutt pgp
 </screen>
 
 roessler@does-not-exist.org        Thomas Roessler mutt pgp
 </screen>
 

-</para>
-

 <para>
 There are two mechanisms for accessing the query function of mutt.  One
 <para>
 There are two mechanisms for accessing the query function of mutt.  One

-is to do a query from the index menu using the query function (default: Q).
+is to do a query from the index menu using the <literal>&lt;query&gt;</literal> function (default: Q).

 This will prompt for a query, then bring up the query menu which will
 list the matching responses.  From the query menu, you can select
 addresses to create aliases, or to mail.  You can tag multiple addresses
 This will prompt for a query, then bring up the query menu which will
 list the matching responses.  From the query menu, you can select
 addresses to create aliases, or to mail.  You can tag multiple addresses


@@ -4440,7 +4760,7 @@ responses.
 <para>
 The other mechanism for accessing the query function is for address
 completion, similar to the alias completion.  In any prompt for address
 <para>
 The other mechanism for accessing the query function is for address
 completion, similar to the alias completion.  In any prompt for address

-entry, you can use the complete-query function (default: &circ;T) to run a
+entry, you can use the <literal>&lt;complete-query&gt;</literal> function (default: &circ;T) to run a

 query based on the current address you have typed.  Like aliases, mutt
 will look for what you have typed back to the last space or comma.  If
 there is a single response for that query, mutt will expand the address
 query based on the current address you have typed.  Like aliases, mutt
 will look for what you have typed back to the last space or comma.  If
 there is a single response for that query, mutt will expand the address


@@ -4466,22 +4786,18 @@ mailboxes, Mutt uses the default specified with the <link linkend="mbox-type">&d
 messages are stored in a single file.  Each message has a line of the form:
 </para>
 
 messages are stored in a single file.  Each message has a line of the form:
 </para>
 

-<para>
-

 <screen>
 From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST
 </screen>
 
 <screen>
 From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST
 </screen>
 

-</para>
-

 <para>
 to denote the start of a new message (this is often referred to as the
 <para>
 to denote the start of a new message (this is often referred to as the

-``From&lowbar;'' line).
+<quote>From&lowbar;</quote> line).

 </para>
 
 <para>
 <emphasis role="bold">MMDF</emphasis>.  This is a variant of the <emphasis>mbox</emphasis> format.  Each message is
 </para>
 
 <para>
 <emphasis role="bold">MMDF</emphasis>.  This is a variant of the <emphasis>mbox</emphasis> format.  Each message is

-surrounded by lines containing ``&circ;A&circ;A&circ;A&circ;A'' (four control-A's).
+surrounded by lines containing <quote>&circ;A&circ;A&circ;A&circ;A</quote> (four control-A's).

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


@@ -4489,7 +4805,7 @@ surrounded by lines containing ``&circ;A&circ;A&circ;A&circ;A'' (four control-A'
 consists of a directory and each message is stored in a separate file.
 The filename indicates the message number (however, this is may not
 correspond to the message number Mutt displays). Deleted messages are
 consists of a directory and each message is stored in a separate file.
 The filename indicates the message number (however, this is may not
 correspond to the message number Mutt displays). Deleted messages are

-renamed with a comma (,) prepended to the filename. <emphasis role="bold">Note:</emphasis> Mutt
+renamed with a comma (,) prepended to the filename. Mutt

 detects this type of mailbox by looking for either <literal>.mh&lowbar;sequences</literal>
 or <literal>.xmhcache</literal> (needed to distinguish normal directories from MH
 mailboxes).
 detects this type of mailbox by looking for either <literal>.mh&lowbar;sequences</literal>
 or <literal>.xmhcache</literal> (needed to distinguish normal directories from MH
 mailboxes).


@@ -4515,8 +4831,6 @@ These shortcuts can be used anywhere you are prompted for a file or mailbox
 path.
 </para>
 
 path.
 </para>
 

-<para>
-

 <itemizedlist>
 <listitem>
 
 <itemizedlist>
 <listitem>
 


@@ -4569,8 +4883,6 @@ path.
 
 </itemizedlist>
 
 
 </itemizedlist>
 

-</para>
-

 </sect1>
 
 <sect1 id="using-lists">
 </sect1>
 
 <sect1 id="using-lists">


@@ -4590,18 +4902,18 @@ Now that Mutt knows what your mailing lists are, it can do several
 things, the first of which is the ability to show the name of a list
 through which you received a message (i.e., of a subscribed list) in
 the <emphasis>index</emphasis> menu display.  This is useful to distinguish between
 things, the first of which is the ability to show the name of a list
 through which you received a message (i.e., of a subscribed list) in
 the <emphasis>index</emphasis> menu display.  This is useful to distinguish between

-personal and list mail in the same mailbox.  In the <link linkend="index-format">&dollar;index&lowbar;format</link> variable, the escape ``&percnt;L''
-will return the string ``To &lt;list&gt;'' when ``list'' appears in the
-``To'' field, and ``Cc &lt;list&gt;'' when it appears in the ``Cc''
+personal and list mail in the same mailbox.  In the <link linkend="index-format">&dollar;index&lowbar;format</link> variable, the escape <quote>&percnt;L</quote>
+will return the string <quote>To &lt;list&gt;</quote> when <quote>list</quote> appears in the
+<quote>To</quote> field, and <quote>Cc &lt;list&gt;</quote> when it appears in the <quote>Cc</quote>

 field (otherwise it returns the name of the author).
 </para>
 
 <para>
 field (otherwise it returns the name of the author).
 </para>
 
 <para>

-Often times the ``To'' and ``Cc'' fields in mailing list messages
+Often times the <quote>To</quote> and <quote>Cc</quote> fields in mailing list messages

 tend to get quite large. Most people do not bother to remove the
 tend to get quite large. Most people do not bother to remove the

-author of the message they are reply to from the list, resulting in
-two or more copies being sent to that person.  The ``list-reply''
-function, which by default is bound to ``L'' in the <emphasis>index</emphasis> menu
+author of the message they reply to from the list, resulting in
+two or more copies being sent to that person.  The <literal>&lt;list-reply&gt;</literal>
+function, which by default is bound to <quote>L</quote> in the <emphasis>index</emphasis> menu

 and <emphasis>pager</emphasis>, helps reduce the clutter by only replying to the
 known mailing list addresses instead of all recipients (except as
 specified by <literal>Mail-Followup-To</literal>, see below).
 and <emphasis>pager</emphasis>, helps reduce the clutter by only replying to the
 known mailing list addresses instead of all recipients (except as
 specified by <literal>Mail-Followup-To</literal>, see below).


@@ -4613,7 +4925,7 @@ a message to a list of recipients which includes one or several
 subscribed mailing lists, and if the <link linkend="followup-to">&dollar;followup&lowbar;to</link> option is set, mutt will generate
 a Mail-Followup-To header which contains all the recipients to whom
 you send this message, but not your address. This indicates that
 subscribed mailing lists, and if the <link linkend="followup-to">&dollar;followup&lowbar;to</link> option is set, mutt will generate
 a Mail-Followup-To header which contains all the recipients to whom
 you send this message, but not your address. This indicates that

-group-replies or list-replies (also known as ``followups'') to this
+group-replies or list-replies (also known as <quote>followups</quote>) to this

 message should only be sent to the original recipients of the
 message, and not separately to you - you'll receive your copy through
 one of the mailing lists you are subscribed to.
 message should only be sent to the original recipients of the
 message, and not separately to you - you'll receive your copy through
 one of the mailing lists you are subscribed to.


@@ -4628,34 +4940,36 @@ that the reply goes to the mailing list, even if it's not specified
 in the list of recipients in the <literal>Mail-Followup-To</literal>.
 </para>
 
 in the list of recipients in the <literal>Mail-Followup-To</literal>.
 </para>
 

+<note>

 <para>
 <para>

-Note that, when header editing is enabled, you can create a
+When header editing is enabled, you can create a

 <literal>Mail-Followup-To</literal> header manually.  Mutt will only auto-generate
 this header if it doesn't exist when you send the message.
 </para>
 <literal>Mail-Followup-To</literal> header manually.  Mutt will only auto-generate
 this header if it doesn't exist when you send the message.
 </para>

+</note>

 
 <para>
 The other method some mailing list admins use is to generate a
 
 <para>
 The other method some mailing list admins use is to generate a

-``Reply-To'' field which points back to the mailing list address rather
+<quote>Reply-To</quote> field which points back to the mailing list address rather

 than the author of the message.  This can create problems when trying
 to reply directly to the author in private, since most mail clients
 than the author of the message.  This can create problems when trying
 to reply directly to the author in private, since most mail clients

-will automatically reply to the address given in the ``Reply-To''
+will automatically reply to the address given in the <quote>Reply-To</quote>

 field.  Mutt uses the <link linkend="reply-to">&dollar;reply&lowbar;to</link>
 variable to help decide which address to use.  If set to <emphasis>ask-yes</emphasis> or
 <emphasis>ask-no</emphasis>, you will be
 prompted as to whether or not you would like to use the address given in
 field.  Mutt uses the <link linkend="reply-to">&dollar;reply&lowbar;to</link>
 variable to help decide which address to use.  If set to <emphasis>ask-yes</emphasis> or
 <emphasis>ask-no</emphasis>, you will be
 prompted as to whether or not you would like to use the address given in

-the ``Reply-To'' field, or reply directly to the address given in the
-``From'' field.  When set to <emphasis>yes</emphasis>, the ``Reply-To'' field will be used when
+the <quote>Reply-To</quote> field, or reply directly to the address given in the
+<quote>From</quote> field.  When set to <emphasis>yes</emphasis>, the <quote>Reply-To</quote> field will be used when

 present.
 </para>
 
 <para>
 present.
 </para>
 
 <para>

-The ``X-Label:'' header field can be used to further identify mailing
+The <quote>X-Label:</quote> header field can be used to further identify mailing

 lists or list subject matter (or just to annotate messages
 lists or list subject matter (or just to annotate messages

-individually).  The <link linkend="index-format">&dollar;index&lowbar;format</link> variable's ``&percnt;y'' and
-``&percnt;Y'' escapes can be used to expand ``X-Label:'' fields in the
+individually).  The <link linkend="index-format">&dollar;index&lowbar;format</link> variable's <quote>&percnt;y</quote> and
+<quote>&percnt;Y</quote> escapes can be used to expand <quote>X-Label:</quote> fields in the

 index, and Mutt's pattern-matcher can match regular expressions to
 index, and Mutt's pattern-matcher can match regular expressions to

-``X-Label:'' fields with the ``&tilde;y'' selector.  ``X-Label:'' is not a
+<quote>X-Label:</quote> fields with the <quote>&tilde;y</quote> selector.  <quote>X-Label:</quote> is not a

 standard message header field, but it can easily be inserted by procmail
 and other mail filtering agents.
 </para>
 standard message header field, but it can easily be inserted by procmail
 and other mail filtering agents.
 </para>


@@ -4672,6 +4986,56 @@ uninteresting threads and quickly find topics of value.
 
 </sect1>
 
 
 </sect1>
 

+<sect1 id="handling-folders">
+<title>Handling multiple folders</title>
+
+<para>
+Mutt supports setups with multiple folders, allowing all of them to
+be monitored for new mail (see <xref linkend="mailboxes"/> for details).
+</para>
+
+<para>
+When in the index menu and being idle (also see
+<link linkend="timeout">&dollar;timeout</link>), Mutt periodically checks
+for new mail in all folders which have been configured via the
+<literal>mailboxes</literal> command. The interval depends on the folder
+type: for local/IMAP folders it consults
+<link linkend="mail-check">&dollar;mail&lowbar;check</link> and
+<link linkend="pop-checkinterval">&dollar;pop&lowbar;checkinterval</link>
+for POP folders.
+</para>
+
+<para>
+Outside the index menu the directory browser supports checking
+for new mail using the <literal>&lt;check-new&gt;</literal> function which is
+unbound by default. Pressing TAB will bring up a
+menu showing the files specified by the <literal>mailboxes</literal> command,
+and indicate which contain new messages. Mutt will automatically enter this
+mode when invoked from the command line with the <literal>-y</literal> option.
+</para>
+
+<para>
+For the pager, index and directory browser menus, Mutt contains the
+<literal>&lt;buffy-list&gt;</literal> function (bound to <quote>.</quote> by default)
+which will print a list of folders with new mail in the command line at
+the bottom of the screen.
+</para>
+
+<para>
+For the index, by default Mutt displays the number of mailboxes with new
+mail in the status bar, please refer to the
+<link linkend="index-format">&dollar;index&lowbar;format</link>
+variable for details.
+</para>
+
+<para>
+When changing folders, Mutt fills the prompt with the first folder from
+the mailboxes list containing new mail (if any), pressing
+<emphasis>space</emphasis> will cycle through folders with new mail.
+</para>
+
+</sect1>
+

 <sect1 id="editing-threads">
 <title>Editing threads</title>
 
 <sect1 id="editing-threads">
 <title>Editing threads</title>
 


@@ -4682,7 +5046,7 @@ correspondents. This allows to clean your mailboxes formats) from these
 annoyances which make it hard to follow a discussion.
 </para>
 
 annoyances which make it hard to follow a discussion.
 </para>
 

-<sect2>
+<sect2 id="link-threads">

 <title>Linking threads</title>
 
 <para>
 <title>Linking threads</title>
 
 <para>


@@ -4691,7 +5055,7 @@ Some mailers tend to "forget" to correctly set the "In-Reply-To:" and
 discussions because Mutt has not enough information to guess the correct
 threading.
 You can fix this by tagging the reply, then moving to the parent message
 discussions because Mutt has not enough information to guess the correct
 threading.
 You can fix this by tagging the reply, then moving to the parent message

-and using the ``link-threads'' function (bound to &amp; by default). The
+and using the <literal>&lt;link-threads&gt;</literal> function (bound to &amp; by default). The

 reply will then be connected to this "parent" message.
 </para>
 
 reply will then be connected to this "parent" message.
 </para>
 


@@ -4702,14 +5066,14 @@ tag-prefix command (';') or the auto&lowbar;tag option.
 
 </sect2>
 
 
 </sect2>
 

-<sect2>
+<sect2 id="break-threads">

 <title>Breaking threads</title>
 
 <para>
 On mailing lists, some people are in the bad habit of starting a new
 discussion by hitting "reply" to any message from the list and changing
 the subject to a totally unrelated one.
 <title>Breaking threads</title>
 
 <para>
 On mailing lists, some people are in the bad habit of starting a new
 discussion by hitting "reply" to any message from the list and changing
 the subject to a totally unrelated one.

-You can fix such threads by using the ``break-thread'' function (bound
+You can fix such threads by using the <literal>&lt;break-thread&gt;</literal> function (bound

 by default to &num;), which will turn the subthread starting from the
 current message into a whole different thread.
 </para>
 by default to &num;), which will turn the subthread starting from the
 current message into a whole different thread.
 </para>


@@ -4724,7 +5088,7 @@ current message into a whole different thread.
 <para>
 RFC1894 defines a set of MIME content types for relaying information
 about the status of electronic mail messages.  These can be thought of as
 <para>
 RFC1894 defines a set of MIME content types for relaying information
 about the status of electronic mail messages.  These can be thought of as

-``return receipts.''
+<quote>return receipts.</quote>

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


@@ -4754,25 +5118,22 @@ request DSN or not.
 </sect1>
 
 <sect1 id="urlview">
 </sect1>
 
 <sect1 id="urlview">

-<title>Start a WWW Browser on URLs (EXTERNAL)</title>
+<title>Start a WWW Browser on URLs</title>

 
 <para>
 
 <para>

-If a message contains URLs (<emphasis>unified resource locator</emphasis> = address in the
-WWW space like <emphasis>http://www.mutt.org/</emphasis>), it is efficient to get
+If a message contains URLs, it is efficient to get

 a menu with all the URLs and start a WWW browser on one of them.  This
 functionality is provided by the external urlview program which can be
 a menu with all the URLs and start a WWW browser on one of them.  This
 functionality is provided by the external urlview program which can be

-retrieved at <ulink
-url="ftp://ftp.mutt.org/mutt/contrib/"
->ftp://ftp.mutt.org/mutt/contrib/</ulink
-> and the configuration commands:
+retrieved at
+<ulink url="ftp://ftp.mutt.org/mutt/contrib/">ftp://ftp.mutt.org/mutt/contrib/</ulink>
+and the configuration commands:
+</para>

 
 <screen>
 macro index \cb |urlview\n
 macro pager \cb |urlview\n
 </screen>
 
 
 <screen>
 macro index \cb |urlview\n
 macro pager \cb |urlview\n
 </screen>
 

-</para>
-

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


@@ -4786,7 +5147,7 @@ MIME MUA.  Every effort has been made to provide the functionality that
 the discerning MIME user requires, and the conformance to the standards
 wherever possible.  When configuring Mutt for MIME, there are two extra
 types of configuration files which Mutt uses.  One is the
 the discerning MIME user requires, and the conformance to the standards
 wherever possible.  When configuring Mutt for MIME, there are two extra
 types of configuration files which Mutt uses.  One is the

-<literal>mime.types</literal> file, which contains the mapping of file extensions to 
+<literal>mime.types</literal> file, which contains the mapping of file extensions to

 IANA MIME types.  The other is the <literal>mailcap</literal> file, which specifies
 the external commands to use for handling specific MIME types.
 </para>
 IANA MIME types.  The other is the <literal>mailcap</literal> file, which specifies
 the external commands to use for handling specific MIME types.
 </para>


@@ -4800,7 +5161,7 @@ pager (while viewing a message), the attachment menu and the compose
 menu.
 </para>
 
 menu.
 </para>
 

-<sect2>
+<sect2 id="mime-pager">

 <title>Viewing MIME messages in the pager</title>
 
 <para>
 <title>Viewing MIME messages in the pager</title>
 
 <para>


@@ -4815,12 +5176,14 @@ including PGP/MIME and application/pgp.
 <para>
 Mutt will denote attachments with a couple lines describing them.
 These lines are of the form:
 <para>
 Mutt will denote attachments with a couple lines describing them.
 These lines are of the form:

+</para>

 
 <screen>
 [-- Attachment #1: Description --]
 [-- Type: text/plain, Encoding: 7bit, Size: 10000 --]
 </screen>
 
 
 <screen>
 [-- Attachment #1: Description --]
 [-- Type: text/plain, Encoding: 7bit, Size: 10000 --]
 </screen>
 

+<para>

 Where the <literal>Description</literal> is the description or filename given for the
 attachment, and the <literal>Encoding</literal> is one of
 <literal>7bit/8bit/quoted-printable/base64/binary</literal>.
 Where the <literal>Description</literal> is the description or filename given for the
 attachment, and the <literal>Encoding</literal> is one of
 <literal>7bit/8bit/quoted-printable/base64/binary</literal>.


@@ -4828,13 +5191,12 @@ attachment, and the <literal>Encoding</literal> is one of
 
 <para>
 If Mutt cannot deal with a MIME type, it will display a message like:
 
 <para>
 If Mutt cannot deal with a MIME type, it will display a message like:

+</para>

 
 <screen>
 [-- image/gif is unsupported (use 'v' to view this part) --]
 </screen>
 
 
 <screen>
 [-- image/gif is unsupported (use 'v' to view this part) --]
 </screen>
 

-</para>
-

 </sect2>
 
 <sect2 id="attach-menu">
 </sect2>
 
 <sect2 id="attach-menu">


@@ -4846,16 +5208,17 @@ attachment menu for a message.  The attachment menu displays a list of
 the attachments in a message.  From the attachment menu, you can save,
 print, pipe, delete, and view attachments.  You can apply these
 operations to a group of attachments at once, by tagging the attachments
 the attachments in a message.  From the attachment menu, you can save,
 print, pipe, delete, and view attachments.  You can apply these
 operations to a group of attachments at once, by tagging the attachments

-and by using the ``tag-prefix'' operator.  You can also reply to the
+and by using the <quote>tag-prefix</quote> operator.  You can also reply to the

 current message from this menu, and only the current attachment (or the
 attachments tagged) will be quoted in your reply.  You can view
 attachments as text, or view them using the mailcap viewer definition.
 </para>
 
 <para>
 current message from this menu, and only the current attachment (or the
 attachments tagged) will be quoted in your reply.  You can view
 attachments as text, or view them using the mailcap viewer definition.
 </para>
 
 <para>

-Finally, you can apply the usual message-related functions (like 
-<link linkend="resend-message">resend-message</link>, and the reply
-and forward functions) to attachments of type <literal>message/rfc822</literal>.
+Finally, you can apply the usual message-related functions (like
+<link linkend="resend-message"><literal>&lt;resend-message&gt;</literal></link>, and the
+<literal>&lt;reply&gt;</literal> and <literal>&lt;forward&gt;</literal>
+functions) to attachments of type <literal>message/rfc822</literal>.

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


@@ -4879,14 +5242,13 @@ information, notably the type, encoding and description.
 
 <para>
 Attachments appear as follows:
 
 <para>
 Attachments appear as follows:

+</para>

 
 <screen>
 - 1 [text/plain, 7bit, 1K]           /tmp/mutt-euler-8082-0 &lt;no description&gt;
   2 [applica/x-gunzip, base64, 422K] ~/src/mutt-0.85.tar.gz &lt;no description&gt;
 </screen>
 
 
 <screen>
 - 1 [text/plain, 7bit, 1K]           /tmp/mutt-euler-8082-0 &lt;no description&gt;
   2 [applica/x-gunzip, base64, 422K] ~/src/mutt-0.85.tar.gz &lt;no description&gt;
 </screen>
 

-</para>
-

 <para>
 The '-' denotes that Mutt will delete the file after sending (or
 postponing, or canceling) the message.  It can be toggled with the
 <para>
 The '-' denotes that Mutt will delete the file after sending (or
 postponing, or canceling) the message.  It can be toggled with the


@@ -4919,6 +5281,7 @@ the system mime.types file at <literal>/usr/local/share/mutt/mime.types</literal
 <para>
 The mime.types file consist of lines containing a MIME type and a space
 separated list of extensions.  For example:
 <para>
 The mime.types file consist of lines containing a MIME type and a space
 separated list of extensions.  For example:

+</para>

 
 <screen>
 application/postscript          ps eps
 
 <screen>
 application/postscript          ps eps


@@ -4926,6 +5289,7 @@ application/pgp                 pgp
 audio/x-aiff                    aif aifc aiff
 </screen>
 
 audio/x-aiff                    aif aifc aiff
 </screen>
 

+<para>

 A sample <literal>mime.types</literal> file comes with the Mutt distribution, and
 should contain most of the MIME types you are likely to use.
 </para>
 A sample <literal>mime.types</literal> file comes with the Mutt distribution, and
 should contain most of the MIME types you are likely to use.
 </para>


@@ -4940,17 +5304,17 @@ type that Mutt assigns to an attachment by using the <literal>edit-type</literal
 command from the compose menu (default: &circ;T). The MIME type is actually a
 major mime type followed by the sub-type, separated by a '/'. 6 major
 types: application, text, image, video, audio, and model have been approved
 command from the compose menu (default: &circ;T). The MIME type is actually a
 major mime type followed by the sub-type, separated by a '/'. 6 major
 types: application, text, image, video, audio, and model have been approved

-after various internet discussions. Mutt recognizes all of these if the 
+after various internet discussions. Mutt recognizes all of these if the

 appropriate entry is found in the mime.types file. It also recognizes other
 appropriate entry is found in the mime.types file. It also recognizes other

-major mime types, such as the chemical type that is widely used in the 
-molecular modeling community to pass molecular data in various forms to 
-various molecular viewers. Non-recognized mime types should only be used 
+major mime types, such as the chemical type that is widely used in the
+molecular modeling community to pass molecular data in various forms to
+various molecular viewers. Non-recognized mime types should only be used

 if the recipient of the message is likely to be expecting such attachments.
 </para>
 
 </sect1>
 
 if the recipient of the message is likely to be expecting such attachments.
 </para>
 
 </sect1>
 

-<sect1 id="mime-viewers">
+<sect1 id="mailcap">

 <title>MIME Viewer configuration with <literal>mailcap</literal></title>
 
 <para>
 <title>MIME Viewer configuration with <literal>mailcap</literal></title>
 
 <para>


@@ -4967,6 +5331,7 @@ In order to handle various MIME types that Mutt can not handle
 internally, Mutt parses a series of external configuration files to
 find an external handler. The default search string for these files
 is a colon delimited list containing the following files:
 internally, Mutt parses a series of external configuration files to
 find an external handler. The default search string for these files
 is a colon delimited list containing the following files:

+</para>

 
 <orderedlist>
 <listitem><para><literal>&dollar;HOME/.mailcap</literal></para></listitem>
 
 <orderedlist>
 <listitem><para><literal>&dollar;HOME/.mailcap</literal></para></listitem>


@@ -4977,6 +5342,7 @@ is a colon delimited list containing the following files:
 <listitem><para><literal>/usr/local/etc/mailcap</literal></para></listitem>
 </orderedlist>
 
 <listitem><para><literal>/usr/local/etc/mailcap</literal></para></listitem>
 </orderedlist>
 

+<para>

 where <literal>&dollar;HOME</literal> is your home directory. The
 <literal>&dollar;PKGDATADIR</literal> and the
 <literal>&dollar;SYSCONFDIR</literal> directories depend on where mutt
 where <literal>&dollar;HOME</literal> is your home directory. The
 <literal>&dollar;PKGDATADIR</literal> and the
 <literal>&dollar;SYSCONFDIR</literal> directories depend on where mutt


@@ -4999,7 +5365,7 @@ usually as <literal>/usr/local/etc/mailcap</literal>, which contains some baseli
 entries.
 </para>
 
 entries.
 </para>
 

-<sect2>
+<sect2 id="mailcap-basics">

 <title>The Basics of the mailcap file</title>
 
 <para>
 <title>The Basics of the mailcap file</title>
 
 <para>


@@ -5047,58 +5413,70 @@ will remove the temporary file if it exists.
 <para>
 So, in the simplest form, you can send a text/plain message to the
 external pager more on stdin:
 <para>
 So, in the simplest form, you can send a text/plain message to the
 external pager more on stdin:

+</para>

 
 <screen>
 text/plain; more
 </screen>
 
 
 <screen>
 text/plain; more
 </screen>
 

+<para>

 Or, you could send the message as a file:
 Or, you could send the message as a file:

+</para>

 
 <screen>
 text/plain; more %s
 </screen>
 
 
 <screen>
 text/plain; more %s
 </screen>
 

-Perhaps you would like to use lynx to interactively view a text/html 
+<para>
+Perhaps you would like to use lynx to interactively view a text/html

 message:
 message:

+</para>

 
 <screen>
 text/html; lynx %s
 </screen>
 
 
 <screen>
 text/html; lynx %s
 </screen>
 

+<para>

 In this case, lynx does not support viewing a file from stdin, so you
 must use the &percnt;s syntax.
 In this case, lynx does not support viewing a file from stdin, so you
 must use the &percnt;s syntax.

-<emphasis role="bold">Note:</emphasis> <emphasis>Some older versions of lynx contain a bug where they
+</para>
+
+<note>
+<para>
+<emphasis>Some older versions of lynx contain a bug where they

 will check the mailcap file for a viewer for text/html.  They will find
 the line which calls lynx, and run it.  This causes lynx to continuously
 spawn itself to view the object.</emphasis>
 </para>
 will check the mailcap file for a viewer for text/html.  They will find
 the line which calls lynx, and run it.  This causes lynx to continuously
 spawn itself to view the object.</emphasis>
 </para>

+</note>

 
 <para>
 On the other hand, maybe you don't want to use lynx interactively, you
 just want to have it convert the text/html to text/plain, then you can
 use:
 
 <para>
 On the other hand, maybe you don't want to use lynx interactively, you
 just want to have it convert the text/html to text/plain, then you can
 use:

+</para>

 
 <screen>
 text/html; lynx -dump %s | more
 </screen>
 
 
 <screen>
 text/html; lynx -dump %s | more
 </screen>
 

-</para>
-

 <para>
 Perhaps you wish to use lynx to view text/html files, and a pager on
 all other text formats, then you would use the following:
 <para>
 Perhaps you wish to use lynx to view text/html files, and a pager on
 all other text formats, then you would use the following:

+</para>

 
 <screen>
 text/html; lynx %s
 text/*; more
 </screen>
 
 
 <screen>
 text/html; lynx %s
 text/*; more
 </screen>
 

+<para>

 This is the simplest form of a mailcap file.
 </para>
 
 </sect2>
 
 This is the simplest form of a mailcap file.
 </para>
 
 </sect2>
 

-<sect2>
+<sect2 id="secure-mailcap">

 <title>Secure use of mailcap</title>
 
 <para>
 <title>Secure use of mailcap</title>
 
 <para>


@@ -5132,27 +5510,25 @@ example (using <literal>&dollar;charset</literal> inside the backtick expansion
 since it is not itself subject to any further expansion):
 </para>
 
 since it is not itself subject to any further expansion):
 </para>
 

-<para>
-

 <screen>
 text/test-mailcap-bug; cat %s; copiousoutput; test=charset=%{charset} &bsol;
         &amp;&amp; test "`echo $charset | tr '[A-Z]' '[a-z]'`" != iso-8859-1
 </screen>
 
 <screen>
 text/test-mailcap-bug; cat %s; copiousoutput; test=charset=%{charset} &bsol;
         &amp;&amp; test "`echo $charset | tr '[A-Z]' '[a-z]'`" != iso-8859-1
 </screen>
 

-</para>
-

 </sect2>
 
 </sect2>
 

-<sect2>
+<sect2 id="advanced-mailcap">

 <title>Advanced mailcap Usage</title>
 
 <title>Advanced mailcap Usage</title>
 

-<sect3>
+<sect3 id="optional-mailcap-fields">

 <title>Optional Fields</title>
 
 <para>
 In addition to the required content-type and view command fields, you
 can add semi-colon ';' separated fields to set flags and other options.
 Mutt recognizes the following optional fields:
 <title>Optional Fields</title>
 
 <para>
 In addition to the required content-type and view command fields, you
 can add semi-colon ';' separated fields to set flags and other options.
 Mutt recognizes the following optional fields:

+</para>
+

 <variablelist>
 
 <varlistentry>
 <variablelist>
 
 <varlistentry>


@@ -5165,11 +5541,13 @@ pager or the external pager defined by the pager variable) on the output
 of the view command.  Without this flag, Mutt assumes that the command
 is interactive.  One could use this to replace the pipe to <literal>more</literal>
 in the <literal>lynx -dump</literal> example in the Basic section:
 of the view command.  Without this flag, Mutt assumes that the command
 is interactive.  One could use this to replace the pipe to <literal>more</literal>
 in the <literal>lynx -dump</literal> example in the Basic section:

+</para>

 
 <screen>
 text/html; lynx -dump %s ; copiousoutput
 </screen>
 
 
 <screen>
 text/html; lynx -dump %s ; copiousoutput
 </screen>
 

+<para>

 This will cause lynx to format the text/html output as text/plain
 and Mutt will use your standard pager to display the results.
 </para>
 This will cause lynx to format the text/html output as text/plain
 and Mutt will use your standard pager to display the results.
 </para>


@@ -5241,12 +5619,12 @@ for instance, to correctly view a file.  For instance, lynx will only
 interpret a file as <literal>text/html</literal> if the file ends in <literal>.html</literal>.
 So, you would specify lynx as a <literal>text/html</literal> viewer with a line in
 the mailcap file like:
 interpret a file as <literal>text/html</literal> if the file ends in <literal>.html</literal>.
 So, you would specify lynx as a <literal>text/html</literal> viewer with a line in
 the mailcap file like:

+</para>

 
 <screen>
 text/html; lynx %s; nametemplate=%s.html
 </screen>
 
 
 <screen>
 text/html; lynx %s; nametemplate=%s.html
 </screen>
 

-</para>

 </listitem>
 </varlistentry>
 <varlistentry>
 </listitem>
 </varlistentry>
 <varlistentry>


@@ -5258,14 +5636,16 @@ entry should be used.  The command is defined with the command expansion
 rules defined in the next section.  If the command returns 0, then the
 test passed, and Mutt uses this entry.  If the command returns non-zero,
 then the test failed, and Mutt continues searching for the right entry.
 rules defined in the next section.  If the command returns 0, then the
 test passed, and Mutt uses this entry.  If the command returns non-zero,
 then the test failed, and Mutt continues searching for the right entry.

-<emphasis role="bold">Note:</emphasis> <emphasis>the content-type must match before Mutt performs the test.</emphasis>
+Note that the content-type must match before Mutt performs the test.

 For example:
 For example:

+</para>

 
 <screen>
 text/html; netscape -remote 'openURL(%s)' ; test=RunningX
 text/html; lynx %s
 </screen>
 
 
 <screen>
 text/html; netscape -remote 'openURL(%s)' ; test=RunningX
 text/html; lynx %s
 </screen>
 

+<para>

 In this example, Mutt will run the program RunningX which will return 0
 if the X Window manager is running, and non-zero if it isn't.  If
 RunningX returns 0, then Mutt will call netscape to display the
 In this example, Mutt will run the program RunningX which will return 0
 if the X Window manager is running, and non-zero if it isn't.  If
 RunningX returns 0, then Mutt will call netscape to display the


@@ -5275,11 +5655,10 @@ to the next entry and use lynx to display the text/html object.
 </listitem>
 </varlistentry>
 </variablelist>
 </listitem>
 </varlistentry>
 </variablelist>

-</para>

 
 </sect3>
 
 
 </sect3>
 

-<sect3>
+<sect3 id="mailcap-search-order">

 <title>Search Order</title>
 
 <para>
 <title>Search Order</title>
 
 <para>


@@ -5288,6 +5667,7 @@ the most useful entry for its purpose.  For instance, if you are
 attempting to print an <literal>image/gif</literal>, and you have the following
 entries in your mailcap file, Mutt will search for an entry with the
 print command:
 attempting to print an <literal>image/gif</literal>, and you have the following
 entries in your mailcap file, Mutt will search for an entry with the
 print command:

+</para>

 
 <screen>
 image/*;        xv %s
 
 <screen>
 image/*;        xv %s


@@ -5295,16 +5675,18 @@ image/gif;      ; print= anytopnm %s | pnmtops | lpr; &bsol;
                 nametemplate=%s.gif
 </screen>
 
                 nametemplate=%s.gif
 </screen>
 

+<para>

 Mutt will skip the <literal>image/*</literal> entry and use the <literal>image/gif</literal>
 entry with the print command.
 </para>
 
 <para>
 Mutt will skip the <literal>image/*</literal> entry and use the <literal>image/gif</literal>
 entry with the print command.
 </para>
 
 <para>

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

 to denote two commands for viewing an attachment, one to be viewed
 automatically, the other to be viewed interactively from the attachment
 menu.  In addition, you can then use the test feature to determine which
 viewer to use interactively depending on your environment.
 to denote two commands for viewing an attachment, one to be viewed
 automatically, the other to be viewed interactively from the attachment
 menu.  In addition, you can then use the test feature to determine which
 viewer to use interactively depending on your environment.

+</para>

 
 <screen>
 text/html;      netscape -remote 'openURL(%s)' ; test=RunningX
 
 <screen>
 text/html;      netscape -remote 'openURL(%s)' ; test=RunningX


@@ -5312,6 +5694,7 @@ text/html;      lynx %s; nametemplate=%s.html
 text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput
 </screen>
 
 text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput
 </screen>
 

+<para>

 For <link linkend="auto-view">auto&lowbar;view</link>, Mutt will choose the third
 entry because of the copiousoutput tag.  For interactive viewing, Mutt
 will run the program RunningX to determine if it should use the first
 For <link linkend="auto-view">auto&lowbar;view</link>, Mutt will choose the third
 entry because of the copiousoutput tag.  For interactive viewing, Mutt
 will run the program RunningX to determine if it should use the first


@@ -5321,7 +5704,7 @@ for interactive viewing.
 
 </sect3>
 
 
 </sect3>
 

-<sect3>
+<sect3 id="mailcap-command-expansion">

 <title>Command Expansion</title>
 
 <para>
 <title>Command Expansion</title>
 
 <para>


@@ -5330,6 +5713,8 @@ The various commands defined in the mailcap files are passed to the
 command is passed to <literal>/bin/sh -c</literal>, it is parsed to expand
 various special parameters with information from Mutt.  The keywords
 Mutt expands are:
 command is passed to <literal>/bin/sh -c</literal>, it is parsed to expand
 various special parameters with information from Mutt.  The keywords
 Mutt expands are:

+</para>
+

 <variablelist>
 
 <varlistentry>
 <variablelist>
 
 <varlistentry>


@@ -5363,11 +5748,13 @@ mailcap definition line, ie <literal>text/html</literal> or
 Mutt will expand this to the value of the specified parameter
 from the Content-Type: line of the mail message.  For instance, if
 Your mail message contains:
 Mutt will expand this to the value of the specified parameter
 from the Content-Type: line of the mail message.  For instance, if
 Your mail message contains:

+</para>

 
 <screen>
 Content-Type: text/plain; charset=iso-8859-1
 </screen>
 
 
 <screen>
 Content-Type: text/plain; charset=iso-8859-1
 </screen>
 

+<para>

 then Mutt will expand &percnt;&lcub;charset&rcub; to iso-8859-1.  The default metamail
 mailcap file uses this feature to test the charset to spawn an xterm
 using the right charset to view the message.
 then Mutt will expand &percnt;&lcub;charset&rcub; to iso-8859-1.  The default metamail
 mailcap file uses this feature to test the charset to spawn an xterm
 using the right charset to view the message.


@@ -5383,6 +5770,8 @@ This will be replaced by a &percnt;
 </listitem>
 </varlistentry>
 </variablelist>
 </listitem>
 </varlistentry>
 </variablelist>

+
+<para>

 Mutt does not currently support the &percnt;F and &percnt;n keywords
 specified in RFC 1524.  The main purpose of these parameters is for
 multipart messages, which is handled internally by Mutt.
 Mutt does not currently support the &percnt;F and &percnt;n keywords
 specified in RFC 1524.  The main purpose of these parameters is for
 multipart messages, which is handled internally by Mutt.


@@ -5392,30 +5781,27 @@ multipart messages, which is handled internally by Mutt.
 
 </sect2>
 
 
 </sect2>
 

-<sect2>
+<sect2 id="mailcap-example">

 <title>Example mailcap files</title>
 
 <para>
 This mailcap file is fairly simple and standard:
 <title>Example mailcap files</title>
 
 <para>
 This mailcap file is fairly simple and standard:

+</para>

 
 

-<programlisting>
+<screen>

 # I'm always running X :)
 video/*;        xanim %s &gt; /dev/null
 image/*;        xv %s &gt; /dev/null
 
 # I'm always running netscape (if my computer had more memory, maybe)
 text/html;      netscape -remote 'openURL(%s)'
 # I'm always running X :)
 video/*;        xanim %s &gt; /dev/null
 image/*;        xv %s &gt; /dev/null
 
 # I'm always running netscape (if my computer had more memory, maybe)
 text/html;      netscape -remote 'openURL(%s)'

-</programlisting>
-
-</para>
+</screen>

 
 <para>
 This mailcap file shows quite a number of examples:
 </para>
 
 
 <para>
 This mailcap file shows quite a number of examples:
 </para>
 

-<para>
-
-<programlisting>
+<screen>

 # Use xanim to view all videos   Xanim produces a header on startup,
 # send that to /dev/null so I don't see it
 video/*;        xanim %s &gt; /dev/null
 # Use xanim to view all videos   Xanim produces a header on startup,
 # send that to /dev/null so I don't see it
 video/*;        xanim %s &gt; /dev/null


@@ -5451,9 +5837,7 @@ pbmtoascii -1x2 ) 2&gt;&amp;1 ; copiousoutput
 
 # Send excel spreadsheets to my NT box
 application/ms-excel; open.pl %s
 
 # Send excel spreadsheets to my NT box
 application/ms-excel; open.pl %s

-</programlisting>
-
-</para>
+</screen>

 
 </sect2>
 
 
 </sect2>
 


@@ -5469,7 +5853,7 @@ automatically viewing MIME attachments while in the pager.
 </para>
 
 <para>
 </para>
 
 <para>

-To work, you must define a viewer in the mailcap file which uses the 
+To work, you must define a viewer in the mailcap file which uses the

 <literal>copiousoutput</literal> option to denote that it is non-interactive.
 Usually, you also use the entry to convert the attachment to a text
 representation which you can view in the pager.
 <literal>copiousoutput</literal> option to denote that it is non-interactive.
 Usually, you also use the entry to convert the attachment to a text
 representation which you can view in the pager.


@@ -5482,17 +5866,17 @@ content-types that you wish to view automatically.
 
 <para>
 For instance, if you set auto&lowbar;view to:
 
 <para>
 For instance, if you set auto&lowbar;view to:

+</para>

 
 <screen>
 auto_view text/html application/x-gunzip &bsol;
   application/postscript image/gif application/x-tar-gz
 </screen>
 
 
 <screen>
 auto_view text/html application/x-gunzip &bsol;
   application/postscript image/gif application/x-tar-gz
 </screen>
 

-</para>
-

 <para>
 Mutt could use the following mailcap entries to automatically view
 attachments of these types.
 <para>
 Mutt could use the following mailcap entries to automatically view
 attachments of these types.

+</para>

 
 <screen>
 text/html;      lynx -dump %s; copiousoutput; nametemplate=%s.html
 
 <screen>
 text/html;      lynx -dump %s; copiousoutput; nametemplate=%s.html


@@ -5503,12 +5887,10 @@ application/x-tar-gz; gunzip -c %s | tar -tf - ; copiousoutput
 application/postscript; ps2ascii %s; copiousoutput
 </screen>
 
 application/postscript; ps2ascii %s; copiousoutput
 </screen>
 

-</para>
-

 <para>
 <para>

-``unauto&lowbar;view'' can be used to remove previous entries from the autoview list.
+<quote>unauto&lowbar;view</quote> can be used to remove previous entries from the autoview list.

 This can be used with message-hook to autoview messages based on size, etc.
 This can be used with message-hook to autoview messages based on size, etc.

-``unauto&lowbar;view *'' will remove all previous entries.
+<quote>unauto&lowbar;view *</quote> will remove all previous entries.

 </para>
 
 </sect1>
 </para>
 
 </sect1>


@@ -5518,20 +5900,19 @@ This can be used with message-hook to autoview messages based on size, etc.
 
 <para>
 Mutt has some heuristics for determining which attachment of a
 
 <para>
 Mutt has some heuristics for determining which attachment of a

-multipart/alternative type to display.  First, mutt will check the 
+multipart/alternative type to display.  First, mutt will check the

 alternative&lowbar;order list to determine if one of the available types
 is preferred.  The alternative&lowbar;order list consists of a number of
 mimetypes in order, including support for implicit and explicit
 wildcards, for example:
 alternative&lowbar;order list to determine if one of the available types
 is preferred.  The alternative&lowbar;order list consists of a number of
 mimetypes in order, including support for implicit and explicit
 wildcards, for example:

+</para>

 
 <screen>
 alternative_order text/enriched text/plain text application/postscript image/*
 </screen>
 
 
 <screen>
 alternative_order text/enriched text/plain text application/postscript image/*
 </screen>
 

-</para>
-

 <para>
 <para>

-Next, mutt will check if any of the types have a defined 
+Next, mutt will check if any of the types have a defined

 <link linkend="auto-view">auto&lowbar;view</link>, and use that.  Failing
 that, Mutt will look for any text type.  As a last attempt, mutt will
 look for any type it knows how to handle.
 <link linkend="auto-view">auto&lowbar;view</link>, and use that.  Failing
 that, Mutt will look for any text type.  As a last attempt, mutt will
 look for any type it knows how to handle.


@@ -5567,6 +5948,7 @@ or not.
 <para>
 The syntax is:
 </para>
 <para>
 The syntax is:
 </para>

+

 <screen>
 attachments   {+|-}disposition mime-type
 unattachments {+|-}disposition mime-type
 <screen>
 attachments   {+|-}disposition mime-type
 unattachments {+|-}disposition mime-type


@@ -5575,11 +5957,12 @@ attachments   ?
 
 <para>
 Disposition is the attachment's Content-disposition type -- either
 
 <para>
 Disposition is the attachment's Content-disposition type -- either

-"inline" or "attachment".  You can abbreviate this to I or A.
+<literal>inline</literal> or <literal>attachment</literal>.
+You can abbreviate this to <literal>I</literal> or <literal>A</literal>.

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

-Disposition is prefixed by either a + symbolor a - symbol.  If it's
+Disposition is prefixed by either a + symbol or a - symbol.  If it's

 a +, you're saying that you want to allow this disposition and MIME
 type to qualify.  If it's a -, you're saying that this disposition
 and MIME type is an exception to previous + rules.  There are examples
 a +, you're saying that you want to allow this disposition and MIME
 type to qualify.  If it's a -, you're saying that this disposition
 and MIME type is an exception to previous + rules.  There are examples


@@ -5588,11 +5971,11 @@ below of how this is useful.
 
 <para>
 Mime-type is, unsurprisingly, the MIME type of the attachment you want
 
 <para>
 Mime-type is, unsurprisingly, the MIME type of the attachment you want

-to affect.  A MIME type is always of the format "major/minor", where
-"major" describes the broad category of document you're looking at, and
-"minor" describes the specific type within that category.  The major
-part of mim-type must be literal text (or the special token "*"), but
-the minor part may be a regular expression.  (Therefore, "*/.*" matches
+to affect.  A MIME type is always of the format <literal>major/minor</literal>, where
+<literal>major</literal> describes the broad category of document you're looking at, and
+<literal>minor</literal> describes the specific type within that category.  The major
+part of mime-type must be literal text (or the special token <quote><literal>*</literal></quote>), but
+the minor part may be a regular expression.  (Therefore, <quote><literal>*/.*</literal></quote> matches

 any MIME type.)
 </para>
 
 any MIME type.)
 </para>
 


@@ -5610,6 +5993,8 @@ Some examples might help to illustrate.  The examples that are not
 commented out define the default configuration of the lists.
 </para>
 
 commented out define the default configuration of the lists.
 </para>
 

+<example id="ex-attach-count">
+<title>Attachment counting</title>

 <screen>
 ## Removing a pattern from a list removes that pattern literally. It
 ## does not remove any type matching the pattern.
 <screen>
 ## Removing a pattern from a list removes that pattern literally. It
 ## does not remove any type matching the pattern.


@@ -5658,10 +6043,12 @@ attachments   +I text/plain
 attachments   -A message/external-body
 attachments   -I message/external-body
 </screen>
 attachments   -A message/external-body
 attachments   -I message/external-body
 </screen>

+</example>

 
 <para>
 
 <para>

-"attachments ?" will list your current settings in Muttrc format, so
-that it can be pasted elsewhere.
+Entering the command <quote><literal>attachments ?</literal></quote>
+as a command will list your current settings in Muttrc format, so that
+it can be pasted elsewhere.

 </para>
 
 </sect1>
 </para>
 
 </sect1>


@@ -5678,13 +6065,12 @@ be compared to the list of extensions in the mime.types file.  The mime-type
 associated with this extension will then be used to process the attachment
 according to the rules in the mailcap file and according to any other configuration
 options (such as auto&lowbar;view) specified.  Common usage would be:
 associated with this extension will then be used to process the attachment
 according to the rules in the mailcap file and according to any other configuration
 options (such as auto&lowbar;view) specified.  Common usage would be:

+</para>

 
 <screen>
 mime_lookup application/octet-stream application/X-Lotus-Manuscript
 </screen>
 
 
 <screen>
 mime_lookup application/octet-stream application/X-Lotus-Manuscript
 </screen>
 

-</para>
-

 <para>
 In addition, the unmime&lowbar;lookup command may be used to disable this feature
 for any particular mime-type if it had been set, for example, in a global
 <para>
 In addition, the unmime&lowbar;lookup command may be used to disable this feature
 for any particular mime-type if it had been set, for example, in a global


@@ -5698,23 +6084,23 @@ muttrc.
 <chapter id="optionalfeatures">
 <title>Optional features</title>
 
 <chapter id="optionalfeatures">
 <title>Optional features</title>
 

-<sect1>
+<sect1 id="optionalfeatures-notes">

 <title>General notes</title>
 
 <title>General notes</title>
 

-<sect2>
+<sect2 id="compile-time-features">

 <title>Enabling/disabling features</title>
 
 <para>
 Mutt supports several of optional features which can be enabled or
 disabled at compile-time by giving the <emphasis>configure</emphasis> script
 <title>Enabling/disabling features</title>
 
 <para>
 Mutt supports several of optional features which can be enabled or
 disabled at compile-time by giving the <emphasis>configure</emphasis> script

-certain arguments. These are listed in the ``Optional features'' section of
+certain arguments. These are listed in the <quote>Optional features</quote> section of

 the <emphasis>configure --help</emphasis> output.
 </para>
 
 <para>
 Which features are enabled or disabled can later be determined from the
 output of <literal>mutt -v</literal>. If a compile option starts with
 the <emphasis>configure --help</emphasis> output.
 </para>
 
 <para>
 Which features are enabled or disabled can later be determined from the
 output of <literal>mutt -v</literal>. If a compile option starts with

-``+'' it is enabled and disabled if prefixed with ``-''. For example, if
+<quote>+</quote> it is enabled and disabled if prefixed with <quote>-</quote>. For example, if

 mutt was compiled using GnuTLS for encrypted communication instead of
 OpenSSL, <literal>mutt -v</literal> would contain:
 </para>
 mutt was compiled using GnuTLS for encrypted communication instead of
 OpenSSL, <literal>mutt -v</literal> would contain:
 </para>


@@ -5741,7 +6127,7 @@ proto[s]://[username[:password]@]server[:port]/[path]
 <para>
 <literal>proto</literal> is the communication protocol:
 <literal>imap</literal> for IMAP, <literal>pop</literal> for POP3 and
 <para>
 <literal>proto</literal> is the communication protocol:
 <literal>imap</literal> for IMAP, <literal>pop</literal> for POP3 and

-<literal>smtp</literal> for SMTP. If ``s'' for ``secure communication''
+<literal>smtp</literal> for SMTP. If <quote>s</quote> for <quote>secure communication</quote>

 is appended, mutt will attempt to establish an encrypted communication
 using SSL or TLS. If no explicit port is given, mutt will use the
 system's default for the given protocol.
 is appended, mutt will attempt to establish an encrypted communication
 using SSL or TLS. If no explicit port is given, mutt will use the
 system's default for the given protocol.


@@ -5750,9 +6136,10 @@ system's default for the given protocol.
 <para>
 Since all protocols by mutt support authentication, the username may be
 given directly in the URL instead of using the <literal>pop_user</literal> or
 <para>
 Since all protocols by mutt support authentication, the username may be
 given directly in the URL instead of using the <literal>pop_user</literal> or

-<literal>imap_user</literal> variables. A password can be given, too but
-is not recommended if the URL is specified in a configuration file on
-disk.
+<literal>imap_user</literal> variables. It may contain the <quote>@</quote> symbol
+being used by many mail systems as part of the login name. A password can be
+given, too but is not recommended if the URL is specified in a configuration
+file on disk.

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


@@ -5765,7 +6152,7 @@ server: <literal>imap://imapserver:port/INBOX</literal>. You can also specify di
 username for each folder: <literal>imap://username@imapserver[:port]/INBOX</literal>
 or <literal>imap://username2@imapserver[:port]/path/to/folder</literal>.
 Replacing <literal>imap://</literal> by <literal>imaps://</literal>
 username for each folder: <literal>imap://username@imapserver[:port]/INBOX</literal>
 or <literal>imap://username2@imapserver[:port]/path/to/folder</literal>.
 Replacing <literal>imap://</literal> by <literal>imaps://</literal>

-would make mutt attempt to conect using SSL or TLS on a different port
+would make mutt attempt to connect using SSL or TLS on a different port

 to encrypt the communication.
 </para>
 
 to encrypt the communication.
 </para>
 


@@ -5779,11 +6166,11 @@ to encrypt the communication.
 <para>
 If mutt is compiled with IMAP, POP3 and/or SMTP support, it can also be
 compiled with support for SSL or TLS using either OpenSSL or GnuTLS (
 <para>
 If mutt is compiled with IMAP, POP3 and/or SMTP support, it can also be
 compiled with support for SSL or TLS using either OpenSSL or GnuTLS (

-by running the <emphasis>configure</emphasis> script with the 
+by running the <emphasis>configure</emphasis> script with the

 <emphasis>--enable-ssl=...</emphasis> option for OpenSSL or
 <emphasis>--enable-gnutls=...</emphasis> for GnuTLS). Mutt can then
 attempt to encrypt communication with remote servers if these protocols
 <emphasis>--enable-ssl=...</emphasis> option for OpenSSL or
 <emphasis>--enable-gnutls=...</emphasis> for GnuTLS). Mutt can then
 attempt to encrypt communication with remote servers if these protocols

-are suffixed with ``s'' for ``secure communication''.
+are suffixed with <quote>s</quote> for <quote>secure communication</quote>.

 </para>
 
 </sect1>
 </para>
 
 </sect1>


@@ -5812,18 +6199,21 @@ controlled by the
 variable, which defaults to every 60 seconds.
 </para>
 
 variable, which defaults to every 60 seconds.
 </para>
 

+<anchor id="fetch-mail"/>

 <para>
 <para>

-Another way to access your POP3 mail is the <emphasis>fetch-mail</emphasis> function
+Another way to access your POP3 mail is the <literal>&lt;fetch-mail&dollar;</literal> function

 (default: G).  It allows to connect to <link linkend="pop-host">&dollar;pop&lowbar;host</link>, fetch all your new mail and place it in the
 local <link linkend="spoolfile">&dollar;spoolfile</link>.  After this
 point, Mutt runs exactly as if the mail had always been local.
 </para>
 
 (default: G).  It allows to connect to <link linkend="pop-host">&dollar;pop&lowbar;host</link>, fetch all your new mail and place it in the
 local <link linkend="spoolfile">&dollar;spoolfile</link>.  After this
 point, Mutt runs exactly as if the mail had always been local.
 </para>
 

+<note>

 <para>
 <para>

-<emphasis role="bold">Note:</emphasis> If you only need to fetch all messages to a
+If you only need to fetch all messages to a

 local mailbox you should consider using a specialized program, such as
 <literal>fetchmail</literal>, <literal>getmail</literal> or similar.
 </para>
 local mailbox you should consider using a specialized program, such as
 <literal>fetchmail</literal>, <literal>getmail</literal> or similar.
 </para>

+</note>

 
 </sect1>
 
 
 </sect1>
 


@@ -5845,7 +6235,7 @@ Alternatively, a pine-compatible notation is also supported, ie
 </para>
 
 <para>
 </para>
 
 <para>

-Note that not all servers use ``/'' as the hierarchy separator.  Mutt should
+Note that not all servers use <quote>/</quote> as the hierarchy separator.  Mutt should

 correctly notice which separator is being used by the server and convert
 paths accordingly.
 </para>
 correctly notice which separator is being used by the server and convert
 paths accordingly.
 </para>


@@ -5853,7 +6243,7 @@ paths accordingly.
 <para>
 When browsing folders on an IMAP server, you can toggle whether to look
 at only the folders you are subscribed to, or all folders with the
 <para>
 When browsing folders on an IMAP server, you can toggle whether to look
 at only the folders you are subscribed to, or all folders with the

-<emphasis>toggle-subscribed</emphasis> command.  See also the 
+<emphasis>toggle-subscribed</emphasis> command.  See also the

 <link linkend="imap-list-subscribed">&dollar;imap&lowbar;list&lowbar;subscribed</link> variable.
 </para>
 
 <link linkend="imap-list-subscribed">&dollar;imap&lowbar;list&lowbar;subscribed</link> variable.
 </para>
 


@@ -5864,28 +6254,33 @@ want to carefully tune the
 and
 <link linkend="timeout">&dollar;timeout</link>
 variables. Personally I use
 and
 <link linkend="timeout">&dollar;timeout</link>
 variables. Personally I use

+</para>

 
 <screen>
 set mail_check=90
 set timeout=15
 </screen>
 
 
 <screen>
 set mail_check=90
 set timeout=15
 </screen>
 

+<para>

 with relatively good results over my slow modem line.
 </para>
 
 with relatively good results over my slow modem line.
 </para>
 

+<note>

 <para>
 Note that if you are using mbox as the mail store on UW servers prior to
 v12.250, the server has been reported to disconnect a client if another client
 selects the same folder.
 </para>
 <para>
 Note that if you are using mbox as the mail store on UW servers prior to
 v12.250, the server has been reported to disconnect a client if another client
 selects the same folder.
 </para>

+</note>

 
 

-<sect2>
+<sect2 id="imap-browser">

 <title>The Folder Browser</title>
 
 <para>
 As of version 1.2, mutt supports browsing mailboxes on an IMAP
 server. This is mostly the same as the local file browser, with the
 following differences:
 <title>The Folder Browser</title>
 
 <para>
 As of version 1.2, mutt supports browsing mailboxes on an IMAP
 server. This is mostly the same as the local file browser, with the
 following differences:

+</para>

 
 <itemizedlist>
 <listitem>
 
 <itemizedlist>
 <listitem>


@@ -5895,7 +6290,7 @@ In lieu of file permissions, mutt displays the string "IMAP",
 possibly followed by the symbol "+", indicating
 that the entry contains both messages and subfolders. On
 Cyrus-like servers folders will often contain both messages and
 possibly followed by the symbol "+", indicating
 that the entry contains both messages and subfolders. On
 Cyrus-like servers folders will often contain both messages and

-subfolders. 
+subfolders.

 </para>
 </listitem>
 <listitem>
 </para>
 </listitem>
 <listitem>


@@ -5922,11 +6317,9 @@ these are bound to <literal>s</literal> and <literal>u</literal>, respectively).
 
 </itemizedlist>
 
 
 </itemizedlist>
 

-</para>
-

 </sect2>
 
 </sect2>
 

-<sect2>
+<sect2 id="imap-authentication">

 <title>Authentication</title>
 
 <para>
 <title>Authentication</title>
 
 <para>


@@ -5955,7 +6348,8 @@ in the following order: SASL, ANONYMOUS, GSSAPI, CRAM-MD5, LOGIN.
 </para>
 
 <para>
 </para>
 
 <para>

-There are a few variables which control authentication: 
+There are a few variables which control authentication:
+</para>

 
 <itemizedlist>
 <listitem>
 
 <itemizedlist>
 <listitem>


@@ -5988,8 +6382,6 @@ listed above).
 
 </itemizedlist>
 
 
 </itemizedlist>
 

-</para>
-

 </sect2>
 
 </sect1>
 </sect2>
 
 </sect1>


@@ -6004,9 +6396,9 @@ was configured and built with <literal>--enable-smtp</literal>.
 </para>
 
 <para>
 </para>
 
 <para>

-If the configuration variable 
+If the configuration variable

 <link linkend="smtp-url">&dollar;smtp&lowbar;url</link> is set, mutt
 <link linkend="smtp-url">&dollar;smtp&lowbar;url</link> is set, mutt

-will contact the given SMTP server to deliver messages; if it is unset, 
+will contact the given SMTP server to deliver messages; if it is unset,

 mutt will use the program specified by <link linkend="sendmail">&dollar;sendmail</link>.
 </para>
 
 mutt will use the program specified by <link linkend="sendmail">&dollar;sendmail</link>.
 </para>
 


@@ -6033,15 +6425,18 @@ you may find managing all the authentication settings inconvenient and
 error-prone. The account-hook command may help. This hook works like
 folder-hook but is invoked whenever you access a remote mailbox
 (including inside the folder browser), not just when you open the
 error-prone. The account-hook command may help. This hook works like
 folder-hook but is invoked whenever you access a remote mailbox
 (including inside the folder browser), not just when you open the

-mailbox.
+mailbox which includes (for example) polling for new mail, storing Fcc
+messages and saving messages to a folder. As a consequence,
+account-hook should only be used to set connection-related settings such
+as passwords or tunnel commands but not settings such as sender
+address or name (because in general it should be considered unpredictable
+which account-hook was last used).

 </para>
 
 <para>
 Some examples:
 </para>
 
 </para>
 
 <para>
 Some examples:
 </para>
 

-<para>
-

 <screen>
 account-hook . 'unset imap_user; unset imap_pass; unset tunnel'
 account-hook imap://host1/ 'set imap_user=me1 imap_pass=foo'
 <screen>
 account-hook . 'unset imap_user; unset imap_pass; unset tunnel'
 account-hook imap://host1/ 'set imap_user=me1 imap_pass=foo'


@@ -6049,8 +6444,6 @@ account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"'
 account-hook smtp://user@host3/ 'set tunnel="ssh host3 /usr/libexec/smtpd"'
 </screen>
 
 account-hook smtp://user@host3/ 'set tunnel="ssh host3 /usr/libexec/smtpd"'
 </screen>
 

-</para>
-

 </sect1>
 
 <sect1 id="caching">
 </sect1>
 
 <sect1 id="caching">


@@ -6058,8 +6451,8 @@ account-hook smtp://user@host3/ 'set tunnel="ssh host3 /usr/libexec/smtpd"'
 
 <para>
 Mutt contains two types of local caching: <emphasis>(1)</emphasis>
 
 <para>
 Mutt contains two types of local caching: <emphasis>(1)</emphasis>

-the so-called ``header caching'' and <emphasis>(2)</emphasis> the
-so-called ``body caching'' which are both described in this section.
+the so-called <quote>header caching</quote> and <emphasis>(2)</emphasis> the
+so-called <quote>body caching</quote> which are both described in this section.

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


@@ -6084,7 +6477,7 @@ thousands of single files (since Maildir and MH use one file per message.)
 Header caching can be enabled via the configure script and the
 <emphasis>--enable-hcache</emphasis> option. It's not turned on
 by default because external database libraries are required: one
 Header caching can be enabled via the configure script and the
 <emphasis>--enable-hcache</emphasis> option. It's not turned on
 by default because external database libraries are required: one

-of qdbm, gdbm or bdb must be present.
+of tokyocabinet, qdbm, gdbm or bdb must be present.

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


@@ -6105,11 +6498,9 @@ can compute the name of the header cache file for a particular local folder
 through a command like the following:
 </para>
 
 through a command like the following:
 </para>
 

-<para>

 <screen>
 $ printf '%s' '/path/to/folder' | md5sum
 </screen>
 <screen>
 $ printf '%s' '/path/to/folder' | md5sum
 </screen>

-</para>

 
 <para>
 The <literal>md5sum</literal> command may also be
 
 <para>
 The <literal>md5sum</literal> command may also be


@@ -6140,7 +6531,7 @@ For configuration, the variable <link linkend="message-cachedir"
 >&dollar;message&lowbar;cachedir</link> must point to a
 directory. There, mutt will create a hierarchy of subdirectories
 named like: <literal>proto:user@hostname</literal> where
 >&dollar;message&lowbar;cachedir</link> must point to a
 directory. There, mutt will create a hierarchy of subdirectories
 named like: <literal>proto:user@hostname</literal> where

-<literal>proto</literal> is either ``pop'' or ``imap.'' Within
+<literal>proto</literal> is either <quote>pop</quote> or <quote>imap.</quote> Within

 there for each folder, mutt stores messages in single files (just
 like Maildir) so that with manual symlink creation these cache
 directories can be examined with mutt as read-only Maildir folders.
 there for each folder, mutt stores messages in single files (just
 like Maildir) so that with manual symlink creation these cache
 directories can be examined with mutt as read-only Maildir folders.


@@ -6183,8 +6574,8 @@ it should not be set in general but only occasionally.
 <title>Exact address generation</title>
 
 <para>
 <title>Exact address generation</title>
 
 <para>

-Mutt supports the ``Name &lt;user@host&gt;'' address syntax for reading and
-writing messages, the older ``user@host (Name)'' syntax is only supported when
+Mutt supports the <quote>Name &lt;user@host&gt;</quote> address syntax for reading and
+writing messages, the older <quote>user@host (Name)</quote> syntax is only supported when

 reading messages. The <emphasis>--enable-exact-address</emphasis>
 switch can be given to configure to build it with write-support
 for the latter syntax. <literal>EXACT_ADDRESS</literal> in the output of
 reading messages. The <emphasis>--enable-exact-address</emphasis>
 switch can be given to configure to build it with write-support
 for the latter syntax. <literal>EXACT_ADDRESS</literal> in the output of


@@ -6205,17 +6596,21 @@ for the latter syntax. <literal>EXACT_ADDRESS</literal> in the output of
 Mutt's performance when reading mailboxes can be improved in two ways:
 </para>
 
 Mutt's performance when reading mailboxes can be improved in two ways:
 </para>
 

-<para>

 <orderedlist>
 <orderedlist>

-<listitem><para>
+
+<listitem>
+<para>

 For remote folders (IMAP and POP) as well as folders using
 one-file-per message storage (Maildir and MH), mutt's
 performance can be greatly improved using
 <link linkend="header-caching">header caching</link>.
 Using a single database per folder may further increase
 performance.
 For remote folders (IMAP and POP) as well as folders using
 one-file-per message storage (Maildir and MH), mutt's
 performance can be greatly improved using
 <link linkend="header-caching">header caching</link>.
 Using a single database per folder may further increase
 performance.

-</para></listitem>
-<listitem><para>
+</para>
+</listitem>
+
+<listitem>
+<para>

 Mutt provides the <link linkend="read-inc">&dollar;read&lowbar;inc</link>
 and <link linkend="write-inc">&dollar;write&lowbar;inc</link>
 variables to specify at which rate to update progress
 Mutt provides the <link linkend="read-inc">&dollar;read&lowbar;inc</link>
 and <link linkend="write-inc">&dollar;write&lowbar;inc</link>
 variables to specify at which rate to update progress


@@ -6229,6 +6624,7 @@ thousand messages, the default value for
 <link linkend="read-inc">&dollar;read&lowbar;inc</link>
 may be too low. It can be tuned on on a folder-basis using
 <link linkend="folder-hook">folder-hooks</link>:
 <link linkend="read-inc">&dollar;read&lowbar;inc</link>
 may be too low. It can be tuned on on a folder-basis using
 <link linkend="folder-hook">folder-hooks</link>:

+</para>

 
 <screen>
 # use very high $read_inc to speed up reading hcache'd maildirs
 
 <screen>
 # use very high $read_inc to speed up reading hcache'd maildirs


@@ -6237,10 +6633,9 @@ folder-hook . 'set read_inc=1000'
 folder-hook ^imap 'set read_inc=100'
 # use even lower value for reading even slower remote POP folders
 folder-hook ^pop 'set read_inc=1'</screen>
 folder-hook ^imap 'set read_inc=100'
 # use even lower value for reading even slower remote POP folders
 folder-hook ^pop 'set read_inc=1'</screen>

-</para>
+

 </listitem>
 </orderedlist>
 </listitem>
 </orderedlist>

-</para>

 
 <para>These settings work on a per-message basis. However, as messages may
 greatly differ in size and certain operations are much faster than others,
 
 <para>These settings work on a per-message basis. However, as messages may
 greatly differ in size and certain operations are much faster than others,


@@ -6277,12 +6672,12 @@ please refer to mutt's so-called
 When searching mailboxes either via a search or a limit action, for
 some patterns mutt distinguishes between regular expression and string
 searches. For regular expressions, patterns are prefixed with
 When searching mailboxes either via a search or a limit action, for
 some patterns mutt distinguishes between regular expression and string
 searches. For regular expressions, patterns are prefixed with

-``&tilde;'' and with ``='' for string searches.
+<quote>&tilde;</quote> and with <quote>=</quote> for string searches.

 </para>
 
 <para>
 Even though a regular expression search is fast, it's several times
 </para>
 
 <para>
 Even though a regular expression search is fast, it's several times

-slower than a pure string search which is noticable especially on large
+slower than a pure string search which is noticeable especially on large

 folders. As a consequence, a string search should be used instead of a
 regular expression search if the user already knows enough about the
 search pattern.
 folders. As a consequence, a string search should be used instead of a
 regular expression search if the user already knows enough about the
 search pattern.


@@ -6318,9 +6713,7 @@ mailbox.  However, it is possible to read other mailboxes and
 to send messages from the command line as well.
 </para>
 
 to send messages from the command line as well.
 </para>
 

-<para>
-
-<table>
+<table id="tab-commandline-options">

 <title>Command line options</title>
 <tgroup cols="2">
 <thead>
 <title>Command line options</title>
 <tgroup cols="2">
 <thead>


@@ -6353,27 +6746,62 @@ to send messages from the command line as well.
 </tgroup>
 </table>
 
 </tgroup>
 </table>
 

-</para>
-

 <para>
 To read messages in a mailbox
 </para>
 
 <para>
 To read messages in a mailbox
 </para>
 

-<para>
-<literal>mutt</literal> &lsqb; -nz &rsqb; &lsqb; -F <emphasis>muttrc</emphasis> &rsqb; &lsqb; -m <emphasis>type</emphasis> &rsqb; &lsqb; -f <emphasis>mailbox</emphasis> &rsqb; 
-</para>
+<cmdsynopsis>
+<command>mutt</command>
+<arg choice="opt"><option>-nz</option></arg>
+<arg choice="opt"><option>-F</option>
+<replaceable>muttrc</replaceable>
+</arg>
+<arg choice="opt"><option>-m</option>
+<replaceable>type</replaceable>
+</arg>
+<arg choice="opt"><option>-f</option>
+<replaceable>mailbox</replaceable>
+</arg>
+</cmdsynopsis>

 
 <para>
 To compose a new message
 </para>
 
 
 <para>
 To compose a new message
 </para>
 

-<para>
-<literal>mutt</literal> &lsqb; -n &rsqb; &lsqb; -F <emphasis>muttrc</emphasis> &rsqb; &lsqb; -a <emphasis>file</emphasis> &rsqb; &lsqb; -c <emphasis>address</emphasis> &rsqb; &lsqb; -i <emphasis>filename</emphasis> &rsqb; &lsqb; -s <emphasis>subject</emphasis> &rsqb;
-&lsqb; &lsqb; <emphasis>file</emphasis> ... &rsqb; -- &rsqb; <emphasis>address</emphasis> &lsqb; <emphasis>address</emphasis> ... &rsqb; 
-</para>
-
-<para>
-Mutt also supports a ``batch'' mode to send prepared messages.  Simply redirect
+<cmdsynopsis>
+<command>mutt</command>
+<arg choice="opt"><option>-n</option></arg>
+<arg choice="opt"><option>-F</option>
+<replaceable>muttrc</replaceable>
+</arg>
+<arg choice="opt"><option>-a</option>
+<replaceable>file</replaceable>
+</arg>
+<arg choice="opt"><option>-c</option>
+<replaceable>address</replaceable>
+</arg>
+<arg choice="opt"><option>-i</option>
+<replaceable>filename</replaceable>
+</arg>
+<arg choice="opt"><option>-s</option>
+<replaceable>subject</replaceable>
+</arg>
+<arg choice="opt">
+<arg choice="opt" rep="repeat">
+<replaceable>file</replaceable>
+</arg>
+<arg choice="plain">--</arg>
+</arg>
+<arg choice="plain">
+<replaceable>address</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable>address</replaceable>
+</arg>
+</cmdsynopsis>
+
+<para>
+Mutt also supports a <quote>batch</quote> mode to send prepared messages.  Simply redirect

 input from the file you wish to send.  For example,
 </para>
 
 input from the file you wish to send.  For example,
 </para>
 


@@ -6383,14 +6811,14 @@ input from the file you wish to send.  For example,
 </para>
 
 <para>
 </para>
 
 <para>

-This command will send a message to ``professor@bigschool.edu'' with a subject
-of ``data set for run &num;2''.  In the body of the message will be the contents
-of the file ``&tilde;/run2.dat''.
+This command will send a message to <quote>professor@bigschool.edu</quote> with a subject
+of <quote>data set for run &num;2</quote>.  In the body of the message will be the contents
+of the file <quote>&tilde;/run2.dat</quote>.

 </para>
 
 <para>
 All files passed with -a <emphasis>file</emphasis> will be attached as a MIME
 </para>
 
 <para>
 All files passed with -a <emphasis>file</emphasis> will be attached as a MIME

-part to the message. To attach several files, use ``--'' to separate files and
+part to the message. To attach several files, use <quote>--</quote> to separate files and

 recipient addresses: <literal>mutt -a *.png -- some@one.org</literal>
 </para>
 
 recipient addresses: <literal>mutt -a *.png -- some@one.org</literal>
 </para>
 


@@ -6403,326 +6831,829 @@ recipient addresses: <literal>mutt -a *.png -- some@one.org</literal>
 The following are the commands understood by mutt.
 </para>
 
 The following are the commands understood by mutt.
 </para>
 

-<para>
-

 <itemizedlist>
 <itemizedlist>

-<listitem>

 
 

-<para>
-<literal><link linkend="account-hook">account-hook</link></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
-</para>
-</listitem>

 <listitem>
 <listitem>

-
-<para>
-<literal><link linkend="alias">alias</link></literal> &lsqb; <literal>-group</literal> <emphasis>name</emphasis> &lsqb; ... &rsqb; &rsqb; <emphasis>key</emphasis> <emphasis>address</emphasis> &lsqb; , <emphasis>address</emphasis>, ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="alias">unalias</link></literal> &lsqb; * &verbar; <emphasis>key</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="alternates">alternates</link></literal> &lsqb; <literal>-group</literal> <emphasis>name</emphasis> &lsqb; ... &rsqb; &rsqb; <emphasis>regexp</emphasis> &lsqb; <emphasis>regexp</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="alternates">unalternates</link></literal> &lsqb; * &verbar; <emphasis>regexp</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="alternative-order">alternative-order</link></literal> <emphasis>mimetype</emphasis> &lsqb; <emphasis>mimetype</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="alternative-order">unalternative-order</link></literal> <emphasis>mimetype</emphasis> &lsqb; <emphasis>mimetype</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="auto-view">auto&lowbar;view</link></literal> <emphasis>mimetype</emphasis> &lsqb; <emphasis>mimetype</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="auto-view">unauto&lowbar;view</link></literal> <emphasis>mimetype</emphasis> &lsqb; <emphasis>mimetype</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="bind">bind</link></literal> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>function</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="charset-hook">charset-hook</link></literal> <emphasis>alias</emphasis> <emphasis>charset</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="charset-hook">iconv-hook</link></literal> <emphasis>charset</emphasis> <emphasis>local-charset</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="color">color</link></literal> <emphasis>object</emphasis> <emphasis>foreground</emphasis> <emphasis>background</emphasis> &lsqb; <emphasis>regexp</emphasis> &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="color">uncolor</link></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> &lsqb; <emphasis>pattern</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="exec">exec</link></literal> <emphasis>function</emphasis> &lsqb; <emphasis>function</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="fcc-hook">fcc-hook</link></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="fcc-save-hook">fcc-save-hook</link></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="folder-hook">folder-hook</link></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="hdr-order">hdr&lowbar;order</link></literal> <emphasis>header</emphasis> &lsqb; <emphasis>header</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="hdr-order">unhdr&lowbar;order</link></literal> <emphasis>header</emphasis> &lsqb; <emphasis>header</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="ignore">ignore</link></literal> <emphasis>pattern</emphasis> &lsqb; <emphasis>pattern</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="ignore">unignore</link></literal> <emphasis>pattern</emphasis> &lsqb; <emphasis>pattern</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="lists">lists</link></literal> &lsqb; <literal>-group</literal> <emphasis>name</emphasis> &lsqb; ... &rsqb; &rsqb; <emphasis>regexp</emphasis> &lsqb; <emphasis>regexp</emphasis> ... &rsqb; 
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="lists">unlists</link></literal> <emphasis>regexp</emphasis> &lsqb; <emphasis>regexp</emphasis> ... &rsqb; 
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="macro">macro</link></literal> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>sequence</emphasis> &lsqb; <emphasis>description</emphasis> &rsqb; 
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="mailboxes">mailboxes</link></literal> <emphasis>filename</emphasis> &lsqb; <emphasis>filename</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="mbox-hook">mbox-hook</link></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="message-hook">message-hook</link></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="mime-lookup">mime&lowbar;lookup</link></literal> <emphasis>mimetype</emphasis> &lsqb; <emphasis>mimetype</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="mime-lookup">unmime&lowbar;lookup</link></literal> <emphasis>mimetype</emphasis> &lsqb; <emphasis>mimetype</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="color">mono</link></literal> <emphasis>object attribute</emphasis> &lsqb; <emphasis>regexp</emphasis> &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="color">unmono</link></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> &lsqb; <emphasis>pattern</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="my-hdr">my&lowbar;hdr</link></literal> <emphasis>string</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="my-hdr">unmy&lowbar;hdr</link></literal> <emphasis>field</emphasis> &lsqb; <emphasis>field</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="crypt-hook">crypt-hook</link></literal> <emphasis>pattern</emphasis> <emphasis>key-id</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="push">push</link></literal> <emphasis>string</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="set">reset</link></literal> <emphasis>variable</emphasis> &lsqb;<emphasis>variable</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="save-hook">save-hook</link></literal> <emphasis>regexp</emphasis> <emphasis>filename</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="score-command">score</link></literal> <emphasis>pattern</emphasis> <emphasis>value</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="score-command">unscore</link></literal> <emphasis>pattern</emphasis> &lsqb; <emphasis>pattern</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="send-hook">reply-hook</link></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="send-hook">send-hook</link></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="send-hook">send2-hook</link></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="set">set</link></literal> &lsqb;no&verbar;inv&rsqb;<emphasis>variable</emphasis>&lsqb;=<emphasis>value</emphasis>&rsqb; &lsqb; <emphasis>variable</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="set">unset</link></literal> <emphasis>variable</emphasis> &lsqb;<emphasis>variable</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="source">source</link></literal> <emphasis>filename</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="spam">spam</link></literal> <emphasis>pattern</emphasis> <emphasis>format</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="spam">nospam</link></literal> <emphasis>pattern</emphasis>
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="lists">subscribe</link></literal> &lsqb; <literal>-group</literal> <emphasis>name</emphasis> &lsqb; ... &rsqb; &rsqb; <emphasis>regexp</emphasis> &lsqb; <emphasis>regexp</emphasis> ... &rsqb; 
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="lists">unsubscribe</link></literal> <emphasis>regexp</emphasis> &lsqb; <emphasis>regexp</emphasis> ... &rsqb; 
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="set">toggle</link></literal> <emphasis>variable</emphasis> &lsqb;<emphasis>variable</emphasis> ... &rsqb;
-</para>
-</listitem>
-<listitem>
-
-<para>
-<literal><link linkend="unhook">unhook</link></literal> <emphasis>hook-type</emphasis>
-</para>
+<cmdsynopsis>
+<command><link linkend="account-hook">account-hook</link></command>
+<arg choice="plain">
+<replaceable>pattern</replaceable>
+<replaceable>command</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="alias">alias</link></command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">key</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">address</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">address</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="alias">unalias</link></command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable>name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">key</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="alternates">alternates</link></command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable>name</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable>regexp</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable>regexp</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="alternates">unalternates</link></command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable>name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>regexp</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="alternative-order">alternative-order</link></command>
+<arg choice="plain">
+<replaceable>mimetype</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable>mimetype</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="alternative-order">unalternative-order</link></command>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>mimetype</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="auto-view">auto-view</link></command>
+<arg choice="plain">
+<replaceable>mimetype</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable>mimetype</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+<listitem>
+
+<cmdsynopsis>
+<command><link linkend="auto-view">unauto-view</link></command>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>mimetype</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="bind">bind</link></command>
+<arg choice="plain">
+<replaceable class="parameter">map</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">key</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">function</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="charset-hook">charset-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">alias</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">charset</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="charset-hook">iconv-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">charset</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">local-charset</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="color">color</link></command>
+<arg choice="plain">
+<replaceable class="parameter">object</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">foreground</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">background</replaceable>
+</arg>
+</cmdsynopsis>
+<cmdsynopsis>
+<command><link linkend="color">color</link></command>
+<group choice="req">
+<arg choice="plain">
+<option>header</option>
+</arg>
+<arg choice="plain">
+<option>body</option>
+</arg>
+</group>
+<arg choice="plain">
+<replaceable class="parameter">foreground</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">background</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+</cmdsynopsis>
+<cmdsynopsis>
+<command><link linkend="color">color</link></command>
+<arg choice="plain">
+<option>index</option>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">foreground</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">background</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="color">uncolor</link></command>
+<arg choice="plain">
+<option>index</option>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="exec">exec</link></command>
+<arg choice="plain">
+<replaceable class="parameter">function</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">function</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="fcc-hook">fcc-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="fcc-save-hook">fcc-save-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="folder-hook">folder-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;regexp</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">command</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="addrgroup">group</link></command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain" rep="repeat">
+<option>-rx</option>
+<replaceable class="parameter">expr</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<option>-addr</option>
+<replaceable class="parameter">expr</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="addrgroup">ungroup</link></command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<option>-rx</option>
+<replaceable class="parameter">expr</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<option>-addr</option>
+<replaceable class="parameter">expr</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="hdr-order">hdr&lowbar;order</link></command>
+<arg choice="plain">
+<replaceable class="parameter">header</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">header</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="hdr-order">unhdr&lowbar;order</link></command>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>header</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="ignore">ignore</link></command>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="ignore">unignore</link></command>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>pattern</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="lists">lists</link></command>
+<arg>
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="lists">unlists</link></command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable>name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>regexp</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="macro">macro</link></command>
+<arg choice="plain">
+<replaceable class="parameter">menu</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">key</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">sequence</replaceable>
+</arg>
+<arg choice="opt">
+<replaceable class="parameter">description</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="mailboxes">mailboxes</link></command>
+<arg choice="plain">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="mailboxes">unmailboxes</link></command>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="mbox-hook">mbox-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="message-hook">message-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">command</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="mime-lookup">mime-lookup</link></command>
+<arg choice="plain">
+<replaceable>mimetype</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable>mimetype</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="mime-lookup">unmime-lookup</link></command>
+<group choice="req">
+<arg choice="plain">
+<replaceable>*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable>mimetype</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="mono">mono</link></command>
+<arg choice="plain">
+<replaceable class="parameter">object</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">attribute</replaceable>
+</arg>
+</cmdsynopsis>
+<cmdsynopsis>
+<command><link linkend="mono">mono</link></command>
+<group choice="req">
+<arg choice="plain">
+<option>header</option>
+</arg>
+<arg choice="plain">
+<option>body</option>
+</arg>
+</group>
+<arg choice="plain">
+<replaceable class="parameter">attribute</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+</cmdsynopsis>
+<cmdsynopsis>
+<command><link linkend="mono">mono</link></command>
+<arg choice="plain">
+<option>index</option>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">attribute</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="mono">unmono</link></command>
+<arg choice="plain">
+<option>index</option>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="my-hdr">my&lowbar;hdr</link></command>
+<arg choice="plain">
+<replaceable class="parameter">string</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="my-hdr">unmy&lowbar;hdr</link></command>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">field</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="crypt-hook">crypt-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">keyid</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="push">push</link></command>
+<arg choice="plain">
+<replaceable class="parameter">string</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="set">reset</link></command>
+<arg choice="plain">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="save-hook">save-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">mailbox</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="score">score</link></command>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">value</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="score">unscore</link></command>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="reply-hook">reply-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">command</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="send-hook">send-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">command</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="send2-hook">send2-hook</link></command>
+<arg choice="plain">
+<replaceable class="parameter">&lsqb;!&rsqb;pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">command</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="set">set</link></command>
+<group choice="req">
+<arg choice="plain">
+<group choice="opt">
+<arg choice="plain"><option>no</option></arg>
+<arg choice="plain"><option>inv</option></arg>
+</group>
+<replaceable class="parameter">variable</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">variable=value</replaceable>
+</arg>
+</group>
+<arg choice="opt" rep="repeat"/>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="set">unset</link></command>
+<arg choice="plain">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="source">source</link></command>
+<arg choice="plain">
+<replaceable class="parameter">filename</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="spam">spam</link></command>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">format</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="spam">nospam</link></command>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">pattern</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="subscribe">subscribe</link></command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable class="parameter">name</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="subscribe">unsubscribe</link></command>
+<arg choice="opt" rep="repeat">
+<option>-group</option>
+<replaceable>name</replaceable>
+</arg>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain" rep="repeat">
+<replaceable class="parameter">regexp</replaceable>
+</arg>
+</group>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="set">toggle</link></command>
+<arg choice="plain">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+<arg choice="opt" rep="repeat">
+<replaceable class="parameter">variable</replaceable>
+</arg>
+</cmdsynopsis>
+</listitem>
+
+<listitem>
+<cmdsynopsis>
+<command><link linkend="unhook">unhook</link></command>
+<group choice="req">
+<arg choice="plain">
+<replaceable class="parameter">*</replaceable>
+</arg>
+<arg choice="plain">
+<replaceable class="parameter">hook-type</replaceable>
+</arg>
+</group>
+</cmdsynopsis>

 </listitem>
 
 </itemizedlist>
 
 </listitem>
 
 </itemizedlist>
 

-</para>
-

 </sect1>
 
 <sect1 id="variables">
 </sect1>
 
 <sect1 id="variables">