more muttng -> madmutt
authorPierre Habouzit <madcoder@debian.org>
Tue, 7 Nov 2006 21:35:00 +0000 (22:35 +0100)
committerPierre Habouzit <madcoder@debian.org>
Tue, 7 Nov 2006 21:35:00 +0000 (22:35 +0100)
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
24 files changed:
curs_lib.c
curs_main.c
doc/PGP-Notes.txt
doc/devel-notes.txt
doc/dotlock.man
doc/madmutt-manual.xsl
doc/madmutt-tex.xsl
doc/madmutt.sty
doc/manual.xml.head
doc/manual.xml.tail
doc/mbox.man
doc/mutt.man
doc/muttbug.man
doc/muttrc.man.head
doc/muttrc.man.tail
doc/patch-notes.txt
dotlock.c
init.c
init.h
lib/debug.c
main.c
mutt_menu.h
muttlib.c
status.c

index e938adf..165c4fd 100644 (file)
@@ -264,7 +264,7 @@ void mutt_query_exit (void)
   curs_set (1);
   if (Timeout)
     timeout (-1);               /* restore blocking operation */
-  if (mutt_yesorno (_("Exit Mutt-ng?"), M_YES) == M_YES) {
+  if (mutt_yesorno (_("Exit Madmutt?"), M_YES) == M_YES) {
     mutt_endwin (NULL);
     exit (1);
   }
index ae62c47..92c6922 100644 (file)
@@ -990,7 +990,7 @@ int mutt_index_menu (void)
         break;
       }
 
-      if (query_quadoption (OPT_QUIT, _("Quit Mutt-ng?")) == M_YES) {
+      if (query_quadoption (OPT_QUIT, _("Quit Madmutt?")) == M_YES) {
         int check;
 
         oldcount = Context ? Context->msgcount : 0;
@@ -1319,7 +1319,7 @@ int mutt_index_menu (void)
 
       if ((menu->menu == MENU_MAIN)
           && (query_quadoption (OPT_QUIT,
-                                _("Exit Mutt-ng without saving?")) == M_YES))
+                                _("Exit Madmutt without saving?")) == M_YES))
       {
         if (Context) {
           mx_fastclose_mailbox (Context);
index 6268b35..f9e3b2a 100644 (file)
@@ -1,4 +1,4 @@
-User's guide - Using PGP/GnuPG with Mutt-ng
+User's guide - Using PGP/GnuPG with Madmutt
 ===========================================
 
 How do I use mutt with PGP, PGP5, or GnuPG?
@@ -9,7 +9,7 @@ three files there, pgp2.rc, pgp5.rc, and gpg.rc.  These files
 contain ready-to-use configurations for using mutt with pgp2, pgp5,
 and gpg.
 
-Include one of these files with your Mutt-ng config file (e.g. ~/.muttngrc), 
+Include one of these files with your Madmutt config file (e.g. ~/.madmuttrc), 
 and things should work out fine.
 
 You may wish to verify that all paths and  the language parameters
@@ -20,7 +20,7 @@ given to the PGP binaries match your needs.
 Frequently Asked Questions and Tips
 -----------------------------------
 
-Q: "People are sending PGP messages which Mutt-ng doesn't
+Q: "People are sending PGP messages which Madmutt doesn't
     recognize.  What can I do?"
 
 A: The new way is to leave headers alone and use mutt's
@@ -88,12 +88,12 @@ if (/^$BPGPS/:b && /^$EPGPS/:b)
 
 Q: "I don't like that PGP/MIME stuff, but want to use the
     old way of PGP-signing my mails.  Can't you include
-    that with Mutt-ng?"
+    that with Madmutt?"
 
 A: No.  Application/pgp is not really suited to a world with MIME,
    non-textual body parts and similar things.  Anyway, if you really
    want to generate these old-style attachments, include the
-   following macro in your ~/.muttngrc (line breaks for readability,
+   following macro in your ~/.madmuttrc (line breaks for readability,
    this is actually one line):
 
   macro compose S "Fpgp +verbose=0 -fast
@@ -103,7 +103,7 @@ A: No.  Application/pgp is not really suited to a world with MIME,
 
 There's a new answer, though: Set the pgp_autoinline
 configuration variable (it's a quad-option) to something different
-from "no" (that's the default).  Mutt-ng will then try to use
+from "no" (that's the default).  Madmutt will then try to use
 application/pgp whereever it makes sense.  In particular, it does
 not make any sense with multiparts, or non-ASCII or non-text bodies.
 In all other cases, PGP/MIME is used unconditionally.
@@ -147,7 +147,7 @@ BACKGROUND
 Auxiliary Programs
 ------------------
 
-Mutt-ng needs two auxiliary programs for its PGP support: pgpewrapng and
+Madmutt needs two auxiliary programs for its PGP support: pgpewrapng and
 pgpringng.
 
 
@@ -196,7 +196,7 @@ line interfaces can't be properly served by mutt's format mechanism.
 The Configuration Interface
 ---------------------------
 
-As usual within Mutt-ng, the configuration interface for the PGP
+As usual within Madmutt, the configuration interface for the PGP
 commands relies on printf-like formats.  For all PGP commands, the
 following %-sequences are defined.
 
index f6455f6..18b0b73 100644 (file)
@@ -1,13 +1,13 @@
 Required tools
 --------------
 
-If you are planning to hack on Mutt-ng, please subscribe to the
-Mutt-ng-devel mailinglist (mutt-ng-deve-l@lists.berlios.de).
+If you are planning to hack on Madmutt, please subscribe to the
+Madmutt-devel mailinglist (Madmutt-deve-l@lists.berlios.de).
 Announcements about recent development
 versions go to that mailing list, as go technical discussions and
 patches.
 
-You'll need several GNU development utilities for working on mutt-ng:
+You'll need several GNU development utilities for working on Madmutt:
 
 - automake
 
@@ -56,7 +56,7 @@ Getting started from SVN
 ------------------------
 
 Once you've checked out a copy of the source from SVN from
-svn.berlios.de/svnroot/repos/mutt-ng , you'll need to run the script
+svn.berlios.de/svnroot/repos/Madmutt , you'll need to run the script
 called 'autogen.sh' that is in the root directory.  The script does all the
 automake/autoconf magic that needs to be done with a fresh checkout. If
 all steps succeed, you'll have a configure script to start off with.
@@ -65,13 +65,13 @@ all steps succeed, you'll have a configure script to start off with.
 A word about warnings
 ---------------------
 
-Mutt-ng's default build process sets some pretty restrictive compiler
+Madmutt's default build process sets some pretty restrictive compiler
 flags which may lead to lots of warnings.  Generally, warnings are
 something which should be eliminated.
 
 Nevertheless, the code in intl/ is said to generate some warnings with
 the compiler settings we usually rely upon.  This code is not
-maintained by the Mutt-ng developpers, so please redirect any comments to
+maintained by the Madmutt developpers, so please redirect any comments to
 the GNU gettext library's developpers.
 
 
@@ -98,7 +98,7 @@ Style Guide
 - When adding new options, make the old behaviour the default. Also,
   add them to UPGRADING in the top-level source directory.
 
-- try to keep Mutt-ng as portable as possible.
+- try to keep Madmutt as portable as possible.
 
 Documentation
 -------------
@@ -184,7 +184,7 @@ Do _not_ use any other SGML or nroff formatting instructions here!
 String comparison
 -----------------
 
-A word of warning about string comparisons: Since Mutt-ng may run in a
+A word of warning about string comparisons: Since Madmutt may run in a
 huge variety of locales, case-insensitive string comparisons and
 case conversions may be dangerous.  For instance, in iso-8859-9,
 tolower('I') is DIFFERENT from 'i' - it's indeed the Turkish dotless
index f86ae0b..73a6a21 100644 (file)
 .\"
 .TH dotlock 1 "AUGUST 1999" Unix "User Manuals"
 .SH NAME
-muttng_dotlock \- Lock mail spool files.
+madmutt_dotlock \- Lock mail spool files.
 .SH SYNOPSIS
 .PP
-.B muttng_dotlock 
+.B madmutt_dotlock 
 [-t|-f|-u|-d] [-p] [-r \fIretries\fP] \fIfile\fP
 .SH DESCRIPTION
 .PP
-.B muttng_dotlock
+.B madmutt_dotlock
 implements the traditional mail spool file locking method:
 To lock \fIfile\fP, a file named \fIfile\fP.lock is
 created. The program operates with group mail privileges
@@ -36,53 +36,53 @@ if necessary.
 .PP
 .IP "-t"
 Just try.
-.B muttng_dotlock
+.B madmutt_dotlock
 won't actually lock a file, but inform the invoking
 process if it's at all possible to lock \fIfile\fP.
 .IP "-f"
 Force the lock.  If another process holds a lock on
 \fIfile\fP longer than a certain amount of time, 
-.B muttng_dotlock
+.B madmutt_dotlock
 will break that lock by removing the lockfile.
 .IP "-u"
 Unlock.
-.B muttng_dotlock 
+.B madmutt_dotlock 
 will remove \fIfile\fP.lock.
 .IP "-d"
 Delete.
-.B muttng_dotlock
+.B madmutt_dotlock
 will lock \fIfile\fP, remove it if it has length 0, and afterwards
 remove \fIfile\fP.lock.
 .IP "-p"
 Use privileges.  If given this option, 
-.B muttng_dotlock
+.B madmutt_dotlock
 will operate with group mail privileges when creating and
 deleting lock files.
 .IP "-r \fIretries\fP"
 This command line option tells 
-.B muttng_dotlock 
+.B madmutt_dotlock 
 to try locking
 \fIretries\fP times before giving up or (if invoked with
 the 
 .B -f
 command line option) break a lock.  The default value is 5.
-.B muttng_dotlock
+.B madmutt_dotlock
 waits one second between successive locking attempts.  
 .SH FILES
 .PP
 .IP "\fIfile\fP.lock"
 The lock file 
-.B muttng_dotlock
+.B madmutt_dotlock
 generates.
 .SH SEE ALSO
 .PP
 .BR fcntl (2),
 .BR flock (2),
 .BR lockfile (1),
-.BR muttng (1)
+.BR madmutt (1)
 .SH DIAGNOSTICS
 .PP
-.B muttng_dotlock
+.B madmutt_dotlock
 gives all diagnostics in its return values:
 .TP
 .B "0 \- DL_EX_OK"
@@ -96,37 +96,37 @@ lack of system memory and the like has occured.
 The 
 user wants to lock a file which has been locked by
 another process already.  If 
-.B muttng_dotlock
+.B madmutt_dotlock
 is invoked with the
 .B -f 
 command line option, 
-.B muttng_dotlock
+.B madmutt_dotlock
 won't generate this error, but break other processes'
 locks.
 .TP 
 .B "4 \- DL_EX_NEED_RPIVS"
 This return value only occurs if 
-.B muttng_dotlock 
+.B madmutt_dotlock 
 has been invoked
 with the 
 .B -t
 command line option.  It means that
-.B muttng_dotlock
+.B madmutt_dotlock
 will have to use its group mail privileges to lock
 \fIfile\fP.
 .TP
 .B "5 \- DL_EX_IMPOSSIBLE"
 This return value only occurs if
-.B muttng_dotlock
+.B madmutt_dotlock
 has been invoked with the
 .B -t
 command line option.  It means that
-.B muttng_dotlock 
+.B madmutt_dotlock 
 is unable to lock \fIfile\fP even with group mail
 privileges.
 .SH NOTES
 .PP
-.B muttng_dotlock
+.B madmutt_dotlock
 tries to implement an NFS-safe dotlocking method which was
 borrowed from 
 .B lockfile
@@ -134,7 +134,7 @@ borrowed from
 .PP
 If the user can't open \fIfile\fP for reading with his
 normal privileges, 
-.B muttng_dotlock 
+.B madmutt_dotlock 
 will return the
 .B DL_EX_ERROR
 exit value to avoid certain attacks against other users'
@@ -143,8 +143,8 @@ when checking permissions; for details of all this see the
 comments in dotlock.c.
 .SH HISTORY
 .PP
-.B muttng_dotlock
-is part of the Mutt-ng mail user agent package.  It has been
-created to avoid running Mutt-ng with group mail privileges.
+.B madmutt_dotlock
+is part of the Madmutt mail user agent package.  It has been
+created to avoid running Madmutt with group mail privileges.
 .SH AUTHOR
-Thomas Roessler <roessler@guug.de>, Nico Golde <nion@muttng.or>>
+Thomas Roessler <roessler@guug.de>, Nico Golde <nion@madmutt.or>>
index 2763a03..94392fa 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- written for mutt-ng by: -->
+<!-- written for madmutt by: -->
 <!-- Felix Meinhold <felix.meinhold@gmx.net> -->
 
 <!-- some more things were added/ajusted by: -->
@@ -11,7 +11,7 @@
   
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:madmutt-doc="http://mutt-ng.berlios.de/doc/#NS"
+  xmlns:madmutt-doc="http://madmutt.berlios.de/doc/#NS"
   >
   
   <xsl:output 
index f711b37..831a30d 100644 (file)
@@ -2,7 +2,7 @@
 
 <!-- manual2latex.xsl                                   -->
 
-<!-- written for mutt-ng by:                            -->
+<!-- written for madmutt by:                            -->
 <!-- Rocco Rutte <pdmef@cs.tu-berlin.de>                -->
 
 <!-- the LaTeX-escaping code at the end is a            -->
 
 <!-- NOTE: this is not a generic DocBook to LaTeX but   -->
 <!--       it contains just enough to convert the       -->
-<!--       mutt-ng manual with some special tags into   -->
+<!--       madmutt manual with some special tags into   -->
 <!--       valid LaTeX code; most of the work is done   -->
 <!--       madmutt.sty anyways...                       -->
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:madmutt-doc="http://mutt-ng.berlios.de/doc/#NS">
+  xmlns:madmutt-doc="http://madmutt.berlios.de/doc/#NS">
 
   <xsl:output method="text" indent="no" output-encoding="utf-8"/>
 
index 36f2ab9..fc75e66 100644 (file)
@@ -1,6 +1,6 @@
 % this is pseudo-package with some definitions exluded
-% from muttng-tex.xsl to muttng.sty
-% written for mutt-ng by:
+% from madmutt-tex.xsl to madmutt.sty
+% written for madmutt by:
 % Rocco Rutte <pdmef@cs.tu-berlin.de>
 
 % packages
@@ -50,9 +50,9 @@
   \addtocounter{app}{1}
 }
 
-% from here on, these implement the muttng-doc namespace,
+% from here on, these implement the madmutt-doc namespace,
 % see Hacking Documentation for details
-% muttng-tex.xsl passes most of the content as-is so that
+% madmutt-tex.xsl passes most of the content as-is so that
 % we do it here via LaTeX rather than XSL for good reason...
 
 \newcommand{\uglyesc}[1]{\lstinline[basicstyle=\ttfamily]{#1}}
index 5079bf7..07fac53 100644 (file)
@@ -2,7 +2,7 @@
 <!-- THIS FILE IST NOT VALID DOCBOOK ! DTD REMOVED -->                                                           
 <!-- Please don't use html entities like [, ] ^  -->                                                   
 <!-- etc. they don't work with xml!                             -->                                              
-<book xmlns:muttng-doc="http://mutt-ng.berlios.de/doc/#NS">
+<book xmlns:madmutt-doc="http://Madmutt.berlios.de/doc/#NS">
 
 <bookinfo> <!--{{{-->
   <title>The Mutt Next Generation E-Mail Client</title>
@@ -33,8 +33,8 @@
     <title>Overview</title>
     
     <para>
-      <emphasis role="bold">Mutt-ng</emphasis> is a small but very
-      powerful text-based MIME mail client.  Mutt-ng is highly
+      <emphasis role="bold">Madmutt</emphasis> is a small but very
+      powerful text-based MIME mail client.  Madmutt is highly
       configurable, and is well suited to the mail power user with
       advanced features like key bindings, keyboard macros, mail
       threading, regular expression searches and a powerful pattern
     
     <para>
       This documentation additionally contains documentation to
-      <emphasis role="bold"> Mutt-NG </emphasis> ,a fork from Mutt
+      <emphasis role="bold"> Madmutt </emphasis> ,a fork from Mutt
       with the goal to fix all the little annoyances of Mutt, to
       integrate all the Mutt patches that are floating around in the
-      web, and to add other new features. Features specific to Mutt-ng
+      web, and to add other new features. Features specific to Madmutt
       will be discussed in an extra section. Don't be confused when
-      most of the documentation talk about Mutt and not Mutt-ng,
-      Mutt-ng contains all Mutt features, plus many more.
+      most of the documentation talk about Mutt and not Madmutt,
+      Madmutt contains all Mutt features, plus many more.
     </para>
     
     <para>
   </sect1>
   
   <sect1 id="homepage">
-    <title>Mutt-ng Home Page</title>
+    <title>Madmutt Home Page</title>
     
     <para>
-      <muttng-doc:web url="http://www.muttng.org/"/>
+      <madmutt-doc:web url="http://www.madmutt.org/"/>
     </para>
     
     <para>
         <listitem>
           
           <para>
-            <email>mutt-ng-users@lists.berlios.de</email>: This is
-            where the mutt-ng user support happens.
+            <email>Madmutt-users@lists.berlios.de</email>: This is
+            where the Madmutt user support happens.
           </para>
         </listitem>
         <listitem>
           
           <para>
-            <email>mutt-ng-devel@lists.berlios.de</email>: The
-            development mailing list for mutt-ng
+            <email>Madmutt-devel@lists.berlios.de</email>: The
+            development mailing list for Madmutt
           </para>
         </listitem>
         
     <title>Software Distribution Sites</title>
     
     <para>
-      So far, there are no official releases of Mutt-ng, but you can
-      download daily snapshots from <muttng-doc:web url="http://mutt-ng.berlios.de/snapshots/"/>
+      So far, there are no official releases of Madmutt, but you can
+      download daily snapshots from <madmutt-doc:web url="http://Madmutt.berlios.de/snapshots/"/>
     </para>
     
     <para>
     <title>IRC</title>
     
     <para>
-      Visit channel <emphasis>#muttng</emphasis> on <ulink
+      Visit channel <emphasis>#madmutt</emphasis> on <ulink
         url="http://www.freenode.net/">irc.freenode.net
         (www.freenode.net) </ulink> to chat with other people
-      interested in Mutt-ng.  
+      interested in Madmutt.  
     </para>
     
   </sect1>
     
     <para>
       If you want to read fresh news about the latest development in
-      Mutt-ng, and get informed about stuff like interesting,
-      Mutt-ng-related articles and packages for your favorite
+      Madmutt, and get informed about stuff like interesting,
+      Madmutt-related articles and packages for your favorite
       distribution, you can read and/or subscribe to our <ulink
-        url="http://mutt-ng.supersized.org/">Mutt-ng development
+        url="http://Madmutt.supersized.org/">Madmutt development
         weblog</ulink>.
     </para>
     
             in a typewriter font and both prefixed with a dollar sign as
             it's common for UNIX-like environments. Configuration
             variables are lower-case only while environment variables
-            are upper-case only. <muttng-doc:varref
+            are upper-case only. <madmutt-doc:varref
               name="imap-mail-check"/> is a configuration variable while
-            <muttng-doc:envvar name="EDITOR"/> is an environment
+            <madmutt-doc:envvar name="EDITOR"/> is an environment
             variable.</para>
         </listitem>
         <listitem>
-          <para>Muttng-specific functions are enclosed in
+          <para>madmutt-specific functions are enclosed in
           <literal>&lt;&gt;</literal> and printed in a typewriter font,
-          too, as in <muttng-doc:funcref name="sync-mailbox"/>.</para>
+          too, as in <madmutt-doc:funcref name="sync-mailbox"/>.</para>
         </listitem>
         <listitem>
           <para>As common for UNIX-like environments, references to
             manual pages are printed with the section enclosed in
-            braces, as in <muttng-doc:man name="vi"/> or <muttng-doc:man
-              name="muttngrc" sect="5"/>. Execute <literal>man [section]
+            braces, as in <madmutt-doc:man name="vi"/> or <madmutt-doc:man
+              name="madmuttrc" sect="5"/>. Execute <literal>man [section]
               [name]</literal> to view the manual page.</para>
         </listitem>
         <listitem>
           <para>Keys are presented in the following way: ordinary keys
             are just given as-is, e.g.
-            <muttng-doc:key>q</muttng-doc:key>. Control characters are
+            <madmutt-doc:key>q</madmutt-doc:key>. Control characters are
             prefixed with <literal>C-</literal> (e.g. the screen can be
-            redraw by pressing <muttng-doc:key
-              mod="C">L</muttng-doc:key>) and <literal>E-</literal> for
+            redraw by pressing <madmutt-doc:key
+              mod="C">L</madmutt-doc:key>) and <literal>E-</literal> for
             Escape, e.g. a folder can be opened read-only with
-            <muttng-doc:key mod="E">c</muttng-doc:key>.
+            <madmutt-doc:key mod="E">c</madmutt-doc:key>.
           </para>
         </listitem>
       </itemizedlist>
     <para>
       If, while reading this fine manual, you find any inconsistencies
       of whatever kind, please contact the developers via
-      <email>mutt-ng-devel@lists.berlios.de</email> to report it.
+      <email>Madmutt-devel@lists.berlios.de</email> to report it.
     </para>
 
   </sect1>
       <title>Screens and Menus</title>
       
       <para>
-        mutt-ng offers different screens of which every has its special
+        Madmutt offers different screens of which every has its special
         purpose:
       </para>
       
             <para>
               The <emphasis>file browser</emphasis> offers operations on and
               displays
-              information of all folders mutt-ng should watch for mail.
+              information of all folders Madmutt should watch for mail.
               
             </para>
           </listitem>
       </para>
       
       <para>
-        When mutt-ng is started without any further options, it'll open
+        When Madmutt is started without any further options, it'll open
         the users default mailbox and display the index.
       </para>
       
       <title>Configuration</title>
       
       <para>
-        Mutt-ng does <emphasis>not</emphasis> feature an internal
+        Madmutt does <emphasis>not</emphasis> feature an internal
         configuration
         interface or menu due to the simple fact that this would be too
         complex to handle (currently there are several <emphasis>hundred</emphasis>
       </para>
       
       <para>
-        Mutt-ng is configured using configuration files which allow
+        Madmutt is configured using configuration files which allow
         users to add comments or manage them via version control systems
         to ease maintenance.
       </para>
       
       <para>
-        Also, mutt-ng comes with a shell script named <literal>grml-muttng</literal>
+        Also, Madmutt comes with a shell script named <literal>grml-madmutt</literal>
         kindly contributed by users which really helps and eases the
         creation of a user's configuration file. When downloading the
         source code via a snapshot or via subversion, it can be found in
       <title>Functions</title>
       
       <para>
-        Mutt-ng offers great flexibility due to the use of functions:
-        internally, every action a user can make mutt-ng perform is named
+        Madmutt offers great flexibility due to the use of functions:
+        internally, every action a user can make Madmutt perform is named
         ``function.'' Those functions are assigned to keys (or even key
         sequences) and may be completely adjusted to user's needs. The
         basic idea is that the impatient users get a very intuitive
       <title>Interaction</title>
       
       <para>
-        Mutt-ng has two basic concepts of user interaction:
+        Madmutt has two basic concepts of user interaction:
       </para>
       
       <para>
       <title>Modularization</title>
       
       <para>
-        Although mutt-ng has many functionality built-in, many
+        Although Madmutt has many functionality built-in, many
         features can be delegated to external tools to increase
         flexibility: users can define programs to filter a message through
         before displaying, users can use any program they want for
         displaying a message, message types (such as PDF or PostScript)
-        for which mutt-ng doesn't have a built-in filter can be rendered
-        by arbitrary tools and so forth. Although mutt-ng has an alias
+        for which Madmutt doesn't have a built-in filter can be rendered
+        by arbitrary tools and so forth. Although Madmutt has an alias
         mechanism built-in, it features using external tools to query for
         nearly every type of addresses from sources like LDAP, databases
         or just the list of locally known users.
       <title>Patterns</title>
       
       <para>
-        Mutt-ng has a built-in pattern matching ``language'' which is
+        Madmutt has a built-in pattern matching ``language'' which is
         as widely used as possible to present a consistent interface to
         users. The same ``pattern terms'' can be used for searching,
         scoring, message selection and much more.
       
       <para>
         The index is the screen that you usually see first when you
-        start mutt-ng. It gives an overview over your emails in the
+        start Madmutt. It gives an overview over your emails in the
         currently opened mailbox. By default, this is your system mailbox.
         The information you see in the index is a list of emails, each with
         its number on the left, its flags (new email, important email,
       
       <para>
         To give the user a good overview, it is possible to configure
-        mutt-ng to show different things in the pager with different
+        Madmutt to show different things in the pager with different
         colors. Virtually everything that can be described with a regular
         expression can be colored, e.g. URLs, email addresses or smileys.
       </para>
       
       <para>
         The sidebar comes in handy to manage mails which are spread
-        over different folders. All folders users setup mutt-ng to watch
+        over different folders. All folders users setup Madmutt to watch
         for new mail will be listed. The listing includes not only the
         name but also the number of total messages, the number of new and
         flagged messages. Items with new mail may be colored different
         lists the current configuration of key bindings and their
         associated commands including a short description, and currently
         unbound functions that still need to be associated with a key
-        binding (or alternatively, they can be called via the mutt-ng
+        binding (or alternatively, they can be called via the Madmutt
         command prompt).
       </para>
       
       <title>Attachment Menu</title>
       
       <para>
-        As will be later discussed in detail, mutt-ng features a good
+        As will be later discussed in detail, Madmutt features a good
         and stable MIME implementation, that is, is greatly supports
         sending and receiving messages of arbitrary type. The
         attachment menu displays a message's structure in detail: what
     
     <para>
       Information is presented in menus, very similar to ELM.  Here is a
-      tableshowing the common keys used to navigate menus in Mutt-ng.
+      tableshowing the common keys used to navigate menus in Madmutt.
     </para>
     
     <para>
         </thead>
         <tbody>
           <row>
-            <entry><muttng-doc:key>j</muttng-doc:key> or <muttng-doc:key>Down</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="next-entry"/></entry>
+            <entry><madmutt-doc:key>j</madmutt-doc:key> or <madmutt-doc:key>Down</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="next-entry"/></entry>
             <entry>move to the next entry</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>k</muttng-doc:key> or <muttng-doc:key>Up</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="previous-entry"/></entry>
+            <entry><madmutt-doc:key>k</madmutt-doc:key> or <madmutt-doc:key>Up</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="previous-entry"/></entry>
             <entry>move to the previous entry</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>z</muttng-doc:key> or <muttng-doc:key>PageDn</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="page-down"/></entry>
+            <entry><madmutt-doc:key>z</madmutt-doc:key> or <madmutt-doc:key>PageDn</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="page-down"/></entry>
             <entry>go to the next page</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>Z</muttng-doc:key> or <muttng-doc:key>PageUp</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="page-up"/></entry>
+            <entry><madmutt-doc:key>Z</madmutt-doc:key> or <madmutt-doc:key>PageUp</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="page-up"/></entry>
             <entry>go to the previous page</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>=</muttng-doc:key> or <muttng-doc:key>Home</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="first-entry"/></entry>
+            <entry><madmutt-doc:key>=</madmutt-doc:key> or <madmutt-doc:key>Home</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="first-entry"/></entry>
             <entry>jump to the first entry</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>*</muttng-doc:key> or <muttng-doc:key>End</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="last-entry"/></entry>
+            <entry><madmutt-doc:key>*</madmutt-doc:key> or <madmutt-doc:key>End</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="last-entry"/></entry>
             <entry>jump to the last entry</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>q</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="quit"/></entry>
+            <entry><madmutt-doc:key>q</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="quit"/></entry>
             <entry>exit the current menu</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>?</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="help"/></entry>
+            <entry><madmutt-doc:key>?</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="help"/></entry>
             <entry>list all key bindings for the current menu</entry>
           </row>
         </tbody>
     <title>Editing Input Fields</title>
     
     <para>
-      Mutt-ng has a builtin line editor which is used as the primary way to
+      Madmutt has a builtin line editor which is used as the primary way to
       input
       textual data such as email addresses or filenames.  The keys used to
       move
         </thead>
         <tbody>
           <row>
-            <entry><muttng-doc:key mod="C">A</muttng-doc:key> or <muttng-doc:key>Home</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="bol"/></entry>
+            <entry><madmutt-doc:key mod="C">A</madmutt-doc:key> or <madmutt-doc:key>Home</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="bol"/></entry>
             <entry>move to the start of the line</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">B</muttng-doc:key> or <muttng-doc:key>Left</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="backward-char"/>
+            <entry><madmutt-doc:key mod="C">B</madmutt-doc:key> or <madmutt-doc:key>Left</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="backward-char"/>
             </entry><entry>move back one char</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">B</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="backward-word"/></entry>
+            <entry><madmutt-doc:key mod="E">B</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="backward-word"/></entry>
             <entry>move back one word</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">D</muttng-doc:key> or <muttng-doc:key>Delete</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="delete-char"/></entry>
+            <entry><madmutt-doc:key mod="C">D</madmutt-doc:key> or <madmutt-doc:key>Delete</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="delete-char"/></entry>
             <entry>delete the char under the cursor</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">E</muttng-doc:key> or <muttng-doc:key>End</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="eol"/></entry>
+            <entry><madmutt-doc:key mod="C">E</madmutt-doc:key> or <madmutt-doc:key>End</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="eol"/></entry>
             <entry>move to the end of the line</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">F</muttng-doc:key> or <muttng-doc:key>Right</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="forward-char"/></entry>
+            <entry><madmutt-doc:key mod="C">F</madmutt-doc:key> or <madmutt-doc:key>Right</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="forward-char"/></entry>
             <entry>move forward one char</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">F</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="forward-word"/></entry>
+            <entry><madmutt-doc:key mod="E">F</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="forward-word"/></entry>
             <entry>move forward one word</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="complete"/></entry>
+            <entry><madmutt-doc:key>Tab</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="complete"/></entry>
             <entry>complete filename or alias</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="complete-query"/></entry>
+            <entry><madmutt-doc:key mod="C">T</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="complete-query"/></entry>
             <entry>complete address with query</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">K</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="kill-eol"/></entry>
+            <entry><madmutt-doc:key mod="C">K</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="kill-eol"/></entry>
             <entry>delete to the end of the line</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="kill-eow"/></entry>
+            <entry><madmutt-doc:key mod="E">d</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="kill-eow"/></entry>
             <entry>delete to the end of the word</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">W</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="kill-word"/></entry>
+            <entry><madmutt-doc:key mod="C">W</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="kill-word"/></entry>
             <entry>kill the word in front of the cursor</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="kill-line"/></entry>
+            <entry><madmutt-doc:key mod="C">U</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="kill-line"/></entry>
             <entry>delete entire line</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">V</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="quote-char"/></entry>
+            <entry><madmutt-doc:key mod="C">V</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="quote-char"/></entry>
             <entry>quote the next typed key</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>Up</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="history-up"/></entry>
+            <entry><madmutt-doc:key>Up</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="history-up"/></entry>
             <entry>recall previous string from history</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>Down</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="history-down"/></entry>
+            <entry><madmutt-doc:key>Down</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="history-down"/></entry>
             <entry>recall next string from history</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>BackSpace</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="backspace"/></entry>
+            <entry><madmutt-doc:key>BackSpace</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="backspace"/></entry>
             <entry>kill the char in front of the cursor</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="upcase-word"/></entry>
+            <entry><madmutt-doc:key mod="E">u</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="upcase-word"/></entry>
             <entry>convert word to upper case</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">l</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="downcase-word"/></entry>
+            <entry><madmutt-doc:key mod="E">l</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="downcase-word"/></entry>
             <entry>convert word to lower case</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">c</muttng-doc:key></entry>
-            <entry><muttng-doc:funcref name="capitalize-word"/></entry>
+            <entry><madmutt-doc:key mod="E">c</madmutt-doc:key></entry>
+            <entry><madmutt-doc:funcref name="capitalize-word"/></entry>
             <entry>capitalize the word</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">G</muttng-doc:key></entry>
+            <entry><madmutt-doc:key mod="C">G</madmutt-doc:key></entry>
             <entry></entry>
             <entry>abort</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>Return</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>Return</madmutt-doc:key></entry>
             <entry></entry>
             <entry>finish editing</entry>
           </row>
     
     <para>
       You can remap the <emphasis>editor</emphasis> functions using the
-      <muttng-doc:cmdref name="bind"/> command.  For example, to make
+      <madmutt-doc:cmdref name="bind"/> command.  For example, to make
       the <emphasis>Delete</emphasis> key delete the character in front
       of the cursor rather than under, you could use
     </para>
     
     <para>
       Similar to many other mail clients, there are two modes in which mail
-      isread in Mutt-ng.  The first is the index of messages in the mailbox,
+      isread in Madmutt.  The first is the index of messages in the mailbox,
       which is
-      called the ``index'' in Mutt-ng.  The second mode is the display of the
+      called the ``index'' in Madmutt.  The second mode is the display of the
       message contents.  This is called the ``pager.''
     </para>
     
         </thead>
         <tbody>
           <row>
-            <entry><muttng-doc:key>c</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>c</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>change to a different mailbox</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">c</muttng-doc:key></entry>
+            <entry><madmutt-doc:key mod="E">c</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>change to a folder in read-only mode</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>C</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>C</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>copy the current message to another mailbox</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">C</muttng-doc:key></entry>
+            <entry><madmutt-doc:key mod="E">C</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>decode a message and copy it to a folder</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">s</muttng-doc:key></entry>
+            <entry><madmutt-doc:key mod="E">s</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>decode a message and save it to a folder</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>D</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>D</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>delete messages matching a pattern</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>d</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>d</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>delete the current message</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>F</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>F</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>mark as important</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>l</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>l</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>show messages matching a pattern</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>N</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>N</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>mark message as new</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>o</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>o</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>change the current sort method</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>O</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>O</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>reverse sort the mailbox</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>q</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>q</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>save changes and exit</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>s</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>s</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>save-message</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>T</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>T</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>tag messages matching a pattern</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>t</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>t</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle the tag on a message</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">t</muttng-doc:key></entry>
+            <entry><madmutt-doc:key mod="E">t</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle tag on entire message thread</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>U</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>U</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>undelete messages matching a pattern</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>u</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>u</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>undelete-message</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>v</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>v</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>view-attachments</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>x</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>x</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>abort changes and exit</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>Return</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>Return</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>display-message</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>Tab</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>jump to the next new or unread message</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>@</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>@</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>show the author's full e-mail address</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>$</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>$</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>save changes to mailbox</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>/</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>/</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
+            <entry><madmutt-doc:key mod="E">/</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search-reverse</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">L</muttng-doc:key></entry>
+            <entry><madmutt-doc:key mod="C">L</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>clear and redraw the screen</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
+            <entry><madmutt-doc:key mod="C">T</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>untag messages matching a pattern</entry>
           </row>
           Furthermore, the following flags reflect who the message is
           addressed
           to.  They can be customized with the
-          <muttng-doc:varref name="to-chars"/> variable.
+          <madmutt-doc:varref name="to-chars"/> variable.
         </para>
         
         <para>
       <title>The Pager</title>
       
       <para>
-        By default, Mutt-ng uses its builtin pager to display the body of
+        By default, Madmutt uses its builtin pager to display the body of
         messages.
         The pager is very similar to the Unix program <emphasis>less</emphasis> though not nearly as
         featureful.
         </thead>
         <tbody>
           <row>
-            <entry><muttng-doc:key>Return</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>Return</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>go down one line</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>Space</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>Space</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>display the next page (or next message if at the end of a message)</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>-</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>-</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>go back to the previous page</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>n</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>n</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search for next match</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>S</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>S</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>skip beyond quoted text</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>T</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>T</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle display of quoted text</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>?</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>?</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>show key bindings</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>/</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>/</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search for a regular expression (pattern)</entry>
           </row>
           <row>
-            <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
+            <entry><madmutt-doc:key mod="E">/</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search backwards for a regular expression</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>\</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>\</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle search pattern coloring</entry>
           </row>
           <row>
-            <entry><muttng-doc:key>^</muttng-doc:key></entry>
+            <entry><madmutt-doc:key>^</madmutt-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>jump to the top of the message</entry>
           </row>
         features.  For one, it will accept and translate the
         ``standard'' nroff sequences forbold and underline. These
         sequences are a series of either the letter, backspace
-        (<muttng-doc:key mod="C">H</muttng-doc:key>), the letter again for bold
-        or the letter, backspace, <muttng-doc:key>_</muttng-doc:key> for denoting
-        underline. Mutt-ng will attempt to display these in bold and
+        (<madmutt-doc:key mod="C">H</madmutt-doc:key>), the letter again for bold
+        or the letter, backspace, <madmutt-doc:key>_</madmutt-doc:key> for denoting
+        underline. Madmutt will attempt to display these in bold and
         underline respectively if your terminal supports them. If not,
-        you can use the bold and underline <muttng-doc:cmdref
+        you can use the bold and underline <madmutt-doc:cmdref
           name="color"/> objects to specify a color or mono attribute
         for them.
       </para>
       
       <para>
         Additionally, the internal pager supports the ANSI escape
-        sequences for character attributes.  Mutt-ng translates them
+        sequences for character attributes.  Madmutt translates them
         into the correct color and character settings.  The sequences
-        Mutt-ng supports are: <literal>ESC [ Ps;Ps;Ps;...;Ps
+        Madmutt supports are: <literal>ESC [ Ps;Ps;Ps;...;Ps
           m</literal> (see table below for possible values for
         <literal>Ps</literal>).
       </para>
         </para>
         
         <para>
-          Mutt-ng uses these attributes for handling text/enriched messages,
+          Madmutt uses these attributes for handling text/enriched messages,
           and they
-          can also be used by an external <muttng-doc:cmdref name="auto_view"/>
+          can also be used by an external <madmutt-doc:cmdref name="auto_view"/>
           script for highlighting purposes.  <emphasis role="bold">Note:</emphasis> If you change the colors for your
           display, for example by changing the color associated with color2 for
           your xterm, then that color will be used instead of green.
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:key mod="C">D</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="delete-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">D</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-thread"/></entry>
                 <entry>delete all messages in the current  thread</entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="undelete-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">U</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="undelete-thread"/></entry>
                 <entry>undelete all messages in the current thread</entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="C">N</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="next-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">N</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-thread"/></entry>
                 <entry>jump to the start of the next thread</entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="C">P</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="previous-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">P</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-thread"/></entry>
                 <entry>jump to the start of the previous thread</entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="C">R</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="read-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">R</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="read-thread"/></entry>
                 <entry>mark the current thread as read</entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="delete-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">d</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-subthread"/></entry>
                 <entry>delete all messages in the current subthread</entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="undelete-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">u</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="undelete-subthread"/></entry>
                 <entry>undelete all messages in the current subthread</entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="E">n</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="next-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">n</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-subthread"/></entry>
                 <entry>jump to the start of the next subthread</entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="E">p</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="previous-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">p</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-subthread"/></entry>
                 <entry>jump to the start of the previous subthread</entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="E">r</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="read-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">r</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="read-subthread"/></entry>
                 <entry>mark the current subthread as read </entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="E">t</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="tag-thread"/></entry>
+              <entry><madmutt-doc:key mod="E">t</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="tag-thread"/></entry>
                 <entry>toggle the tag on the current thread</entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="E">v</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="collapse-thread"/></entry>
+              <entry><madmutt-doc:key mod="E">v</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="collapse-thread"/></entry>
                 <entry>toggle collapse for the current thread</entry>
               </row>
             <row>
-              <entry><muttng-doc:key mod="E">V</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="collapse-all"/></entry>
+              <entry><madmutt-doc:key mod="E">V</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="collapse-all"/></entry>
                 <entry>toggle collapse for all threads</entry>
               </row>
             <row>
-              <entry><muttng-doc:key>P</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="parent-message"/></entry>
+              <entry><madmutt-doc:key>P</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="parent-message"/></entry>
                 <entry>jump to parent message in thread</entry>
               </row>
           </tbody>
           in the thread and hides the others. This is useful when threads
           contain so many messages that you can only see a handful of threads
           onthe screen. See <literal>%M</literal> in
-          <muttng-doc:varref name="index-format"/>.
+          <madmutt-doc:varref name="index-format"/>.
         </para>
 
         <para>
           For example, you could use
-          <literal>%?M?(#%03M)&amp;(%4l)?</literal> in <muttng-doc:varref name="index-format"/>
+          <literal>%?M?(#%03M)&amp;(%4l)?</literal> in <madmutt-doc:varref name="index-format"/>
           to optionally
           display the number of hidden messages if the thread is collapsed.
         </para>
         
         <para>
-          See also the <muttng-doc:varref name="strict-threads"/> variable.
+          See also the <madmutt-doc:varref name="strict-threads"/> variable.
         </para>
         
       </sect2>
         <title>Miscellaneous Functions</title>
         
         <para>
-          <muttng-doc:funcdef name="create-alias"><muttng-doc:key>a</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="create-alias"><madmutt-doc:key>a</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
           Creates a new alias based upon the current message (or prompts for a
-          new one).  Once editing is complete, an <muttng-doc:cmdref name="alias"/>
-          command is added to the file specified by the <muttng-doc:varref name="alias-file"/>
+          new one).  Once editing is complete, an <madmutt-doc:cmdref name="alias"/>
+          command is added to the file specified by the <madmutt-doc:varref name="alias-file"/>
           variable for future use. <emphasis role="bold">Note:</emphasis>
-          Specifying an <muttng-doc:varref name="alias-file"/>
-          does not add the aliases specified there-in, you must also <muttng-doc:cmdref name="source"/>
+          Specifying an <madmutt-doc:varref name="alias-file"/>
+          does not add the aliases specified there-in, you must also <madmutt-doc:cmdref name="source"/>
           the file.
         </para>
         
         <para>
-          <muttng-doc:funcdef name="check-traditional-pgp"><muttng-doc:key mod="E">P</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="check-traditional-pgp"><madmutt-doc:key mod="E">P</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
           encrypted with PGP the "traditional" 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
-          is similar to the <muttng-doc:funcref name="edit-type"/>
+          is similar to the <madmutt-doc:funcref name="edit-type"/>
           function's
           effect.
         </para>
         
         <para>
-          <muttng-doc:funcdef name="display-toggle-weed"><muttng-doc:key>h</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="display-toggle-weed"><madmutt-doc:key>h</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
-          Toggles the weeding of message header fields specified by <muttng-doc:cmdref name="ignore"/>
+          Toggles the weeding of message header fields specified by <madmutt-doc:cmdref name="ignore"/>
           commands.
         </para>
         
         <para>
-          <muttng-doc:funcdef name="edit"><muttng-doc:key>e</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="edit"><madmutt-doc:key>e</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="edit-type"/>
-          (default: <muttng-doc:key mod="C">E</muttng-doc:key> on the attachment menu, and in the pager and index
-          menus; <muttng-doc:key mod="C">T</muttng-doc:key> on the compose menu)
+          <madmutt-doc:funcdef name="edit-type"/>
+          (default: <madmutt-doc:key mod="C">E</madmutt-doc:key> on the attachment menu, and in the pager and index
+          menus; <madmutt-doc:key mod="C">T</madmutt-doc:key> on the compose menu)
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="enter-command"><muttng-doc:key>:</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="enter-command"><madmutt-doc:key>:</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
           a
           configuration file.  A common use is to check the settings of
           variables, or
-          in conjunction with <muttng-doc:cmdref name="macro"/> to change
+          in conjunction with <madmutt-doc:cmdref name="macro"/> to change
           settings on the
           fly.
         </para>
         
         <para>
-          <muttng-doc:funcdef name="extract-keys"><muttng-doc:key mod="C">K</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="extract-keys"><madmutt-doc:key mod="C">K</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="forget-passphrase"><muttng-doc:key mod="C">F</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="forget-passphrase"><madmutt-doc:key mod="C">F</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="list-reply"><muttng-doc:key>L</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="list-reply"><madmutt-doc:key>L</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
           Reply to the current or tagged message(s) by extracting any addresses
           which
-          match the regular expressions given by the <muttng-doc:cmdref name="lists"/>
+          match the regular expressions given by the <madmutt-doc:cmdref name="lists"/>
           commands, but also honor any <literal>Mail-Followup-To</literal>
           header(s) if the
-          <muttng-doc:varref name="honor-followup-to"/>
+          <madmutt-doc:varref name="honor-followup-to"/>
           configuration variable is set.  Using this when replying to messages
           posted
           to mailing lists helps avoid duplicate copies being sent to the
         </para>
         
         <para>
-          <muttng-doc:funcdef name="pipe-message" default="|"/>
+          <madmutt-doc:funcdef name="pipe-message" default="|"/>
         </para>
         
         <para>
           Asks for an external Unix command and pipes the current or
           tagged message(s) to it. The variables
-          <muttng-doc:varref name="pipe-decode"/>,
-          <muttng-doc:varref name="pipe-split"/>,
-          <muttng-doc:varref name="pipe-decode"/> and
-          <muttng-doc:varref name="wait-key"/> 
+          <madmutt-doc:varref name="pipe-decode"/>,
+          <madmutt-doc:varref name="pipe-split"/>,
+          <madmutt-doc:varref name="pipe-decode"/> and
+          <madmutt-doc:varref name="wait-key"/> 
           control the exact behavior of this function.
         </para>
         
         <para>
-          <muttng-doc:funcdef name="resend-message"><muttng-doc:key mod="E">e</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="resend-message"><madmutt-doc:key mod="E">e</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
           folders".  It can conveniently be used to forward MIME messages while
           preserving the original mail structure. Note that the amount of
           headers
-          included here depends on the value of the <muttng-doc:varref name="weed"/>
+          included here depends on the value of the <madmutt-doc:varref name="weed"/>
           variable.
         </para>
         
         </para>
         
         <para>
-          <muttng-doc:funcdef name="shell-escape"><muttng-doc:key>!</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="shell-escape"><madmutt-doc:key>!</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
           Asks for an external Unix command and executes it.  The
-          <muttng-doc:varref name="wait-key"/>
+          <madmutt-doc:varref name="wait-key"/>
           can be used to control
-          whether Mutt-ng will wait for a key to be pressed when the command
+          whether Madmutt 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>
-          <muttng-doc:funcdef name="toggle-quoted"><muttng-doc:key>T</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="toggle-quoted"><madmutt-doc:key>T</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
           The <emphasis>pager</emphasis> uses the
-          <muttng-doc:varref name="quote-regexp"/>
+          <madmutt-doc:varref name="quote-regexp"/>
           variable to detect quoted text when
           displaying the body of the message.  This function toggles the
           displayof the quoted material in the message.  It is particularly
         </para>
         
         <para>
-          <muttng-doc:funcdef name="skip-quoted"><muttng-doc:key>S</muttng-doc:key></muttng-doc:funcdef>
+          <madmutt-doc:funcdef name="skip-quoted"><madmutt-doc:key>S</madmutt-doc:key></madmutt-doc:funcdef>
         </para>
         
         <para>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:key>m</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="compose"/></entry>
+              <entry><madmutt-doc:key>m</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="compose"/></entry>
               <entry>compose a new message</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>r</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="reply"/></entry>
+              <entry><madmutt-doc:key>r</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="reply"/></entry>
               <entry>reply to sender</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>g</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="group-reply"/></entry>
+              <entry><madmutt-doc:key>g</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="group-reply"/></entry>
               <entry>reply to all recipients</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>L</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="list-reply"/></entry>
+              <entry><madmutt-doc:key>L</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="list-reply"/></entry>
               <entry>reply to mailing list address</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>f</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="forward"/></entry>
+              <entry><madmutt-doc:key>f</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="forward"/></entry>
               <entry>forward message</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>b</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="bounce"/></entry>
+              <entry><madmutt-doc:key>b</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="bounce"/></entry>
               <entry>bounce (remail) message</entry>
             </row>
             <row>
-              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="mail-key"/></entry>
+              <entry><madmutt-doc:key mod="E">k</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="mail-key"/></entry>
               <entry>mail a PGP public key to someone</entry>
             </row>
           </tbody>
         <title>Composing new messages</title>
         
         <para>
-          When you want to send an email using mutt-ng, simply press <muttng-doc:key>m</muttng-doc:key> on
-          your keyboard. Then, mutt-ng asks for the recipient via a prompt in
+          When you want to send an email using Madmutt, simply press <madmutt-doc:key>m</madmutt-doc:key> on
+          your keyboard. Then, Madmutt asks for the recipient via a prompt in
           the last line:
         </para>
         
         <para>
           
-          <muttng-doc:lstmail>
-To:</muttng-doc:lstmail>
+          <madmutt-doc:lstmail>
+To:</madmutt-doc:lstmail>
           
         </para>
         
         <para>
           After you've finished entering the recipient(s), press return. If you
           want to send an email to more than one recipient, separate the email
-          addresses using the comma "<literal>,</literal>". Mutt-ng then asks
+          addresses using the comma "<literal>,</literal>". Madmutt then asks
           you for the email
           subject. Again, press return after you've entered it. After that,
-          mutt-ng
+          Madmutt
           got the most important information from you, and starts up an editor
           where you can then enter your email.
         </para>
         
         <para>
           The editor that is called is selected in the following way: you
-          can e.g. set it in the mutt-ng configuration:
+          can e.g. set it in the Madmutt configuration:
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
 set editor = "vim +/^$/ -c ':set tw=72'"
 set editor = "nano"
-set editor = "emacs"</muttng-doc:lstconf>
+set editor = "emacs"</madmutt-doc:lstconf>
           
         </para>
         
         <para>
-          If you don't set your preferred editor in your configuration, mutt-ng
-          first looks whether the environment variable <muttng-doc:envvar name="VISUAL"/> is set, and if
+          If you don't set your preferred editor in your configuration, Madmutt
+          first looks whether the environment variable <madmutt-doc:envvar name="VISUAL"/> is set, and if
           so, it takes its value as editor command. Otherwise, it has a look
-          at <muttng-doc:envvar name="EDITOR"/> and takes its value if it is set. If no
+          at <madmutt-doc:envvar name="EDITOR"/> and takes its value if it is set. If no
           editor command
-          can be found, mutt-ng simply assumes <muttng-doc:man name="vi"/> to be the
+          can be found, Madmutt simply assumes <madmutt-doc:man name="vi"/> to be the
           default editor,
           since it's the most widespread editor in the Unix world and it's
           pretty
@@ -1971,7 +1971,7 @@ set editor = "emacs"</muttng-doc:lstconf>
         
         <para>
           When you've finished entering your message, save it and quit your 
-          editor. Mutt-ng will then present you with a summary screen, the
+          editor. Madmutt will then present you with a summary screen, the
           compose menu. 
           On the top, you see a summary of the most important available key
           commands.
@@ -1989,13 +1989,13 @@ set editor = "emacs"</muttng-doc:lstconf>
         </para>
         
         <para>
-          At this point, you can add more attachments, pressing <muttng-doc:key>a</muttng-doc:key>, you
-          can edit the recipient addresses, pressing <muttng-doc:key>t</muttng-doc:key> for
+          At this point, you can add more attachments, pressing <madmutt-doc:key>a</madmutt-doc:key>, you
+          can edit the recipient addresses, pressing <madmutt-doc:key>t</madmutt-doc:key> for
           the "To:" field,
-          <muttng-doc:key>c</muttng-doc:key> for the "Cc:" field, and <muttng-doc:key>b</muttng-doc:key>
+          <madmutt-doc:key>c</madmutt-doc:key> for the "Cc:" field, and <madmutt-doc:key>b</madmutt-doc:key>
           for the "Bcc: field. You can
-          also edit the subject the subject by simply pressing <muttng-doc:key>s</muttng-doc:key> or the
-          email message that you've entered before by pressing <muttng-doc:key>e</muttng-doc:key>. You will
+          also edit the subject the subject by simply pressing <madmutt-doc:key>s</madmutt-doc:key> or the
+          email message that you've entered before by pressing <madmutt-doc:key>e</madmutt-doc:key>. You will
           then again return to the editor. You can even edit the sender, by
           pressing
           <literal>&lt;esc&gt;f</literal>, but this shall only be used with
@@ -2003,15 +2003,15 @@ set editor = "emacs"</muttng-doc:lstconf>
         </para>
         
         <para>
-          Alternatively, you can configure mutt-ng in a way that most of the
+          Alternatively, you can configure Madmutt in a way that most of the
           above settings can be edited using the editor. Therefore, you only
           need to add the following to your configuration:
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
-set edit_headers</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set edit_headers</madmutt-doc:lstconf>
           
         </para>
         
@@ -2035,103 +2035,103 @@ set edit_headers</muttng-doc:lstconf>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:key>a</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="attach-file"/></entry>
+              <entry><madmutt-doc:key>a</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="attach-file"/></entry>
               <entry>attach a file</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>A</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="attach-message"/></entry>
+              <entry><madmutt-doc:key>A</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="attach-message"/></entry>
               <entry>attach message(s) to the message</entry>
             </row>
             <row>
-              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="attach-key"/></entry>
+              <entry><madmutt-doc:key mod="E">k</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="attach-key"/></entry>
               <entry>attach a PGP public key</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>d</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="edit-description"/></entry>
+              <entry><madmutt-doc:key>d</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-description"/></entry>
               <entry>edit description on attachment</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>D</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="detach-file"/></entry>
+              <entry><madmutt-doc:key>D</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="detach-file"/></entry>
               <entry>detach a file</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>t</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="edit-to"/></entry>
+              <entry><madmutt-doc:key>t</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-to"/></entry>
               <entry>edit the To field</entry>
             </row>
             <row>
-              <entry><muttng-doc:key mod="E">f</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="edit-from"/></entry>
+              <entry><madmutt-doc:key mod="E">f</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-from"/></entry>
               <entry>edit the From field</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>r</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="edit-reply-to"/></entry>
+              <entry><madmutt-doc:key>r</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-reply-to"/></entry>
               <entry>edit the Reply-To field</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>c</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="edit-cc"/></entry>
+              <entry><madmutt-doc:key>c</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-cc"/></entry>
               <entry>edit the Cc field</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>b</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="edit-bcc"/></entry>
+              <entry><madmutt-doc:key>b</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-bcc"/></entry>
               <entry>edit the Bcc field</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>y</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="send-message"/></entry>
+              <entry><madmutt-doc:key>y</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="send-message"/></entry>
               <entry>send the message</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>s</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="edit-subject"/></entry>
+              <entry><madmutt-doc:key>s</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-subject"/></entry>
               <entry>edit the Subject</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>S</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="smime-menu"/></entry>
+              <entry><madmutt-doc:key>S</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="smime-menu"/></entry>
               <entry>select S/MIME options</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>f</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="edit-fcc"/></entry>
+              <entry><madmutt-doc:key>f</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-fcc"/></entry>
               <entry>specify an ``Fcc'' mailbox</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>p</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="pgp-menu"/></entry>
+              <entry><madmutt-doc:key>p</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="pgp-menu"/></entry>
               <entry>select PGP options</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>P</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="postpone-message"/></entry>
+              <entry><madmutt-doc:key>P</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="postpone-message"/></entry>
               <entry>postpone this message until later</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>q</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="quit"/></entry>
+              <entry><madmutt-doc:key>q</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="quit"/></entry>
               <entry>quit (abort) sending the message</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>w</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="write-fcc"/></entry>
+              <entry><madmutt-doc:key>w</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="write-fcc"/></entry>
               <entry>write the message to a folder</entry>
             </row>
             <row>
-              <entry><muttng-doc:key>i</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="ispell"/></entry>
+              <entry><madmutt-doc:key>i</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="ispell"/></entry>
               <entry>check spelling (if available on your system)</entry>
             </row>
             <row>
-              <entry><muttng-doc:key mod="C">F</muttng-doc:key></entry>
-              <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
+              <entry><madmutt-doc:key mod="C">F</madmutt-doc:key></entry>
+              <entry><madmutt-doc:funcref name="forget-passphrase"/></entry>
               <entry>wipe passphrase(s) from memory</entry>
             </row>
           </tbody>
@@ -2148,7 +2148,7 @@ set edit_headers</muttng-doc:lstconf>
           certainoperations like composing a new mail, replying, forwarding,
           etc. are
           not permitted when you are in that folder. The <literal>%r</literal>
-          in <muttng-doc:varref name="status-format"/>
+          in <madmutt-doc:varref name="status-format"/>
           will change to
           a 'A' to indicate that you are in attach-message mode.
         </para>
@@ -2167,22 +2167,22 @@ set edit_headers</muttng-doc:lstconf>
           
           <para>
             When you want to reply to an email message, select it in the index
-            menu and then press <muttng-doc:key>r</muttng-doc:key>. Mutt-ng's behaviour is
+            menu and then press <madmutt-doc:key>r</madmutt-doc:key>. Madmutt's behaviour is
             then similar to the 
             behaviour when you compose a message: first, you will be asked for
-            the recipient, then for the subject, and then, mutt-ng will start
+            the recipient, then for the subject, and then, Madmutt will start
             the editor with the quote attribution and the quoted message. This
             can e.g. look like the example below.
           </para>
           
           <para>
             
-            <muttng-doc:lstmail>
+            <madmutt-doc:lstmail>
 On Mon, Mar 07, 2005 at 05:02:12PM +0100, Michael Svensson wrote:
 &gt; Bill, can you please send last month's progress report to Mr. 
 &gt; Morgan? We also urgently need the cost estimation for the new 
 &gt; production server that we want to set up before our customer's 
-&gt; project will go live.</muttng-doc:lstmail>
+&gt; project will go live.</madmutt-doc:lstmail>
             
           </para>
           
@@ -2199,28 +2199,28 @@ On Mon, Mar 07, 2005 at 05:02:12PM +0100, Michael Svensson wrote:
           <para>
             The quote attribution is configurable, by default it is set to
             
-            <muttng-doc:lstconf>
-set attribution = "On %d, %n wrote:"</muttng-doc:lstconf>
+            <madmutt-doc:lstconf>
+set attribution = "On %d, %n wrote:"</madmutt-doc:lstconf>
             
           </para>
           
           <para>
             It can also be set to something more compact, e.g.
             
-            <muttng-doc:lstconf>
-set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</muttng-doc:lstconf>
+            <madmutt-doc:lstconf>
+set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</madmutt-doc:lstconf>
             
           </para>
           
           <para>
             The example above results in the following attribution:
             
-            <muttng-doc:lstmail>
+            <madmutt-doc:lstmail>
 * Michael Svensson &lt;svensson@foobar.com&gt; [05-03-06 17:02]:
 &gt; Bill, can you please send last month's progress report to Mr. 
 &gt; Morgan? We also urgently need the cost estimation for the new 
 &gt; production server that we want to set up before our customer's 
-&gt; project will go live.</muttng-doc:lstmail>
+&gt; project will go live.</madmutt-doc:lstmail>
             
           </para>
           
@@ -2252,8 +2252,8 @@ set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</muttng-do
             In the situation where a group of people uses email as a
             discussion, most of the emails will have one or more recipients,
             and probably several "Cc:" recipients. The group reply
-            functionalityensures that when you press <muttng-doc:key>g</muttng-doc:key>
-            instead of <muttng-doc:key>r</muttng-doc:key> to do a reply,
+            functionalityensures that when you press <madmutt-doc:key>g</madmutt-doc:key>
+            instead of <madmutt-doc:key>r</madmutt-doc:key> to do a reply,
             each and every recipient that is contained in the original message
             will receive a copy of the message, either as normal recipient or
             as "Cc:" recipient.
@@ -2271,16 +2271,16 @@ set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</muttng-do
           <para>
             When you use mailing lists, it's generally better to send your
             reply to a message only to the list instead of the list and the
-            original author. To make this easy to use, mutt-ng features list
+            original author. To make this easy to use, Madmutt features list
             replies.
           </para>
           
           <para>
-            To do a list reply, simply press <muttng-doc:key>L</muttng-doc:key>. If the email
+            To do a list reply, simply press <madmutt-doc:key>L</madmutt-doc:key>. If the email
             contains
             a <literal>Mail-Followup-To:</literal> header, its value will be
             used as reply
-            address. Otherwise, mutt-ng searches through all mail addresses in
+            address. Otherwise, Madmutt searches through all mail addresses in
             the original message and tries to match them a list of regular
             expressions which can be specified using the <literal>lists</literal> command. 
             If any of the regular expression matches, a mailing
@@ -2289,8 +2289,8 @@ set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</muttng-do
           
           <para>
             
-            <muttng-doc:lstconf>
-lists linuxevent@luga\.at vuln-dev@ mutt-ng-users@</muttng-doc:lstconf>
+            <madmutt-doc:lstconf>
+lists linuxevent@luga\.at vuln-dev@ Madmutt-users@</madmutt-doc:lstconf>
             
           </para>
           
@@ -2327,7 +2327,7 @@ lists linuxevent@luga\.at vuln-dev@ mutt-ng-users@</muttng-doc:lstconf>
           
           <literal>Fcc:</literal> <emphasis>filename</emphasis>
           
-          Mutt-ng will pick up <emphasis>filename</emphasis>
+          Madmutt will pick up <emphasis>filename</emphasis>
           just as if you had used the <emphasis>edit-fcc</emphasis> function in
           the <emphasis>compose</emphasis> menu.
         </para>
@@ -2335,8 +2335,8 @@ lists linuxevent@luga\.at vuln-dev@ mutt-ng-users@</muttng-doc:lstconf>
         <para>
           You can also attach files to your message by specifying
 
-          <muttng-doc:lstmail>
-Attach: filename [description]</muttng-doc:lstmail>
+          <madmutt-doc:lstmail>
+Attach: filename [description]</madmutt-doc:lstmail>
 
           where <emphasis>filename</emphasis> is the file to attach and <emphasis>
             description
@@ -2347,13 +2347,13 @@ Attach: filename [description]</muttng-doc:lstmail>
         
         <para>
           When replying to messages, if you remove the <emphasis>In-Reply-To:</emphasis> field from
-          the header field, Mutt-ng will not generate a <emphasis>References:</emphasis> field, which
+          the header field, Madmutt will not generate a <emphasis>References:</emphasis> field, which
           allows you to create a new message thread.
         </para>
         
         <para>
-          Also see the <muttng-doc:varref name="edit-headers"/> and
-          <muttng-doc:varref name="editor-headers"/> variables
+          Also see the <madmutt-doc:varref name="edit-headers"/> and
+          <madmutt-doc:varref name="editor-headers"/> variables
         </para>
         
         <para>
@@ -2363,24 +2363,24 @@ Attach: filename [description]</muttng-doc:lstmail>
       </sect2>
       
       <sect2 id="sending-crypto">
-        <title>Using Mutt-ng with PGP</title>
+        <title>Using Madmutt with PGP</title>
         
         <para>
           If you want to use PGP, you can specify 
         
-          <muttng-doc:lstmail>
-Pgp: [E | S | S id]</muttng-doc:lstmail>
+          <madmutt-doc:lstmail>
+Pgp: [E | S | S id]</madmutt-doc:lstmail>
 
           ``E'' encrypts, ``S'' signs and
           ``S&lt;id&gt;'' signs with the given key, setting
-          <muttng-doc:varref name="pgp-sign-as"/>
+          <madmutt-doc:varref name="pgp-sign-as"/>
           permanently.
         </para>
         
         <para>
           If you have told mutt to PGP encrypt a message, it will guide you
           through a key selection process when you try to send the message.
-          Mutt-ng will not ask you any questions about keys which have a
+          Madmutt will not ask you any questions about keys which have a
           certified user ID matching one of the message recipients' mail
           addresses.  However, there may be situations in which there are
           several keys, weakly certified user ID fields, or where no matching
@@ -2391,7 +2391,7 @@ Pgp: [E | S | S id]</muttng-doc:lstmail>
           In these cases, you are dropped into a menu with a list of keys from
           which you can select one.  When you quit this menu, or mutt can't
           find any matching keys, you are prompted for a user ID.  You can, as
-          usually, abort this prompt using <muttng-doc:key mod="C">G</muttng-doc:key>.  When
+          usually, abort this prompt using <madmutt-doc:key mod="C">G</madmutt-doc:key>.  When
           you do so, mutt will
           return to the compose screen.
         </para>
@@ -2403,7 +2403,7 @@ Pgp: [E | S | S id]</muttng-doc:lstmail>
         
         <para>
           Most fields of the entries in the key selection menu (see also 
-          <muttng-doc:varref name="pgp-entry-format"/>)
+          <madmutt-doc:varref name="pgp-entry-format"/>)
           have obvious meanings.  But some explanations on the capabilities,
           flags, 
           and validity fields are in order.
@@ -2509,7 +2509,7 @@ Pgp: [E | S | S id]</muttng-doc:lstmail>
         <para>
           To use it, you'll have to obey certain restrictions.  Most
           important, you cannot use the <literal>Cc</literal> and <literal>Bcc</literal> headers.  To tell
-          Mutt-ng to use mixmaster, you have to select a remailer chain, using
+          Madmutt to use mixmaster, you have to select a remailer chain, using
           the mix function on the compose menu.  
         </para>
         
@@ -2524,7 +2524,7 @@ Pgp: [E | S | S id]</muttng-doc:lstmail>
           and
           <literal>chain-next</literal> functions, which are by default bound
           to the left
-          and right arrows and to the <muttng-doc:key>h</muttng-doc:key> and <muttng-doc:key>l</muttng-doc:key> keys (think vi
+          and right arrows and to the <madmutt-doc:key>h</madmutt-doc:key> and <madmutt-doc:key>l</madmutt-doc:key> keys (think vi
           keyboard bindings).  To insert a remailer at the current chain
           position, use the <literal>insert</literal> function.  To append a
           remailer behind
@@ -2543,7 +2543,7 @@ Pgp: [E | S | S id]</muttng-doc:lstmail>
         <para>
           Note that different remailers do have different capabilities,
           indicated in the <literal>%c</literal> entry of the remailer menu lines (see
-          <muttng-doc:varref name="mix-entry-format"/>).
+          <madmutt-doc:varref name="mix-entry-format"/>).
           Most important is
           the ``middleman'' capability, indicated by a capital ``M'': This
           means that the remailer in question cannot be used as the final
@@ -2569,13 +2569,13 @@ Pgp: [E | S | S id]</muttng-doc:lstmail>
       
       <para>
         Often, it is necessary to forward mails to other people.
-        Therefore, mutt-ng supports forwarding messages in two different
+        Therefore, Madmutt supports forwarding messages in two different
         ways.
       </para>
       
       <para>
         The first one is regular forwarding, as you probably know it from
-        other mail clients. You simply press <muttng-doc:key>f</muttng-doc:key>, enter the
+        other mail clients. You simply press <madmutt-doc:key>f</madmutt-doc:key>, enter the
         recipient
         email address, the subject of the forwarded email, and then you can
         edit the message to be forwarded in the editor. The forwarded
@@ -2585,7 +2585,7 @@ Pgp: [E | S | S id]</muttng-doc:lstmail>
       
       <para>
         
-        <muttng-doc:lstmail>
+        <madmutt-doc:lstmail>
 ----- Forwarded message from Lucas User &lt;luser@example.com&gt; -----
 
 From: Lucas User &lt;luser@example.com&gt;
@@ -2596,7 +2596,7 @@ Subject: Re: blackmail
 Pay me EUR 50,000.- cash or your favorite stuffed animal will die
 a horrible death.
 
------ End forwarded message -----</muttng-doc:lstmail>
+----- End forwarded message -----</madmutt-doc:lstmail>
         
       </para>
       
@@ -2607,12 +2607,12 @@ a horrible death.
       </para>
       
       <para>
-        The second mode of forwarding emails with mutt-ng is the
+        The second mode of forwarding emails with Madmutt is the
         so-called <emphasis>bouncing</emphasis>: when you bounce an email to
         another
         address, it will be sent in practically the same format you send it
         (except for headers that are created during transporting the
-        message). To bounce a message, press <muttng-doc:key>b</muttng-doc:key> and enter the
+        message). To bounce a message, press <madmutt-doc:key>b</madmutt-doc:key> and enter the
         recipient
         email address. By default, you are then asked whether you really
         want to bounce the message to the specified recipient. If you answer
@@ -2643,8 +2643,8 @@ a horrible death.
         used in the <emphasis>compose</emphasis> menu, the body of your message
         and attachments
         are stored in the mailbox specified by the
-        <muttng-doc:varref name="postponed"/> variable.  This means that you can recall the
-        message even if you exit Mutt-ng and then restart it at a later time.
+        <madmutt-doc:varref name="postponed"/> variable.  This means that you can recall the
+        message even if you exit Madmutt and then restart it at a later time.
       </para>
       
       <para>
@@ -2667,7 +2667,7 @@ a horrible death.
       </para>
       
       <para>
-        See also the <muttng-doc:varref name="postpone"/> quad-option.
+        See also the <madmutt-doc:varref name="postpone"/> quad-option.
       </para>
       
       <para>
@@ -2692,39 +2692,39 @@ a horrible death.
       <title>Locations of Configuration Files</title>
       
       <para>
-        While the default configuration (or ``preferences'') make Mutt-ng
+        While the default configuration (or ``preferences'') make Madmutt
         usable right out
-        of the box, it is often desirable to tailor Mutt-ng to suit your own
+        of the box, it is often desirable to tailor Madmutt to suit your own
         tastes. When
-        Mutt-ng is first invoked, it will attempt to read the ``system''
+        Madmutt 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">commandline</link> option is
         specified.  This file is
-        typically <literal>/usr/local/share/muttng/Muttngrc</literal> or <literal>
-          /etc/Muttngrc
+        typically <literal>/usr/local/share/madmutt/madmuttrc</literal> or <literal>
+          /etc/madmuttrc
         </literal>
         ,
-        Mutt-ng users will find this file in <literal>
-          /usr/local/share/muttng/Muttrc
+        Madmutt users will find this file in <literal>
+          /usr/local/share/madmutt/Muttrc
         </literal>
         or
-        <literal>/etc/Muttngrc</literal>. Mutt will next look for a file named <literal>
+        <literal>/etc/madmuttrc</literal>. Mutt will next look for a file named <literal>
           .muttrc
         </literal>
-        in your home directory, Mutt-ng will look for <literal>.muttngrc</literal>.  If this file
+        in your home directory, Madmutt will look for <literal>.madmuttrc</literal>.  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>.muttng/muttngrc</literal>. 
+        mutt try to load a file named <literal>.madmutt/madmuttrc</literal>. 
       </para>
       
       <para>
-        <literal>.muttrc</literal> (or <literal>.muttngrc</literal> for
-        Mutt-ng) is the file where you will
+        <literal>.muttrc</literal> (or <literal>.madmuttrc</literal> for
+        Madmutt) is the file where you will
         usually place your <link linkend="commands">commands</link> to
-        configure Mutt-ng.
+        configure Madmutt.
       </para>
       
       <para>
@@ -2741,8 +2741,8 @@ a horrible death.
         When multiple commands are used, they must be separated by a semicolon
         (;).
         
-        <muttng-doc:lstconf>
-set realname='Mutt-ng user' ; ignore x-</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+set realname='Madmutt user' ; ignore x-</madmutt-doc:lstconf>
         
         The hash mark, or pound sign
         (``#''), is used as a ``comment'' character. You can use it to
@@ -2752,8 +2752,8 @@ set realname='Mutt-ng user' ; ignore x-</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
-my_hdr X-Disclaimer: Why are you listening to me? # This is a comment</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+my_hdr X-Disclaimer: Why are you listening to me? # This is a comment</madmutt-doc:lstconf>
         
       </para>
       
@@ -2783,8 +2783,8 @@ my_hdr X-Disclaimer: Why are you listening to me? # This is a comment</muttng-do
         interpreted
         character.
         
-        <muttng-doc:lstconf>
-set realname="Michael \"MuttDude\" Elkins"</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+set realname="Michael \"MuttDude\" Elkins"</madmutt-doc:lstconf>
         
       </para>
       
@@ -2801,7 +2801,7 @@ set realname="Michael \"MuttDude\" Elkins"</muttng-doc:lstconf>
       </para>
       
       <para>
-        Please note that, unlike the various shells, mutt-ng interprets a
+        Please note that, unlike the various shells, Madmutt interprets a
         ``\''
         at the end of a line also in comments. This allows you to disable a
         command
@@ -2810,9 +2810,9 @@ set realname="Michael \"MuttDude\" Elkins"</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 # folder-hook . \
-set realname="Michael \"MuttDude\" Elkins"</muttng-doc:lstconf>
+set realname="Michael \"MuttDude\" Elkins"</madmutt-doc:lstconf>
         
       </para>
       
@@ -2834,12 +2834,12 @@ set realname="Michael \"MuttDude\" Elkins"</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 line1\
 line2a # line2b\
 line3\
 line4
-line5</muttng-doc:lstconf>
+line5</madmutt-doc:lstconf>
         
       </para>
       
@@ -2880,8 +2880,8 @@ line5</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-my_hdr X-Operating-System: `uname -a`</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+my_hdr X-Operating-System: `uname -a`</madmutt-doc:lstconf>
           
         </para>
         
@@ -2905,16 +2905,16 @@ my_hdr X-Operating-System: `uname -a`</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-set record=+sent_on_$HOSTNAME</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set record=+sent_on_$HOSTNAME</madmutt-doc:lstconf>
           
         </para>
         
         <para>
-          sets the <muttng-doc:varref name="record"/> variable to the
+          sets the <madmutt-doc:varref name="record"/> variable to the
           string <emphasis>+sent_on_</emphasis> and appends the
           value of the evironment
-          variable <muttng-doc:envvar name="HOSTNAME"/>.
+          variable <madmutt-doc:envvar name="HOSTNAME"/>.
         </para>
         
         <para>
@@ -2935,23 +2935,23 @@ set record=+sent_on_$HOSTNAME</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-set imap_home_namespace = $folder</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set imap_home_namespace = $folder</madmutt-doc:lstconf>
           
         </para>
         
         <para>
-          would set the value of <muttng-doc:varref name="imap-home-namespace"/>
-          to the value to which <muttng-doc:varref name="folder"/>
+          would set the value of <madmutt-doc:varref name="imap-home-namespace"/>
+          to the value to which <madmutt-doc:varref name="folder"/>
           is <emphasis>currently</emphasis> set to.
         </para>
         
         <para>
           <emphasis role="bold">Note:</emphasis> There're no logical links
           established in such cases so
-          that the the value for <muttng-doc:varref name="imap-home-namespace"/>
+          that the the value for <madmutt-doc:varref name="imap-home-namespace"/>
           won't change even
-          if <muttng-doc:varref name="folder"/> gets changed.
+          if <madmutt-doc:varref name="folder"/> gets changed.
         </para>
         
         <para>
@@ -2967,7 +2967,7 @@ set imap_home_namespace = $folder</muttng-doc:lstconf>
         <title>Self-Defined Variables</title>
         
         <para>
-          Mutt-ng flexibly allows users to define their own variables. To
+          Madmutt flexibly allows users to define their own variables. To
           avoid conflicts with the standard set and to prevent misleading
           error messages, there's a reserved namespace for them: all
           user-defined variables must be prefixed with <literal>user_</literal> and can be
@@ -2982,9 +2982,9 @@ set imap_home_namespace = $folder</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
 macro generic &lt;F1&gt; "!less -r /path/to/manual" "Show manual"
-macro pager &lt;F1&gt; "!less -r /path/to/manual" "Show manual"</muttng-doc:lstconf>
+macro pager &lt;F1&gt; "!less -r /path/to/manual" "Show manual"</madmutt-doc:lstconf>
           
         </para>
         
@@ -2998,11 +2998,11 @@ macro pager &lt;F1&gt; "!less -r /path/to/manual" "Show manual"</muttng-doc:lstc
         
         <para>
           
-          <muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
 set user_manualcmd = "!less -r /path/to_manual" 
 macro generic &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"
 macro pager &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"
-macro index &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"</muttng-doc:lstconf>
+macro index &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"</madmutt-doc:lstconf>
           
         </para>
         
@@ -3012,8 +3012,8 @@ macro index &lt;F1&gt; "$user_manualcmd&lt;enter&gt;" "Show manual"</muttng-doc:
         
         <para>
           
-          <muttng-doc:lstconf>
-macro index &lt;F2&gt; "$user_manualcmd | grep '\^[ ]\\+~. '" "Show Patterns"</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+macro index &lt;F2&gt; "$user_manualcmd | grep '\^[ ]\\+~. '" "Show Patterns"</madmutt-doc:lstconf>
           
         </para>
         
@@ -3041,9 +3041,9 @@ macro index &lt;F2&gt; "$user_manualcmd | grep '\^[ ]\\+~. '" "Show Patterns"</m
         
         <para>
           
-          <muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
 set user_foo = 42
-set user_foo = 666</muttng-doc:lstconf>
+set user_foo = 666</madmutt-doc:lstconf>
           
         </para>
         
@@ -3055,8 +3055,8 @@ set user_foo = 666</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-set ?user_foo</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set ?user_foo</madmutt-doc:lstconf>
           
         </para>
         
@@ -3066,8 +3066,8 @@ set ?user_foo</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-reset user_foo</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+reset user_foo</madmutt-doc:lstconf>
           
         </para>
         
@@ -3078,8 +3078,8 @@ reset user_foo</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-unset user_foo</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+unset user_foo</madmutt-doc:lstconf>
           
         </para>
         
@@ -3097,7 +3097,7 @@ unset user_foo</muttng-doc:lstconf>
           In order to allow users to share one setup over a number of
           different machines without having to change its contents, there's a
           number of pre-defined variables. These are prefixed with
-          <literal>muttng_</literal> and are read-only, i.e. they cannot
+          <literal>madmutt_</literal> and are read-only, i.e. they cannot
           be set, unset or
           reset. The reference chapter lists all available variables.
         </para>
@@ -3113,8 +3113,8 @@ unset user_foo</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstshell>
-$ muttng -Q muttng_docdir</muttng-doc:lstshell>
+          <madmutt-doc:lstshell>
+$ madmutt -Q madmutt_docdir</madmutt-doc:lstshell>
           
         </para>
         
@@ -3126,8 +3126,8 @@ $ muttng -Q muttng_docdir</muttng-doc:lstshell>
         
         <para>
           
-          <muttng-doc:lstconf>
-set user_manualcmd = '!less -r /path/to_manual'</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set user_manualcmd = '!less -r /path/to_manual'</madmutt-doc:lstconf>
           
         </para>
         
@@ -3137,8 +3137,8 @@ set user_manualcmd = '!less -r /path/to_manual'</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-set user_manualcmd = "!less -r $muttng_docdir/manual.txt"</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set user_manualcmd = "!less -r $madmutt_docdir/manual.txt"</madmutt-doc:lstconf>
           
         </para>
         
@@ -3147,7 +3147,7 @@ set user_manualcmd = "!less -r $muttng_docdir/manual.txt"</muttng-doc:lstconf>
         </para>
         
         <para>
-          Please note that by the type of quoting, muttng determines when
+          Please note that by the type of quoting, madmutt determines when
           to expand these values: when it finds double quotes, the value will
           be expanded during reading the setup files but when it finds single
           quotes, it'll expand it at runtime as needed.
@@ -3159,8 +3159,8 @@ set user_manualcmd = "!less -r $muttng_docdir/manual.txt"</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-folder-hook . "set user_current_folder = $muttng_folder_name"</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+folder-hook . "set user_current_folder = $madmutt_folder_name"</madmutt-doc:lstconf>
           
         </para>
         
@@ -3171,21 +3171,21 @@ folder-hook . "set user_current_folder = $muttng_folder_name"</muttng-doc:lstcon
         
         <para>
           
-          <muttng-doc:lstconf>
-folder-hook . "set user_current_folder = some_folder"</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+folder-hook . "set user_current_folder = some_folder"</madmutt-doc:lstconf>
           
         </para>
         
         <para>
           with <literal>some_folder</literal> being the name of the
-          first folder muttng
+          first folder madmutt
           opens. On the contrary,
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
-folder-hook . 'set user_current_folder = $muttng_folder_name'</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+folder-hook . 'set user_current_folder = $madmutt_folder_name'</madmutt-doc:lstconf>
           
         </para>
         
@@ -3202,8 +3202,8 @@ folder-hook . 'set user_current_folder = $muttng_folder_name'</muttng-doc:lstcon
         
         <para>
           
-          <muttng-doc:lstconf>
-folder-hook . 'source ~/.mutt/score-$muttng_folder_name'</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+folder-hook . 'source ~/.mutt/score-$madmutt_folder_name'</madmutt-doc:lstconf>
           
         </para>
         
@@ -3223,17 +3223,17 @@ folder-hook . 'source ~/.mutt/score-$muttng_folder_name'</muttng-doc:lstconf>
           operation they're converted to and from string. That means that
           there's no need to worry about types when referencing any variable.
           As an example, the following can be used without harm (besides
-          makeing muttng very likely behave strange):
+          makeing madmutt very likely behave strange):
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
 set read_inc = 100
 set folder = $read_inc
 set read_inc = $folder
 set user_magic_number = 42
-set folder = $user_magic_number</muttng-doc:lstconf>
+set folder = $user_magic_number</madmutt-doc:lstconf>
           
         </para>
         
@@ -3245,15 +3245,15 @@ set folder = $user_magic_number</muttng-doc:lstconf>
       <title>Defining/Using aliases</title>
 
       <para>
-        <muttng-doc:cmddef name="alias">
+        <madmutt-doc:cmddef name="alias">
           key address [, address,...]
-        </muttng-doc:cmddef>
+        </madmutt-doc:cmddef>
       </para>
       
       <para>
         It's usually very cumbersome to remember or type out the address of
         someone
-        you are communicating with.  Mutt-ng allows you to create ``aliases''
+        you are communicating with.  Madmutt allows you to create ``aliases''
         which map
         a short string to a full address.
       </para>
@@ -3270,38 +3270,38 @@ set folder = $user_magic_number</muttng-doc:lstconf>
       </para>
       
       <para>
-        <muttng-doc:cmddef name="unalias">
+        <madmutt-doc:cmddef name="unalias">
           [* | key ... ]
-        </muttng-doc:cmddef>
+        </madmutt-doc:cmddef>
       </para>
       
       <para>
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 alias muttdude me@cs.hmc.edu (Michael Elkins)
-alias theguys manny, moe, jack</muttng-doc:lstconf>
+alias theguys manny, moe, jack</madmutt-doc:lstconf>
         
       </para>
       
       <para>
-        Unlike other mailers, Mutt-ng doesn't require aliases to be defined
+        Unlike other mailers, Madmutt doesn't require aliases to be defined
         in a special file.  The <literal>alias</literal> command can appear
         anywhere in
-        a configuration file, as long as this file is <muttng-doc:cmdref name="source"/>.
+        a configuration file, as long as this file is <madmutt-doc:cmdref name="source"/>.
         Consequently, you can have multiple alias files, or
         you can have all aliases defined in your muttrc.
       </para>
       
       <para>
-        On the other hand, the <muttng-doc:funcref name="create-alias"/>
+        On the other hand, the <madmutt-doc:funcref name="create-alias"/>
         function can use only one file, the one pointed to by the
-        <muttng-doc:varref name="alias-file"/>
+        <madmutt-doc:varref name="alias-file"/>
         variable (which is
         <literal>~/.muttrc</literal> by default). This file is not
         special either,
-        in the sense that Mutt-ng will happily append aliases to any file, but
+        in the sense that Madmutt will happily append aliases to any file, but
         in
-        order for the new aliases to take effect you need to explicitly <muttng-doc:cmdref name="source"/>
+        order for the new aliases to take effect you need to explicitly <madmutt-doc:cmdref name="source"/>
         this file too.
       </para>
       
@@ -3311,10 +3311,10 @@ alias theguys manny, moe, jack</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
-source /usr/local/share/Mutt-ng.aliases
+        <madmutt-doc:lstconf>
+source /usr/local/share/Madmutt.aliases
 source ~/.mail_aliases
-set alias_file=~/.mail_aliases</muttng-doc:lstconf>
+set alias_file=~/.mail_aliases</madmutt-doc:lstconf>
         
       </para>
       
@@ -3326,7 +3326,7 @@ set alias_file=~/.mail_aliases</muttng-doc:lstconf>
         prompt.  You can
         also enter aliases in your editor at the appropriate headers if you
         have the
-        <muttng-doc:varref name="editor-headers"/>
+        <madmutt-doc:varref name="editor-headers"/>
         variable set.
       </para>
       
@@ -3361,9 +3361,9 @@ set alias_file=~/.mail_aliases</muttng-doc:lstconf>
       <title>Changing the default key bindings</title>
       
       <para>
-        <muttng-doc:cmddef name="bind">
+        <madmutt-doc:cmddef name="bind">
           map key function
-        </muttng-doc:cmddef>
+        </madmutt-doc:cmddef>
       </para>
       
       <para>
@@ -3390,7 +3390,7 @@ set alias_file=~/.mail_aliases</muttng-doc:lstconf>
                 the other
                 menus except for the pager and editor modes.  If a key is not
                 defined in
-                another menu, Mutt-ng will look for a binding to use in this
+                another menu, Madmutt will look for a binding to use in this
                 menu.  This allows
                 you to bind a key to a certain function in multiple menus
                 instead of having
@@ -3648,21 +3648,21 @@ set alias_file=~/.mail_aliases</muttng-doc:lstconf>
 
       <anchor id="iconv-hook"/>
       <para>
-        Usage: <muttng-doc:hook name="charset"/> <emphasis>alias</emphasis> <emphasis> charset</emphasis>
+        Usage: <madmutt-doc:hook name="charset"/> <emphasis>alias</emphasis> <emphasis> charset</emphasis>
       </para>
       <para>
-        Usage: <muttng-doc:hook name="iconv"/> <emphasis>charset</emphasis> <emphasis> local-charset </emphasis>
+        Usage: <madmutt-doc:hook name="iconv"/> <emphasis>charset</emphasis> <emphasis> local-charset </emphasis>
       </para>
       
       <para>
-        The <muttng-doc:hook name="charset"/> command defines an alias for a
+        The <madmutt-doc:hook name="charset"/> command defines an alias for a
         character set.
         This is useful to properly display messages which are tagged with a
         character set name not known to mutt.
       </para>
       
       <para>
-        The <muttng-doc:hook name="iconv"/> command defines a system-specific
+        The <madmutt-doc:hook name="iconv"/> command defines a system-specific
         name for a
         character set.  This is helpful when your systems character
         conversion library insists on using strange, system-specific names
@@ -3679,25 +3679,25 @@ set alias_file=~/.mail_aliases</muttng-doc:lstconf>
       <title>Setting variables based upon mailbox</title>
       
       <para>
-        Usage: <muttng-doc:hook name="folder"/> [!]<emphasis>regexp</emphasis> <emphasis>command</emphasis>
+        Usage: <madmutt-doc:hook name="folder"/> [!]<emphasis>regexp</emphasis> <emphasis>command</emphasis>
       </para>
       
       <para>
         It is often desirable to change settings based on which mailbox you are
-        reading.  The <muttng-doc:hook name="folder"/> command provides a method by which you can
+        reading.  The <madmutt-doc:hook name="folder"/> command provides a method by which you can
         execute
         any configuration command.  <emphasis>regexp</emphasis> is a regular
         expression specifying
         in which mailboxes to execute <emphasis>command</emphasis> before
         loading.  If a mailbox
-        matches multiple <muttng-doc:hook name="folder"/>'s, they are executed in the order given in
+        matches multiple <madmutt-doc:hook name="folder"/>'s, they are executed in the order given in
         the
         muttrc.
       </para>
       
       <para>
         <emphasis role="bold">Note:</emphasis> if you use the ``!'' shortcut
-        for <muttng-doc:varref name="spoolfile"/> at the beginning of the
+        for <madmutt-doc:varref name="spoolfile"/> 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.
@@ -3712,8 +3712,8 @@ set alias_file=~/.mail_aliases</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
-folder-hook mutt set sort=threads</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+folder-hook mutt set sort=threads</madmutt-doc:lstconf>
         
       </para>
       
@@ -3726,8 +3726,8 @@ folder-hook mutt set sort=threads</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
-folder-hook . set sort=date-sent</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+folder-hook . set sort=date-sent</madmutt-doc:lstconf>
         
       </para>
       
@@ -3741,9 +3741,9 @@ folder-hook . set sort=date-sent</muttng-doc:lstconf>
       <title>Keyboard macros</title>
       
       <para>
-        <muttng-doc:cmddef name="macro">
+        <madmutt-doc:cmddef name="macro">
           menu key sequence [description]
-        </muttng-doc:cmddef>
+        </madmutt-doc:cmddef>
       </para>
       
       <para>
@@ -3752,7 +3752,7 @@ folder-hook . set sort=date-sent</muttng-doc:lstconf>
         actions.  When you press <emphasis>key</emphasis> in menu <emphasis>
           menu
         </emphasis>
-        ,Mutt-ng will behave as if
+        ,Madmutt 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
@@ -3769,7 +3769,7 @@ folder-hook . set sort=date-sent</muttng-doc:lstconf>
       
       <para>
         <emphasis>key</emphasis> and <emphasis>sequence</emphasis> are
-        expanded by the same rules as the <muttng-doc:cmdref
+        expanded by the same rules as the <madmutt-doc:cmdref
           name="bind"/>.  There are some additions however.  The first
         is that control characters in <emphasis>sequence</emphasis> can
         also be specified as <literal>^x</literal>.  In order to get a
@@ -3778,7 +3778,7 @@ folder-hook . set sort=date-sent</muttng-doc:lstconf>
         invoke a function directly, you can use the format
         <emphasis>&lt;key name&gt;</emphasis> and <emphasis>&lt;function
           name&gt; </emphasis> .For a listing of key names see the
-        section on <muttng-doc:cmdref name="bind"/>.  Functions are
+        section on <madmutt-doc:cmdref name="bind"/>.  Functions are
         listed in the <link linkend="functions">functions</link>.
       </para>
       
@@ -3789,7 +3789,7 @@ folder-hook . set sort=date-sent</muttng-doc:lstconf>
         the user having particular key definitions.  This makes them more
         robustand portable, and also facilitates defining of macros in files
         used by more
-        than one user (eg. the system Muttngrc).
+        than one user (eg. the system madmuttrc).
       </para>
       
       <para>
@@ -3813,17 +3813,17 @@ folder-hook . set sort=date-sent</muttng-doc:lstconf>
       <title>Using color and mono video attributes</title>
 
       <para>
-        <muttng-doc:cmddef name="color">object foreground background [regexp]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="color">object foreground background [regexp]</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="color" noanchor="1">index foreground pattern</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="color" noanchor="1">index foreground pattern</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="uncolor">index pattern [pattern ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="uncolor">index pattern [pattern ...]</madmutt-doc:cmddef>
       </para>
       
       <para>
-        If your terminal supports color, you can spice up Mutt-ng by creating
+        If your terminal supports color, you can spice up Madmutt by creating
         your own
         color scheme.  To define the color of an object (type of information),
         you
@@ -3859,7 +3859,7 @@ folder-hook . set sort=date-sent</muttng-doc:lstconf>
           <listitem>
             
             <para>
-              error (error messages printed by Mutt-ng)
+              error (error messages printed by Madmutt)
             </para>
           </listitem>
           <listitem>
@@ -3909,7 +3909,7 @@ folder-hook . set sort=date-sent</muttng-doc:lstconf>
           <listitem>
             
             <para>
-              quoted (text matching <muttng-doc:varref name="quote-regexp"/> in the body of a message)
+              quoted (text matching <madmutt-doc:varref name="quote-regexp"/> in the body of a message)
             </para>
           </listitem>
           <listitem>
@@ -4044,18 +4044,18 @@ folder-hook . set sort=date-sent</muttng-doc:lstconf>
       <para>
         If your terminal supports it, the special keyword <emphasis>default</emphasis> can be
         used as a transparent color.  The value <emphasis>brightdefault</emphasis> is also valid.
-        If Mutt-ng is linked against the <emphasis>S-Lang</emphasis> library,
+        If Madmutt is linked against the <emphasis>S-Lang</emphasis> library,
         you also need to set
-        the <muttng-doc:envvar name="COLORFGBG"/> environment variable to the default
+        the <madmutt-doc:envvar name="COLORFGBG"/> environment variable to the default
         colors of your
         terminal for this to work; for example (for Bourne-like shells):
       </para>
       
       <para>
         
-        <muttng-doc:lstshell>
+        <madmutt-doc:lstshell>
 set COLORFGBG="green;black"
-export COLORFGBG</muttng-doc:lstshell>
+export COLORFGBG</madmutt-doc:lstshell>
         
       </para>
       
@@ -4080,7 +4080,7 @@ export COLORFGBG</muttng-doc:lstshell>
       </para>
       
       <para>
-        Mutt-ng also recognizes the keywords <emphasis>color0</emphasis>, <emphasis>
+        Madmutt also recognizes the keywords <emphasis>color0</emphasis>, <emphasis>
           color1
         </emphasis>
         ,...,
@@ -4102,13 +4102,13 @@ export COLORFGBG</muttng-doc:lstshell>
       </para>
       
       <para>
-        <muttng-doc:cmddef name="mono">object attribute [regexp]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="mono">object attribute [regexp]</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="mono" noanchor="1">index attribute pattern</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="mono" noanchor="1">index attribute pattern</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="unmono">index pattern [pattern ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unmono">index pattern [pattern ...]</madmutt-doc:cmddef>
       </para>
       
       <para>
@@ -4163,11 +4163,11 @@ export COLORFGBG</muttng-doc:lstshell>
       <title>Ignoring (weeding) unwanted message headers</title>
 
       <para>
-        <muttng-doc:cmddef name="ignore">pattern [pattern ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="ignore">pattern [pattern ...]</madmutt-doc:cmddef>
       </para>
 
       <para>
-        <muttng-doc:cmddef name="unignore">pattern [pattern ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unignore">pattern [pattern ...]</madmutt-doc:cmddef>
       </para>
  
       <para>
@@ -4188,7 +4188,7 @@ export COLORFGBG</muttng-doc:lstshell>
       <para>
         To remove a previously added token from the list, use the ``unignore''
         command.
-        The ``unignore'' command will make Mutt-ng display headers with the
+        The ``unignore'' command will make Madmutt display headers with the
         given pattern.
         For example, if you do ``ignore x-'' it is possible to ``unignore
         x-mailer''.
@@ -4201,12 +4201,12 @@ export COLORFGBG</muttng-doc:lstshell>
       <para>
         For example:
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 # Sven's draconian header weeding
 ignore *
 unignore from date subject to cc
 unignore organization organisation x-mailer: x-newsreader: x-mailing-list:
-unignore posted-to:</muttng-doc:lstconf>
+unignore posted-to:</madmutt-doc:lstconf>
         
       </para>
       
@@ -4220,11 +4220,11 @@ unignore posted-to:</muttng-doc:lstconf>
       <title>Alternative addresses</title>
       
       <para>
-        <muttng-doc:cmddef name="alternates">regexp [regexp ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="alternates">regexp [regexp ...]</madmutt-doc:cmddef>
       </para>
 
       <para>
-        <muttng-doc:cmddef name="unalternates">regexp [regexp ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unalternates">regexp [regexp ...]</madmutt-doc:cmddef>
       </para>
  
       <para>
@@ -4234,7 +4234,7 @@ unignore posted-to:</muttng-doc:lstconf>
         sent to a different party, mutt will automatically suggest to send
         the response to the original message's recipients--responding to
         yourself won't make much sense in many cases.
-        (See <muttng-doc:varref name="reply-to"/>.)
+        (See <madmutt-doc:varref name="reply-to"/>.)
       </para>
       
       <para>
@@ -4290,7 +4290,7 @@ unignore posted-to:</muttng-doc:lstconf>
         <title>Introduction</title>
         
         <para>
-          Mutt-ng contains support for so-called <literal>format=flowed</literal> messages.
+          Madmutt contains support for so-called <literal>format=flowed</literal> messages.
           In the beginning of email, each message had a fixed line width, and
           it was enough for displaying them on fixed-size terminals. But times
           changed, and nowadays hardly anybody still uses fixed-size terminals:
@@ -4305,7 +4305,7 @@ unignore posted-to:</muttng-doc:lstconf>
         <para>
           For introductory information on <literal>format=flowed</literal>
           messages, see
-          <muttng-doc:web url="http://www.joeclark.org/ffaq.html"/>.
+          <madmutt-doc:web url="http://www.joeclark.org/ffaq.html"/>.
         </para>
         
       </sect2>
@@ -4315,7 +4315,7 @@ unignore posted-to:</muttng-doc:lstconf>
         
         <para>
           When you receive emails that are marked as <literal>format=flowed</literal>
-          messages, and is formatted correctly, mutt-ng will try to reformat
+          messages, and is formatted correctly, Madmutt will try to reformat
           the message to optimally fit on your terminal. If you want a fixed
           margin on the right side of your terminal, you can set the
           following:
@@ -4323,8 +4323,8 @@ unignore posted-to:</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-set wrapmargin = 10</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set wrapmargin = 10</madmutt-doc:lstconf>
           
         </para>
         
@@ -4340,8 +4340,8 @@ set wrapmargin = 10</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-set max_line_length = 120</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set max_line_length = 120</madmutt-doc:lstconf>
           
         </para>
         
@@ -4358,24 +4358,24 @@ set max_line_length = 120</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstmail>
+          <madmutt-doc:lstmail>
 &gt;Bill, can you please send last month's progress report to Mr. 
 &gt;Morgan? We also urgently need the cost estimation for the new 
 &gt;production server that we want to set up before our customer's 
-&gt;project will go live.</muttng-doc:lstmail>
+&gt;project will go live.</madmutt-doc:lstmail>
           
         </para>
         
         <para>
           This obviously doesn't look very nice, and it makes it very
           hard to differentiate between text and quoting character. The
-          solution is to configure mutt-ng to "stuff" the quoting:
+          solution is to configure Madmutt to "stuff" the quoting:
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
-set stuff_quoted</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set stuff_quoted</madmutt-doc:lstconf>
           
         </para>
         
@@ -4385,11 +4385,11 @@ set stuff_quoted</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstmail>
+          <madmutt-doc:lstmail>
 &gt; Bill, can you please send last month's progress report to Mr. 
 &gt; Morgan? We also urgently need the cost estimation for the new 
 &gt; production server that we want to set up before our customer's
-&gt; project will go live.</muttng-doc:lstmail>
+&gt; project will go live.</madmutt-doc:lstmail>
           
         </para>
         
@@ -4399,20 +4399,20 @@ set stuff_quoted</muttng-doc:lstconf>
         <title>Sending</title>
         
         <para>
-          If you want mutt-ng to send emails with <literal>format=flowed</literal> set, you
+          If you want Madmutt to send emails with <literal>format=flowed</literal> set, you
           need to explicitly set it:
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
-set text_flowed</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set text_flowed</madmutt-doc:lstconf>
           
         </para>
         
         <para>
           Additionally, you have to use an editor which supports writing
-          <literal>format=flowed</literal>-conforming emails. For <muttng-doc:man name="vim"/>, this is
+          <literal>format=flowed</literal>-conforming emails. For <madmutt-doc:man name="vim"/>, this is
           done by
           adding <literal>w</literal> to the formatoptions (see <literal>:h
             formatoptions
@@ -4428,8 +4428,8 @@ set text_flowed</muttng-doc:lstconf>
           indented with a single space on the sending side. On the receiving
           side, the first space (if any) is removed. As a consequence and in
           addition to the above simple setting, please keep this in mind when
-          making manual formattings within the editor. Also note that mutt-ng
-          currently violates the standard (<muttng-doc:rfc num="3676"/>) as it does not
+          making manual formattings within the editor. Also note that Madmutt
+          currently violates the standard (<madmutt-doc:rfc num="3676"/>) as it does not
           space-stuff lines starting with:
         </para>
         
@@ -4458,7 +4458,7 @@ set text_flowed</muttng-doc:lstconf>
         <title>Additional Notes</title>
         
         <para>
-          For completeness, the <muttng-doc:varref name="delete-space"/> variable provides the mechanism
+          For completeness, the <madmutt-doc:varref name="delete-space"/> variable provides the mechanism
           to generate a <literal>DelSp=yes</literal> parameter on <emphasis>
             outgoing
           </emphasis>
@@ -4486,20 +4486,20 @@ set text_flowed</muttng-doc:lstconf>
       <title>Mailing lists</title>
       
       <para>
-        <muttng-doc:cmddef name="lists">regexp [regexp ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="lists">regexp [regexp ...]</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="unlists">regexp [regexp ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unlists">regexp [regexp ...]</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="subscribe">regexp [regexp ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="subscribe">regexp [regexp ...]</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="unsubscribe">regexp [regexp ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unsubscribe">regexp [regexp ...]</madmutt-doc:cmddef>
       </para>
       
       <para>
-        Mutt-ng has a few nice features for <link linkend="using-lists">using-lists</link>. 
+        Madmutt has a few nice features for <link linkend="using-lists">using-lists</link>. 
         In order to take advantage of them, you must
         specify which addresses belong to mailing lists, and which mailing
         lists you are subscribed to.  Once you have done this, the
@@ -4513,12 +4513,12 @@ set text_flowed</muttng-doc:lstconf>
         against
         receiving personal CCs of list messages.  Also note that the generation
         of the Mail-Followup-To header is controlled by the
-        <muttng-doc:varref name="followup-to"/>
+        <madmutt-doc:varref name="followup-to"/>
         configuration variable.
       </para>
       
       <para>
-        More precisely, Mutt-ng maintains lists of patterns for the addresses
+        More precisely, Madmutt 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''.
@@ -4534,10 +4534,10 @@ set text_flowed</muttng-doc:lstconf>
       
       <para>
         Specify as much of the address as you need to to remove ambiguity.  For
-        example, if you've subscribed to the Mutt-ng mailing list, you will
+        example, if you've subscribed to the Madmutt mailing list, you will
         receive mail
         addressed to <emphasis>mutt-users@mutt.org</emphasis>.  So, to tell
-        Mutt-ng that this is a
+        Madmutt that this is a
         mailing list, you could add ``lists mutt-users'' to your
         initialization file.  To tell mutt that you are subscribed to it,
         add ``subscribe mutt-users'' to your initialization file instead.
@@ -4569,7 +4569,7 @@ set text_flowed</muttng-doc:lstconf>
       <title>Using Multiple spool mailboxes</title>
       
       <para>
-        Usage: <muttng-doc:hook name="mbox"/> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+        Usage: <madmutt-doc:hook name="mbox"/> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
       </para>
       
       <para>
@@ -4602,10 +4602,10 @@ set text_flowed</muttng-doc:lstconf>
       <title>Defining mailboxes which receive mail</title>
 
       <para>
-        <muttng-doc:cmddef name="mailboxes"> [!]filename [filename ... ]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="mailboxes"> [!]filename [filename ... ]</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="unmailboxes"> [!]filename [filename ... ]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unmailboxes"> [!]filename [filename ... ]</madmutt-doc:cmddef>
       </para>
  
       <para>
@@ -4625,7 +4625,7 @@ set text_flowed</muttng-doc:lstconf>
         files
         specified by the <literal>mailboxes</literal> command, and indicate
         which contain new
-        messages.  Mutt-ng will automatically enter this mode when invoked from
+        messages.  Madmutt will automatically enter this mode when invoked from
         the
         command line with the <literal>-y</literal> option.
       </para>
@@ -4643,7 +4643,7 @@ set text_flowed</muttng-doc:lstconf>
           frm
         </literal>
         or any other
-        program which accesses the mailbox might cause Mutt-ng to never detect
+        program which accesses the mailbox might cause Madmutt 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.
@@ -4656,8 +4656,8 @@ set text_flowed</muttng-doc:lstconf>
         command are resolved when
         the command is executed, so if these names contain <link linkend="shortcuts">shortcuts</link>
         (such as ``='' and ``!''), any variable
-        definition that affect these characters (like <muttng-doc:varref name="folder"/>
-        and <muttng-doc:varref name="spoolfile"/>)
+        definition that affect these characters (like <madmutt-doc:varref name="folder"/>
+        and <madmutt-doc:varref name="spoolfile"/>)
         should be executed before the <literal>mailboxes</literal> command.
       </para>
       
@@ -4671,10 +4671,10 @@ set text_flowed</muttng-doc:lstconf>
       <title>User defined headers</title>
       
       <para>
-        <muttng-doc:cmddef name="my_hdr">string</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="my_hdr">string</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="unmy_hdr">field [field ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unmy_hdr">field [field ...]</madmutt-doc:cmddef>
       </para>
       
       <para>
@@ -4689,8 +4689,8 @@ set text_flowed</muttng-doc:lstconf>
       </para>
       
       <para>
-        <muttng-doc:lstconf>
-my_hdr Organization: A Really Big Company, Anytown, USA</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+my_hdr Organization: A Really Big Company, Anytown, USA</madmutt-doc:lstconf>
       </para>
       
       <para>
@@ -4702,13 +4702,13 @@ my_hdr Organization: A Really Big Company, Anytown, USA</muttng-doc:lstconf>
           not
         </emphasis>
         allowed between the keyword and
-        the colon (``:'').  The standard for electronic mail (<muttng-doc:rfc num="822"/>) says that
-        space is illegal there, so Mutt-ng enforces the rule.
+        the colon (``:'').  The standard for electronic mail (<madmutt-doc:rfc num="822"/>) says that
+        space is illegal there, so Madmutt enforces the rule.
       </para>
       
       <para>
         If you would like to add a header field to a single message, you should
-        either set the <muttng-doc:varref name="edit-headers"/>
+        either set the <madmutt-doc:varref name="edit-headers"/>
         variable,
         or use the <emphasis>edit-headers</emphasis> function (default: ``E'')
         in the send-menu so
@@ -4723,8 +4723,8 @@ my_hdr Organization: A Really Big Company, Anytown, USA</muttng-doc:lstconf>
       </para>
       
       <para>
-        <muttng-doc:lstconf>
-unmy_hdr to cc</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+unmy_hdr to cc</madmutt-doc:lstconf>
       </para>
       
       <para>
@@ -4737,11 +4737,11 @@ unmy_hdr to cc</muttng-doc:lstconf>
       <title>Defining the order of headers when viewing messages</title>
       
       <para>
-        <muttng-doc:cmddef name="hdr_order">header header [header ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="hdr_order">header header [header ...]</madmutt-doc:cmddef>
       </para>
 
       <para>
-        <muttng-doc:cmddef name="unhdr_order">[ * | header header ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unhdr_order">[ * | header header ...]</madmutt-doc:cmddef>
       </para>
  
       <para>
@@ -4758,8 +4758,8 @@ unmy_hdr to cc</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
-hdr_order From Date: From: To: Cc: Subject:</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+hdr_order From Date: From: To: Cc: Subject:</madmutt-doc:lstconf>
         
       </para>
       
@@ -4773,7 +4773,7 @@ hdr_order From Date: From: To: Cc: Subject:</muttng-doc:lstconf>
       <title>Specify default save filename</title>
       
       <para>
-        Usage: <muttng-doc:hook name="save"/> [!]<emphasis>pattern</emphasis> <emphasis>filename</emphasis>
+        Usage: <madmutt-doc:hook name="save"/> [!]<emphasis>pattern</emphasis> <emphasis>filename</emphasis>
       </para>
       
       <para>
@@ -4788,7 +4788,7 @@ hdr_order From Date: From: To: Cc: Subject:</muttng-doc:lstconf>
       </para>
       
       <para>
-        See <muttng-doc:hook name="pattern"/> for information on
+        See <madmutt-doc:hook name="pattern"/> for information on
         the exact format of <emphasis>pattern</emphasis>.
       </para>
       
@@ -4798,14 +4798,14 @@ hdr_order From Date: From: To: Cc: Subject:</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 save-hook me@(turing\\.)?cs\\.hmc\\.edu$ +elkins
-save-hook aol\\.com$ +spam</muttng-doc:lstconf>
+save-hook aol\\.com$ +spam</madmutt-doc:lstconf>
         
       </para>
       
       <para>
-        Also see the <muttng-doc:hook name="fcc-save"/>
+        Also see the <madmutt-doc:hook name="fcc-save"/>
         command.
       </para>
       
@@ -4819,22 +4819,22 @@ save-hook aol\\.com$ +spam</muttng-doc:lstconf>
       <title>Specify default Fcc: mailbox when composing</title>
       
       <para>
-        Usage: <muttng-doc:hook name="fcc"/> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+        Usage: <madmutt-doc:hook name="fcc"/> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
       </para>
       
       <para>
         This command is used to save outgoing mail in a mailbox other than
-        <muttng-doc:varref name="record"/>. Mutt-ng searches the initial
+        <madmutt-doc:varref name="record"/>. Madmutt searches the initial
         list of
         message recipients for the first matching <emphasis>regexp</emphasis>
         and uses <emphasis>mailbox</emphasis>
         as the default Fcc: mailbox.  If no match is found the message will be
         saved
-        to <muttng-doc:varref name="record"/> mailbox.
+        to <madmutt-doc:varref name="record"/> mailbox.
       </para>
       
       <para>
-        See <muttng-doc:hook name="pattern"/> for information on
+        See <madmutt-doc:hook name="pattern"/> for information on
         the exact format of <emphasis>pattern</emphasis>.
       </para>
       
@@ -4843,14 +4843,14 @@ save-hook aol\\.com$ +spam</muttng-doc:lstconf>
       </para>
 
       <para>
-        <muttng-doc:lstconf>
-fcc-hook [@.]aol\\.com$ +spammers</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+fcc-hook [@.]aol\\.com$ +spammers</madmutt-doc:lstconf>
       </para>
       
       <para>
         The above will save a copy of all messages going to the aol.com
         domain to the `+spammers' mailbox by default.  Also see the
-        <muttng-doc:hook name="fcc-save"/> command.
+        <madmutt-doc:hook name="fcc-save"/> command.
       </para>
       
       <para>
@@ -4863,12 +4863,12 @@ fcc-hook [@.]aol\\.com$ +spammers</muttng-doc:lstconf>
       <title>Specify default save filename and default Fcc: mailbox at once</title>
       
       <para>
-        Usage: <literal><muttng-doc:hook name="fcc-save"/></literal> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+        Usage: <literal><madmutt-doc:hook name="fcc-save"/></literal> [!]<emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
       </para>
       
       <para>
-        This command is a shortcut, equivalent to doing both a <muttng-doc:hook name="fcc"/>
-        and a <muttng-doc:hook name="save"/> with its arguments.
+        This command is a shortcut, equivalent to doing both a <madmutt-doc:hook name="fcc"/>
+        and a <madmutt-doc:hook name="save"/> with its arguments.
       </para>
       
       <para>
@@ -4883,13 +4883,13 @@ fcc-hook [@.]aol\\.com$ +spammers</muttng-doc:lstconf>
       <anchor id="reply-hook"/>
       <anchor id="send2-hook"/>
       <para>
-        Usage: <muttng-doc:hook name="reply"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
+        Usage: <madmutt-doc:hook name="reply"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
       </para>
       <para>
-        Usage: <muttng-doc:hook name="send"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
+        Usage: <madmutt-doc:hook name="send"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
       </para>
       <para>
-        Usage: <muttng-doc:hook name="send2"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
+        Usage: <madmutt-doc:hook name="send2"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
       </para>
       
       <para>
@@ -4903,42 +4903,42 @@ fcc-hook [@.]aol\\.com$ +spammers</muttng-doc:lstconf>
       </para>
       
       <para>
-        <muttng-doc:hook name="reply"/> is matched against the message you are <emphasis>
+        <madmutt-doc:hook name="reply"/> is matched against the message you are <emphasis>
           replying
         </emphasis>
         <emphasis role="bold">to</emphasis>, instead of the message you are <emphasis>
           sending
         </emphasis>
-        .<muttng-doc:hook name="send"/> is
+        .<madmutt-doc:hook name="send"/> is
         matched against all messages, both <emphasis>new</emphasis> and <emphasis>
           replies
         </emphasis>
         .<emphasis role="bold">Note:</emphasis>
-        <muttng-doc:hook name="reply"/>s are matched <emphasis role="bold">before</emphasis> the
-        <muttng-doc:hook name="send"/>, <emphasis role="bold">regardless</emphasis>
+        <madmutt-doc:hook name="reply"/>s are matched <emphasis role="bold">before</emphasis> the
+        <madmutt-doc:hook name="send"/>, <emphasis role="bold">regardless</emphasis>
         of the order specified in the users's configuration file.
       </para>
       
       <para>
-        <muttng-doc:hook name="send2"/> is matched every time a message is
+        <madmutt-doc:hook name="send2"/> is matched every time a message is
         changed, either
         by editing it, or by using the compose menu to change its recipients
-        or subject.  <muttng-doc:hook name="send2"/> is executed after <muttng-doc:hook name="send"/>
+        or subject.  <madmutt-doc:hook name="send2"/> is executed after <madmutt-doc:hook name="send"/>
         ,and
-        can, e.g., be used to set parameters such as the <muttng-doc:varref name="sendmail"/>
+        can, e.g., be used to set parameters such as the <madmutt-doc:varref name="sendmail"/>
         variable depending on the message's sender
         address.
       </para>
       
       <para>
-        For each type of <muttng-doc:hook name="send"/> or <muttng-doc:hook name="reply"/>, when multiple matches
+        For each type of <madmutt-doc:hook name="send"/> or <madmutt-doc:hook name="reply"/>, when multiple matches
         occur, commands are executed in the order they are specified in the
         muttrc
         (for that type of hook).
       </para>
       
       <para>
-        See <muttng-doc:hook name="pattern"/> for information on
+        See <madmutt-doc:hook name="pattern"/> for information on
         the exact format of <emphasis>pattern</emphasis>.
       </para>
       
@@ -4950,21 +4950,21 @@ fcc-hook [@.]aol\\.com$ +spammers</muttng-doc:lstconf>
       
       <para>
         Another typical use for this command is to change the values of the
-        <muttng-doc:varref name="attribution"/>,
-        <muttng-doc:varref name="signature"/> and <muttng-doc:varref
+        <madmutt-doc:varref name="attribution"/>,
+        <madmutt-doc:varref name="signature"/> and <madmutt-doc:varref
           name="locale"/>
         variables in order to change the language of the attributions and
         signatures based upon the recipients.
       </para>
       
       <para>
-        <emphasis role="bold">Note:</emphasis> the <muttng-doc:hook name="send"/>'s are only
+        <emphasis role="bold">Note:</emphasis> the <madmutt-doc:hook name="send"/>'s are only
         executed ONCE after getting the initial
         list of recipients.  Adding a recipient after replying or editing the
-        message will NOT cause any <muttng-doc:hook name="send"/> to be executed.  Also note that
+        message will NOT cause any <madmutt-doc:hook name="send"/> to be executed.  Also note that
         my_hdr commands which modify recipient headers, or the message's
         subject, don't have any effect on the current message when executed
-        from a <muttng-doc:hook name="send"/>.
+        from a <madmutt-doc:hook name="send"/>.
       </para>
       
       <para>
@@ -4977,7 +4977,7 @@ fcc-hook [@.]aol\\.com$ +spammers</muttng-doc:lstconf>
       <title>Change settings before formatting a message</title>
       
       <para>
-        Usage: <muttng-doc:hook name="message"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
+        Usage: <madmutt-doc:hook name="message"/> [!]<emphasis>pattern</emphasis> <emphasis>command</emphasis>
       </para>
       
       <para>
@@ -4991,16 +4991,16 @@ fcc-hook [@.]aol\\.com$ +spammers</muttng-doc:lstconf>
       </para>
       
       <para>
-        See <muttng-doc:hook name="pattern"/> for
+        See <madmutt-doc:hook name="pattern"/> for
         information on the exact format of <emphasis>pattern</emphasis>.
       </para>
       
       <para>
         Example:
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 message-hook ~A 'set pager=builtin'
-message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</muttng-doc:lstconf>
+message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</madmutt-doc:lstconf>
         
       </para>
       
@@ -5014,7 +5014,7 @@ message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</muttng-
       <title>Choosing the cryptographic key of the recipient</title>
       
       <para>
-        Usage: <muttng-doc:hook name="crypt"/> <emphasis>pattern</emphasis> <emphasis>keyid</emphasis>
+        Usage: <madmutt-doc:hook name="crypt"/> <emphasis>pattern</emphasis> <emphasis>keyid</emphasis>
       </para>
       
       <para>
@@ -5022,8 +5022,8 @@ message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</muttng-
         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-ng
-        wouldnormally use.  The <muttng-doc:hook name="crypt"/> command provides a method by which
+        or because, for some reasons, you need to override the key Madmutt
+        wouldnormally use.  The <madmutt-doc:hook name="crypt"/> 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.
@@ -5045,20 +5045,20 @@ message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</muttng-
       <title>Adding key sequences to the keyboard buffer</title>
       
       <para>
-        <muttng-doc:cmddef name="push">string</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="push">string</madmutt-doc:cmddef>
       </para>
       
       <para>
 
         This command adds the named string to the keyboard buffer. The
         string may contain control characters, key names and function
-        names like the sequence string in the <muttng-doc:cmdref name="macro"/> command. You may use it to
+        names like the sequence string in the <madmutt-doc:cmdref name="macro"/> command. You may use it to
         automatically run a sequence of commands at startup, or when
         entering certain folders. For example, the following command
         will automatically collapse all threads when entering a folder:
 
-        <muttng-doc:lstconf>
-folder-hook . 'push &lt;collapse-all&gt;'</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+folder-hook . 'push &lt;collapse-all&gt;'</madmutt-doc:lstconf>
 
       </para>
       
@@ -5072,7 +5072,7 @@ folder-hook . 'push &lt;collapse-all&gt;'</muttng-doc:lstconf>
       <title>Executing functions</title>
       
       <para>
-        <muttng-doc:cmddef name="exec">function [function ... ]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="exec">function [function ... ]</madmutt-doc:cmddef>
       </para>
       
       <para>
@@ -5091,10 +5091,10 @@ folder-hook . 'push &lt;collapse-all&gt;'</muttng-doc:lstconf>
       <title>Message Scoring</title>
       
       <para>
-        <muttng-doc:cmddef name="score">pattern value</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="score">pattern value</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="unscore">pattern [pattern ... ]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unscore">pattern [pattern ... ]</madmutt-doc:cmddef>
       </para>
       
       <para>
@@ -5102,7 +5102,7 @@ folder-hook . 'push &lt;collapse-all&gt;'</muttng-doc:lstconf>
         when you read many different mailing lists, and take part in
         discussions, it is always useful to have the important messages
         marked and the annoying messages or the ones that you aren't
-        interested in deleted. For this purpose, mutt-ng features a
+        interested in deleted. For this purpose, Madmutt features a
         mechanism called ``scoring''.
       </para>
       
@@ -5117,9 +5117,9 @@ folder-hook . 'push &lt;collapse-all&gt;'</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
-score "~f nion@muttng\.org" 50
-score "~f @sco\.com" -100</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+score "~f nion@madmutt\.org" 50
+score "~f @sco\.com" -100</madmutt-doc:lstconf>
         
       </para>
       
@@ -5131,8 +5131,8 @@ score "~f @sco\.com" -100</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
-score "~f santaclaus@northpole\.int" =666</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+score "~f santaclaus@northpole\.int" =666</madmutt-doc:lstconf>
         
       </para>
       
@@ -5182,14 +5182,14 @@ score "~f santaclaus@northpole\.int" =666</muttng-doc:lstconf>
       
       <para>
         These three thresholds can be set via the variables
-        <muttng-doc:varref name="score-threshold-read"/>,
-        <muttng-doc:varref name="score-threshold-flag"/> and
-        <muttng-doc:varref name="score-threshold-delete"/>.
+        <madmutt-doc:varref name="score-threshold-read"/>,
+        <madmutt-doc:varref name="score-threshold-flag"/> and
+        <madmutt-doc:varref name="score-threshold-delete"/>.
       </para>
       <para>
         By default,
-        <muttng-doc:varref name="score-threshold-read"/> and
-        <muttng-doc:varref name="score-threshold-delete"/> 
+        <madmutt-doc:varref name="score-threshold-read"/> and
+        <madmutt-doc:varref name="score-threshold-delete"/> 
         are set to
         <literal>-1</literal>, which means that in the default threshold
         configuration no
@@ -5201,14 +5201,14 @@ score "~f santaclaus@northpole\.int" =666</muttng-doc:lstconf>
           color
         </literal>
         command
-        and the <muttng-doc:pattern name="n"/> pattern:
+        and the <madmutt-doc:pattern name="n"/> pattern:
       </para>
       
       <para>
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 color index  black   yellow  "~n 10-"
-color index  red     yellow  "~n 100-"</muttng-doc:lstconf>
+color index  red     yellow  "~n 100-"</madmutt-doc:lstconf>
         
       </para>
       
@@ -5230,14 +5230,14 @@ color index  red     yellow  "~n 100-"</muttng-doc:lstconf>
       <title>Spam detection</title>
 
       <para>
-        <muttng-doc:cmddef name="spam">pattern format</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="spam">pattern format</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="nospam">pattern</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="nospam">pattern</madmutt-doc:cmddef>
       </para>
       
       <para>
-        Mutt-ng has generalized support for external spam-scoring filters.
+        Madmutt has generalized support for external spam-scoring filters.
         By defining your spam patterns with the <literal>spam</literal> and <literal>
           nospam
         </literal>
@@ -5248,7 +5248,7 @@ color index  red     yellow  "~n 100-"</muttng-doc:lstconf>
         mail based on its spam attributes, as determined by the external
         filter. You also can display the spam attributes in your index
         display using the <literal>%H</literal> selector in the
-        <muttng-doc:varref name="index-format"/>
+        <madmutt-doc:varref name="index-format"/>
         variable. (Tip: try <literal>%?H?[%H] ?</literal>
         to display spam tags only when they are defined for a given message.)
       </para>
@@ -5288,11 +5288,11 @@ color index  red     yellow  "~n 100-"</muttng-doc:lstconf>
         For example, suppose I use DCC, SpamAssassin, and PureMessage. I might
         define these spam settings:
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 spam "X-DCC-.*-Metrics:.*(....)=many"         "90+/DCC-%1"
 spam "X-Spam-Status: Yes"                     "90+/SA"
 spam "X-PerlMX-Spam: .*Probability=([0-9]+)%" "%1/PM"
-set spam_separator=", "</muttng-doc:lstconf>
+set spam_separator=", "</madmutt-doc:lstconf>
         
       </para>
       
@@ -5318,7 +5318,7 @@ set spam_separator=", "</muttng-doc:lstconf>
           $index_format
         </literal>
         variable. It's also the
-        string that the <muttng-doc:pattern name="H"/> pattern-matching expression
+        string that the <madmutt-doc:pattern name="H"/> pattern-matching expression
         matches against for
         <emphasis>search</emphasis> and <emphasis>limit</emphasis> functions.
         And it's what sorting by spam
@@ -5374,7 +5374,7 @@ set spam_separator=", "</muttng-doc:lstconf>
         will be removed. This might be the default action if you use <literal>
           spam
         </literal>
-        and <literal>nospam</literal> in conjunction with a <muttng-doc:hook name="folder"/>.
+        and <literal>nospam</literal> in conjunction with a <madmutt-doc:hook name="folder"/>.
       </para>
       
       <para>
@@ -5387,8 +5387,8 @@ set spam_separator=", "</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
-spam "^From: .*MAILER-DAEMON"       "999"</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+spam "^From: .*MAILER-DAEMON"       "999"</madmutt-doc:lstconf>
         
       </para>
       
@@ -5402,16 +5402,16 @@ spam "^From: .*MAILER-DAEMON"       "999"</muttng-doc:lstconf>
       <title>Setting variables</title>
 
       <para>
-        <muttng-doc:cmddef name="set">[no|inv]variable [=value] [variable...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="set">[no|inv]variable [=value] [variable...]</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="toggle">variable [variable ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="toggle">variable [variable ...]</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="unset">variable [variable ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unset">variable [variable ...]</madmutt-doc:cmddef>
       </para>
       <para>
-        <muttng-doc:cmddef name="reset">variable [variable ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="reset">variable [variable ...]</madmutt-doc:cmddef>
       </para>
       
       <para>
@@ -5493,8 +5493,8 @@ spam "^From: .*MAILER-DAEMON"       "999"</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
-set ?allow_8bit</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+set ?allow_8bit</madmutt-doc:lstconf>
         
       </para>
       
@@ -5528,7 +5528,7 @@ set ?allow_8bit</muttng-doc:lstconf>
       <title>Reading initialization commands from another file</title>
       
       <para>
-        <muttng-doc:cmddef name="source">filename [filename ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="source">filename [filename ...]</madmutt-doc:cmddef>
       </para>
       
       <para>
@@ -5564,7 +5564,7 @@ set ?allow_8bit</muttng-doc:lstconf>
       <title>Removing hooks</title>
       
       <para>
-        <muttng-doc:cmddef name="unhook">[* | hook-type]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unhook">[* | hook-type]</madmutt-doc:cmddef>
       </para>
       
       <para>
@@ -5587,31 +5587,31 @@ set ?allow_8bit</muttng-doc:lstconf>
         <title>Character Sets</title>
         
         <para>
-          As users may run mutt-ng on different systems, the configuration
+          As users may run Madmutt on different systems, the configuration
           must be maintained because it's likely that people want to use the
-          setup everywhere they use mutt-ng. And mutt-ng tries to help where it
+          setup everywhere they use Madmutt. And Madmutt tries to help where it
           can.
         </para>
         
         <para>
-          To not produce conflicts with different character sets, mutt-ng
+          To not produce conflicts with different character sets, Madmutt
           allows users to specify in which character set their configuration
           files are encoded. Please note that while reading the configuration
           files, this is only respected after the corresponding declaration
           appears. It's advised to put the following at the very beginning of a
-          users muttngrc:
+          users madmuttrc:
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
-set config_charset = "..."</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set config_charset = "..."</madmutt-doc:lstconf>
           
         </para>
         
         <para>
           and replacing the dots with the actual character set. To avoid
-          problems while maintaining the setup, <muttng-doc:man name="vim"/> user's may want to use
+          problems while maintaining the setup, <madmutt-doc:man name="vim"/> user's may want to use
           modelines as show in:
         </para>
         
@@ -5624,7 +5624,7 @@ set config_charset = "..."</muttng-doc:lstconf>
         
         <para>
           while, again, replacing the dots with the appropriate name. This
-          tells <muttng-doc:man name="vim"/> as which character set to read and save the file.
+          tells <madmutt-doc:man name="vim"/> as which character set to read and save the file.
         </para>
         
         <para>
@@ -5659,20 +5659,20 @@ set config_charset = "..."</muttng-doc:lstconf>
         
         <para>
           When using a configuration on different systems, the user may not
-          always have influence on how mutt-ng is installed and which features
+          always have influence on how Madmutt is installed and which features
           it includes.
         </para>
         
         <para>
-          To solve this, mutt-ng contain a feature based on the ``ifdef''
+          To solve this, Madmutt contain a feature based on the ``ifdef''
           patch written for mutt. Its basic syntax is:
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
 ifdef &lt;item&gt; &lt;command&gt;
-ifndef &lt;item&gt; &lt;command&gt;</muttng-doc:lstconf>
+ifndef &lt;item&gt; &lt;command&gt;</madmutt-doc:lstconf>
           
         </para>
         
@@ -5728,45 +5728,45 @@ ifndef &lt;item&gt; &lt;command&gt;</muttng-doc:lstconf>
         
         <para>
           As an example, one can use the following in
-          <literal>~/.muttngrc</literal>:
+          <literal>~/.madmuttrc</literal>:
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
-ifdef feature_imap 'source ~/.mutt-ng/setup-imap'
-ifdef feature_pop  'source ~/.mutt-ng/setup-pop'
-ifdef feature_nntp 'source ~/.mutt-ng/setup-nntp'</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+ifdef feature_imap 'source ~/.Madmutt/setup-imap'
+ifdef feature_pop  'source ~/.Madmutt/setup-pop'
+ifdef feature_nntp 'source ~/.Madmutt/setup-nntp'</madmutt-doc:lstconf>
           
         </para>
         
         <para>
-          ...to only source <literal>~/.mutt-ng/setup-imap</literal> if
+          ...to only source <literal>~/.Madmutt/setup-imap</literal> if
           IMAP
-          support is built in, only source <literal>~/.mutt-ng/setup-pop</literal>
+          support is built in, only source <literal>~/.Madmutt/setup-pop</literal>
           if POP support is built in and only source
-          <literal>~/.mutt-ng/setup-nntp</literal> if NNTP support is
+          <literal>~/.Madmutt/setup-nntp</literal> if NNTP support is
           built in.
         </para>
         
         <para>
           An example for testing for variable names can be used if users
-          use different revisions of mutt-ng whereby the older one may not
+          use different revisions of Madmutt whereby the older one may not
           have a certain variable. To test for the availability of
-          <muttng-doc:varref name="imap-mail-check"/>
+          <madmutt-doc:varref name="imap-mail-check"/>
           use:
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
-ifdef imap_mail_check 'set imap_mail_check = 300'</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+ifdef imap_mail_check 'set imap_mail_check = 300'</madmutt-doc:lstconf>
           
         </para>
         
         <para>
           Provided for completeness is the test for menu names. To set
-          <muttng-doc:varref name="pager-index-lines"
+          <madmutt-doc:varref name="pager-index-lines"
            />
           only if the pager
           menu is available, use:
@@ -5774,8 +5774,8 @@ ifdef imap_mail_check 'set imap_mail_check = 300'</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-ifdef pager 'set pager_index_lines = 10'</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+ifdef pager 'set pager_index_lines = 10'</madmutt-doc:lstconf>
           
         </para>
         
@@ -5789,9 +5789,9 @@ ifdef pager 'set pager_index_lines = 10'</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-ifdef feature_ncurses 'source ~/.mutt-ng/setup-ncurses'
-ifndef feature_ncurses 'source ~/.mutt-ng/setup-slang'</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+ifdef feature_ncurses 'source ~/.Madmutt/setup-ncurses'
+ifndef feature_ncurses 'source ~/.Madmutt/setup-slang'</madmutt-doc:lstconf>
           
         </para>
         
@@ -5801,9 +5801,9 @@ ifndef feature_ncurses 'source ~/.mutt-ng/setup-slang'</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-ifdef feature_slang 'source ~/.mutt-ng/setup-slang'
-ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+ifdef feature_slang 'source ~/.Madmutt/setup-slang'
+ifndef feature_slang 'source ~/.Madmutt/setup-ncurses'</madmutt-doc:lstconf>
           
         </para>
         
@@ -5849,7 +5849,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
       <title>Regular Expressions</title>
       
       <para>
-        All string patterns in Mutt-ng including those in more complex
+        All string patterns in Madmutt including those in more complex
         <link linkend="tab-patterns">patterns</link> must be specified
         using regular expressions (regexp) in the ``POSIX extended'' syntax
         (which
@@ -6177,7 +6177,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
       </para>
       
       <para>
-        <emphasis role="bold">Note:</emphasis> If you compile Mutt-ng with the
+        <emphasis role="bold">Note:</emphasis> If you compile Madmutt with the
         GNU <emphasis>rx</emphasis> package, the
         following operators may also be used in regular expressions:
       </para>
@@ -6269,7 +6269,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
       <title>Patterns</title>
       
       <para>
-        Mutt-ng's pattern language provides a simple yet effective way to
+        Madmutt's pattern language provides a simple yet effective way to
         set up rules to match messages, e.g. for operations like tagging and
         scoring. A pattern consists of one or more sub-pattern, which can be
         logically grouped, ORed, and negated. For a complete listing of
@@ -6296,7 +6296,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
         <para>
           
           <screen>
-<muttng-doc:pattern name="s"/> 'SPAM' <muttng-doc:pattern name="U"/></screen>
+<madmutt-doc:pattern name="s"/> 'SPAM' <madmutt-doc:pattern name="U"/></screen>
           
         </para>
         
@@ -6314,16 +6314,16 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
         <para>
           
           <screen>
-<muttng-doc:pattern name="f"/> ("nion@muttng\.org"|"ak@muttng\.org"|"pdmef@muttng\.org")
-(<muttng-doc:pattern name="b"/> mutt-ng|<muttng-doc:pattern name="s"/> Mutt-ng)
-!<muttng-doc:pattern name="x"/> '@synflood\.at'</screen>
+<madmutt-doc:pattern name="f"/> ("nion@madmutt\.org"|"ak@madmutt\.org"|"pdmef@madmutt\.org")
+(<madmutt-doc:pattern name="b"/> Madmutt|<madmutt-doc:pattern name="s"/> Madmutt)
+!<madmutt-doc:pattern name="x"/> '@synflood\.at'</screen>
           
         </para>
         
         <para>
           The first pattern matches all messages that were sent by one of
-          the mutt-ng maintainers, while the seconds pattern matches all
-          messages that contain ``mutt-ng'' in the message body or ``Mutt-ng''
+          the Madmutt maintainers, while the seconds pattern matches all
+          messages that contain ``Madmutt'' in the message body or ``Madmutt''
           in the subject. The third pattern matches all messages that do not
           contain ``@synflood\.at'' in the <literal>References:</literal>
           header, i.e.
@@ -6365,9 +6365,9 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
         <para>
           
           <screen>
-<muttng-doc:pattern name="d"/> 01/01/2005+1y
-<muttng-doc:pattern name="d"/> 18/10/2004-2w
-<muttng-doc:pattern name="d"/> 28/12/2004*1d</screen>
+<madmutt-doc:pattern name="d"/> 01/01/2005+1y
+<madmutt-doc:pattern name="d"/> 18/10/2004-2w
+<madmutt-doc:pattern name="d"/> 28/12/2004*1d</screen>
           
         </para>
         
@@ -6388,9 +6388,9 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
         <para>
           
           <screen>
-<muttng-doc:pattern name="d"/> &gt;2w # messages older than two weeks
-<muttng-doc:pattern name="d"/> &lt;3d # messages newer than 3 days
-<muttng-doc:pattern name="d"/> =1m # messages that are exactly one month old</screen>
+<madmutt-doc:pattern name="d"/> &gt;2w # messages older than two weeks
+<madmutt-doc:pattern name="d"/> &lt;3d # messages newer than 3 days
+<madmutt-doc:pattern name="d"/> =1m # messages that are exactly one month old</screen>
           
         </para>
         
@@ -6411,7 +6411,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
         <para>
           The so called <emphasis>Format Strings</emphasis> offer great
           flexibility when
-          configuring mutt-ng. In short, they describe what items to print
+          configuring Madmutt. In short, they describe what items to print
           out how in menus and status messages.
         </para>
         
@@ -6422,7 +6422,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
         </para>
         
         <para>
-          For example, when running mutt-ng on different machines or
+          For example, when running Madmutt on different machines or
           different versions for testing purposes, it may be interesting to
           have the following information always printed on screen when one
           is in the index:
@@ -6441,7 +6441,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
             <listitem>
               
               <para>
-                the current mutt-ng version number
+                the current Madmutt version number
                 
               </para>
             </listitem>
@@ -6452,7 +6452,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
         
         <para>
           The setting for the status bar of the index is controlled via the
-          <muttng-doc:varref name="status-format"/>
+          <madmutt-doc:varref name="status-format"/>
           variable. For the hostname and version string, there's an expando
           for <literal>$status_format</literal>: <literal>
             %h
@@ -6464,24 +6464,24 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-set status_format = "%v on %h: ..."</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set status_format = "%v on %h: ..."</madmutt-doc:lstconf>
           
         </para>
         
         <para>
-          mutt-ng will replace the sequence <literal>%v</literal> with
+          Madmutt will replace the sequence <literal>%v</literal> with
           the version string
           and <literal>%h</literal> with the host's name. When you are,
           for example, running
-          mutt-ng version <literal>1.5.9i</literal> on host <literal>mailhost</literal>, you'll see the
+          Madmutt version <literal>1.5.9i</literal> on host <literal>mailhost</literal>, you'll see the
           following when you're in the index:
         </para>
         
         <para>
           
           <screen>
-Mutt-ng 1.5.9i on mailhost: ...</screen>
+Madmutt 1.5.9i on mailhost: ...</screen>
           
         </para>
         
@@ -6525,8 +6525,8 @@ Mutt-ng 1.5.9i on mailhost: ...</screen>
         
         <para>
           
-          <muttng-doc:lstconf>
-set status_format = "%v on %h: %B: ...</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set status_format = "%v on %h: %B: ...</madmutt-doc:lstconf>
           
         </para>
         
@@ -6539,7 +6539,7 @@ set status_format = "%v on %h: %B: ...</muttng-doc:lstconf>
         <para>
           
           <screen>
-Mutt-ng 1.5.9i on mailhost: Inbox: ...</screen>
+Madmutt 1.5.9i on mailhost: Inbox: ...</screen>
           
         </para>
         
@@ -6570,8 +6570,8 @@ Mutt-ng 1.5.9i on mailhost: Inbox: ...</screen>
         
         <para>
           
-          <muttng-doc:lstconf>
-set status_format = "%v on %h: %B %?n?%n new? ...</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set status_format = "%v on %h: %B %?n?%n new? ...</madmutt-doc:lstconf>
           
         </para>
         
@@ -6591,7 +6591,7 @@ set status_format = "%v on %h: %B %?n?%n new? ...</muttng-doc:lstconf>
         </para>
         
         <para>
-          which tells mutt-ng to only look at <literal>&lt;string if
+          which tells Madmutt to only look at <literal>&lt;string if
             nonzero&gt;
           </literal>
           if the value of the <literal>%&lt;item%gt;</literal>
@@ -6603,7 +6603,7 @@ set status_format = "%v on %h: %B %?n?%n new? ...</muttng-doc:lstconf>
         
         <para>
           But this is not all: this feature only offers one alternative: 
-          ``print something if not zero.'' Mutt-ng does, as you might guess, 
+          ``print something if not zero.'' Madmutt does, as you might guess, 
           also provide a logically complete version: ``if zero, print 
           something and else print something else.'' This is achieved by the 
           following syntax for those expandos which may be printed nonzero:
@@ -6617,7 +6617,7 @@ set status_format = "%v on %h: %B %?n?%n new? ...</muttng-doc:lstconf>
         </para>
         
         <para>
-          Using this we can make mutt-ng to do the following:
+          Using this we can make Madmutt to do the following:
         </para>
         
         <para>
@@ -6652,8 +6652,8 @@ set status_format = "%v on %h: %B %?n?%n new? ...</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-set status_format = "%v on %h: %B: %?n?%n new messages&amp;no new messages? ...</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set status_format = "%v on %h: %B: %?n?%n new messages&amp;no new messages? ...</madmutt-doc:lstconf>
           
         </para>
         
@@ -6664,8 +6664,8 @@ set status_format = "%v on %h: %B: %?n?%n new messages&amp;no new messages? ...<
         
         <para>
           
-          <muttng-doc:lstconf>
-set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages ...</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages ...</madmutt-doc:lstconf>
           
         </para>
         
@@ -6697,7 +6697,7 @@ set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages ...</muttng-doc:l
               <para>
                 When specifying <literal>%_&lt;item&gt;</literal>
                 instead of
-                just <literal>%&lt;item&gt;</literal>, mutt-ng will
+                just <literal>%&lt;item&gt;</literal>, Madmutt will
                 convert all
                 characters in the expansion of <literal>&lt;item&gt;</literal>
                 to
@@ -6710,7 +6710,7 @@ set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages ...</muttng-doc:l
               <para>
                 When specifying <literal>%:&lt;item&gt;</literal>
                 instead of just
-                <literal>%&lt;item&gt;</literal>, mutt-ng will convert
+                <literal>%&lt;item&gt;</literal>, Madmutt will convert
                 all dots in the
                 expansion of <literal>&lt;item&gt;</literal> to underscores
                 (<literal>_</literal>).
@@ -6740,7 +6740,7 @@ set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages ...</muttng-doc:l
               </term>
               <listitem>
                 <para>
-                  When this occurs, mutt-ng will fill the
+                  When this occurs, Madmutt will fill the
                   rest of the line with the character <literal>X</literal>. In
                   our example,
                   filling the rest of the line with dashes is done by setting:
@@ -6748,8 +6748,8 @@ set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages ...</muttng-doc:l
                 
                 <para>
                   
-                  <muttng-doc:lstconf>
-set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages %|-"</muttng-doc:lstconf>
+                  <madmutt-doc:lstconf>
+set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages %|-"</madmutt-doc:lstconf>
                   
                 </para>
               </listitem>
@@ -6774,8 +6774,8 @@ set status_format = "%v on %h: %B: %?n?%n&amp;no? new messages %|-"</muttng-doc:
                 
                 <para>
                   
-                  <muttng-doc:lstconf>
-set status_format = "%B: %?n?%n&amp;no? new messages %&gt; (%v on %h)"</muttng-doc:lstconf>
+                  <madmutt-doc:lstconf>
+set status_format = "%B: %?n?%n&amp;no? new messages %&gt; (%v on %h)"</madmutt-doc:lstconf>
                   
                 </para>
               </listitem>
@@ -6806,7 +6806,7 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&gt; (%v on %h)"</muttng-d
         matching a pattern, use the tag-pattern function, which is bound to
         ``shift-T'' by default.  Or you can select individual messages by
         hand using the ``tag-message'' function, which is bound to ``t'' by
-        default.  See <link linkend="tab-patterns">patterns</link> for Mutt-ng's
+        default.  See <link linkend="tab-patterns">patterns</link> for Madmutt's
         pattern
         matching syntax.
       </para>
@@ -6819,16 +6819,16 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&gt; (%v on %h)"</muttng-d
         </emphasis>
         operation will
         be applied to all tagged messages if that operation can be used in that
-        manner.  If the <muttng-doc:varref name="auto-tag"/>
+        manner.  If the <madmutt-doc:varref name="auto-tag"/>
         variable is set, the next operation applies to the tagged messages
         automatically, without requiring the ``tag-prefix''.
       </para>
       
       <para>
-        In <muttng-doc:cmdref name="macro"/> or <muttng-doc:cmdref name="push"/> commands,
+        In <madmutt-doc:cmdref name="macro"/> or <madmutt-doc:cmdref name="push"/> commands,
         you can use the ``tag-prefix-cond'' operator.  If there are no tagged
         messages, mutt will "eat" the rest of the macro to abort it's
-        execution.Mutt-ng will stop "eating" the macro when it encounters the
+        execution.Madmutt will stop "eating" the macro when it encounters the
         ``end-cond''
         operator;  after this operator the rest of the macro will be executed
         asnormal.
@@ -6850,7 +6850,7 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&gt; (%v on %h)"</muttng-d
         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-ng world, a <emphasis>
+        reading, or to whom you are sending mail.  In the Madmutt world, a <emphasis>
           hook
         </emphasis>
         consists of a <link linkend="advanced-regexp">regexp</link> or
@@ -6861,43 +6861,43 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&gt; (%v on %h)"</muttng-d
           <listitem>
             
             <para>
-              <muttng-doc:hook name="folder"/>
+              <madmutt-doc:hook name="folder"/>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <muttng-doc:hook name="send"/>
+              <madmutt-doc:hook name="send"/>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <muttng-doc:hook name="message"/>
+              <madmutt-doc:hook name="message"/>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <muttng-doc:hook name="save"/>
+              <madmutt-doc:hook name="save"/>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <muttng-doc:hook name="mbox"/>
+              <madmutt-doc:hook name="mbox"/>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <muttng-doc:hook name="fcc"/>
+              <madmutt-doc:hook name="fcc"/>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <muttng-doc:hook name="fcc-save"/>
+              <madmutt-doc:hook name="fcc-save"/>
             </para>
           </listitem>
           
@@ -6913,16 +6913,16 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&gt; (%v on %h)"</muttng-d
         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 <muttng-doc:hook name="send"/> and
+        restore configuration defaults. Here is an example with <madmutt-doc:hook name="send"/> and
         the
         my_hdr directive:
       </para>
       
       <para>
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 send-hook . 'unmy_hdr From:'
-send-hook '~C ^b@b\.b$' my-hdr from: c@c.c</muttng-doc:lstconf>
+send-hook '~C ^b@b\.b$' my-hdr from: c@c.c</madmutt-doc:lstconf>
         
       </para>
       
@@ -6930,8 +6930,8 @@ send-hook '~C ^b@b\.b$' my-hdr from: c@c.c</muttng-doc:lstconf>
         <title>Message Matching in Hooks</title>
         
         <para>
-          Hooks that act upon messages (<literal><muttng-doc:hook name="send"/>, <muttng-doc:hook name="save"/>,
-            <muttng-doc:hook name="fcc"/>,<muttng-doc:hook name="message"/>
+          Hooks that act upon messages (<literal><madmutt-doc:hook name="send"/>, <madmutt-doc:hook name="save"/>,
+            <madmutt-doc:hook name="fcc"/>,<madmutt-doc:hook name="message"/>
           </literal>
           )are evaluated in a slightly different manner.  For the other
           types of hooks, a <link linkend="advanced-regexp">regexp</link> is
@@ -6941,7 +6941,7 @@ send-hook '~C ^b@b\.b$' my-hdr from: c@c.c</muttng-doc:lstconf>
         </para>
         
         <para>
-          Mutt-ng allows the use of the <link linkend="tab-patterns">patterns</link>
+          Madmutt allows the use of the <link linkend="tab-patterns">patterns</link>
           language for matching messages in hook commands.  This works in
           exactly the same way as it would when <emphasis>limiting</emphasis>
           or<emphasis>searching</emphasis> the mailbox, except that you are
@@ -6955,8 +6955,8 @@ send-hook '~C ^b@b\.b$' my-hdr from: c@c.c</muttng-doc:lstconf>
           sending
           mail to a specific address, you could do something like:
           
-          <muttng-doc:lstconf>
-send-hook '~t ^me@cs\.hmc\.edu$' 'my-hdr From: Mutt-ng User &lt;user@host&gt;'</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+send-hook '~t ^me@cs\.hmc\.edu$' 'my-hdr From: Madmutt User &lt;user@host&gt;'</madmutt-doc:lstconf>
           
           which would execute the given command when sending mail to
           <emphasis>me@cs.hmc.edu</emphasis>.
@@ -6969,13 +6969,13 @@ send-hook '~t ^me@cs\.hmc\.edu$' 'my-hdr From: Mutt-ng User &lt;user@host&gt;'</
             regular
             expression
           </emphasis>
-          like the other hooks, in which case Mutt-ng will translate your
+          like the other hooks, in which case Madmutt will translate your
           pattern into the full language, using the translation specified by
           the 
-          <muttng-doc:hook name="default"/> variable.  The
+          <madmutt-doc:hook name="default"/> variable.  The
           pattern is translated at the time the hook is declared, so the value
           of 
-          <muttng-doc:hook name="default"/> that is in effect
+          <madmutt-doc:hook name="default"/> that is in effect
           at that time will be used.
         </para>
         
@@ -6991,7 +6991,7 @@ send-hook '~t ^me@cs\.hmc\.edu$' 'my-hdr From: Mutt-ng User &lt;user@host&gt;'</
       <title>Using the sidebar</title>
       
       <para>
-        The sidebar, a feature specific to Mutt-ng, allows you to use a mailbox
+        The sidebar, a feature specific to Madmutt, allows you to use a mailbox
         listing 
         which looks very similar to the ones you probably know from GUI mail
         clients.
@@ -6999,37 +6999,37 @@ send-hook '~t ^me@cs\.hmc\.edu$' 'my-hdr From: Mutt-ng User &lt;user@host&gt;'</
         and highlights the ones with new email
         Use the following configuration commands:
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 set sidebar_visible="yes"
-set sidebar_width=25</muttng-doc:lstconf>
+set sidebar_width=25</madmutt-doc:lstconf>
         
       </para>
       
       <para>
         If you want to specify the mailboxes you can do so with:
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 set mbox='=INBOX'
 mailboxes INBOX \
 MBOX1 \
 MBOX2 \
-...</muttng-doc:lstconf>
+...</madmutt-doc:lstconf>
         
       </para>
       
       <para>
         You can also specify the colors for mailboxes with new mails by using:
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 color sidebar_new red black
-color sidebar white black</muttng-doc:lstconf>
+color sidebar white black</madmutt-doc:lstconf>
         
       </para>
       
       <para>
         Reasonable key bindings look e.g. like this:
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 bind index \Cp sidebar-prev
 bind index \Cn sidebar-next
 bind index \Cb sidebar-open
@@ -7038,7 +7038,7 @@ bind pager \Cn sidebar-next
 bind pager \Cb sidebar-open
 
 macro index B ':toggle sidebar_visible^M'
-macro pager B ':toggle sidebar_visible^M'</muttng-doc:lstconf>
+macro pager B ':toggle sidebar_visible^M'</madmutt-doc:lstconf>
         
       </para>
       
@@ -7057,19 +7057,19 @@ macro pager B ':toggle sidebar_visible^M'</muttng-doc:lstconf>
       <title>External Address Queries</title>
       
       <para>
-        Mutt-ng supports connecting to external directory databases such as
+        Madmutt supports connecting to external directory databases such as
         LDAP,
         ph/qi, bbdb, or NIS through a wrapper script which connects to mutt
         using a simple interface.  Using the
-        <muttng-doc:varref name="query-command"/>
+        <madmutt-doc:varref name="query-command"/>
         variable, you specify the wrapper
         command to use.  For example:
       </para>
       
       <para>
         
-        <muttng-doc:lstconf>
-set query_command = "mutt_ldap_query.pl '%s'"</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+set query_command = "mutt_ldap_query.pl '%s'"</madmutt-doc:lstconf>
         
       </para>
       
@@ -7129,11 +7129,11 @@ roessler@guug.de        Thomas Roessler mutt pgp</screen>
       <title>Mailbox Formats</title>
       
       <para>
-        Mutt-ng supports reading and writing of four different mailbox formats:
+        Madmutt supports reading and writing of four different mailbox formats:
         mbox, MMDF, MH and Maildir.  The mailbox type is autodetected, so there
         is no need to use a flag for different mailbox types.  When creating
-        newmailboxes, Mutt-ng uses the default specified with the
-        <muttng-doc:varref name="mbox-type"/>
+        newmailboxes, Madmutt uses the default specified with the
+        <madmutt-doc:varref name="mbox-type"/>
         variable.
       </para>
       
@@ -7146,8 +7146,8 @@ roessler@guug.de        Thomas Roessler mutt pgp</screen>
       
       <para>
         
-        <muttng-doc:lstmail>
-From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
+        <madmutt-doc:lstmail>
+From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</madmutt-doc:lstmail>
         
       </para>
       
@@ -7172,7 +7172,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
         and <emphasis>MMDF</emphasis>, a mailbox
         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-ng displays). Deleted messages
+        correspond to the message number Madmutt displays). Deleted messages
         arerenamed with a comma (,) prepended to the filename. <emphasis role="bold">
           Note:
         </emphasis>
@@ -7223,20 +7223,20 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
           <listitem>
             
             <para>
-              ! -- refers to your <muttng-doc:varref name="spoolfile"/>
+              ! -- refers to your <madmutt-doc:varref name="spoolfile"/>
               (incoming) mailbox
             </para>
           </listitem>
           <listitem>
             
             <para>
-              &gt; -- refers to your <muttng-doc:varref name="mbox"/> file
+              &gt; -- refers to your <madmutt-doc:varref name="mbox"/> file
             </para>
           </listitem>
           <listitem>
             
             <para>
-              &lt; -- refers to your <muttng-doc:varref name="record"/> file
+              &lt; -- refers to your <madmutt-doc:varref name="record"/> file
             </para>
           </listitem>
           <listitem>
@@ -7260,14 +7260,14 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
           <listitem>
             
             <para>
-              = or + -- refers to your <muttng-doc:varref name="folder"/>
+              = or + -- refers to your <madmutt-doc:varref name="folder"/>
               directory
             </para>
           </listitem>
           <listitem>
             
             <para>
-              @<emphasis>alias</emphasis> -- refers to the <muttng-doc:hook name="save"/>
+              @<emphasis>alias</emphasis> -- refers to the <madmutt-doc:hook name="save"/>
               as determined by the address of the alias
             </para>
           </listitem>
@@ -7286,23 +7286,23 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
       <title>Handling Mailing Lists</title>
       
       <para>
-        Mutt-ng has a few configuration options that make dealing with large
+        Madmutt has a few configuration options that make dealing with large
         amounts of mail easier.  The first thing you must do is to let Mutt
         know what addresses you consider to be mailing lists (technically
         this does not have to be a mailing list, but that is what it is most
         often used for), and what lists you are subscribed to.  This is
-        accomplished through the use of the <muttng-doc:cmdref name="lists"/>
+        accomplished through the use of the <madmutt-doc:cmdref name="lists"/>
         commands in your muttrc.
       </para>
       
       <para>
-        Now that Mutt-ng knows what your mailing lists are, it can do several
+        Now that Madmutt 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
         personal and list mail in the same mailbox.  In the
-        <muttng-doc:varref name="index-format"/>
+        <madmutt-doc:varref name="index-format"/>
         variable, the escape ``%L''
         will return the string ``To &lt;list&gt;'' when ``list'' appears in the
         ``To'' field, and ``Cc &lt;list&gt;'' when it appears in the ``Cc''
@@ -7322,10 +7322,10 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
       </para>
       
       <para>
-        Mutt-ng also supports the <literal>Mail-Followup-To</literal> header. 
+        Madmutt also supports the <literal>Mail-Followup-To</literal> header. 
         When you send
         a message to a list of recipients which includes one or several
-        subscribed mailing lists, and if the <muttng-doc:varref name="followup-to"/>
+        subscribed mailing lists, and if the <madmutt-doc:varref name="followup-to"/>
         option is set, mutt will generate
         a Mail-Followup-To header which contains all the recipients to whom
         you send this message, but not your address. This indicates that
@@ -7339,7 +7339,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
         Conversely, when group-replying or list-replying to a message which
         has a <literal>Mail-Followup-To</literal> header, mutt will respect
         this header if
-        the <muttng-doc:varref name="honor-followup-to"/>
+        the <madmutt-doc:varref name="honor-followup-to"/>
         configuration
         variable is set.  Using list-reply will in this case also make sure
         that the reply goes to the mailing list, even if it's not specified
@@ -7348,7 +7348,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
       
       <para>
         Note that, when header editing is enabled, you can create a
-        <literal>Mail-Followup-To</literal> header manually.  Mutt-ng will only
+        <literal>Mail-Followup-To</literal> header manually.  Madmutt will only
         auto-generate
         this header if it doesn't exist when you send the message.
       </para>
@@ -7359,7 +7359,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
         than the author of the message.  This can create problems when trying
         to reply directly to the author in private, since most mail clients
         will automatically reply to the address given in the ``Reply-To''
-        field.  Mutt-ng uses the <muttng-doc:varref name="reply-to"/>
+        field.  Madmutt uses the <madmutt-doc:varref name="reply-to"/>
         variable to help decide which address to use.  If set to <emphasis>
           ask-yes
         </emphasis>
@@ -7375,18 +7375,18 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
       <para>
         The ``X-Label:'' header field can be used to further identify mailing
         lists or list subject matter (or just to annotate messages
-        individually).  The <muttng-doc:varref name="index-format"/>
+        individually).  The <madmutt-doc:varref name="index-format"/>
         variable's ``%y'' and
         ``%Y'' escapes can be used to expand ``X-Label:'' fields in the
-        index, and Mutt-ng's pattern-matcher can match regular expressions to
-        ``X-Label:'' fields with the ``<muttng-doc:pattern name="y"/>'' selector.  ``X-Label:'' is
+        index, and Madmutt's pattern-matcher can match regular expressions to
+        ``X-Label:'' fields with the ``<madmutt-doc:pattern name="y"/>'' selector.  ``X-Label:'' is
         not a
         standard message header field, but it can easily be inserted by
         procmailand other mail filtering agents.
       </para>
       
       <para>
-        Lastly, Mutt-ng has the ability to <link linkend="sort">sort</link> the
+        Lastly, Madmutt has the ability to <link linkend="sort">sort</link> the
         mailbox into
         <link linkend="threads">threads</link>.  A thread is a group of
         messages which all relate to the same
@@ -7409,7 +7409,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
       <title>Editing threads</title>
       
       <para>
-        Mutt-ng has the ability to dynamically restructure threads that are
+        Madmutt has the ability to dynamically restructure threads that are
         broken
         either by misconfigured software or bad behavior from some
         correspondents. This allows to clean your mailboxes formats) from these
@@ -7423,7 +7423,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
           Some mailers tend to "forget" to correctly set the "In-Reply-To:" and
           "References:" headers when replying to a message. This results in
           broken
-          discussions because Mutt-ng has not enough information to guess the
+          discussions because Madmutt has not enough information to guess the
           correct
           threading.
           You can fix this by tagging the reply, then moving to the parent
@@ -7467,7 +7467,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
       <title>Delivery Status Notification (DSN) Support</title>
       
       <para>
-        <muttng-doc:rfc num="1894"/> defines a set of MIME content types for relaying information
+        <madmutt-doc:rfc num="1894"/> defines a set of MIME content types for relaying information
         about the status of electronic mail messages.  These can be thought of
         as
         ``return receipts.''
@@ -7510,7 +7510,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
           <listitem>
             
             <para>
-              <muttng-doc:varref name="dsn-notify"/> is used
+              <madmutt-doc:varref name="dsn-notify"/> is used
               to request receipts for different results (such as failed
               message,message delivered, etc.).
               
@@ -7519,7 +7519,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
           <listitem>
             
             <para>
-              <muttng-doc:varref name="dsn-return"/> requests
+              <madmutt-doc:varref name="dsn-return"/> requests
               how much of your message should be returned with the receipt
               (headers or full message).
               
@@ -7544,7 +7544,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
       <title>POP3 Support (OPTIONAL)</title>
       
       <para>
-        If Mutt-ng was compiled with POP3 support (by running the <emphasis>
+        If Madmutt was compiled with POP3 support (by running the <emphasis>
           configure
         </emphasis>
         script with the <emphasis>--enable-pop</emphasis> flag), it has the
@@ -7571,15 +7571,15 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
       
       <para>
         Polling for new mail is more expensive over POP3 than locally. For this
-        reason the frequency at which Mutt-ng will check for mail remotely can
+        reason the frequency at which Madmutt will check for mail remotely can
         be
         controlled by the
-        <muttng-doc:varref name="pop-mail-check"/>
+        <madmutt-doc:varref name="pop-mail-check"/>
         variable, which defaults to every 60 seconds.
       </para>
       
       <para>
-        If Mutt-ng was compiled with SSL support (by running the <emphasis>
+        If Madmutt was compiled with SSL support (by running the <emphasis>
           configure
         </emphasis>
         script with the <emphasis>--with-ssl</emphasis> flag), connections to
@@ -7595,15 +7595,15 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
         (default: G).  It allows to connect to <link
           linkend="pop-host">pop-host</link>
         ,fetch all your new mail and place it in the
-        local <muttng-doc:varref name="spoolfile"/>.  After this
-        point, Mutt-ng runs exactly as if the mail had always been local.
+        local <madmutt-doc:varref name="spoolfile"/>.  After this
+        point, Madmutt runs exactly as if the mail had always been local.
       </para>
       
       <para>
         <emphasis role="bold">Note:</emphasis> If you only need to fetch all
         messages to local mailbox
         you should consider using a specialized program, such as
-        <muttng-doc:man name="fetchmail"/>.
+        <madmutt-doc:man name="fetchmail"/>.
       </para>
       
       <para>
@@ -7616,7 +7616,7 @@ From me@cs.hmc.edu Fri, 11 Apr 1997 11:44:56 PST</muttng-doc:lstmail>
       <title>IMAP Support (OPTIONAL)</title>
       
       <para>
-        If Mutt-ng was compiled with IMAP support (by running the
+        If Madmutt was compiled with IMAP support (by running the
         <emphasis>configure</emphasis> script with the
         <emphasis>--enable-imap</emphasis> flag), it has the
         ability to work with folders located on a remote IMAP server.
@@ -7661,7 +7661,7 @@ imap://imapserver:port/INBOX</screen>
       </para>
       
       <para>
-        If Mutt-ng was compiled with SSL support (by running the <emphasis>
+        If Madmutt was compiled with SSL support (by running the <emphasis>
           configure
         </emphasis>
         script with the <emphasis>--with-ssl</emphasis> flag), connections to
@@ -7673,7 +7673,7 @@ imap://imapserver:port/INBOX</screen>
       </para>
       
       <para>
-        Note that not all servers use / as the hierarchy separator.  Mutt-ng
+        Note that not all servers use / as the hierarchy separator.  Madmutt
         should
         correctly notice which separator is being used by the server and
         convertpaths accordingly.
@@ -7683,7 +7683,7 @@ imap://imapserver:port/INBOX</screen>
         When browsing folders on an IMAP server, you can toggle whether to look
         at only the folders you are subscribed to, or all folders with the
         <emphasis>toggle-subscribed</emphasis> command.  See also the 
-        <muttng-doc:varref name="imap-list-subscribed"/>
+        <madmutt-doc:varref name="imap-list-subscribed"/>
         variable.
       </para>
       
@@ -7691,9 +7691,9 @@ imap://imapserver:port/INBOX</screen>
         Polling for new mail on an IMAP server can cause noticeable delays. So,
         you'll
         want to carefully tune the
-        <muttng-doc:varref name="imap-mail-check"/>
+        <madmutt-doc:varref name="imap-mail-check"/>
         and
-        <muttng-doc:varref name="timeout"/>
+        <madmutt-doc:varref name="timeout"/>
         variables.
       </para>
       
@@ -7761,7 +7761,7 @@ imap://imapserver:port/INBOX</screen>
         <title>Authentication</title>
         
         <para>
-          Mutt-ng supports four authentication methods with IMAP servers: SASL,
+          Madmutt supports four authentication methods with IMAP servers: SASL,
           GSSAPI, CRAM-MD5, and LOGIN (there is a patch by Grant Edwards to add
           NTLM authentication for you poor exchange users out there, but it has
           yet to be integrated into the main tree). There is also support for
@@ -7789,7 +7789,7 @@ imap://imapserver:port/INBOX</screen>
         </para>
         
         <para>
-          Mutt-ng will try whichever methods are compiled in and available on
+          Madmutt will try whichever methods are compiled in and available on
           the server,
           in the following order: SASL, ANONYMOUS, GSSAPI, CRAM-MD5, LOGIN.
         </para>
@@ -7801,7 +7801,7 @@ imap://imapserver:port/INBOX</screen>
             <listitem>
               
               <para>
-                <muttng-doc:varref name="imap-user"/> - controls
+                <madmutt-doc:varref name="imap-user"/> - controls
                 the username under which you request authentication on the IMAP
                 server,
                 for all authenticators. This is overridden by an explicit
@@ -7813,7 +7813,7 @@ imap://imapserver:port/INBOX</screen>
             <listitem>
               
               <para>
-                <muttng-doc:varref name="imap-pass"/> - a
+                <madmutt-doc:varref name="imap-pass"/> - a
                 password which you may preset, used by all authentication
                 methods where
                 a password is needed.
@@ -7822,7 +7822,7 @@ imap://imapserver:port/INBOX</screen>
             <listitem>
               
               <para>
-                <muttng-doc:varref name="imap-authenticators"/>
+                <madmutt-doc:varref name="imap-authenticators"/>
                 - a colon-delimited list of IMAP
                 authentication methods to try, in the order you wish to try
                 them. If
@@ -7848,18 +7848,18 @@ imap://imapserver:port/INBOX</screen>
       <title>NNTP Support (OPTIONAL)</title>
       
       <para>
-        If compiled with ``--enable-nntp'' option, Mutt-ng can read news from
+        If compiled with ``--enable-nntp'' option, Madmutt can read news from
         a newsserver via NNTP.  You can open a newsgroup with the
         ``change-newsgroup'' function from the index/pager which is by default
-        bound to <muttng-doc:key>i</muttng-doc:key>.
+        bound to <madmutt-doc:key>i</madmutt-doc:key>.
       </para>
       
       <para>
-        The Default newsserver can be obtained from the <muttng-doc:envvar name="NNTPSERVER"/>
+        The Default newsserver can be obtained from the <madmutt-doc:envvar name="NNTPSERVER"/>
         environment variable. Like other
         news readers,
         info about subscribed newsgroups is saved in a file as specified by the
-        <muttng-doc:varref name="nntp-newsrc"/> variable.
+        <madmutt-doc:varref name="nntp-newsrc"/> variable.
         Article headers are cached and can be loaded from a file when a
         newsgroup is entered instead loading from newsserver; currently, this
         caching mechanism still is different from the header caching for
@@ -7871,13 +7871,13 @@ imap://imapserver:port/INBOX</screen>
         
         <para>
           Especially for Usenet, people often ask for advanced filtering
-          and scoring functionality. Of course, mutt-ng has scoring and
+          and scoring functionality. Of course, Madmutt has scoring and
           allows a killfile, too. How to use a killfile has been discussed
           in <link linkend="command-score">Message Scoring</link>.
         </para>
         
         <para>
-          What has not been discusses in detail is mutt-ng's built-in
+          What has not been discusses in detail is Madmutt's built-in
           realname filter. For may newsreaders including those for
           ``advanced users'' like <emphasis>slrn</emphasis> or <emphasis>tin</emphasis>, there are frequent
           request for such functionality. The solutions offered often are
@@ -7885,25 +7885,25 @@ imap://imapserver:port/INBOX</screen>
         </para>
         
         <para>
-          In mutt-ng this is as easy as
+          In Madmutt this is as easy as
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
-score ~* =42</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+score ~* =42</madmutt-doc:lstconf>
           
         </para>
         
         <para>
-          This tells mutt-ng to apply a score of 42 to all messages whose
+          This tells Madmutt to apply a score of 42 to all messages whose
           sender specified a valid realname and a valid email address. Using
         </para>
         
         <para>
           
-          <muttng-doc:lstconf>
-score !~* =42</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+score !~* =42</madmutt-doc:lstconf>
           
         </para>
         
@@ -7918,7 +7918,7 @@ score !~* =42</muttng-doc:lstconf>
             <listitem>
               
               <para>
-                Email addresses must be valid according to <muttng-doc:rfc num="2822"/>
+                Email addresses must be valid according to <madmutt-doc:rfc num="2822"/>
               </para>
             </listitem>
             <listitem>
@@ -7962,33 +7962,33 @@ score !~* =42</muttng-doc:lstconf>
       <title>SMTP Support (OPTIONAL)</title>
       
       <para>
-        Mutt-ng can be built using a library called ``libESMTP'' which
+        Madmutt can be built using a library called ``libESMTP'' which
         provides SMTP functionality. When <literal>configure</literal> was
         called with
-        <literal>--with-libesmtp</literal> or the output <literal>muttng -v</literal> contains
+        <literal>--with-libesmtp</literal> or the output <literal>madmutt -v</literal> contains
         <literal>+USE_LIBESMTP</literal>, this will be or is the case
         already. The SMTP
         support includes support for Delivery Status Notification
         (see <link linkend="dsn">dsn</link> section) as well as
         handling the <literal>8BITMIME</literal> flag controlled via
-        <muttng-doc:varref name="use-8bitmime"/>.
+        <madmutt-doc:varref name="use-8bitmime"/>.
       </para>
       
       <para>
         To enable sending mail directly via SMTP without an MTA such as
-        Postfix or SSMTP and the like, simply set the <muttng-doc:varref name="smtp-host"/>
+        Postfix or SSMTP and the like, simply set the <madmutt-doc:varref name="smtp-host"/>
         variable pointing to your SMTP server.
       </para>
       
       <para>
-        Authentication mechanisms are available via the <muttng-doc:varref name="smtp-user"/>
-        and <muttng-doc:varref name="smtp-pass"/> variables.
+        Authentication mechanisms are available via the <madmutt-doc:varref name="smtp-user"/>
+        and <madmutt-doc:varref name="smtp-pass"/> variables.
       </para>
       
       <para>
         Transport Encryption via the StartTLS command is also available. For
-        this to work, first of all Mutt-ng must be built with SSL or GNUTLS.
-        Secondly, the <muttng-doc:varref name="smtp-use-tls"/> variable
+        this to work, first of all Madmutt must be built with SSL or GNUTLS.
+        Secondly, the <madmutt-doc:varref name="smtp-use-tls"/> variable
         must be either set
         to ``enabled'' or ``required.'' In both cases, StartTLS will be used if
         the server supports it: for the second case, the connection will fail
@@ -8001,7 +8001,7 @@ score !~* =42</muttng-doc:lstconf>
         sender, i.e. they allow for only one value which may not be what the
         user wants to send as the <literal>From:</literal> header. In this
         case, the variable
-        <muttng-doc:varref name="smtp-envelope"/> may be used
+        <madmutt-doc:varref name="smtp-envelope"/> may be used
         to set the envelope different from the <literal>From:</literal> header.
       </para>
       
@@ -8013,8 +8013,8 @@ score !~* =42</muttng-doc:lstconf>
       <para>
         If you happen to have accounts on multiple IMAP and/or POP servers,
         you may find managing all the authentication settings inconvenient and
-        error-prone.  The <muttng-doc:hook name="account"/> command may help. This hook works like
-        <muttng-doc:hook name="folder"/> but is invoked whenever you access a remote mailbox
+        error-prone.  The <madmutt-doc:hook name="account"/> command may help. This hook works like
+        <madmutt-doc:hook name="folder"/> but is invoked whenever you access a remote mailbox
         (including inside the folder browser), not just when you open the
         mailbox.
       </para>
@@ -8025,10 +8025,10 @@ score !~* =42</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 account-hook . 'unset imap_user; unset imap_pass; unset tunnel'
 account-hook imap://host1/ 'set imap_user=me1 imap_pass=foo'
-account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"'</muttng-doc:lstconf>
+account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"'</madmutt-doc:lstconf>
         
       </para>
       
@@ -8047,12 +8047,12 @@ account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"'</muttng-d
         efficient to get
         a menu with all the URLs and start a WWW browser on one of them.  This
         functionality is provided by the external urlview program which can be
-        retrieved at <muttng-doc:web url="ftp://ftp.mutt.org/mutt/contrib/"/>
+        retrieved at <madmutt-doc:web url="ftp://ftp.mutt.org/mutt/contrib/"/>
         and the configuration commands:
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 macro index \cb |urlview\n
-macro pager \cb |urlview\n</muttng-doc:lstconf>
+macro pager \cb |urlview\n</madmutt-doc:lstconf>
         
       </para>
       
@@ -8066,7 +8066,7 @@ macro pager \cb |urlview\n</muttng-doc:lstconf>
       <title>Compressed folders Support (OPTIONAL)</title>
       
       <para>
-        If Mutt-ng was compiled with compressed folders support (by running the
+        If Madmutt was compiled with compressed folders support (by running the
         <emphasis>configure</emphasis> script with the <emphasis>
           --enable-compressed
         </emphasis>
@@ -8089,8 +8089,8 @@ macro pager \cb |urlview\n</muttng-doc:lstconf>
       </para>
       
       <para>
-        There are three hooks defined (<muttng-doc:hook name="open"/>,
-        <muttng-doc:hook name="close"/> and <muttng-doc:hook name="append"/>
+        There are three hooks defined (<madmutt-doc:hook name="open"/>,
+        <madmutt-doc:hook name="close"/> and <madmutt-doc:hook name="append"/>
         )which define commands to uncompress and compress
         a folder and to append messages to an existing compressed folder 
         respectively.
@@ -8102,32 +8102,32 @@ macro pager \cb |urlview\n</muttng-doc:lstconf>
       
       <para>
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 open-hook \\.gz$ "gzip -cd %f &gt; %t" 
 close-hook \\.gz$ "gzip -c %t &gt; %f"
-append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </muttng-doc:lstconf>
+append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </madmutt-doc:lstconf>
         
       </para>
       
       <para>
-        You do not have to specify all of the commands. If you omit <muttng-doc:hook name="append"/>
+        You do not have to specify all of the commands. If you omit <madmutt-doc:hook name="append"/>
         ,the folder will be open and
-        closed again each time you will add to it. If you omit <muttng-doc:hook name="close"/>
+        closed again each time you will add to it. If you omit <madmutt-doc:hook name="close"/>
         (or give empty command) , the
-        folder will be open in the  mode. If you specify <muttng-doc:hook name="append"/>
+        folder will be open in the  mode. If you specify <madmutt-doc:hook name="append"/>
         though you'll be able to append
         to the folder.
       </para>
       
       <para>
-        Note that Mutt-ng will only try to use hooks if the file is not in one
+        Note that Madmutt will only try to use hooks if the file is not in one
         of
         the accepted formats. In particular, if the file is empty, mutt
         supposes it is not compressed. This is important because it allows the
         use of programs that do not have well defined extensions. Just use
         &quot;.&quot; as a regexp. But this may be surprising if your
         compressing script produces empty files. In this situation, unset
-        <muttng-doc:varref name="save-empty"/>
+        <madmutt-doc:varref name="save-empty"/>
         ,so that the compressed file
         will be removed if you delete all of the messages.
       </para>
@@ -8136,7 +8136,7 @@ append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </muttng-doc:lstconf>
         <title>Open a compressed mailbox for reading</title>
         
         <para>
-          Usage: <muttng-doc:hook name="open"/> <emphasis>regexp</emphasis> &quot;<emphasis>command</emphasis>&quot;
+          Usage: <madmutt-doc:hook name="open"/> <emphasis>regexp</emphasis> &quot;<emphasis>command</emphasis>&quot;
         </para>
         
         <para>
@@ -8173,8 +8173,8 @@ append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-open-hook \\.gz$ "gzip -cd %f &gt; %t"</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+open-hook \\.gz$ "gzip -cd %f &gt; %t"</madmutt-doc:lstconf>
           
         </para>
         
@@ -8190,11 +8190,11 @@ open-hook \\.gz$ "gzip -cd %f &gt; %t"</muttng-doc:lstconf>
         <title>Write a compressed mailbox</title>
         
         <para>
-          Usage: <muttng-doc:hook name="close"/> <emphasis>regexp</emphasis>&quot;<emphasis>command</emphasis>&quot;
+          Usage: <madmutt-doc:hook name="close"/> <emphasis>regexp</emphasis>&quot;<emphasis>command</emphasis>&quot;
         </para>
         
         <para>
-          This is used to close the folder that was open with the <muttng-doc:hook name="open"/>
+          This is used to close the folder that was open with the <madmutt-doc:hook name="open"/>
           command after some changes were made to it.
         </para>
         
@@ -8203,9 +8203,9 @@ open-hook \\.gz$ "gzip -cd %f &gt; %t"</muttng-doc:lstconf>
           used for closing the
           folders whose names match <emphasis>regexp</emphasis>. It has the
           same format as in 
-          the <muttng-doc:hook name="open"/> command. Temporary
+          the <madmutt-doc:hook name="open"/> command. Temporary
           folder
-          in this case is the folder previously produced by the <muttng-doc:hook name="open"/>
+          in this case is the folder previously produced by the <madmutt-doc:hook name="open"/>
           command.
         </para>
         
@@ -8222,8 +8222,8 @@ open-hook \\.gz$ "gzip -cd %f &gt; %t"</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-close-hook \\.gz$ "gzip -c %t &gt; %f"</muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+close-hook \\.gz$ "gzip -c %t &gt; %f"</madmutt-doc:lstconf>
           
         </para>
         
@@ -8234,7 +8234,7 @@ close-hook \\.gz$ "gzip -c %t &gt; %f"</muttng-doc:lstconf>
         </para>
         
         <para>
-          <muttng-doc:hook name="close"/> is not called when you
+          <madmutt-doc:hook name="close"/> is not called when you
           exit
           from the folder if the folder was not changed.
         </para>
@@ -8245,7 +8245,7 @@ close-hook \\.gz$ "gzip -c %t &gt; %f"</muttng-doc:lstconf>
         <title>Append a message to a compressed mailbox</title>
         
         <para>
-          Usage: <muttng-doc:hook name="append"/> <emphasis>regexp</emphasis>&quot;<emphasis>command</emphasis>&quot;
+          Usage: <madmutt-doc:hook name="append"/> <emphasis>regexp</emphasis>&quot;<emphasis>command</emphasis>&quot;
         </para>
         
         <para>
@@ -8254,7 +8254,7 @@ close-hook \\.gz$ "gzip -c %t &gt; %f"</muttng-doc:lstconf>
           appending to the
           folders whose names match <emphasis>regexp</emphasis>. It has the
           same format as in 
-          the <muttng-doc:hook name="open"/> command.
+          the <madmutt-doc:hook name="open"/> command.
           The temporary folder in this case contains the messages that are
           beingappended. 
         </para>
@@ -8272,23 +8272,23 @@ close-hook \\.gz$ "gzip -c %t &gt; %f"</muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
-append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
+append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </madmutt-doc:lstconf>
           
         </para>
         
         <para>
-          When <muttng-doc:hook name="append"/> is used, the
+          When <madmutt-doc:hook name="append"/> is used, the
           folder is
           not opened, which saves time, but this means that we can not find out
-          what the folder type is. Thus the default (<muttng-doc:varref name="mbox-type"/>
+          what the folder type is. Thus the default (<madmutt-doc:varref name="mbox-type"/>
           )type is always supposed (i.e.
           this is the format used for the temporary folder).
         </para>
         
         <para>
-          If the file does not exist when you save to it, <muttng-doc:hook name="close"/>
-          is called, and not <muttng-doc:hook name="append"/>. <muttng-doc:hook name="append"/>
+          If the file does not exist when you save to it, <madmutt-doc:hook name="close"/>
+          is called, and not <madmutt-doc:hook name="append"/>. <madmutt-doc:hook name="append"/>
           is only
           for appending to existing folders.
         </para>
@@ -8297,7 +8297,7 @@ append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </muttng-doc:lstconf>
           If the <emphasis>command</emphasis> is empty, this operation is
           disabled for this file
           type. In this case, the folder will be open and closed again (using
-          <muttng-doc:hook name="open"/> and <muttng-doc:hook name="close"/>
+          <madmutt-doc:hook name="open"/> and <madmutt-doc:hook name="close"/>
           respectively) each time you will add to it.
         </para>
         
@@ -8314,15 +8314,15 @@ append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </muttng-doc:lstconf>
         
         <para>
           
-          <muttng-doc:lstconf>
+          <madmutt-doc:lstconf>
 open-hook  \\.pgp$ "pgp -f &lt; %f &gt; %t"
-close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"</muttng-doc:lstconf>
+close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"</madmutt-doc:lstconf>
           
         </para>
         
         <para>
           Please note, that PGP does not support appending to an encrypted
-          folder, so there is no <muttng-doc:hook name="append"/> defined.
+          folder, so there is no <madmutt-doc:hook name="append"/> defined.
         </para>
         
         <para>
@@ -8348,14 +8348,14 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"</muttng-doc:ls
   <!--}}}-->
   
   <chapter id="mime-support"> <!--{{{-->
-    <title>Mutt-ng's MIME Support</title>
+    <title>Madmutt's MIME Support</title>
     
     <para>
-      Quite a bit of effort has been made to make Mutt-ng the premier text-mode
+      Quite a bit of effort has been made to make Madmutt the premier text-mode
       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-ng for MIME, there are two
-      extratypes of configuration files which Mutt-ng uses.  One is the
+      wherever possible.  When configuring Madmutt for MIME, there are two
+      extratypes of configuration files which Madmutt uses.  One is the
       <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
@@ -8367,7 +8367,7 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"</muttng-doc:ls
       <title>Using MIME in Mutt</title>
       
       <para>
-        There are three areas/menus in Mutt-ng which deal with MIME, they are
+        There are three areas/menus in Madmutt which deal with MIME, they are
         the
         pager (while viewing a message), the attachment menu and the compose
         menu.
@@ -8379,18 +8379,18 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"</muttng-doc:ls
         <para>
           When you select a message from the index and view it in the pager,
           Mutt
-          decodes the message to a text representation.  Mutt-ng internally
+          decodes the message to a text representation.  Madmutt internally
           supports
           a number of MIME types, including <literal>text/plain, text/enriched,
             message/rfc822, and message/news
           </literal>
           .In addition, the export
-          controlled version of Mutt-ng recognizes a variety of PGP MIME types,
+          controlled version of Madmutt recognizes a variety of PGP MIME types,
           including PGP/MIME and application/pgp.
         </para>
         
         <para>
-          Mutt-ng will denote attachments with a couple lines describing them.
+          Madmutt will denote attachments with a couple lines describing them.
           These lines are of the form:
           
           <screen>
@@ -8404,7 +8404,7 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"</muttng-doc:ls
         </para>
         
         <para>
-          If Mutt-ng cannot deal with a MIME type, it will display a message
+          If Madmutt cannot deal with a MIME type, it will display a message
           like:
           
           <screen>
@@ -8436,7 +8436,7 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"</muttng-doc:ls
         
         <para>
           Finally, you can apply the usual message-related functions (like 
-          <muttng-doc:funcref name="resend-message"/>, and the reply
+          <madmutt-doc:funcref name="resend-message"/>, and the reply
           and forward functions) to attachments of type <literal>message/rfc822</literal>.
         </para>
         
@@ -8470,7 +8470,7 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"</muttng-doc:ls
         </para>
         
         <para>
-          The '-' denotes that Mutt-ng will delete the file after sending (or
+          The '-' denotes that Madmutt will delete the file after sending (or
           postponing, or canceling) the message.  It can be toggled with the
           <literal>toggle-unlink</literal> command (default: u).  The next
           field is the MIME
@@ -8503,8 +8503,8 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"</muttng-doc:ls
       </title>
       
       <para>
-        When you add an attachment to your mail message, Mutt-ng searches your
-        personal mime.types file within <muttng-doc:envvar name="HOME"/> and then
+        When you add an attachment to your mail message, Madmutt searches your
+        personal mime.types file within <madmutt-doc:envvar name="HOME"/> and then
         the system mime.types file at <literal>/usr/local/share/mutt/mime.types</literal> or
         <literal>/etc/mime.types</literal>
       </para>
@@ -8518,22 +8518,22 @@ application/postscript          ps eps
 application/pgp                 pgp
 audio/x-aiff                    aif aifc aiff</screen>
         
-        A sample <literal>mime.types</literal> file comes with the Mutt-ng
+        A sample <literal>mime.types</literal> file comes with the Madmutt
         distribution, and
         should contain most of the MIME types you are likely to use.  
       </para>
       
       <para>
-        If Mutt-ng can not determine the mime type by the extension of the file
+        If Madmutt can not determine the mime type by the extension of the file
         you
         attach, it will look at the file.  If the file is free of binary
-        information, Mutt-ng will assume that the file is plain text, and mark
+        information, Madmutt will assume that the file is plain text, and mark
         it
         as <literal>text/plain</literal>.  If the file contains binary
-        information, then Mutt-ng will
+        information, then Madmutt will
         mark it as <literal>application/octet-stream</literal>.  You can change
         the MIME
-        type that Mutt-ng assigns to an attachment by using the <literal>
+        type that Madmutt assigns to an attachment by using the <literal>
           edit-type
         </literal>
         command from the compose menu (default: ^T). The MIME type is
@@ -8541,7 +8541,7 @@ audio/x-aiff                    aif aifc aiff</screen>
         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-ng recognises all of these if
+        after various internet discussions. Madmutt recognises all of these if
         the 
         appropriate entry is found in the mime.types file. It also recognises
         other
@@ -8566,7 +8566,7 @@ audio/x-aiff                    aif aifc aiff</screen>
       </title>
       
       <para>
-        Mutt-ng supports <muttng-doc:rfc num="1524"/> MIME Configuration, in particular the Unix
+        Madmutt supports <madmutt-doc:rfc num="1524"/> MIME Configuration, in particular the Unix
         specific format specified in Appendix A of the RfC.  This file format
         is commonly referred to as the mailcap format.  Many MIME compliant
         programs utilize the mailcap format, allowing you to specify handling
@@ -8575,15 +8575,15 @@ audio/x-aiff                    aif aifc aiff</screen>
       </para>
       
       <para>
-        In order to handle various MIME types that Mutt-ng can not handle
-        internally, Mutt-ng parses a series of external configuration files to
+        In order to handle various MIME types that Madmutt can not handle
+        internally, Madmutt parses a series of external configuration files to
         find an external handler.  The default search string for these files
         is a colon delimited list set to
         
         <screen>
 ${HOME}/.mailcap:/usr/local/share/mutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap</screen>
         
-        where <muttng-doc:envvar name="HOME"/> is your home directory.
+        where <madmutt-doc:envvar name="HOME"/> is your home directory.
       </para>
       
       <para>
@@ -8639,10 +8639,10 @@ ${HOME}/.mailcap:/usr/local/share/mutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/et
           are two different types of commands supported. The default is to send
           the body of the MIME message to the command on stdin. You can change
           this behavior by using %s as a parameter to your view command.
-          This will cause Mutt-ng to save the body of the MIME message to a
+          This will cause Madmutt to save the body of the MIME message to a
           temporary
           file, and then call the view command with the %s replaced by
-          the name of the temporary file. In both cases, Mutt-ng will turn over
+          the name of the temporary file. In both cases, Madmutt will turn over
           the
           terminal to the view program until the program quits, at which time
           Mutt
@@ -8709,11 +8709,11 @@ text/*; more</screen>
         <para>
           The interpretation of shell meta-characters embedded in MIME
           parameters
-          can lead to security problems in general.  Mutt-ng tries to quote
+          can lead to security problems in general.  Madmutt tries to quote
           parameters
           in expansion of %s syntaxes properly, and avoids risky
           characters by
-          substituting them, see the <muttng-doc:varref name="mailcap-sanitize"/>
+          substituting them, see the <madmutt-doc:varref name="mailcap-sanitize"/>
           variable.
         </para>
         
@@ -8726,7 +8726,7 @@ text/*; more</screen>
         
         <para>
           <emphasis>Keep the %-expandos away from shell quoting.</emphasis>
-          Don't quote them with single or double quotes.  Mutt-ng does this for
+          Don't quote them with single or double quotes.  Madmutt does this for
           you, the right way, as should any other program which interprets
           mailcap.  Don't put them into backtick expansions.  Be highly careful
           with eval statements, and avoid them if possible at all.  Trying to
@@ -8766,20 +8766,20 @@ text/test-mailcap-bug; cat %s; copiousoutput; test=charset=%{charset} \
             you
             can add semi-colon ';' separated fields to set flags and other
             options.
-            Mutt-ng recognizes the following optional fields:
+            Madmutt recognizes the following optional fields:
             <variablelist>
               
               <varlistentry>
                 <term>copiousoutput</term>
                 <listitem>
                   <para>
-                    This flag tells Mutt-ng that the command passes possibly
+                    This flag tells Madmutt that the command passes possibly
                     large amounts of
-                    text on stdout.  This causes Mutt-ng to invoke a pager
+                    text on stdout.  This causes Madmutt to invoke a pager
                     (either the internal
                     pager or the external pager defined by the pager variable)
                     on the output
-                    of the view command.  Without this flag, Mutt-ng assumes
+                    of the view command.  Without this flag, Madmutt assumes
                     that the command
                     is interactive.  One could use this to replace the pipe to <literal>
                       more
@@ -8792,7 +8792,7 @@ text/html; lynx -dump %s ; copiousoutput</screen>
                     
                     This will cause lynx to format the text/html output as
                     text/plain
-                    and Mutt-ng will use your standard pager to display the
+                    and Madmutt will use your standard pager to display the
                     results.
                   </para>
                 </listitem>
@@ -8801,13 +8801,13 @@ text/html; lynx -dump %s ; copiousoutput</screen>
                 <term>needsterminal</term>
                 <listitem>
                   <para>
-                    Mutt-ng uses this flag when viewing attachments with <muttng-doc:cmdref name="auto_view"/>,
+                    Madmutt uses this flag when viewing attachments with <madmutt-doc:cmdref name="auto_view"/>,
                     in order to decide whether it should honor the setting
-                    of the <muttng-doc:varref name="wait-key"/> variable or
+                    of the <madmutt-doc:varref name="wait-key"/> variable or
                     not.  When an attachment is viewed using an interactive
                     program, and the
-                    corresponding mailcap entry has a <emphasis>needsterminal</emphasis> flag, Mutt-ng will use
-                    <muttng-doc:varref name="wait-key"/> and the exit
+                    corresponding mailcap entry has a <emphasis>needsterminal</emphasis> flag, Madmutt will use
+                    <madmutt-doc:varref name="wait-key"/> and the exit
                     statusof the program to decide if it will ask you to press
                     a key after the
                     external program has exited.  In all other situations it
@@ -8822,7 +8822,7 @@ text/html; lynx -dump %s ; copiousoutput</screen>
                   <para>
                     This flag specifies the command to use to create a new
                     attachment of a
-                    specific MIME type.  Mutt-ng supports this from the compose
+                    specific MIME type.  Madmutt supports this from the compose
                     menu.
                   </para>
                 </listitem>
@@ -8839,7 +8839,7 @@ text/html; lynx -dump %s ; copiousoutput</screen>
                     This can be
                     used to specify parameters, filename, description, etc. for
                     a new
-                    attachment.   Mutt-ng supports this from the compose menu.
+                    attachment.   Madmutt supports this from the compose menu.
                   </para>
                 </listitem>
               </varlistentry>
@@ -8849,7 +8849,7 @@ text/html; lynx -dump %s ; copiousoutput</screen>
                   <para>
                     This flag specifies the command to use to print a specific
                     MIME type.
-                    Mutt-ng supports this from the attachment and compose
+                    Madmutt supports this from the attachment and compose
                     menus.
                   </para>
                 </listitem>
@@ -8860,9 +8860,9 @@ text/html; lynx -dump %s ; copiousoutput</screen>
                   <para>
                     This flag specifies the command to use to edit a specific
                     MIME type.  
-                    Mutt-ng supports this from the compose menu, and also uses
+                    Madmutt supports this from the compose menu, and also uses
                     it to compose
-                    new attachments.  Mutt-ng will default to the defined
+                    new attachments.  Madmutt will default to the defined
                     editor for text
                     attachments.
                   </para>
@@ -8899,12 +8899,12 @@ text/html; lynx %s; nametemplate=%s.html</screen>
                     command expansion
                     rules defined in the next section.  If the command returns
                     0, then the
-                    test passed, and Mutt-ng uses this entry.  If the command
+                    test passed, and Madmutt uses this entry.  If the command
                     returns non-zero,
-                    then the test failed, and Mutt-ng continues searching for
+                    then the test failed, and Madmutt continues searching for
                     the right entry.
                     <emphasis role="bold">Note:</emphasis> <emphasis>the
-                      content-type must match before Mutt-ng performs the test.
+                      content-type must match before Madmutt performs the test.
                     </emphasis>
                     For example:
                     
@@ -8912,14 +8912,14 @@ text/html; lynx %s; nametemplate=%s.html</screen>
 text/html; netscape -remote 'openURL(%s)' ; test=RunningX
 text/html; lynx %s</screen>
                     
-                    In this example, Mutt-ng will run the program RunningX
+                    In this example, Madmutt 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-ng will call netscape to
+                    RunningX returns 0, then Madmutt will call netscape to
                     display the
                     text/html object.  If RunningX doesn't return 0, then
-                    Mutt-ng will go on
+                    Madmutt will go on
                     to the next entry and use lynx to display the text/html
                     object.
                   </para>
@@ -8934,12 +8934,12 @@ text/html; lynx %s</screen>
           <title>Search Order</title>
           
           <para>
-            When searching for an entry in the mailcap file, Mutt-ng will
+            When searching for an entry in the mailcap file, Madmutt will
             search for
             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-ng will search for an entry with
+            entries in your mailcap file, Madmutt will search for an entry with
             the
             print command:
             
@@ -8948,14 +8948,14 @@ image/*;        xv %s
 image/gif;      ; print= anytopnm %s | pnmtops | lpr; \
 nametemplate=%s.gif</screen>
             
-            Mutt-ng will skip the <literal>image/*</literal> entry and use the <literal>
+            Madmutt 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 <muttng-doc:cmdref name="auto_view"/>
+            In addition, you can use this with <madmutt-doc:cmdref name="auto_view"/>
             to denote two commands for viewing an attachment, one to be viewed
             automatically, the other to be viewed interactively from the
             attachment
@@ -8968,13 +8968,13 @@ text/html;      netscape -remote 'openURL(%s)' ; test=RunningX
 text/html;      lynx %s; nametemplate=%s.html
 text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput</screen>
             
-            For <muttng-doc:cmdref name="auto_view"/>, Mutt-ng will choose
+            For <madmutt-doc:cmdref name="auto_view"/>, Madmutt 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
-            entry.  If the program returns non-zero, Mutt-ng will use the
+            entry.  If the program returns non-zero, Madmutt will use the
             second entry
             for interactive viewing.
           </para>
@@ -8990,9 +8990,9 @@ text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput</screen>
             Before the
             command is passed to <literal>/bin/sh -c</literal>, it is parsed to
             expand
-            various special parameters with information from Mutt-ng.  The
+            various special parameters with information from Madmutt.  The
             keywords
-            Mutt-ng expands are:
+            Madmutt expands are:
             <variablelist>
               
               <varlistentry>
@@ -9007,7 +9007,7 @@ text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput</screen>
                     composing
                     program should place the results of composition.  In
                     addition, the
-                    use of this keyword causes Mutt-ng to not pass the body of
+                    use of this keyword causes Madmutt to not pass the body of
                     the message
                     to the view/print/edit program on stdin.
                   </para>
@@ -9017,7 +9017,7 @@ text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput</screen>
                 <term>%t</term>
                 <listitem>
                   <para>
-                    Mutt-ng will expand %t to the text representation of
+                    Madmutt will expand %t to the text representation of
                     the content
                     type of the message in the same form as the first parameter
                     of the
@@ -9030,16 +9030,16 @@ text/html;      lynx -dump %s; nametemplate=%s.html; copiousoutput</screen>
                 <term>%{&lt;parameter&gt;}</term>
                 <listitem>
                   <para>
-                    Mutt-ng will expand this to the value of the specified
+                    Madmutt 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:
                     
-                    <muttng-doc:lstmail>
-Content-Type: text/plain; charset=iso-8859-1</muttng-doc:lstmail>
+                    <madmutt-doc:lstmail>
+Content-Type: text/plain; charset=iso-8859-1</madmutt-doc:lstmail>
                     
-                    then Mutt-ng will expand %{charset} to
+                    then Madmutt will expand %{charset} to
                     iso-8859-1.  The default metamail
                     mailcap file uses this feature to test the charset to spawn
                     an xterm
@@ -9056,10 +9056,10 @@ Content-Type: text/plain; charset=iso-8859-1</muttng-doc:lstmail>
                 </listitem>
               </varlistentry>
             </variablelist>
-            Mutt-ng does not currently support the %F and %n
+            Madmutt does not currently support the %F and %n
             keywords
-            specified in <muttng-doc:rfc num="1524"/>.  The main purpose of these parameters is for
-            multipart messages, which is handled internally by Mutt-ng.
+            specified in <madmutt-doc:rfc num="1524"/>.  The main purpose of these parameters is for
+            multipart messages, which is handled internally by Madmutt.
           </para>
           
         </sect3>
@@ -9137,16 +9137,16 @@ application/ms-excel; open.pl %s</screen>
       <title>MIME Autoview</title>
 
       <para>
-        <muttng-doc:cmddef name="auto_view">mime-type [mime-type ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="auto_view">mime-type [mime-type ...]</madmutt-doc:cmddef>
       </para>
 
       <para>
-        <muttng-doc:cmddef name="unauto_view">mime-type [mime-type ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unauto_view">mime-type [mime-type ...]</madmutt-doc:cmddef>
       </para>
  
       <para>
-        In addition to explicitly telling Mutt-ng to view an attachment with
-        theMIME viewer defined in the mailcap file, Mutt-ng has support for
+        In addition to explicitly telling Madmutt to view an attachment with
+        theMIME viewer defined in the mailcap file, Madmutt has support for
         automatically viewing MIME attachments while in the pager.
       </para>
       
@@ -9167,14 +9167,14 @@ application/ms-excel; open.pl %s</screen>
       <para>
         For instance, if you set auto_view to:
         
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 auto_view text/html application/x-gunzip application/postscript
-image/gif application/x-tar-gz</muttng-doc:lstconf>
+image/gif application/x-tar-gz</madmutt-doc:lstconf>
         
       </para>
       
       <para>
-        Mutt-ng could use the following mailcap entries to automatically view
+        Madmutt could use the following mailcap entries to automatically view
         attachments of these types.
         
         <screen>
@@ -9189,7 +9189,7 @@ application/postscript; ps2ascii %s; copiousoutput</screen>
       <para>
         ``unauto_view'' can be used to remove previous entries from the
         autoview list.
-        This can be used with <muttng-doc:hook name="message"/> to autoview messages based on size,
+        This can be used with <madmutt-doc:hook name="message"/> to autoview messages based on size,
         etc.
         ``unauto_view *'' will remove all previous entries.
       </para>
@@ -9204,15 +9204,15 @@ application/postscript; ps2ascii %s; copiousoutput</screen>
       <title>MIME Multipart/Alternative</title>
 
       <para>
-        <muttng-doc:cmddef name="alternative_order">mime-type [mime-type ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="alternative_order">mime-type [mime-type ...]</madmutt-doc:cmddef>
       </para>
       
       <para>
-        <muttng-doc:cmddef name="unalternative_order">mime-type [mime-type ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unalternative_order">mime-type [mime-type ...]</madmutt-doc:cmddef>
       </para>
  
       <para>
-        Mutt-ng has some heuristics for determining which attachment of a
+        Madmutt has some heuristics for determining which attachment of a
         multipart/alternative type to display.  First, mutt will check the 
         alternative_order list to determine if one of the available
         typesis preferred.  The alternative_order list consists of a
@@ -9220,16 +9220,16 @@ application/postscript; ps2ascii %s; copiousoutput</screen>
         MIME types in order, including support for implicit and explicit
         wildcards, for example:
        
-        <muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
 alternative_order text/enriched text/plain text
-application/postscript image/*</muttng-doc:lstconf>
+application/postscript image/*</madmutt-doc:lstconf>
         
       </para>
       
       <para>
         Next, mutt will check if any of the types have a defined 
-        <muttng-doc:cmdref name="auto_view"/>, and use that.  Failing
-        that, Mutt-ng will look for any text type.  As a last attempt, mutt
+        <madmutt-doc:cmdref name="auto_view"/>, and use that.  Failing
+        that, Madmutt will look for any text type.  As a last attempt, mutt
         willlook for any type it knows how to handle.
       </para>
       
@@ -9262,14 +9262,14 @@ The syntax is:
 </para>
 
 <para>
-  <muttng-doc:cmddef name="attachments">
+  <madmutt-doc:cmddef name="attachments">
     ( {+|-}disposition mime-type | ? )
-  </muttng-doc:cmddef>
+  </madmutt-doc:cmddef>
 </para>
 <para>
-  <muttng-doc:cmddef name="unattachments">
+  <madmutt-doc:cmddef name="unattachments">
     {+|-}disposition mime-type
-  </muttng-doc:cmddef>
+  </madmutt-doc:cmddef>
 </para>
 
 <para>
@@ -9367,7 +9367,7 @@ that it can be pasted elsewhere.
   Please note that counting attachments may require lots of data be
   loaded. This may cause noticeable slowdowns over network links
   depending on the connection speed and message sizes. To fine-tune the
-  behavior on a per-folder or other basis, the <muttng-doc:varref
+  behavior on a per-folder or other basis, the <madmutt-doc:varref
     name="count-attachments"/> variable may be used.
 </para>
 
@@ -9377,15 +9377,15 @@ that it can be pasted elsewhere.
       <title>MIME Lookup</title>
 
       <para>
-        <muttng-doc:cmddef name="mime_lookup">mime-type [mime-type ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="mime_lookup">mime-type [mime-type ...]</madmutt-doc:cmddef>
       </para>
 
       <para>
-        <muttng-doc:cmddef name="unmime_lookup">mime-type [mime-type ...]</muttng-doc:cmddef>
+        <madmutt-doc:cmddef name="unmime_lookup">mime-type [mime-type ...]</madmutt-doc:cmddef>
       </para>
  
       <para>
-        Mutt-ng's mime_lookup list specifies a list of mime-types that
+        Madmutt's mime_lookup list specifies a list of mime-types that
         should not
         be treated according to their mailcap entry.  This option is designed
         todeal with binary types such as application/octet-stream.  When an
@@ -9400,8 +9400,8 @@ that it can be pasted elsewhere.
         configuration
         options (such as auto_view) specified.  Common usage would be:
         
-        <muttng-doc:lstconf>
-mime_lookup application/octet-stream application/X-Lotus-Manuscript</muttng-doc:lstconf>
+        <madmutt-doc:lstconf>
+mime_lookup application/octet-stream application/X-Lotus-Manuscript</madmutt-doc:lstconf>
         
       </para>
       
@@ -9430,24 +9430,24 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</muttng-doc:
     <title>Security Considerations</title>
     
     <para>
-      First of all, mutt-ng contains no security holes included by
+      First of all, Madmutt contains no security holes included by
       intention but may contain unknown security holes. As a consequence,
-      please run mutt-ng only with as few permissions as possible.
+      please run Madmutt only with as few permissions as possible.
     </para>
     
     <para>
-      Please do not run mutt-ng as the super user.
+      Please do not run Madmutt as the super user.
     </para>
     
     <para>
-      When configuring mutt-ng, there're some points to note about secure
+      When configuring Madmutt, there're some points to note about secure
       setups.
     </para>
     
     <para>
-      In practice, mutt-ng can be easily made as vulnerable as even the
+      In practice, Madmutt can be easily made as vulnerable as even the
       most insecure mail user agents (in their default configuration) just
-      by changing mutt-ng's configuration files: it then can execute
+      by changing Madmutt's configuration files: it then can execute
       arbitrary programs and scripts attached to messages, send out private
       data on its own, etc. Although this is not believed to the common type
       of setup, please read this chapter carefully.
@@ -9457,7 +9457,7 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</muttng-doc:
       <title>Passwords</title>
       
       <para>
-        Although mutt-ng can be told the various passwords for accounts,
+        Although Madmutt can be told the various passwords for accounts,
         please never store passwords in configuration files. Besides the
         fact that the system's operator can always read them, you could
         forget to replace the actual password with asterisks when reporting
@@ -9472,12 +9472,12 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</muttng-doc:
       <title>Temporary Files</title>
       
       <para>
-        Mutt-ng uses many temporary files for viewing messages, verifying
-        digital signatures, etc. The <muttng-doc:varref name="umask"/>
+        Madmutt uses many temporary files for viewing messages, verifying
+        digital signatures, etc. The <madmutt-doc:varref name="umask"/>
         variable can be used to change the default permissions of these
         files. Please only change it if you really know what you are doing.
         Also, a different location for these files may be desired which can
-        be changed via the <muttng-doc:varref name="tmpdir"/> variable.
+        be changed via the <madmutt-doc:varref name="tmpdir"/> variable.
       </para>
       
     </sect1>
@@ -9489,7 +9489,7 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</muttng-doc:
         <title>Message-ID: headers</title>
         
         <para>
-          In the default configuration, mutt-ng will leak some information
+          In the default configuration, Madmutt will leak some information
           to the outside world when sending messages: the generation of
           <literal>Message-ID:</literal> headers includes a step counter which
           is increased
@@ -9497,7 +9497,7 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</muttng-doc:
           information probably telling others how many mail you sent in which
           time, you at least need to remove the <literal>%P</literal>
           expando from the
-          default setting of the <muttng-doc:varref name="msgid-format"/> variable. Please make sure that
+          default setting of the <madmutt-doc:varref name="msgid-format"/> variable. Please make sure that
           you really know how local parts of these <literal>Message-ID:</literal> headers
           are composed.
         </para>
@@ -9508,13 +9508,13 @@ mime_lookup application/octet-stream application/X-Lotus-Manuscript</muttng-doc:
         <title>mailto:-style links</title>
         
         <para>
-          As mutt-ng be can be set up to be the mail client to handle
+          As Madmutt be can be set up to be the mail client to handle
           <literal>mailto:</literal> style links in websites, there're security
-          considerations, too. To keep the old behavior by default, mutt-ng
+          considerations, too. To keep the old behavior by default, Madmutt
           will be strict in interpreting them which means that arbitrary
           header fields can be embedded in these links which could override
           existing header fields or attach arbitrary files. This may be
-          problematic if the <muttng-doc:varref name="edit-headers"/>
+          problematic if the <madmutt-doc:varref name="edit-headers"/>
           variable is <emphasis>unset</emphasis>, i.e. the
           user doesn't want to see header fields while editing the message.
         </para>
@@ -9537,8 +9537,8 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
         </para>
         
         <para>
-          When <emphasis>unsetting</emphasis> the <muttng-doc:varref name="strict-mailto"/>
-          variable, mutt-ng will
+          When <emphasis>unsetting</emphasis> the <madmutt-doc:varref name="strict-mailto"/>
+          variable, Madmutt will
         </para>
         
         <para>
@@ -9557,7 +9557,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
             <listitem>
               
               <para>
-                turn on the <muttng-doc:varref name="edit-headers"/>
+                turn on the <madmutt-doc:varref name="edit-headers"/>
                 variable by
                 force to let the user see all the headers
                 (because they still may leak information.)
@@ -9577,7 +9577,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       <title>External applications</title>
       
       <para>
-        Mutt-ng in many places has to rely on external applications or
+        Madmutt in many places has to rely on external applications or
         for convenience supports mechanisms involving external
         applications.
       </para>
@@ -9587,10 +9587,10 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
         
         <para>
           One of these is the <literal>mailcap</literal> mechanism as defined
-          by <muttng-doc:rfc num="1524"/>. Mutt-ng can be set up to <emphasis>automatically</emphasis>
+          by <madmutt-doc:rfc num="1524"/>. Madmutt can be set up to <emphasis>automatically</emphasis>
           execute any
           given utility as listed in one of the mailcap files (see the
-          <muttng-doc:varref name="mailcap-path"/>
+          <madmutt-doc:varref name="mailcap-path"/>
           variable for details.) 
         </para>
         
@@ -9600,7 +9600,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           other exploitable bugs.  These vulnerabilities may go unnoticed by
           the user, especially when they are called automatically (and
           without interactive prompting) from the mailcap file(s). When
-          using mutt-ng's autoview mechanism in combination with mailcap
+          using Madmutt's autoview mechanism in combination with mailcap
           files, please be sure to...
         </para>
         
@@ -9634,7 +9634,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
             <listitem>
               
               <para>
-                leave the <muttng-doc:varref name="mailcap-sanitize"/> variable in its default
+                leave the <madmutt-doc:varref name="mailcap-sanitize"/> variable in its default
                 state to restrict mailcap expandos to a safe set of characters
                 
               </para>
@@ -9650,13 +9650,13 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
         <title>Other</title>
         
         <para>
-          Besides the mailcap mechanism, mutt-ng uses a number of other
+          Besides the mailcap mechanism, Madmutt uses a number of other
           external utilities for operation.
         </para>
         
         <para>
           The same security considerations apply for these as for tools
-          involved via mailcap (for example, mutt-ng is vulnerable to Denial
+          involved via mailcap (for example, Madmutt is vulnerable to Denial
           of Service Attacks with compressed folders support if the
           uncompressed mailbox is too large for the disk it is saved to.)
         </para>
@@ -9680,7 +9680,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       <title>Command line options</title>
       
       <para>
-        Running <literal>mutt</literal> with no arguments will make Mutt-ng
+        Running <literal>mutt</literal> with no arguments will make Madmutt
         attempt to read your spool
         mailbox.  However, it is possible to read other mailboxes and
         to send messages from the command line as well.
@@ -9744,7 +9744,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
             </row>
             <row>
               <entry><literal>-n</literal></entry>
-              <entry>do not read the system Muttngrc</entry>
+              <entry>do not read the system madmuttrc</entry>
             </row>
             <row>
               <entry><literal>-p</literal></entry>
@@ -9825,7 +9825,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       </para>
       
       <para>
-        Mutt-ng also supports a ``batch'' mode to send prepared messages. 
+        Madmutt also supports a ``batch'' mode to send prepared messages. 
         Simply redirect
         input from the file you wish to send.  For example,
       </para>
@@ -9868,227 +9868,227 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:pattern full="1" name="A"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="A"/></entry>
               <entry><literal></literal></entry>
               <entry>all messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="b"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="b"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the message body</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="B"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="B"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the whole message</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="c"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="c"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages carbon-copied to EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="C"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="C"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>message is either to: or cc: EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="D"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="D"/></entry>
               <entry><literal></literal></entry>
               <entry>deleted messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="d"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="d"/></entry>
               <entry><literal>[MIN]-[MAX]</literal></entry>
               <entry>messages with ``date-sent'' in a Date range</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="E"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="E"/></entry>
               <entry><literal></literal></entry>
               <entry>expired messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="e"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="e"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>message which contains EXPR in the ``Sender'' field</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="F"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="F"/></entry>
               <entry><literal></literal></entry>
               <entry>flagged messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="f"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="f"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages originating from EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="g"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="g"/></entry>
               <entry><literal></literal></entry>
               <entry>cryptographically signed messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="G"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="G"/></entry>
               <entry><literal></literal></entry>
               <entry>cryptographically encrypted messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="H"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="H"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages with a spam attribute matching EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="h"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="h"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the message header</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="k"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="k"/></entry>
               <entry><literal></literal></entry>
               <entry>message contains PGP key material</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="i"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="i"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>message which match ID in the ``Message-ID'' field</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="L"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="L"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>message is either originated or received by EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="l"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="l"/></entry>
               <entry><literal></literal></entry>
               <entry>message is addressed to a known mailing list</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="m"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="m"/></entry>
               <entry><literal>[MIN]-[MAX]</literal></entry>
               <entry>message in the range MIN to MAX *)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="M"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="M"/></entry>
               <entry><literal></literal></entry>
               <entry>multipart messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="n"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="n"/></entry>
               <entry><literal>[MIN]-[MAX]</literal></entry>
               <entry>messages with a score in the range MIN to MAX *)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="N"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="N"/></entry>
               <entry><literal></literal></entry>
               <entry>new messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="O"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="O"/></entry>
               <entry><literal></literal></entry>
               <entry>old messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="p"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="p"/></entry>
               <entry><literal></literal></entry>
               <entry>message is addressed to you (consults alternates)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="P"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="P"/></entry>
               <entry><literal></literal></entry>
               <entry>message is from you (consults alternates)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="Q"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="Q"/></entry>
               <entry><literal></literal></entry>
               <entry>messages which have been replied to</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="R"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="R"/></entry>
               <entry><literal></literal></entry>
               <entry>read messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="r"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="r"/></entry>
               <entry><literal>[MIN]-[MAX]</literal></entry>
               <entry>messages with ``date-received'' in a Date range</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="S"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="S"/></entry>
               <entry><literal></literal></entry>
               <entry>superseded messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="s"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="s"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages having EXPR in the ``Subject'' field.</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="T"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="T"/></entry>
               <entry><literal></literal></entry>
               <entry>tagged messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="t"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="t"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages addressed to EXPR</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="U"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="U"/></entry>
               <entry><literal></literal></entry>
               <entry>unread messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="u"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="u"/></entry>
               <entry><literal></literal></entry>
               <entry>message is addressed to a subscribed mailing list</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="v"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="v"/></entry>
               <entry><literal></literal></entry>
               <entry>message is part of a collapsed thread.</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="V"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="V"/></entry>
               <entry><literal></literal></entry>
               <entry>cryptographically verified messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="w"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="w"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the `Newsgroups' field (if compiled with NNTP support)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="x"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="x"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the `References' field</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="X"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="X"/></entry>
               <entry><literal>[MIN]-[MAX]</literal></entry>
               <entry>messages with MIN to MAX attachments *)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="y"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="y"/></entry>
               <entry><literal>EXPR</literal></entry>
               <entry>messages which contain EXPR in the `X-Label' field</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="z"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="z"/></entry>
               <entry><literal>[MIN]-[MAX]</literal></entry>
               <entry>messages with a size in the range MIN to MAX *)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="="/></entry>
+              <entry><madmutt-doc:pattern full="1" name="="/></entry>
               <entry><literal></literal></entry>
               <entry>duplicated messages (see $duplicate_threads)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="$"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="$"/></entry>
               <entry><literal></literal></entry>
               <entry>unreferenced messages (requires threaded view)</entry>
             </row>
             <row>
-              <entry><muttng-doc:pattern full="1" name="*"/></entry>
+              <entry><madmutt-doc:pattern full="1" name="*"/></entry>
               <entry><literal></literal></entry>
               <entry>``From'' contains realname and (syntactically) valid address
                 (excluded are addresses matching against alternates or any alias)</entry>
@@ -10102,7 +10102,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
         Where EXPR are 
         <link linkend="advanced-regexp">regexp</link>.  Special attention has to be
         made when using regular expressions inside of patterns.  Specifically,
-        Mutt-ng's parser for these patterns will strip one level of backslash
+        Madmutt's parser for these patterns will strip one level of backslash
         (\),
         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
@@ -10131,326 +10131,326 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="account"/></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
+              <literal><madmutt-doc:hook name="account"/></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="alias"/></literal> <emphasis>key</emphasis> <emphasis>address</emphasis> [, <emphasis>address</emphasis>, ... ]
+              <literal><madmutt-doc:cmdref name="alias"/></literal> <emphasis>key</emphasis> <emphasis>address</emphasis> [, <emphasis>address</emphasis>, ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unalias"/></literal> [ * | <emphasis>key</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="unalias"/></literal> [ * | <emphasis>key</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="alternates"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="alternates"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unalternates"/></literal> [ * | <emphasis>regexp</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="unalternates"/></literal> [ * | <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="alternative_order"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="alternative_order"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unalternative_order"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="unalternative_order"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="append"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
+              <literal><madmutt-doc:hook name="append"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="auto_view"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="auto_view"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unauto_view"/></literal><emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="unauto_view"/></literal><emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="bind"/></literal> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>function</emphasis>
+              <literal><madmutt-doc:cmdref name="bind"/></literal> <emphasis>map</emphasis> <emphasis>key</emphasis> <emphasis>function</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="charset"/></literal> <emphasis>alias</emphasis> <emphasis>charset</emphasis>
+              <literal><madmutt-doc:hook name="charset"/></literal> <emphasis>alias</emphasis> <emphasis>charset</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="close"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
+              <literal><madmutt-doc:hook name="close"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="color"/></literal> <emphasis>object</emphasis> <emphasis>foreground</emphasis> <emphasis>background</emphasis> [ <emphasis>regexp</emphasis> ]
+              <literal><madmutt-doc:cmdref name="color"/></literal> <emphasis>object</emphasis> <emphasis>foreground</emphasis> <emphasis>background</emphasis> [ <emphasis>regexp</emphasis> ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="uncolor"/></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="uncolor"/></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="exec"/></literal> <emphasis>function</emphasis> [ <emphasis>function</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="exec"/></literal> <emphasis>function</emphasis> [ <emphasis>function</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="fcc"/></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+              <literal><madmutt-doc:hook name="fcc"/></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="fcc-save"/></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+              <literal><madmutt-doc:hook name="fcc-save"/></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="folder"/></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
+              <literal><madmutt-doc:hook name="folder"/></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="hdr_order"/></literal> <emphasis>header</emphasis> [ <emphasis>header</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="hdr_order"/></literal> <emphasis>header</emphasis> [ <emphasis>header</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unhdr_order"/></literal> <emphasis>header</emphasis> [ <emphasis>header</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="unhdr_order"/></literal> <emphasis>header</emphasis> [ <emphasis>header</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="charset"/></literal> <emphasis>charset</emphasis> <emphasis>local-charset</emphasis>
+              <literal><madmutt-doc:hook name="charset"/></literal> <emphasis>charset</emphasis> <emphasis>local-charset</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="ignore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="ignore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unignore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="unignore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="lists"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="lists"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unlists"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="unlists"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="macro"/></literal> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>sequence</emphasis> [ <emphasis>description</emphasis> ]
+              <literal><madmutt-doc:cmdref name="macro"/></literal> <emphasis>menu</emphasis> <emphasis>key</emphasis> <emphasis>sequence</emphasis> [ <emphasis>description</emphasis> ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="mailboxes"/></literal> <emphasis>filename</emphasis> [ <emphasis>filename</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="mailboxes"/></literal> <emphasis>filename</emphasis> [ <emphasis>filename</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="mbox"/></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
+              <literal><madmutt-doc:hook name="mbox"/></literal> <emphasis>pattern</emphasis> <emphasis>mailbox</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="message"/></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
+              <literal><madmutt-doc:hook name="message"/></literal> <emphasis>pattern</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="mime_lookup"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="mime_lookup"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
               <literal>
-                <muttng-doc:cmdref name="unmime_lookup"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
+                <madmutt-doc:cmdref name="unmime_lookup"/></literal> <emphasis>mimetype</emphasis> [ <emphasis>mimetype</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="mono"/></literal> <emphasis>object attribute</emphasis> [ <emphasis>regexp</emphasis> ]
+              <literal><madmutt-doc:cmdref name="mono"/></literal> <emphasis>object attribute</emphasis> [ <emphasis>regexp</emphasis> ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unmono"/></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="unmono"/></literal> <emphasis>index</emphasis> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="my_hdr"/></literal> <emphasis>string</emphasis>
+              <literal><madmutt-doc:cmdref name="my_hdr"/></literal> <emphasis>string</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unmy_hdr"/></literal> <emphasis>field</emphasis> [ <emphasis>field</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="unmy_hdr"/></literal> <emphasis>field</emphasis> [ <emphasis>field</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="open"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
+              <literal><madmutt-doc:hook name="open"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="crypt"/></literal> <emphasis>pattern</emphasis> <emphasis>key-id</emphasis>
+              <literal><madmutt-doc:hook name="crypt"/></literal> <emphasis>pattern</emphasis> <emphasis>key-id</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="push"/></literal> <emphasis>string</emphasis>
+              <literal><madmutt-doc:cmdref name="push"/></literal> <emphasis>string</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="reset"/> </literal><emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="reset"/> </literal><emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="save"/></literal> <emphasis>regexp</emphasis> <emphasis>filename</emphasis>
+              <literal><madmutt-doc:hook name="save"/></literal> <emphasis>regexp</emphasis> <emphasis>filename</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="score"/> </literal> <emphasis>pattern</emphasis> <emphasis>value</emphasis>
+              <literal><madmutt-doc:cmdref name="score"/> </literal> <emphasis>pattern</emphasis> <emphasis>value</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unscore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="unscore"/></literal> <emphasis>pattern</emphasis> [ <emphasis>pattern</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="send"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
+              <literal><madmutt-doc:hook name="send"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:hook name="reply"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
+              <literal><madmutt-doc:hook name="reply"/></literal> <emphasis>regexp</emphasis> <emphasis>command</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="set"/></literal> [no|inv]<emphasis>variable</emphasis>[ =<emphasis>value</emphasis> ] [ <emphasis>variable</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="set"/></literal> [no|inv]<emphasis>variable</emphasis>[ =<emphasis>value</emphasis> ] [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unset"/></literal> <emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="unset"/></literal> <emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="source"/></literal> <emphasis>filename</emphasis>
+              <literal><madmutt-doc:cmdref name="source"/></literal> <emphasis>filename</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="spam"/></literal> <emphasis>pattern</emphasis> <emphasis>format</emphasis>
+              <literal><madmutt-doc:cmdref name="spam"/></literal> <emphasis>pattern</emphasis> <emphasis>format</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="nospam"/></literal> <emphasis>pattern</emphasis>
+              <literal><madmutt-doc:cmdref name="nospam"/></literal> <emphasis>pattern</emphasis>
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="subscribe"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ] 
+              <literal><madmutt-doc:cmdref name="subscribe"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ] 
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unsubscribe"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ] 
+              <literal><madmutt-doc:cmdref name="unsubscribe"/></literal> <emphasis>regexp</emphasis> [ <emphasis>regexp</emphasis> ... ] 
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="toggle"/></literal> <emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
+              <literal><madmutt-doc:cmdref name="toggle"/></literal> <emphasis>variable</emphasis> [ <emphasis>variable</emphasis> ... ]
             </para>
           </listitem>
           <listitem>
             
             <para>
-              <literal><muttng-doc:cmdref name="unhook"/></literal> <emphasis>hook-type</emphasis>
+              <literal><madmutt-doc:cmdref name="unhook"/></literal> <emphasis>hook-type</emphasis>
             </para>
           </listitem>
           
@@ -10485,171 +10485,171 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
           <tbody>
             <row>
               <entry><literal>edit_hdrs</literal></entry>
-              <entry><muttng-doc:varref name="edit-headers"/></entry>
+              <entry><madmutt-doc:varref name="edit-headers"/></entry>
             </row>
             <row>
               <entry><literal>forw_decode</literal></entry>
-              <entry><muttng-doc:varref name="forward-decode"/></entry>
+              <entry><madmutt-doc:varref name="forward-decode"/></entry>
               </row>
             <row>
               <entry><literal>forw_format</literal></entry>
-              <entry><muttng-doc:varref name="forward-format"/></entry>
+              <entry><madmutt-doc:varref name="forward-format"/></entry>
               </row>
             <row>
               <entry><literal>forw_quote</literal></entry>
-              <entry><muttng-doc:varref name="forward-quote"/></entry>
+              <entry><madmutt-doc:varref name="forward-quote"/></entry>
               </row>
             <row>
               <entry><literal>hdr_format</literal></entry>
-              <entry><muttng-doc:varref name="index-format"/></entry>
+              <entry><madmutt-doc:varref name="index-format"/></entry>
               </row>
             <row>
               <entry><literal>indent_str</literal></entry>
-              <entry><muttng-doc:varref name="indent-string"/></entry>
+              <entry><madmutt-doc:varref name="indent-string"/></entry>
               </row>
             <row>
               <entry><literal>mime_fwd</literal></entry>
-              <entry><muttng-doc:varref name="mime-forward"/></entry>
+              <entry><madmutt-doc:varref name="mime-forward"/></entry>
               </row>
             <row>
               <entry><literal>msg_format</literal></entry>
-              <entry><muttng-doc:varref name="message-format"/></entry>
+              <entry><madmutt-doc:varref name="message-format"/></entry>
               </row>
             <row>
               <entry><literal>pgp_autosign</literal></entry>
-              <entry><muttng-doc:varref name="crypt-autosign"/></entry>
+              <entry><madmutt-doc:varref name="crypt-autosign"/></entry>
               </row>
             <row>
               <entry><literal>pgp_autoencrypt</literal></entry>
-              <entry><muttng-doc:varref name="crypt-autoencrypt"/></entry>
+              <entry><madmutt-doc:varref name="crypt-autoencrypt"/></entry>
               </row>
             <row>
               <entry><literal>pgp_replyencrypt</literal></entry>
-              <entry><muttng-doc:varref name="crypt-replyencrypt"/></entry>
+              <entry><madmutt-doc:varref name="crypt-replyencrypt"/></entry>
               </row>
             <row>
               <entry><literal>pgp_replysign</literal></entry>
-              <entry><muttng-doc:varref name="crypt-replysign"/></entry>
+              <entry><madmutt-doc:varref name="crypt-replysign"/></entry>
               </row>
             <row>
               <entry><literal>pgp_replysignencrypted</literal></entry>
-              <entry><muttng-doc:varref name="crypt-replysignencrypted"/></entry>
+              <entry><madmutt-doc:varref name="crypt-replysignencrypted"/></entry>
               </row>
             <row>
               <entry><literal>pgp_verify_sig</literal></entry>
-              <entry><muttng-doc:varref name="crypt-verify-sig"/></entry>
+              <entry><madmutt-doc:varref name="crypt-verify-sig"/></entry>
               </row>
             <row>
               <entry><literal>pgp_create_traditional</literal></entry>
-              <entry><muttng-doc:varref name="pgp-autoinline"/></entry>
+              <entry><madmutt-doc:varref name="pgp-autoinline"/></entry>
               </row>
             <row>
               <entry><literal>pgp_auto_traditional</literal></entry>
-              <entry><muttng-doc:varref name="pgp-replyinline"/></entry>
+              <entry><madmutt-doc:varref name="pgp-replyinline"/></entry>
               </row>
             <row>
               <entry><literal>forw_decrypt</literal></entry>
-              <entry><muttng-doc:varref name="forward-decrypt"/></entry>
+              <entry><madmutt-doc:varref name="forward-decrypt"/></entry>
               </row>
             <row>
               <entry><literal>smime_sign_as</literal></entry>
-              <entry><muttng-doc:varref name="smime-default-key"/></entry>
+              <entry><madmutt-doc:varref name="smime-default-key"/></entry>
               </row>
             <row>
               <entry><literal>post_indent_str</literal></entry>
-              <entry><muttng-doc:varref name="post-indent-string"/></entry>
+              <entry><madmutt-doc:varref name="post-indent-string"/></entry>
               </row>
             <row>
               <entry><literal>print_cmd</literal></entry>
-              <entry><muttng-doc:varref name="print-command"/></entry>
+              <entry><madmutt-doc:varref name="print-command"/></entry>
               </row>
             <row>
               <entry><literal>shorten_hierarchy</literal></entry>
-              <entry><muttng-doc:varref name="sidebar-shorten-hierarchy"/></entry>
+              <entry><madmutt-doc:varref name="sidebar-shorten-hierarchy"/></entry>
               </row>
             <row>
               <entry><literal>ask_followup_to</literal></entry>
-              <entry><muttng-doc:varref name="nntp-ask-followup-to"/></entry>
+              <entry><madmutt-doc:varref name="nntp-ask-followup-to"/></entry>
               </row>
             <row>
               <entry><literal>ask_x_comment_to</literal></entry>
-              <entry><muttng-doc:varref name="nntp-ask-x-comment-to"/></entry>
+              <entry><madmutt-doc:varref name="nntp-ask-x-comment-to"/></entry>
               </row>
             <row>
               <entry><literal>catchup_newsgroup</literal></entry>
-              <entry><muttng-doc:varref name="nntp-catchup"/></entry>
+              <entry><madmutt-doc:varref name="nntp-catchup"/></entry>
             </row>
             <row>
               <entry><literal>followup_to_poster</literal></entry>
-              <entry><muttng-doc:varref name="nntp-followup-to-poster"/></entry>
+              <entry><madmutt-doc:varref name="nntp-followup-to-poster"/></entry>
             </row>
             <row>
               <entry><literal>group_index_format</literal></entry>
-              <entry><muttng-doc:varref name="nntp-group-index-format"/></entry>
+              <entry><madmutt-doc:varref name="nntp-group-index-format"/></entry>
             </row>
             <row>
               <entry><literal>inews</literal></entry>
-              <entry><muttng-doc:varref name="nntp-inews"/></entry>
+              <entry><madmutt-doc:varref name="nntp-inews"/></entry>
             </row>
             <row>
               <entry><literal>mime_subject</literal></entry>
-              <entry><muttng-doc:varref name="nntp-mime-subject"/></entry>
+              <entry><madmutt-doc:varref name="nntp-mime-subject"/></entry>
             </row>
             <row>
               <entry><literal>news_cache_dir</literal></entry>
-              <entry><muttng-doc:varref name="nntp-cache-dir"/></entry>
+              <entry><madmutt-doc:varref name="nntp-cache-dir"/></entry>
             </row>
             <row>
               <entry><literal>news_server</literal></entry>
-              <entry><muttng-doc:varref name="nntp-host"/></entry>
+              <entry><madmutt-doc:varref name="nntp-host"/></entry>
             </row>
             <row>
               <entry><literal>newsrc</literal></entry>
-              <entry><muttng-doc:varref name="nntp-newsrc"/></entry>
+              <entry><madmutt-doc:varref name="nntp-newsrc"/></entry>
             </row>
             <row>
               <entry><literal>nntp_poll</literal></entry>
-              <entry><muttng-doc:varref name="nntp-mail-check"/></entry>
+              <entry><madmutt-doc:varref name="nntp-mail-check"/></entry>
             </row>
             <row>
               <entry><literal>pop_checkinterval</literal></entry>
-              <entry><muttng-doc:varref name="pop-mail-check"/></entry>
+              <entry><madmutt-doc:varref name="pop-mail-check"/></entry>
             </row>
             <row>
               <entry><literal>post_moderated</literal></entry>
-              <entry><muttng-doc:varref name="nntp-post-moderated"/></entry>
+              <entry><madmutt-doc:varref name="nntp-post-moderated"/></entry>
             </row>
             <row>
               <entry><literal>save_unsubscribed</literal></entry>
-              <entry><muttng-doc:varref name="nntp-save-unsubscribed"/></entry>
+              <entry><madmutt-doc:varref name="nntp-save-unsubscribed"/></entry>
             </row>
             <row>
               <entry><literal>show_new_news</literal></entry>
-              <entry><muttng-doc:varref name="nntp-show-new-news"/></entry>
+              <entry><madmutt-doc:varref name="nntp-show-new-news"/></entry>
             </row>
             <row>
               <entry><literal>show_only_unread</literal></entry>
-              <entry><muttng-doc:varref name="nntp-show-only-unread"/></entry>
+              <entry><madmutt-doc:varref name="nntp-show-only-unread"/></entry>
             </row>
             <row>
               <entry><literal>x_comment_to</literal></entry>
-              <entry><muttng-doc:varref name="nntp-x-comment-to"/></entry>
+              <entry><madmutt-doc:varref name="nntp-x-comment-to"/></entry>
             </row>
             <row>
               <entry><literal>smtp_auth_username</literal></entry>
-              <entry><muttng-doc:varref name="smtp-user"/></entry>
+              <entry><madmutt-doc:varref name="smtp-user"/></entry>
             </row>
             <row>
               <entry><literal>smtp_auth_password</literal></entry>
-              <entry><muttng-doc:varref name="smtp-pass"/></entry>
+              <entry><madmutt-doc:varref name="smtp-pass"/></entry>
             </row>
             <row>
               <entry><literal>envelope_from_address</literal></entry>
-              <entry><muttng-doc:varref name="smtp-envelope"/></entry>
+              <entry><madmutt-doc:varref name="smtp-envelope"/></entry>
             </row>
             <row>
               <entry><literal>user_agent</literal></entry>
-              <entry><muttng-doc:varref name="agent-string"/></entry>
+              <entry><madmutt-doc:varref name="agent-string"/></entry>
             </row>
           </tbody>
         </tgroup>
index bbe9d18..6f600f4 100644 (file)
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:funcref name="bottom-page"/></entry>
-              <entry><muttng-doc:key>L</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="bottom-page"/></entry>
+              <entry><madmutt-doc:key>L</madmutt-doc:key></entry>
               <entry>move to the bottom of the page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="current-bottom"/></entry>
+              <entry><madmutt-doc:funcref name="current-bottom"/></entry>
               <entry></entry>
               <entry>move current entry to bottom of page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="current-middle"/></entry>
+              <entry><madmutt-doc:funcref name="current-middle"/></entry>
               <entry></entry>
               <entry>move current entry to middle of page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="current-top"/></entry>
+              <entry><madmutt-doc:funcref name="current-top"/></entry>
               <entry></entry>
               <entry>move current entry to top of page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="enter-command"/></entry>
-              <entry><muttng-doc:key>:</muttng-doc:key></entry>
-              <entry>enter a muttngrc command</entry>
+              <entry><madmutt-doc:funcref name="enter-command"/></entry>
+              <entry><madmutt-doc:key>:</madmutt-doc:key></entry>
+              <entry>enter a madmuttrc command</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="exit"/></entry>
-              <entry><muttng-doc:key>q</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="exit"/></entry>
+              <entry><madmutt-doc:key>q</madmutt-doc:key></entry>
               <entry>exit this menu</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="first-entry"/></entry>
-              <entry><muttng-doc:key>=</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="first-entry"/></entry>
+              <entry><madmutt-doc:key>=</madmutt-doc:key></entry>
               <entry>move to the first entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="half-down"/></entry>
-              <entry><muttng-doc:key>]</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="half-down"/></entry>
+              <entry><madmutt-doc:key>]</madmutt-doc:key></entry>
               <entry>scroll down 1/2 page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="half-up"/></entry>
-              <entry><muttng-doc:key>[</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="half-up"/></entry>
+              <entry><madmutt-doc:key>[</madmutt-doc:key></entry>
               <entry>scroll up 1/2 page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="help"/></entry>
-              <entry><muttng-doc:key>?</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="help"/></entry>
+              <entry><madmutt-doc:key>?</madmutt-doc:key></entry>
               <entry>this screen</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="jump"/></entry>
-              <entry><muttng-doc:key>number</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="jump"/></entry>
+              <entry><madmutt-doc:key>number</madmutt-doc:key></entry>
               <entry>jump to an index number</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="last-entry"/></entry>
-              <entry><muttng-doc:key>*</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="last-entry"/></entry>
+              <entry><madmutt-doc:key>*</madmutt-doc:key></entry>
               <entry>move to the last entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="middle-page"/></entry>
-              <entry><muttng-doc:key>M</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="middle-page"/></entry>
+              <entry><madmutt-doc:key>M</madmutt-doc:key></entry>
               <entry>move to the middle of the page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-entry"/></entry>
-              <entry><muttng-doc:key>j</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-entry"/></entry>
+              <entry><madmutt-doc:key>j</madmutt-doc:key></entry>
               <entry>move to the next entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-line"/></entry>
-              <entry><muttng-doc:key>></muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-line"/></entry>
+              <entry><madmutt-doc:key>></madmutt-doc:key></entry>
               <entry>scroll down one line</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-page"/></entry>
-              <entry><muttng-doc:key>z</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-page"/></entry>
+              <entry><madmutt-doc:key>z</madmutt-doc:key></entry>
               <entry>move to the next page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-entry"/></entry>
-              <entry><muttng-doc:key>k</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-entry"/></entry>
+              <entry><madmutt-doc:key>k</madmutt-doc:key></entry>
               <entry>move to the previous entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-line"/></entry>
-              <entry><muttng-doc:key>></muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-line"/></entry>
+              <entry><madmutt-doc:key>></madmutt-doc:key></entry>
               <entry>scroll up one line</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-page"/></entry>
-              <entry><muttng-doc:key>Z</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-page"/></entry>
+              <entry><madmutt-doc:key>Z</madmutt-doc:key></entry>
               <entry>move to the previous page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="rebuild-cache"/></entry>
+              <entry><madmutt-doc:funcref name="rebuild-cache"/></entry>
               <entry></entry>
               <entry>cycle through all defined mailboxes to rebuild all header caches</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="refresh"/></entry>
-              <entry><muttng-doc:key mod="C">L</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="refresh"/></entry>
+              <entry><madmutt-doc:key mod="C">L</madmutt-doc:key></entry>
               <entry>clear and redraw the screen</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search"/></entry>
-              <entry><muttng-doc:key>/</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search"/></entry>
+              <entry><madmutt-doc:key>/</madmutt-doc:key></entry>
               <entry>search for a regular expression</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-next"/></entry>
-              <entry><muttng-doc:key>n</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search-next"/></entry>
+              <entry><madmutt-doc:key>n</madmutt-doc:key></entry>
               <entry>search for next match</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-opposite"/></entry>
+              <entry><madmutt-doc:funcref name="search-opposite"/></entry>
               <entry></entry>
               <entry>search for next match in opposite direction</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-reverse"/></entry>
-              <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search-reverse"/></entry>
+              <entry><madmutt-doc:key mod="E">/</madmutt-doc:key></entry>
               <entry>search backwards for a regular expression</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="select-entry"/></entry>
-              <entry><muttng-doc:key>Return</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="select-entry"/></entry>
+              <entry><madmutt-doc:key>Return</madmutt-doc:key></entry>
               <entry>select the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="shell-escape"/></entry>
-              <entry><muttng-doc:key>!</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="shell-escape"/></entry>
+              <entry><madmutt-doc:key>!</madmutt-doc:key></entry>
               <entry>run a program in a subshell</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="tag-entry"/></entry>
-              <entry><muttng-doc:key>t</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="tag-entry"/></entry>
+              <entry><madmutt-doc:key>t</madmutt-doc:key></entry>
               <entry>toggle the tag on the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="tag-prefix"/></entry>
-              <entry><muttng-doc:key>;</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="tag-prefix"/></entry>
+              <entry><madmutt-doc:key>;</madmutt-doc:key></entry>
               <entry>apply next command to tagged entries</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="tag-prefix-cond"/></entry>
+              <entry><madmutt-doc:funcref name="tag-prefix-cond"/></entry>
               <entry></entry>
               <entry>apply next function ONLY to tagged messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="top-page"/></entry>
-              <entry><muttng-doc:key>H</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="top-page"/></entry>
+              <entry><madmutt-doc:key>H</madmutt-doc:key></entry>
               <entry>move to the top of the page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="what-key"/></entry>
+              <entry><madmutt-doc:funcref name="what-key"/></entry>
               <entry></entry>
               <entry>display the keycode for a key press</entry>
             </row>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:funcref name="bounce-message"/></entry>
-              <entry><muttng-doc:key>b</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="bounce-message"/></entry>
+              <entry><madmutt-doc:key>b</madmutt-doc:key></entry>
               <entry>remail a message to another user</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="change-folder"/></entry>
-              <entry><muttng-doc:key>c</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="change-folder"/></entry>
+              <entry><madmutt-doc:key>c</madmutt-doc:key></entry>
               <entry>open a different folder</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="change-folder-readonly"/></entry>
-              <entry><muttng-doc:key mod="E">c</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="change-folder-readonly"/></entry>
+              <entry><madmutt-doc:key mod="E">c</madmutt-doc:key></entry>
               <entry>open a different folder in read only mode</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="check-traditional-pgp"/></entry>
-              <entry><muttng-doc:key mod="E">P</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="check-traditional-pgp"/></entry>
+              <entry><madmutt-doc:key mod="E">P</madmutt-doc:key></entry>
               <entry>check for classic pgp</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="clear-flag"/></entry>
-              <entry><muttng-doc:key>W</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="clear-flag"/></entry>
+              <entry><madmutt-doc:key>W</madmutt-doc:key></entry>
               <entry>clear a status flag from a message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="copy-message"/></entry>
-              <entry><muttng-doc:key>C</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="copy-message"/></entry>
+              <entry><madmutt-doc:key>C</madmutt-doc:key></entry>
               <entry>copy a message to a file/mailbox</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="create-alias"/></entry>
-              <entry><muttng-doc:key>a</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="create-alias"/></entry>
+              <entry><madmutt-doc:key>a</madmutt-doc:key></entry>
               <entry>create an alias from a message sender</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="decode-copy"/></entry>
-              <entry><muttng-doc:key mod="E">C</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="decode-copy"/></entry>
+              <entry><madmutt-doc:key mod="E">C</madmutt-doc:key></entry>
               <entry>decode a message and copy it to a file/mailbox</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="decode-save"/></entry>
-              <entry><muttng-doc:key mod="E">s</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="decode-save"/></entry>
+              <entry><madmutt-doc:key mod="E">s</madmutt-doc:key></entry>
               <entry>decode a message and save it to a file/mailbox</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="delete-message"/></entry>
-              <entry><muttng-doc:key>d</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-message"/></entry>
+              <entry><madmutt-doc:key>d</madmutt-doc:key></entry>
               <entry>delete the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="delete-pattern"/></entry>
-              <entry><muttng-doc:key>D</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-pattern"/></entry>
+              <entry><madmutt-doc:key>D</madmutt-doc:key></entry>
               <entry>delete messages matching a pattern</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="delete-subthread"/></entry>
-              <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">d</madmutt-doc:key></entry>
               <entry>delete all messages in subthread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="delete-thread"/></entry>
-              <entry><muttng-doc:key mod="C">D</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">D</madmutt-doc:key></entry>
               <entry>delete all messages in thread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="display-address"/></entry>
-              <entry><muttng-doc:key>@</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="display-address"/></entry>
+              <entry><madmutt-doc:key>@</madmutt-doc:key></entry>
               <entry>display full address of sender</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
-              <entry><muttng-doc:key>h</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="display-toggle-weed"/></entry>
+              <entry><madmutt-doc:key>h</madmutt-doc:key></entry>
               <entry>display message and toggle header weeding</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="display-message"/></entry>
-              <entry><muttng-doc:key>Return</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="display-message"/></entry>
+              <entry><madmutt-doc:key>Return</madmutt-doc:key></entry>
               <entry>display a message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit"/></entry>
-              <entry><muttng-doc:key>e</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit"/></entry>
+              <entry><madmutt-doc:key>e</madmutt-doc:key></entry>
               <entry>edit the current message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-type"/></entry>
-              <entry><muttng-doc:key mod="C">E</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-type"/></entry>
+              <entry><madmutt-doc:key mod="C">E</madmutt-doc:key></entry>
               <entry>edit the current message's Content-Type</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="exit"/></entry>
-              <entry><muttng-doc:key>x</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="exit"/></entry>
+              <entry><madmutt-doc:key>x</madmutt-doc:key></entry>
               <entry>exit without saving changes</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="extract-keys"/></entry>
-              <entry><muttng-doc:key mod="C">K</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="extract-keys"/></entry>
+              <entry><madmutt-doc:key mod="C">K</madmutt-doc:key></entry>
               <entry>extract PGP public keys</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="fetch-mail"/></entry>
-              <entry><muttng-doc:key>G</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="fetch-mail"/></entry>
+              <entry><madmutt-doc:key>G</madmutt-doc:key></entry>
               <entry>retrieve mail from POP server</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="flag-message"/></entry>
-              <entry><muttng-doc:key>F</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="flag-message"/></entry>
+              <entry><madmutt-doc:key>F</madmutt-doc:key></entry>
               <entry>toggle a message's 'important' flag</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
-              <entry><muttng-doc:key mod="C">F</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="forget-passphrase"/></entry>
+              <entry><madmutt-doc:key mod="C">F</madmutt-doc:key></entry>
               <entry>wipe PGP passphrase from memory</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="forward-message"/></entry>
-              <entry><muttng-doc:key>f</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="forward-message"/></entry>
+              <entry><madmutt-doc:key>f</madmutt-doc:key></entry>
               <entry>forward a message with comments</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="group-reply"/></entry>
-              <entry><muttng-doc:key>g</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="group-reply"/></entry>
+              <entry><madmutt-doc:key>g</madmutt-doc:key></entry>
               <entry>reply to all recipients</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="limit"/></entry>
-              <entry><muttng-doc:key>l</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="limit"/></entry>
+              <entry><madmutt-doc:key>l</madmutt-doc:key></entry>
               <entry>show only messages matching a pattern</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="list-reply"/></entry>
-              <entry><muttng-doc:key>L</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="list-reply"/></entry>
+              <entry><madmutt-doc:key>L</madmutt-doc:key></entry>
               <entry>reply to specified mailing list</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="mail"/></entry>
-              <entry><muttng-doc:key>m</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="mail"/></entry>
+              <entry><madmutt-doc:key>m</madmutt-doc:key></entry>
               <entry>compose a new mail message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="mail-key"/></entry>
-              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="mail-key"/></entry>
+              <entry><madmutt-doc:key mod="E">k</madmutt-doc:key></entry>
               <entry>mail a PGP public key</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-new"/></entry>
+              <entry><madmutt-doc:funcref name="next-new"/></entry>
               <entry></entry>
               <entry>jump to the next new message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-new-then-unread"/></entry>
-              <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-new-then-unread"/></entry>
+              <entry><madmutt-doc:key>Tab</madmutt-doc:key></entry>
               <entry>jump to the next new or unread message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-subthread"/></entry>
-              <entry><muttng-doc:key mod="E">n</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">n</madmutt-doc:key></entry>
               <entry>jump to the next subthread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-thread"/></entry>
-              <entry><muttng-doc:key mod="C">N</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">N</madmutt-doc:key></entry>
               <entry>jump to the next thread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-undeleted"/></entry>
-              <entry><muttng-doc:key>j</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-undeleted"/></entry>
+              <entry><madmutt-doc:key>j</madmutt-doc:key></entry>
               <entry>move to the next undeleted message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-unread"/></entry>
+              <entry><madmutt-doc:funcref name="next-unread"/></entry>
               <entry></entry>
               <entry>jump to the next unread message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="parent-message"/></entry>
-              <entry><muttng-doc:key>P</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="parent-message"/></entry>
+              <entry><madmutt-doc:key>P</madmutt-doc:key></entry>
               <entry>jump to parent message in thread </entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="pipe-message"/></entry>
-              <entry><muttng-doc:key>|</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="pipe-message"/></entry>
+              <entry><madmutt-doc:key>|</madmutt-doc:key></entry>
               <entry>pipe message/attachment to a shell command</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-new"/></entry>
+              <entry><madmutt-doc:funcref name="previous-new"/></entry>
               <entry></entry>
               <entry>jump to the previous new message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-new-then-unread"/></entry>
-              <entry><muttng-doc:key mod="E">Tab</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-new-then-unread"/></entry>
+              <entry><madmutt-doc:key mod="E">Tab</madmutt-doc:key></entry>
               <entry>jump to the previous new or unread message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-page"/></entry>
-              <entry><muttng-doc:key>Z</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-page"/></entry>
+              <entry><madmutt-doc:key>Z</madmutt-doc:key></entry>
               <entry>move to the previous page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-subthread"/></entry>
-              <entry><muttng-doc:key mod="E">p</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">p</madmutt-doc:key></entry>
               <entry>jump to previous subthread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-thread"/></entry>
-              <entry><muttng-doc:key mod="C">P</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">P</madmutt-doc:key></entry>
               <entry>jump to previous thread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-undeleted"/></entry>
-              <entry><muttng-doc:key>k</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-undeleted"/></entry>
+              <entry><madmutt-doc:key>k</madmutt-doc:key></entry>
               <entry>move to the last undelete message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-unread"/></entry>
+              <entry><madmutt-doc:funcref name="previous-unread"/></entry>
               <entry></entry>
               <entry>jump to the previous unread message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="print-message"/></entry>
-              <entry><muttng-doc:key>p</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="print-message"/></entry>
+              <entry><madmutt-doc:key>p</madmutt-doc:key></entry>
               <entry>print the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="query"/></entry>
-              <entry><muttng-doc:key>Q</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="query"/></entry>
+              <entry><madmutt-doc:key>Q</madmutt-doc:key></entry>
               <entry>query external program for addresses</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="quit"/></entry>
-              <entry><muttng-doc:key>q</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="quit"/></entry>
+              <entry><madmutt-doc:key>q</madmutt-doc:key></entry>
               <entry>save changes to mailbox and quit</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="read-subthread"/></entry>
-              <entry><muttng-doc:key mod="E">r</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="read-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">r</madmutt-doc:key></entry>
               <entry>mark the current subthread as read</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="read-thread"/></entry>
-              <entry><muttng-doc:key mod="C">R</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="read-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">R</madmutt-doc:key></entry>
               <entry>mark the current thread as read</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="recall-message"/></entry>
-              <entry><muttng-doc:key>R</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="recall-message"/></entry>
+              <entry><madmutt-doc:key>R</madmutt-doc:key></entry>
               <entry>recall a postponed message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="reply"/></entry>
-              <entry><muttng-doc:key>r</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="reply"/></entry>
+              <entry><madmutt-doc:key>r</madmutt-doc:key></entry>
               <entry>reply to a message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="resend-message"/></entry>
-              <entry><muttng-doc:key mod="E">e</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="resend-message"/></entry>
+              <entry><madmutt-doc:key mod="E">e</madmutt-doc:key></entry>
               <entry>resend message and preserve MIME structure</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="save-message"/></entry>
-              <entry><muttng-doc:key>s</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="save-message"/></entry>
+              <entry><madmutt-doc:key>s</madmutt-doc:key></entry>
               <entry>save message/attachment to a file</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="set-flag"/></entry>
-              <entry><muttng-doc:key>w</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="set-flag"/></entry>
+              <entry><madmutt-doc:key>w</madmutt-doc:key></entry>
               <entry>set a status flag on a message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="show-version"/></entry>
-              <entry><muttng-doc:key>V</muttng-doc:key></entry>
-              <entry>show the Mutt-ng version number and date</entry>
+              <entry><madmutt-doc:funcref name="show-version"/></entry>
+              <entry><madmutt-doc:key>V</madmutt-doc:key></entry>
+              <entry>show the Madmutt version number and date</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="show-limit"/></entry>
-              <entry><muttng-doc:key mod="E">l</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="show-limit"/></entry>
+              <entry><madmutt-doc:key mod="E">l</madmutt-doc:key></entry>
               <entry>show currently active limit pattern, if any</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="sort-mailbox"/></entry>
-              <entry><muttng-doc:key>o</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="sort-mailbox"/></entry>
+              <entry><madmutt-doc:key>o</madmutt-doc:key></entry>
               <entry>sort messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="sort-reverse"/></entry>
-              <entry><muttng-doc:key>O</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="sort-reverse"/></entry>
+              <entry><madmutt-doc:key>O</madmutt-doc:key></entry>
               <entry>sort messages in reverse order</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="sync-mailbox"/></entry>
-              <entry><muttng-doc:key>$</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="sync-mailbox"/></entry>
+              <entry><madmutt-doc:key>$</madmutt-doc:key></entry>
               <entry>save changes to mailbox</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="tag-pattern"/></entry>
-              <entry><muttng-doc:key>T</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="tag-pattern"/></entry>
+              <entry><madmutt-doc:key>T</madmutt-doc:key></entry>
               <entry>tag messages matching a pattern</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="tag-thread"/></entry>
-              <entry><muttng-doc:key mod="E">t</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="tag-thread"/></entry>
+              <entry><madmutt-doc:key mod="E">t</madmutt-doc:key></entry>
               <entry>tag/untag all messages in the current thread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="toggle-new"/></entry>
-              <entry><muttng-doc:key>N</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="toggle-new"/></entry>
+              <entry><madmutt-doc:key>N</madmutt-doc:key></entry>
               <entry>toggle a message's 'new' flag</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="toggle-write"/></entry>
-              <entry><muttng-doc:key>%</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="toggle-write"/></entry>
+              <entry><madmutt-doc:key>%</madmutt-doc:key></entry>
               <entry>toggle whether the mailbox will be rewritten</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="undelete-message"/></entry>
-              <entry><muttng-doc:key>u</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="undelete-message"/></entry>
+              <entry><madmutt-doc:key>u</madmutt-doc:key></entry>
               <entry>undelete the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="undelete-pattern"/></entry>
-              <entry><muttng-doc:key>U</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="undelete-pattern"/></entry>
+              <entry><madmutt-doc:key>U</madmutt-doc:key></entry>
               <entry>undelete messages matching a pattern</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="undelete-subthread"/></entry>
-              <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="undelete-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">u</madmutt-doc:key></entry>
               <entry>undelete all messages in subthread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="undelete-thread"/></entry>
-              <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="undelete-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">U</madmutt-doc:key></entry>
               <entry>undelete all messages in thread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="untag-pattern"/></entry>
-              <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="untag-pattern"/></entry>
+              <entry><madmutt-doc:key mod="C">T</madmutt-doc:key></entry>
               <entry>untag messages matching a pattern</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="view-attachments"/></entry>
-              <entry><muttng-doc:key>v</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="view-attachments"/></entry>
+              <entry><madmutt-doc:key>v</madmutt-doc:key></entry>
               <entry>show MIME attachments</entry>
             </row>
                   </tbody>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:funcref name="bottom"/></entry>
+              <entry><madmutt-doc:funcref name="bottom"/></entry>
               <entry></entry>
               <entry>jump to the bottom of the message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="bounce-message"/></entry>
-              <entry><muttng-doc:key>b</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="bounce-message"/></entry>
+              <entry><madmutt-doc:key>b</madmutt-doc:key></entry>
               <entry>remail a message to another user</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="change-folder"/></entry>
-              <entry><muttng-doc:key>c</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="change-folder"/></entry>
+              <entry><madmutt-doc:key>c</madmutt-doc:key></entry>
               <entry>open a different folder</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="change-folder-readonly"/></entry>
-              <entry><muttng-doc:key mod="E">c</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="change-folder-readonly"/></entry>
+              <entry><madmutt-doc:key mod="E">c</madmutt-doc:key></entry>
               <entry>open a different folder in read only mode</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="check-traditional-pgp"/></entry>
-              <entry><muttng-doc:key mod="E">P</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="check-traditional-pgp"/></entry>
+              <entry><madmutt-doc:key mod="E">P</madmutt-doc:key></entry>
               <entry>check for classic pgp</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="copy-message"/></entry>
-              <entry><muttng-doc:key>C</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="copy-message"/></entry>
+              <entry><madmutt-doc:key>C</madmutt-doc:key></entry>
               <entry>copy a message to a file/mailbox</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="create-alias"/></entry>
-              <entry><muttng-doc:key>a</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="create-alias"/></entry>
+              <entry><madmutt-doc:key>a</madmutt-doc:key></entry>
               <entry>create an alias from a message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="senderdecode-copy"/></entry>
-              <entry><muttng-doc:key mod="E">C</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="senderdecode-copy"/></entry>
+              <entry><madmutt-doc:key mod="E">C</madmutt-doc:key></entry>
               <entry>decode a message and copy it to a file/mailbox</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="decode-save"/></entry>
-              <entry><muttng-doc:key mod="E">s</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="decode-save"/></entry>
+              <entry><madmutt-doc:key mod="E">s</madmutt-doc:key></entry>
               <entry>decode a message and save it to a file/mailbox</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="delete-message"/></entry>
-              <entry><muttng-doc:key>d</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-message"/></entry>
+              <entry><madmutt-doc:key>d</madmutt-doc:key></entry>
               <entry>delete the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="delete-subthread"/></entry>
-              <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">d</madmutt-doc:key></entry>
               <entry>delete all messages in subthread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="delete-thread"/></entry>
-              <entry><muttng-doc:key mod="C">D</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">D</madmutt-doc:key></entry>
               <entry>delete all messages in thread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="display-address"/></entry>
-              <entry><muttng-doc:key>@</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="display-address"/></entry>
+              <entry><madmutt-doc:key>@</madmutt-doc:key></entry>
               <entry>display full address of sender</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
-              <entry><muttng-doc:key>h</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="display-toggle-weed"/></entry>
+              <entry><madmutt-doc:key>h</madmutt-doc:key></entry>
               <entry>display message and toggle header weeding</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit"/></entry>
-              <entry><muttng-doc:key>e</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit"/></entry>
+              <entry><madmutt-doc:key>e</madmutt-doc:key></entry>
               <entry>edit the current message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-type"/></entry>
-              <entry><muttng-doc:key mod="C">E</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-type"/></entry>
+              <entry><madmutt-doc:key mod="C">E</madmutt-doc:key></entry>
               <entry>edit the current message's             Content-Type</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="enter-command"/></entry>
-              <entry><muttng-doc:key>:</muttng-doc:key></entry>
-              <entry>enter a muttngrc command</entry>
+              <entry><madmutt-doc:funcref name="enter-command"/></entry>
+              <entry><madmutt-doc:key>:</madmutt-doc:key></entry>
+              <entry>enter a madmuttrc command</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="exit"/></entry>
-              <entry><muttng-doc:key>i</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="exit"/></entry>
+              <entry><madmutt-doc:key>i</madmutt-doc:key></entry>
               <entry>return to the main-menu</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="extract-keys"/></entry>
-              <entry><muttng-doc:key mod="C">K</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="extract-keys"/></entry>
+              <entry><madmutt-doc:key mod="C">K</madmutt-doc:key></entry>
               <entry>extract PGP public keys</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="flag-message"/></entry>
-              <entry><muttng-doc:key>F</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="flag-message"/></entry>
+              <entry><madmutt-doc:key>F</madmutt-doc:key></entry>
               <entry>toggle a message's 'important' flag</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
-              <entry><muttng-doc:key mod="C">F</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="forget-passphrase"/></entry>
+              <entry><madmutt-doc:key mod="C">F</madmutt-doc:key></entry>
               <entry>wipe PGP passphrase from memory</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="forward-message"/></entry>
-              <entry><muttng-doc:key>f</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="forward-message"/></entry>
+              <entry><madmutt-doc:key>f</madmutt-doc:key></entry>
               <entry>forward a message with comments</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="group-reply"/></entry>
-              <entry><muttng-doc:key>g</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="group-reply"/></entry>
+              <entry><madmutt-doc:key>g</madmutt-doc:key></entry>
               <entry>reply to all recipients</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="half-up"/></entry>
+              <entry><madmutt-doc:funcref name="half-up"/></entry>
               <entry></entry>
               <entry>move up one-half page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="half-down"/></entry>
+              <entry><madmutt-doc:funcref name="half-down"/></entry>
               <entry></entry>
               <entry>move down one-half page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="help"/></entry>
-              <entry><muttng-doc:key>?</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="help"/></entry>
+              <entry><madmutt-doc:key>?</madmutt-doc:key></entry>
               <entry>this screen</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="list-reply"/></entry>
-              <entry><muttng-doc:key>L</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="list-reply"/></entry>
+              <entry><madmutt-doc:key>L</madmutt-doc:key></entry>
               <entry>reply to specified mailing list</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="mail"/></entry>
-              <entry><muttng-doc:key>m</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="mail"/></entry>
+              <entry><madmutt-doc:key>m</madmutt-doc:key></entry>
               <entry>compose a new mail message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="mail-key"/></entry>
-              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="mail-key"/></entry>
+              <entry><madmutt-doc:key mod="E">k</madmutt-doc:key></entry>
               <entry>mail a PGP public key</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="mark-as-new"/></entry>
-              <entry><muttng-doc:key>N</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="mark-as-new"/></entry>
+              <entry><madmutt-doc:key>N</madmutt-doc:key></entry>
               <entry>toggle a message's 'new' flag</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-line"/></entry>
-              <entry><muttng-doc:key>Return</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-line"/></entry>
+              <entry><madmutt-doc:key>Return</madmutt-doc:key></entry>
               <entry>scroll down one line</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-entry"/></entry>
-              <entry><muttng-doc:key>J</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-entry"/></entry>
+              <entry><madmutt-doc:key>J</madmutt-doc:key></entry>
               <entry>move to the next entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-new"/></entry>
+              <entry><madmutt-doc:funcref name="next-new"/></entry>
               <entry></entry>
               <entry>jump to the next new message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-new-then-unread"/></entry>
-              <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-new-then-unread"/></entry>
+              <entry><madmutt-doc:key>Tab</madmutt-doc:key></entry>
               <entry>jump to the next new or unread message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-page"/></entry>
+              <entry><madmutt-doc:funcref name="next-page"/></entry>
               <entry></entry>
               <entry>move to the next page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-subthread"/></entry>
-              <entry><muttng-doc:key mod="E">n</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">n</madmutt-doc:key></entry>
               <entry>jump to the next subthread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-thread"/></entry>
-              <entry><muttng-doc:key mod="C">N</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">N</madmutt-doc:key></entry>
               <entry>jump to the next thread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-undeleted"/></entry>
-              <entry><muttng-doc:key>j</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="next-undeleted"/></entry>
+              <entry><madmutt-doc:key>j</madmutt-doc:key></entry>
               <entry>move to the next undeleted message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="next-unread"/></entry>
+              <entry><madmutt-doc:funcref name="next-unread"/></entry>
               <entry></entry>
               <entry>jump to the next unread message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="parent-message"/></entry>
-              <entry><muttng-doc:key>P</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="parent-message"/></entry>
+              <entry><madmutt-doc:key>P</madmutt-doc:key></entry>
               <entry>jump to parent message in thread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="pipe-message"/></entry>
-              <entry><muttng-doc:key>|</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="pipe-message"/></entry>
+              <entry><madmutt-doc:key>|</madmutt-doc:key></entry>
               <entry>pipe message/attachment to a shell command</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-line"/></entry>
-              <entry><muttng-doc:key>BackSpace</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-line"/></entry>
+              <entry><madmutt-doc:key>BackSpace</madmutt-doc:key></entry>
               <entry>scroll up one line</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-entry"/></entry>
-              <entry><muttng-doc:key>K</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-entry"/></entry>
+              <entry><madmutt-doc:key>K</madmutt-doc:key></entry>
               <entry>move to the previous entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-new"/></entry>
+              <entry><madmutt-doc:funcref name="previous-new"/></entry>
               <entry></entry>
               <entry>jump to the previous new message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-new-then-unread"/></entry>
+              <entry><madmutt-doc:funcref name="previous-new-then-unread"/></entry>
               <entry></entry>
               <entry>jump to the previous new or unread message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-page"/></entry>
-              <entry><muttng-doc:key>-</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-page"/></entry>
+              <entry><madmutt-doc:key>-</madmutt-doc:key></entry>
               <entry>move to the previous page</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-subthread"/></entry>
-              <entry><muttng-doc:key mod="E">p</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">p</madmutt-doc:key></entry>
               <entry>jump to previous subthread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-thread"/></entry>
-              <entry><muttng-doc:key mod="C">P</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">P</madmutt-doc:key></entry>
               <entry>jump to previous thread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-undeleted"/></entry>
-              <entry><muttng-doc:key>k</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="previous-undeleted"/></entry>
+              <entry><madmutt-doc:key>k</madmutt-doc:key></entry>
               <entry>move to the last undelete message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="previous-unread"/></entry>
+              <entry><madmutt-doc:funcref name="previous-unread"/></entry>
               <entry></entry>
               <entry>jump to the previous unread message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="print-message"/></entry>
-              <entry><muttng-doc:key>p</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="print-message"/></entry>
+              <entry><madmutt-doc:key>p</madmutt-doc:key></entry>
               <entry>print the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="quit"/></entry>
-              <entry><muttng-doc:key>Q</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="quit"/></entry>
+              <entry><madmutt-doc:key>Q</madmutt-doc:key></entry>
               <entry>save changes to mailbox and quit</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="read-subthread"/></entry>
-              <entry><muttng-doc:key mod="E">r</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="read-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">r</madmutt-doc:key></entry>
               <entry>mark the current subthread as read</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="read-thread"/></entry>
-              <entry><muttng-doc:key mod="C">R</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="read-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">R</madmutt-doc:key></entry>
               <entry>mark the current thread as read</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="recall-message"/></entry>
-              <entry><muttng-doc:key>R</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="recall-message"/></entry>
+              <entry><madmutt-doc:key>R</madmutt-doc:key></entry>
               <entry>recall a postponed message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="redraw-screen"/></entry>
-              <entry><muttng-doc:key mod="C">L</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="redraw-screen"/></entry>
+              <entry><madmutt-doc:key mod="C">L</madmutt-doc:key></entry>
               <entry>clear and redraw the screen</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="reply"/></entry>
-              <entry><muttng-doc:key>r</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="reply"/></entry>
+              <entry><madmutt-doc:key>r</madmutt-doc:key></entry>
               <entry>reply to a message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="save-message"/></entry>
-              <entry><muttng-doc:key>s</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="save-message"/></entry>
+              <entry><madmutt-doc:key>s</madmutt-doc:key></entry>
               <entry>save message/attachment to a file</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search"/></entry>
-              <entry><muttng-doc:key>/</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search"/></entry>
+              <entry><madmutt-doc:key>/</madmutt-doc:key></entry>
               <entry>search for a regular expression</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-next"/></entry>
-              <entry><muttng-doc:key>n</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search-next"/></entry>
+              <entry><madmutt-doc:key>n</madmutt-doc:key></entry>
               <entry>search for next match</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-opposite"/></entry>
+              <entry><madmutt-doc:funcref name="search-opposite"/></entry>
               <entry></entry>
               <entry>search for next match in opposite direction</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-reverse"/></entry>
-              <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search-reverse"/></entry>
+              <entry><madmutt-doc:key mod="E">/</madmutt-doc:key></entry>
               <entry>search backwards for a regular expression</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-toggle"/></entry>
-              <entry><muttng-doc:key>\</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search-toggle"/></entry>
+              <entry><madmutt-doc:key>\</madmutt-doc:key></entry>
               <entry>toggle search pattern coloring</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="shell-escape"/></entry>
-              <entry><muttng-doc:key>!</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="shell-escape"/></entry>
+              <entry><madmutt-doc:key>!</madmutt-doc:key></entry>
               <entry>invoke a command in a subshell</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="show-version"/></entry>
-              <entry><muttng-doc:key>V</muttng-doc:key></entry>
-              <entry>show the Mutt-ng version number and date</entry>
+              <entry><madmutt-doc:funcref name="show-version"/></entry>
+              <entry><madmutt-doc:key>V</madmutt-doc:key></entry>
+              <entry>show the Madmutt version number and date</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="skip-quoted"/></entry>
-              <entry><muttng-doc:key>S</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="skip-quoted"/></entry>
+              <entry><madmutt-doc:key>S</madmutt-doc:key></entry>
               <entry>skip beyond quoted text</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="sync-mailbox"/></entry>
-              <entry><muttng-doc:key>$</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="sync-mailbox"/></entry>
+              <entry><madmutt-doc:key>$</madmutt-doc:key></entry>
               <entry>save changes to mailbox</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="tag-message"/></entry>
-              <entry><muttng-doc:key>t</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="tag-message"/></entry>
+              <entry><madmutt-doc:key>t</madmutt-doc:key></entry>
               <entry>tag a message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="toggle-quoted"/></entry>
-              <entry><muttng-doc:key>T</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="toggle-quoted"/></entry>
+              <entry><madmutt-doc:key>T</madmutt-doc:key></entry>
               <entry>toggle display of quoted text</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="top"/></entry>
-              <entry><muttng-doc:key>^</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="top"/></entry>
+              <entry><madmutt-doc:key>^</madmutt-doc:key></entry>
               <entry>jump to the top of the message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="undelete-message"/></entry>
-              <entry><muttng-doc:key>u</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="undelete-message"/></entry>
+              <entry><madmutt-doc:key>u</madmutt-doc:key></entry>
               <entry>undelete the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="undelete-subthread"/></entry>
-              <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="undelete-subthread"/></entry>
+              <entry><madmutt-doc:key mod="E">u</madmutt-doc:key></entry>
               <entry>undelete all messages in subthread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="undelete-thread"/></entry>
-              <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="undelete-thread"/></entry>
+              <entry><madmutt-doc:key mod="C">U</madmutt-doc:key></entry>
               <entry>undelete all messages in thread</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="view-attachments"/></entry>
-              <entry><muttng-doc:key>v</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="view-attachments"/></entry>
+              <entry><madmutt-doc:key>v</madmutt-doc:key></entry>
               <entry>show MIME attachments</entry>
             </row>
                   </tbody>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:funcref name="search"/></entry>
-              <entry><muttng-doc:key>/</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search"/></entry>
+              <entry><madmutt-doc:key>/</madmutt-doc:key></entry>
               <entry>search for a regular expression</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-next"/></entry>
-              <entry><muttng-doc:key>n</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search-next"/></entry>
+              <entry><madmutt-doc:key>n</madmutt-doc:key></entry>
               <entry>search for next match</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-reverse"/></entry>
-              <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search-reverse"/></entry>
+              <entry><madmutt-doc:key mod="E">/</madmutt-doc:key></entry>
               <entry>search backwards for a regular expression</entry>
             </row>
                   </tbody>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:funcref name="create-alias"/></entry>
-              <entry><muttng-doc:key>a</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="create-alias"/></entry>
+              <entry><madmutt-doc:key>a</madmutt-doc:key></entry>
               <entry>create an alias from a message sender</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="mail"/></entry>
-              <entry><muttng-doc:key>m</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="mail"/></entry>
+              <entry><madmutt-doc:key>m</madmutt-doc:key></entry>
               <entry>compose a new mail message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="query"/></entry>
-              <entry><muttng-doc:key>Q</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="query"/></entry>
+              <entry><madmutt-doc:key>Q</madmutt-doc:key></entry>
               <entry>query external program for addresses</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="query-append"/></entry>
-              <entry><muttng-doc:key>A</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="query-append"/></entry>
+              <entry><madmutt-doc:key>A</madmutt-doc:key></entry>
               <entry>append new query results to current results</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search"/></entry>
-              <entry><muttng-doc:key>/</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search"/></entry>
+              <entry><madmutt-doc:key>/</madmutt-doc:key></entry>
               <entry>search for a regular expression</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-next"/></entry>
-              <entry><muttng-doc:key>n</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search-next"/></entry>
+              <entry><madmutt-doc:key>n</madmutt-doc:key></entry>
               <entry>search for next match</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-opposite"/></entry>
+              <entry><madmutt-doc:funcref name="search-opposite"/></entry>
               <entry></entry>
               <entry>search for next match in opposite direction</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-reverse"/></entry>
-              <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search-reverse"/></entry>
+              <entry><madmutt-doc:key mod="E">/</madmutt-doc:key></entry>
               <entry>search backwards for a regular expression</entry>
             </row>
                   </tbody>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:funcref name="bounce-message"/></entry>
-              <entry><muttng-doc:key>b</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="bounce-message"/></entry>
+              <entry><madmutt-doc:key>b</madmutt-doc:key></entry>
               <entry>remail a message to another user</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="collapse-parts"/></entry>
-              <entry><muttng-doc:key>v</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="collapse-parts"/></entry>
+              <entry><madmutt-doc:key>v</madmutt-doc:key></entry>
               <entry>toggle display of subparts</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="delete-entry"/></entry>
-              <entry><muttng-doc:key>d</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-entry"/></entry>
+              <entry><madmutt-doc:key>d</madmutt-doc:key></entry>
               <entry>delete the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
-              <entry><muttng-doc:key>h</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="display-toggle-weed"/></entry>
+              <entry><madmutt-doc:key>h</madmutt-doc:key></entry>
               <entry>display message and toggle header weeding</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-type"/></entry>
-              <entry><muttng-doc:key mod="C">E</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-type"/></entry>
+              <entry><madmutt-doc:key mod="C">E</madmutt-doc:key></entry>
               <entry>edit the current entry's Content-Type</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="extract-keys"/></entry>
-              <entry><muttng-doc:key mod="C">K</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="extract-keys"/></entry>
+              <entry><madmutt-doc:key mod="C">K</madmutt-doc:key></entry>
               <entry>extract PGP public keys</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="forward-message"/></entry>
-              <entry><muttng-doc:key>f</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="forward-message"/></entry>
+              <entry><madmutt-doc:key>f</madmutt-doc:key></entry>
               <entry>forward a message with comments</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="group-reply"/></entry>
-              <entry><muttng-doc:key>g</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="group-reply"/></entry>
+              <entry><madmutt-doc:key>g</madmutt-doc:key></entry>
               <entry>reply to all recipients</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="list-reply"/></entry>
-              <entry><muttng-doc:key>L</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="list-reply"/></entry>
+              <entry><madmutt-doc:key>L</madmutt-doc:key></entry>
               <entry>reply to specified mailing list</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="pipe-entry"/></entry>
-              <entry><muttng-doc:key>|</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="pipe-entry"/></entry>
+              <entry><madmutt-doc:key>|</madmutt-doc:key></entry>
               <entry>pipe message/attachment to a shell command</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="print-entry"/></entry>
-              <entry><muttng-doc:key>p</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="print-entry"/></entry>
+              <entry><madmutt-doc:key>p</madmutt-doc:key></entry>
               <entry>print the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="reply"/></entry>
-              <entry><muttng-doc:key>r</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="reply"/></entry>
+              <entry><madmutt-doc:key>r</madmutt-doc:key></entry>
               <entry>reply to a message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="resend-message"/></entry>
-              <entry><muttng-doc:key mod="E">e</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="resend-message"/></entry>
+              <entry><madmutt-doc:key mod="E">e</madmutt-doc:key></entry>
               <entry>resend message and preserve MIME        structure</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="save-entry"/></entry>
-              <entry><muttng-doc:key>s</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="save-entry"/></entry>
+              <entry><madmutt-doc:key>s</madmutt-doc:key></entry>
               <entry>save message/attachment to a file</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="undelete-entry"/></entry>
-              <entry><muttng-doc:key>u</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="undelete-entry"/></entry>
+              <entry><madmutt-doc:key>u</madmutt-doc:key></entry>
               <entry>undelete the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="view-attach"/></entry>
-              <entry><muttng-doc:key>Return</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="view-attach"/></entry>
+              <entry><madmutt-doc:key>Return</madmutt-doc:key></entry>
               <entry>view attachment using mailcap entry if necessary</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="view-mailcap"/></entry>
-              <entry><muttng-doc:key>m</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="view-mailcap"/></entry>
+              <entry><madmutt-doc:key>m</madmutt-doc:key></entry>
               <entry>force viewing of attachment using mailcap</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="view-text"/></entry>
-              <entry><muttng-doc:key>T</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="view-text"/></entry>
+              <entry><madmutt-doc:key>T</madmutt-doc:key></entry>
               <entry>view attachment as text</entry>
             </row>
                   </tbody>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:funcref name="attach-file"/></entry>
-              <entry><muttng-doc:key>a</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="attach-file"/></entry>
+              <entry><madmutt-doc:key>a</madmutt-doc:key></entry>
               <entry>attach a file(s) to this message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="attach-message"/></entry>
-              <entry><muttng-doc:key>A</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="attach-message"/></entry>
+              <entry><madmutt-doc:key>A</madmutt-doc:key></entry>
               <entry>attach message(s) to this message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="attach-key"/></entry>
-              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="attach-key"/></entry>
+              <entry><madmutt-doc:key mod="E">k</madmutt-doc:key></entry>
               <entry>attach a PGP public key</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="copy-file"/></entry>
-              <entry><muttng-doc:key>C</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="copy-file"/></entry>
+              <entry><madmutt-doc:key>C</madmutt-doc:key></entry>
               <entry>save message/attachment to a file</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="detach-file"/></entry>
-              <entry><muttng-doc:key>D</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="detach-file"/></entry>
+              <entry><madmutt-doc:key>D</madmutt-doc:key></entry>
               <entry>delete the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
-              <entry><muttng-doc:key>h</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="display-toggle-weed"/></entry>
+              <entry><madmutt-doc:key>h</madmutt-doc:key></entry>
               <entry>display message and toggle header weeding</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-bcc"/></entry>
-              <entry><muttng-doc:key>b</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-bcc"/></entry>
+              <entry><madmutt-doc:key>b</madmutt-doc:key></entry>
               <entry>edit the BCC list</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-cc"/></entry>
-              <entry><muttng-doc:key>c</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-cc"/></entry>
+              <entry><madmutt-doc:key>c</madmutt-doc:key></entry>
               <entry>edit the CC list</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-description"/></entry>
-              <entry><muttng-doc:key>d</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-description"/></entry>
+              <entry><madmutt-doc:key>d</madmutt-doc:key></entry>
               <entry>edit attachment description</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-encoding"/></entry>
-              <entry><muttng-doc:key mod="C">E</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-encoding"/></entry>
+              <entry><madmutt-doc:key mod="C">E</madmutt-doc:key></entry>
               <entry>edit attachment transfer-encoding</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-fcc"/></entry>
-              <entry><muttng-doc:key>f</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-fcc"/></entry>
+              <entry><madmutt-doc:key>f</madmutt-doc:key></entry>
               <entry>enter a file to save a copy of this message in</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-from"/></entry>
-              <entry><muttng-doc:key mod="E">f</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-from"/></entry>
+              <entry><madmutt-doc:key mod="E">f</madmutt-doc:key></entry>
               <entry>edit the from: field</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-file"/></entry>
-              <entry><muttng-doc:key mod="C">X e</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-file"/></entry>
+              <entry><madmutt-doc:key mod="C">X e</madmutt-doc:key></entry>
               <entry>edit the file to be attached</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-headers"/></entry>
-              <entry><muttng-doc:key>E</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-headers"/></entry>
+              <entry><madmutt-doc:key>E</madmutt-doc:key></entry>
               <entry>edit the message with headers</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit"/></entry>
-              <entry><muttng-doc:key>e</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit"/></entry>
+              <entry><madmutt-doc:key>e</madmutt-doc:key></entry>
               <entry>edit the message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-mime"/></entry>
-              <entry><muttng-doc:key>m</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-mime"/></entry>
+              <entry><madmutt-doc:key>m</madmutt-doc:key></entry>
               <entry>edit attachment using mailcap entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-reply-to"/></entry>
-              <entry><muttng-doc:key>r</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-reply-to"/></entry>
+              <entry><madmutt-doc:key>r</madmutt-doc:key></entry>
               <entry>edit the Reply-To field</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-subject"/></entry>
-              <entry><muttng-doc:key>s</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-subject"/></entry>
+              <entry><madmutt-doc:key>s</madmutt-doc:key></entry>
               <entry>edit the subject of this message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-to"/></entry>
-              <entry><muttng-doc:key>t</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-to"/></entry>
+              <entry><madmutt-doc:key>t</madmutt-doc:key></entry>
               <entry>edit the TO list</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="edit-type"/></entry>
-              <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="edit-type"/></entry>
+              <entry><madmutt-doc:key mod="C">T</madmutt-doc:key></entry>
               <entry>edit attachment type</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="filter-entry"/></entry>
-              <entry><muttng-doc:key>F</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="filter-entry"/></entry>
+              <entry><madmutt-doc:key>F</madmutt-doc:key></entry>
               <entry>filter attachment through a shell command</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
-              <entry><muttng-doc:key mod="C">F</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="forget-passphrase"/></entry>
+              <entry><madmutt-doc:key mod="C">F</madmutt-doc:key></entry>
               <entry>wipe PGP passphrase from memory</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="ispell"/></entry>
-              <entry><muttng-doc:key>i</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="ispell"/></entry>
+              <entry><madmutt-doc:key>i</madmutt-doc:key></entry>
               <entry>run ispell on the message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="new-mime"/></entry>
-              <entry><muttng-doc:key>n</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="new-mime"/></entry>
+              <entry><madmutt-doc:key>n</madmutt-doc:key></entry>
               <entry>compose new attachment using mailcap entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="pgp-menu"/></entry>
-              <entry><muttng-doc:key>p</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="pgp-menu"/></entry>
+              <entry><madmutt-doc:key>p</madmutt-doc:key></entry>
               <entry>show PGP options</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="pipe-entry"/></entry>
-              <entry><muttng-doc:key>|</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="pipe-entry"/></entry>
+              <entry><madmutt-doc:key>|</madmutt-doc:key></entry>
               <entry>pipe message/attachment to a shell command</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="postpone-message"/></entry>
-              <entry><muttng-doc:key>P</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="postpone-message"/></entry>
+              <entry><madmutt-doc:key>P</madmutt-doc:key></entry>
               <entry>save this message to send later</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="print-entry"/></entry>
-              <entry><muttng-doc:key>l</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="print-entry"/></entry>
+              <entry><madmutt-doc:key>l</madmutt-doc:key></entry>
               <entry>print the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="rename-file"/></entry>
-              <entry><muttng-doc:key>R</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="rename-file"/></entry>
+              <entry><madmutt-doc:key>R</madmutt-doc:key></entry>
               <entry>rename/move an attached file</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="send-message"/></entry>
-              <entry><muttng-doc:key>y</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="send-message"/></entry>
+              <entry><madmutt-doc:key>y</madmutt-doc:key></entry>
               <entry>send the message</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="toggle-unlink"/></entry>
-              <entry><muttng-doc:key>u</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="toggle-unlink"/></entry>
+              <entry><madmutt-doc:key>u</madmutt-doc:key></entry>
               <entry>toggle whether to delete file after sending it</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="view-attach"/></entry>
-              <entry><muttng-doc:key>Return</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="view-attach"/></entry>
+              <entry><madmutt-doc:key>Return</madmutt-doc:key></entry>
               <entry>view attachment using mailcap entry if necessary</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="write-fcc"/></entry>
-              <entry><muttng-doc:key>w</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="write-fcc"/></entry>
+              <entry><madmutt-doc:key>w</madmutt-doc:key></entry>
               <entry>write the message to a folder</entry>
             </row>
                   </tbody>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:funcref name="delete-entry"/></entry>
-              <entry><muttng-doc:key>d</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-entry"/></entry>
+              <entry><madmutt-doc:key>d</madmutt-doc:key></entry>
               <entry>delete the current entry</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="undelete-entry"/></entry>
-              <entry><muttng-doc:key>u</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="undelete-entry"/></entry>
+              <entry><madmutt-doc:key>u</madmutt-doc:key></entry>
               <entry>undelete the current entry</entry>
             </row>
                   </tbody>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:funcref name="change-dir"/></entry>
-              <entry><muttng-doc:key>c</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="change-dir"/></entry>
+              <entry><madmutt-doc:key>c</madmutt-doc:key></entry>
               <entry>change directories</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="check-new"/></entry>
-              <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="check-new"/></entry>
+              <entry><madmutt-doc:key>Tab</madmutt-doc:key></entry>
               <entry>check mailboxes for new mail</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="enter-mask"/></entry>
-              <entry><muttng-doc:key>m</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="enter-mask"/></entry>
+              <entry><madmutt-doc:key>m</madmutt-doc:key></entry>
               <entry>enter a file mask</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search"/></entry>
-              <entry><muttng-doc:key>/</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search"/></entry>
+              <entry><madmutt-doc:key>/</madmutt-doc:key></entry>
               <entry>search for a regular expression</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-next"/></entry>
-              <entry><muttng-doc:key>n</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search-next"/></entry>
+              <entry><madmutt-doc:key>n</madmutt-doc:key></entry>
               <entry>search for next match</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="search-reverse"/></entry>
-              <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="search-reverse"/></entry>
+              <entry><madmutt-doc:key mod="E">/</madmutt-doc:key></entry>
               <entry>search backwards for a regular expression</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="select-new"/></entry>
-              <entry><muttng-doc:key>N</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="select-new"/></entry>
+              <entry><madmutt-doc:key>N</madmutt-doc:key></entry>
               <entry>select a new file in this directory</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="sort"/></entry>
-              <entry><muttng-doc:key>o</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="sort"/></entry>
+              <entry><madmutt-doc:key>o</madmutt-doc:key></entry>
               <entry>sort messages</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="sort-reverse"/></entry>
-              <entry><muttng-doc:key>O</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="sort-reverse"/></entry>
+              <entry><madmutt-doc:key>O</madmutt-doc:key></entry>
               <entry>sort messages in reverse order</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="toggle-mailboxes"/></entry>
-              <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="toggle-mailboxes"/></entry>
+              <entry><madmutt-doc:key>Tab</madmutt-doc:key></entry>
               <entry>toggle whether to browse mailboxes or all files</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="view-file"/></entry>
-              <entry><muttng-doc:key>Space</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="view-file"/></entry>
+              <entry><madmutt-doc:key>Space</madmutt-doc:key></entry>
               <entry>view file</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="subscribe"/></entry>
-              <entry><muttng-doc:key>s</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="subscribe"/></entry>
+              <entry><madmutt-doc:key>s</madmutt-doc:key></entry>
               <entry>subscribe to current mailbox (IMAP            Only)</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="unsubscribe"/></entry>
-              <entry><muttng-doc:key>u</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="unsubscribe"/></entry>
+              <entry><madmutt-doc:key>u</madmutt-doc:key></entry>
               <entry>unsubscribe to current mailbox (IMAP            Only)</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="toggle-subscribed"/></entry>
-              <entry><muttng-doc:key>T</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="toggle-subscribed"/></entry>
+              <entry><madmutt-doc:key>T</madmutt-doc:key></entry>
               <entry>toggle view all/subscribed mailboxes            (IMAP Only)</entry>
             </row>
                   </tbody>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:funcref name="view-name"/></entry>
-              <entry><muttng-doc:key>%</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="view-name"/></entry>
+              <entry><madmutt-doc:key>%</madmutt-doc:key></entry>
               <entry>view the key's user id</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="verify-key"/></entry>
-              <entry><muttng-doc:key>c</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="verify-key"/></entry>
+              <entry><madmutt-doc:key>c</madmutt-doc:key></entry>
               <entry>verify a PGP public key</entry>
             </row>
                   </tbody>
           </thead>
           <tbody>
             <row>
-              <entry><muttng-doc:funcref name="backspace"/></entry>
-              <entry><muttng-doc:key>BackSpace</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="backspace"/></entry>
+              <entry><madmutt-doc:key>BackSpace</madmutt-doc:key></entry>
               <entry>delete the char in front of the cursor</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="backward-char"/></entry>
-              <entry><muttng-doc:key mod="C">B</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="backward-char"/></entry>
+              <entry><madmutt-doc:key mod="C">B</madmutt-doc:key></entry>
               <entry>move the cursor one character to the left</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="backward-word"/></entry>
-              <entry><muttng-doc:key mod="E">b</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="backward-word"/></entry>
+              <entry><madmutt-doc:key mod="E">b</madmutt-doc:key></entry>
               <entry>move the cursor to the previous word</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="bol"/></entry>
-              <entry><muttng-doc:key mod="C">A</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="bol"/></entry>
+              <entry><madmutt-doc:key mod="C">A</madmutt-doc:key></entry>
               <entry>jump to the beginning of the line</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="buffy-cycle"/></entry>
-              <entry><muttng-doc:key>Space</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="buffy-cycle"/></entry>
+              <entry><madmutt-doc:key>Space</madmutt-doc:key></entry>
               <entry>cycle among incoming mailboxes</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="capitalize-word"/></entry>
-              <entry><muttng-doc:key mod="E">c</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="capitalize-word"/></entry>
+              <entry><madmutt-doc:key mod="E">c</madmutt-doc:key></entry>
               <entry>uppercase the first character in the word</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="complete"/></entry>
-              <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="complete"/></entry>
+              <entry><madmutt-doc:key>Tab</madmutt-doc:key></entry>
               <entry>complete filename or alias</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="complete-query"/></entry>
-              <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="complete-query"/></entry>
+              <entry><madmutt-doc:key mod="C">T</madmutt-doc:key></entry>
               <entry>complete address with query</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="delete-char"/></entry>
-              <entry><muttng-doc:key mod="C">D</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="delete-char"/></entry>
+              <entry><madmutt-doc:key mod="C">D</madmutt-doc:key></entry>
               <entry>delete the char under the cursor</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="downcase-word"/></entry>
-              <entry><muttng-doc:key mod="E">l</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="downcase-word"/></entry>
+              <entry><madmutt-doc:key mod="E">l</madmutt-doc:key></entry>
               <entry>lowercase all characters in current word</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="eol"/></entry>
-              <entry><muttng-doc:key mod="C">E</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="eol"/></entry>
+              <entry><madmutt-doc:key mod="C">E</madmutt-doc:key></entry>
               <entry>jump to the end of the line</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="forward-char"/></entry>
-              <entry><muttng-doc:key mod="C">F</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="forward-char"/></entry>
+              <entry><madmutt-doc:key mod="C">F</madmutt-doc:key></entry>
               <entry>move the cursor one character to the right</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="forward-word"/></entry>
-              <entry><muttng-doc:key mod="E">f</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="forward-word"/></entry>
+              <entry><madmutt-doc:key mod="E">f</madmutt-doc:key></entry>
               <entry>move the cursor to the next word</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="history-down"/></entry>
+              <entry><madmutt-doc:funcref name="history-down"/></entry>
               <entry></entry>
               <entry>scroll down through the history list</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="history-up"/></entry>
+              <entry><madmutt-doc:funcref name="history-up"/></entry>
               <entry></entry>
               <entry>scroll up through the history list</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="kill-eol"/></entry>
-              <entry><muttng-doc:key mod="C">K</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="kill-eol"/></entry>
+              <entry><madmutt-doc:key mod="C">K</madmutt-doc:key></entry>
               <entry>delete chars from cursor to end of line</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="kill-eow"/></entry>
-              <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="kill-eow"/></entry>
+              <entry><madmutt-doc:key mod="E">d</madmutt-doc:key></entry>
               <entry>delete chars from cursor to end of word</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="kill-line"/></entry>
-              <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="kill-line"/></entry>
+              <entry><madmutt-doc:key mod="C">U</madmutt-doc:key></entry>
               <entry>delete all chars on the line</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="kill-word"/></entry>
-              <entry><muttng-doc:key mod="C">W</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="kill-word"/></entry>
+              <entry><madmutt-doc:key mod="C">W</madmutt-doc:key></entry>
               <entry>delete the word in front of the cursor</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="quote-char"/></entry>
-              <entry><muttng-doc:key mod="C">V</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="quote-char"/></entry>
+              <entry><madmutt-doc:key mod="C">V</madmutt-doc:key></entry>
               <entry>quote the next typed key</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="transpose-chars"/></entry>
+              <entry><madmutt-doc:funcref name="transpose-chars"/></entry>
               <entry></entry>
               <entry>transpose character under cursor with previous</entry>
             </row>
             <row>
-              <entry><muttng-doc:funcref name="upcase-word"/></entry>
-              <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
+              <entry><madmutt-doc:funcref name="upcase-word"/></entry>
+              <entry><madmutt-doc:key mod="E">u</madmutt-doc:key></entry>
               <entry>uppercase all characters in current word</entry>
             </row>
                   </tbody>
           <tbody>
             <row>
               <entry></entry>
-              <entry><muttng-doc:funcref name="sidebar-scroll-up"/></entry>
+              <entry><madmutt-doc:funcref name="sidebar-scroll-up"/></entry>
               <entry>Scrolls the mailbox list up 1 page</entry>
             </row>
             <row>
               <entry></entry>
-              <entry><muttng-doc:funcref name="sidebar-scroll-down"/></entry>
+              <entry><madmutt-doc:funcref name="sidebar-scroll-down"/></entry>
               <entry>Scrolls the mailbox list down 1 page</entry>
             </row>
             <row>
               <entry></entry>
-              <entry><muttng-doc:funcref name="sidebar-next"/></entry>
+              <entry><madmutt-doc:funcref name="sidebar-next"/></entry>
               <entry>Highlights the next mailbox</entry>
             </row>
             <row>
               <entry></entry>
-              <entry><muttng-doc:funcref name="sidebar-next-new"/></entry>
+              <entry><madmutt-doc:funcref name="sidebar-next-new"/></entry>
               <entry>Highlights the next mailbox with new mail</entry>
             </row>
             <row>
               <entry></entry>
-              <entry><muttng-doc:funcref name="sidebar-previous"/></entry>
+              <entry><madmutt-doc:funcref name="sidebar-previous"/></entry>
               <entry>Highlights the previous mailbox</entry>
             </row>
             <row>
               <entry></entry>
-              <entry><muttng-doc:funcref name="sidebar-open"/></entry>
+              <entry><madmutt-doc:funcref name="sidebar-open"/></entry>
               <entry>Opens the currently highlighted mailbox</entry>
             </row>
           </tbody>
       </para>
       
       <para>
-        Mutt-ng is developed by the following people:
+        Madmutt is developed by the following people:
       </para>
       
       <para>
       
       <para>
         The following people have been very helpful to the
-        development of Mutt-ng (sorted by surnames):
+        development of Madmutt (sorted by surnames):
       </para>
       
       <para>
 
       <para>
         This manual is written in XML and transformed via a XSLT
-        stylesheet into valid DocBook/XML and/or <muttng-doc:special
+        stylesheet into valid DocBook/XML and/or <madmutt-doc:special
           docbook="LaTeX" latex="\LaTeX{}"/> to be again transformed via a
         XSLT stylesheet into the final formats.
       </para>
 
       <para>
         To achieve the latter, the sources come with a file called
-        <literal>muttng-manual.xsl</literal> introducing the
-        <literal>muttng-doc</literal> namespace which offers the following
+        <literal>madmutt-manual.xsl</literal> introducing the
+        <literal>madmutt-doc</literal> namespace which offers the following
         tags to be used (<emphasis>note: this is far from being
           complete, any help towards consistency is <emphasis
             role="bold">highly</emphasis> appreciated</emphasis>).
       <para>
         <variablelist>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:man name="" [sect=""]/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:man name="" [sect=""]/&gt;</literal></term>
             <listitem><para>
                 <emphasis>References to manual pages.</emphasis> If the
                 <literal>sect</literal> parameter is omitted, it'll
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:envvar name=""/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:envvar name=""/&gt;</literal></term>
             <listitem><para>
                 <emphasis>References to environment
                   variables.</emphasis> The <literal>name</literal>
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:hook name=""/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:hook name=""/&gt;</literal></term>
             <listitem><para>
                 <emphasis>References to hooks.</emphasis> The string
                 <literal>-hook</literal> will be added automatically to
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:pattern name="" [full="1"]/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:pattern name="" [full="1"]/&gt;</literal></term>
             <listitem><para>
                 <emphasis>References to patterns.</emphasis> The
                 <literal>name</literal> parameter must only contain the
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:key [mod="C|E"]&gt;key&lt;/muttng-doc:key&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:key [mod="C|E"]&gt;key&lt;/madmutt-doc:key&gt;</literal></term>
             <listitem><para>
                 <emphasis>Referencing a key.</emphasis>. Because it's
                 somewhat untrivial to always get the right escaping for 
-                <muttng-doc:special docbook="LaTeX" latex="\LaTeX{}"/>,
+                <madmutt-doc:special docbook="LaTeX" latex="\LaTeX{}"/>,
                 there's a tag for it. The optional modifiers
                 <literal>C</literal> or <literal>E</literal> stand for
                 Control and Escape respectively. To still allow
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:funcdef name=""/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:funcdef name=""/&gt;</literal></term>
             <listitem><para>
                 <emphasis>Defining a command.</emphasis>. It's used to
                 define a command with the name given in the
                 <literal>name</literal> parameter. The default key
                 binding must be given via
-                <literal>&lt;muttng-doc:key/&gt;</literal> (see above). The string
+                <literal>&lt;madmutt-doc:key/&gt;</literal> (see above). The string
                 will be automatically enclosed in
                 <literal>&lt;&gt;</literal>. Auto-indexing is done.
                 Also an anchor with id
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:funcref name=""/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:funcref name=""/&gt;</literal></term>
             <listitem><para>
                 <emphasis>References to functions.</emphasis>. This is
                 practically the same as the above except that there's no
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:vardef name=""/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:vardef name=""/&gt;</literal></term>
             <listitem><para>
                 <emphasis>Defining a variable.</emphasis> This is to be
                 used by <literal>makedoc</literal> only to define a
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:varref name=""/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:varref name=""/&gt;</literal></term>
             <listitem><para>
                 <emphasis>References to variables.</emphasis> This
                 practically is the same as above except that the text
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:web url""/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:web url""/&gt;</literal></term>
             <listitem><para>
                 <emphasis>Pretty print a linked URL</emphasis>. As for
                 E-Mail addresses where the text (mostly) equals the
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:rfc num=""/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:rfc num=""/&gt;</literal></term>
             <listitem><para>
                 <emphasis>References to RfC documents.</emphasis> Use
                 this to produce links to RfC document with number given
                 as the <literal>num</literal> parameter. A link to
-                <muttng-doc:web url="http://www.faqs.org/"/> will be
+                <madmutt-doc:web url="http://www.faqs.org/"/> will be
                 made. Auto-indexing is done under
                 <emphasis>RfC</emphasis>.
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:cmddef name="" [noanchor="1"]/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:cmddef name="" [noanchor="1"]/&gt;</literal></term>
             <listitem><para>
                 <emphasis>Defining a configuration command.</emphasis>
                 The name of the command is given as the
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:cmdref name=""/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:cmdref name=""/&gt;</literal></term>
             <listitem><para>
                 <emphasis>References to configuration commands.</emphasis>
                 Use this to refer to commands as it builds the proper
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:lstconf/&gt;</literal>,
-              <literal>&lt;muttng-doc:lstmail/&gt;</literal>,
-              <literal>&lt;muttng-doc:lstshell/&gt;</literal>
+            <term><literal>&lt;madmutt-doc:lstconf/&gt;</literal>,
+              <literal>&lt;madmutt-doc:lstmail/&gt;</literal>,
+              <literal>&lt;madmutt-doc:lstshell/&gt;</literal>
             </term>
             <listitem><para>
                 <emphasis>Screen layout by context.</emphasis> These are
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:special [docbook=""] [latex=""]/&gt;</literal></term>
+            <term><literal>&lt;madmutt-doc:special [docbook=""] [latex=""]/&gt;</literal></term>
             <listitem><para>
                 This is intended for specifying special strings for
-                either DocBook/XML or <muttng-doc:special
+                either DocBook/XML or <madmutt-doc:special
                   docbook="LaTeX" latex="\LaTeX{}"/>.
             </para></listitem>
           </varlistentry>
         <itemizedlist>
           <listitem>
             <para>To not fully bloat the XSL stylesheet
-              procuding the <muttng-doc:special docbook="LaTeX"
+              procuding the <madmutt-doc:special docbook="LaTeX"
                 latex="\LaTeX{}"/> code, all tables <emphasis>must</emphasis>
               have an attribute called <literal>texstr</literal> which is
               directly passed to <literal>longtable</literal>.
index faf0969..13bbb87 100644 (file)
@@ -69,7 +69,7 @@ into
 before storing it. Besides \fBMBOXO\fP and \fBMBOXRD\fP there is also
 \fBMBOXCL\fP which is \fBMBOXO\fP with a "Content-Length:"-field with the
 number of bytes in the message body; some MUAs (like
-.BR muttng (1))
+.BR madmutt (1))
 do automatically transform \fBMBOXO\fP mailboxes into \fBMBOXCL\fP ones when
 ever they write them back as \fBMBOXCL\fP can be read by any \fBMBOXO\fP-MUA
 without any problems.
@@ -163,7 +163,7 @@ format folders.
 .PP
 .\"
 .SH "SEE ALSO"
-.BR muttng (1),
+.BR madmutt (1),
 .BR fcntl (2),
 .BR flock (2),
 .BR link (2),
index 0b88add..1811708 100644 (file)
 .\"     along with this program; if not, write to the Free Software
 .\"     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 .\"
-.TH mutt-ng 1 Unix "User Manuals"
+.TH Madmutt 1 Unix "User Manuals"
 .SH NAME
-mutt-ng \- The Mutt-ng Mail User Agent
+Madmutt \- The Madmutt Mail User Agent
 .SH SYNOPSIS
 .PP
-.B muttng
+.B madmutt
 [-GnRyzZ] 
 [-e \fIcmd\fP] [-F \fIfile\fP] [-g \fIserver\fP] [-m \fItype\fP] [-f \fIfile\fP]
 .PP
-.B muttng 
+.B madmutt 
 [-nx] 
 [-e \fIcmd\fP] 
 [-a \fIfile\fP]
@@ -37,23 +37,23 @@ mutt-ng \- The Mutt-ng Mail User Agent
 [-b \fIaddr\fP]
 [-c \fIaddr\fP] \fIaddr\fP [...]
 .PP
-.B muttng
+.B madmutt
 [-n] [-e \fIcmd\fP] [-F \fIfile\fP] [-t | -T]
 .PP
-.B muttng
+.B madmutt
 [-n] [-e \fIcmd\fP] [-F \fIfile\fP] -p
 .PP
-.B muttng
+.B madmutt
 [-n] [-e \fIcmd\fP] [-F \fIfile\fP] -Q \fIquery\fP
 .PP
-.B muttng
+.B madmutt
 [-n] [-e \fIcmd\fP] [-F \fIfile\fP] -A \fIalias\fP
 .PP
-.B muttng
+.B madmutt
 -v[v]
 .SH DESCRIPTION
 .PP
-Mutt-ng is a small but very powerful text based program for reading electronic
+Madmutt is a small but very powerful text based program for reading electronic
 mail under unix operating systems, including support color terminals, MIME,
 and a threaded sorting mode.
 .SH OPTIONS
@@ -75,14 +75,14 @@ Specify a configuration command to be run after processing of initialization
 files.
 .IP "-f \fImailbox\fP"
 Specify which mailbox to load.
-.IP "-F \fImuttngrc\fP"
-Specify an initialization file to read instead of ~/.muttngrc
+.IP "-F \fImadmuttrc\fP"
+Specify an initialization file to read instead of ~/.madmuttrc
 .IP "-g \fIserver\fP"
-Start Mutt-ng with a listing of subscribed newsgroups at specified newsserver.
+Start Madmutt with a listing of subscribed newsgroups at specified newsserver.
 .IP "-G"
-Start Mutt-ng with a listing of subscribed newsgroups.
+Start Madmutt with a listing of subscribed newsgroups.
 .IP "-d"
-Specify a debugging level. This will cause muttng to create .muttngdebug<level> files which include
+Specify a debugging level. This will cause madmutt to create .madmuttdebug<level> files which include
 debugging information.
 .IP "-h"
 Display help.
@@ -94,7 +94,7 @@ Specify a file to include into the body of a message.
 .IP "-m \fItype\fP       "
 specify a default mailbox type
 .IP "-n"
-Causes Mutt-ng to bypass the system configuration file.
+Causes Madmutt to bypass the system configuration file.
 .IP "-p"
 Resume a postponed message.
 .IP "-Q \fIquery\fP"
@@ -106,17 +106,17 @@ Open a mailbox in \fIread-only\fP mode.
 .IP "-s \fIsubject\fP"
 Specify the subject of the message.
 .IP "-v"
-Display the Mutt-ng version number and compile-time definitions.
+Display the Madmutt version number and compile-time definitions.
 .IP "-x"
 Emulate the mailx compose mode.
 .IP "-y"
-Start Mutt-ng with a listing of all mailboxes specified by the \fImailboxes\fP
+Start Madmutt with a listing of all mailboxes specified by the \fImailboxes\fP
 command.
 .IP "-z"
-When used with -f, causes Mutt-ng not to start if there are no messages in the
+When used with -f, causes Madmutt not to start if there are no messages in the
 mailbox.
 .IP "-Z"
-Causes Mutt-ng to open the first mailbox specified by the \fImailboxes\fP
+Causes Madmutt to open the first mailbox specified by the \fImailboxes\fP
 command which contains new mail.
 .SH ENVIRONMENT
 .PP
@@ -147,12 +147,12 @@ Default Reply-To address.
 Specifies the editor to use when composing messages.
 .SH FILES
 .PP
-.IP "~/.muttngrc or ~/.muttng/muttngrc"
+.IP "~/.madmuttrc or ~/.madmutt/madmuttrc"
 User configuration file.
-.IP "@sysconfdir@/Muttngrc"
+.IP "@sysconfdir@/madmuttrc"
 System-wide configuration file.
 .IP "/tmp/muttXXXXXX"
-Temporary files created by Mutt-ng.
+Temporary files created by Madmutt.
 .IP "~/.mailcap"
 User definition for handling non-text MIME types.
 .IP "@sysconfdir@/mailcap"
@@ -161,10 +161,10 @@ System definition for handling non-text MIME types.
 User's personal mapping between MIME types and file extensions.
 .IP "@sysconfdir@/mime.types"
 System mapping between MIME types and file extensions.
-.IP "@bindir@/muttng_dotlock"
+.IP "@bindir@/madmutt_dotlock"
 The privileged dotlocking program.
 .IP "@docdir@/manual.txt"
-The Mutt-ng manual.
+The Madmutt manual.
 .SH BUGS
 .PP
 None.  Mutts have fleas, not bugs.
@@ -174,16 +174,16 @@ Suspend/resume while editing a file with an external editor does not work
 under SunOS 4.x if you use the curses lib in /usr/5lib.  It \fIdoes\fP work
 with the S-Lang library, however.
 .PP
-Resizing the screen while using an external pager causes Mutt-ng to go haywire
+Resizing the screen while using an external pager causes Madmutt to go haywire
 on some systems.
 .PP
 suspend/resume does not work under Ultrix.
 .PP
 The help line for the index menu is not updated if you change the bindings
-for one of the functions listed while Mutt-ng is running.
+for one of the functions listed while Madmutt is running.
 .PP
 For a more up-to-date list of bugs, errm, fleas, please visit the
-mutt-ng project's bug tracking system under http://developer.berlios.de/projects/mutt-ng/.  To
+Madmutt project's bug tracking system under http://developer.berlios.de/projects/Madmutt/.  To
 report a bug, please use the
 .BR fleang (1)
 program.
@@ -199,21 +199,21 @@ GNU General Public License for more details.
 .BR mailcap (5),
 .BR maildir (5),
 .BR mbox (5),
-.BR muttng_dotlock (1),
-.BR muttngrc (5),
+.BR madmutt_dotlock (1),
+.BR madmuttrc (5),
 .BR ncurses (3),
 .BR sendmail (1),
 .BR smail (1)
 .PP
-Mutt-ng Home Page: http://www.muttng.org
+Madmutt Home Page: http://www.madmutt.org
 .PP
-The Mutt-ng manual: http://www.muttng.org/manual
+The Madmutt manual: http://www.madmutt.org/manual
 .PP
 The GNU General Public License.
 .SH AUTHOR
 .PP
 Original mutt was/is written Michael Elkins, and others.
 .PP
-Mutt-ng is written by Andreas Krennmair <ak@synflood.at> and others.
+Madmutt is written by Andreas Krennmair <ak@synflood.at> and others.
 .PP
-Use <mutt-ng-devel@lists.berlios.de> to contact the developers.
+Use <Madmutt-devel@lists.berlios.de> to contact the developers.
index 18683ff..ef6fef8 100644 (file)
 .\"
 .TH fleang 1 "January 2005" Unix "User Manuals"
 .SH NAME
-fleang \- Report a bug (or rather a flea) in Mutt-ng. (OBSOLETE)
+fleang \- Report a bug (or rather a flea) in Madmutt. (OBSOLETE)
 .SH DESCRIPTION
 .PP
 .B fleang
 used to be a shell script which helped you to submit a bug report against the 
-.BR muttng (1)
+.BR madmutt (1)
 mail user agent.
 .PP
 If you want to submit bugs with a web interface use:
index faf4403..7f474e5 100644 (file)
 .\"     along with this program; if not, write to the Free Software
 .\"     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 .\"
-.TH muttngrc 5 "September 2002" Unix "User Manuals"
+.TH madmuttrc 5 "September 2002" Unix "User Manuals"
 .SH NAME
-muttngrc \- Configuration file for the Mutt-ng Mail User Agent
+madmuttrc \- Configuration file for the Madmutt Mail User Agent
 .SH DESCRIPTION
 .PP
-A Mutt-ng configuration file consists of a series of \(lqcommands\(rq.
+A Madmutt configuration file consists of a series of \(lqcommands\(rq.
 Each line of the file may contain one or more commands.  When
 multiple commands are used, they must be separated by a semicolon
 (\(lq\fB;\fP\(rq).
@@ -80,9 +80,9 @@ all aliases when \(lq\fB*\fP\(rq is used as an argument.
 \fBunalternates\fP [\fB * \fP | \fIregexp\fP [ \fB,\fP \fIregexp\fP [ ... ]] ]
 .fi
 .IP
-\fBalternates\fP is used to inform Mutt-ng about alternate addresses
+\fBalternates\fP is used to inform Madmutt about alternate addresses
 where you receive mail; you can use regular expressions to specify
-alternate addresses.  This affects Mutt-ng's idea about messages
+alternate addresses.  This affects Madmutt's idea about messages
 from you, and messages addressed to you.  \fBunalternates\fP removes
 a regular expression from the list of known alternates.
 .PP
@@ -92,7 +92,7 @@ a regular expression from the list of known alternates.
 .fi
 .IP
 \fBalternative_order\fP command permits you to define an order of preference which is
-used by Mutt-ng to determine which part of a
+used by Madmutt to determine which part of a
 \fBmultipart/alternative\fP body to display.
 A subtype of \(lq\fB*\fP\(rq matches any subtype, as does an empty
 subtype.   \fBunalternative_order\fP removes entries from the
@@ -104,7 +104,7 @@ as an argument.
 \fBunauto_view\fP \fItype\fP[\fB/\fP\fIsubtype\fP] [ ... ]
 .fi
 .IP
-This commands permits you to specify that Mutt-ng should automatically
+This commands permits you to specify that Madmutt should automatically
 convert the given MIME types to text/plain when displaying messages.
 For this to work, there must be a 
 .BR mailcap (5)
@@ -119,7 +119,7 @@ matches any subtype, as does an empty subtype.
 .fi
 .IP
 This command permits you to define a list of "data" MIME content
-types for which Mutt-ng will try to determine the actual file type from
+types for which Madmutt will try to determine the actual file type from
 the file name, and not use a 
 .BR mailcap (5)
 entry given for the original MIME type.  For instance, you may add
@@ -137,7 +137,7 @@ Valid maps are:
 .BR pager ", " pgp ", " postpone ", "
 .BR mix .
 .IP
-For more information on keys and functions, please consult the Mutt-ng
+For more information on keys and functions, please consult the Madmutt
 Manual.
 .TP
 \fBaccount-hook\fP [\fB!\fP]\fIregexp\fP \fIcommand\fP
@@ -147,7 +147,7 @@ to adjust configuration settings to different IMAP or POP servers.
 \fBcharset-hook\fP \fIalias\fP \fIcharset\fP
 This command defines an alias for a character set.  This is useful
 to properly display messages which are tagged with a character set
-name not known to Mutt-ng.
+name not known to Madmutt.
 .TP
 \fBiconv-hook\fP \fIcharset\fP \fIlocal-charset\fP
 This command defines a system-specific name for a character set.
@@ -163,7 +163,7 @@ In this specific case, you'd put this into your configuration file:
 .B "iconv-hook iso-8859-1 8859-1"
 .TP
 \fBmessage-hook\fP [\fB!\fP]\fIpattern\fP \fIcommand\fP
-Before Mutt-ng displays (or formats for replying or forwarding) a
+Before Madmutt displays (or formats for replying or forwarding) a
 message which matches the given \fIpattern\fP (or, when it is
 preceded by an exclamation mark, does not match the \fIpattern\fP),
 the given \fIcommand\fP is executed.  When multiple
@@ -171,7 +171,7 @@ the given \fIcommand\fP is executed.  When multiple
 which they occur in the configuration file.
 .TP
 \fBfolder-hook\fP [\fB!\fP]\fIregexp\fP \fIcommand\fP
-When Mutt-ng enters a folder which matches \fIregexp\fP (or, when
+When Madmutt enters a folder which matches \fIregexp\fP (or, when
 \fIregexp\fP is preceded by an exclamation mark, does not match
 \fIregexp\fP), the given \fIcommand\fP is executed.
 .IP
@@ -232,7 +232,7 @@ the above mentioned list of ignored headers.
 \fBunsubscribe\fP \fIregexp\fP [ \fIregexp\fP ... ]
 .fi
 .IP
-Mutt-ng maintains two lists of mailing list address patterns, a list of
+Madmutt maintains two lists of mailing list address patterns, a list of
 subscribed mailing lists, and a list of known mailing lists.  All
 subscribed mailing lists are known.  Patterns use regular expressions.
 .IP
@@ -244,7 +244,7 @@ and subscribed mailing lists.  The \fBunsubscribe\fP command removes
 it from the list of subscribed mailing lists.
 .TP
 \fBmbox-hook\fP [\fB!\fP]\fIpattern\fP \fImailbox\fP
-When Mutt-ng changes to a mail folder which matches \fIpattern\fP,
+When Madmutt changes to a mail folder which matches \fIpattern\fP,
 \fImailbox\fP will be used as the \(lqmbox\(rq folder, i.e., read
 messages will be moved to that folder when the mail folder is left.
 .IP
@@ -272,7 +272,7 @@ the messages you compose.  \fBunmy_hdr\fP will remove the given
 user-defined headers.
 .TP
 \fBhdr_order\fP \fIheader1\fP \fIheader2\fP [ ... ]
-With this command, you can specify an order in which Mutt-ng will
+With this command, you can specify an order in which Madmutt will
 attempt to present headers to you when viewing messages.
 .TP
 \fBsave-hook\fP [\fB!\fP]\fIpattern\fP \fIfilename\fP
@@ -325,7 +325,7 @@ or even just an arbitrary search string.
 .IP
 These commands provide a way to handle compressed folders. The given
 \fBregexp\fP specifies which folders are taken as compressed (e.g.
-"\fI\\\\.gz$\fP"). The commands tell Mutt-ng how to uncompress a folder
+"\fI\\\\.gz$\fP"). The commands tell Madmutt how to uncompress a folder
 (\fBopen-hook\fP), compress a folder (\fBclose-hook\fP) or append a
 compressed mail to a compressed folder (\fBappend-hook\fP). The
 \fIcommand\fP string is the 
@@ -348,7 +348,7 @@ This command adds the named \fIstring\fP to the keyboard buffer.
 These commands are used to set and manipulate configuration
 varibles.
 .IP
-Mutt-ng knows four basic types of variables: boolean, number, string
+Madmutt knows four basic types of variables: boolean, number, string
 and quadoption.  Boolean variables can be \fBset\fP (true),
 \fBunset\fP (false), or \fBtoggle\fPd. Number variables can be assigned
 a positive integer value.
@@ -379,9 +379,9 @@ The given file will be evaluated as a configuration file.
 \fBnospam\fP \fIpattern\fP
 .fi
 These commands define spam-detection patterns from external spam
-filters, so that Mutt-ng can sort, limit, and search on
+filters, so that Madmutt can sort, limit, and search on
 ``spam tags'' or ``spam attributes'', or display them
-in the index. See the Mutt-ng manual for details.
+in the index. See the Madmutt manual for details.
 .TP
 \fBunhook\fP [\fB * \fP | \fIhook-type\fP ]
 This command will remove all hooks of a given type, or all hooks
@@ -389,13 +389,13 @@ when \(lq\fB*\fP\(rq is used as an argument.  \fIhook-type\fP
 can be any of the \fB-hook\fP commands documented above.
 .SH PATTERNS
 .PP
-In various places with Mutt-ng, including some of the abovementioned
+In various places with Madmutt, including some of the abovementioned
 \fBhook\fP commands, you can specify patterns to match messages.
 .SS Constructing Patterns
 .PP
 A simple pattern consists of an operator of the form
 \(lq\fB~\fP\fIcharacter\fP\(rq, possibly followed by a parameter
-against which Mutt-ng is supposed to match the object specified by
+against which Madmutt is supposed to match the object specified by
 this operator.  (For a list of operators, see below.)
 .PP
 With some of these operators, the object to be matched consists of
@@ -406,15 +406,15 @@ hat (\(lq\fB^\fP\(rq) character to such a pattern to indicate that
 .PP
 You can construct complex patterns by combining simple patterns with
 logical operators.  Logical AND is specified by simply concatenating
-two simple patterns, for instance \(lq~C mutt-ng-dev ~s bug\(rq.
+two simple patterns, for instance \(lq~C Madmutt-dev ~s bug\(rq.
 Logical OR is specified by inserting a vertical bar (\(lq\fB|\fP\(rq)
 between two patterns, for instance \(lq~C mutti-ng-dev | ~s bug\(rq.
 Additionally, you can negate a pattern by prepending a bang
 (\(lq\fB!\fP\(rq) character.  For logical grouping, use braces
-(\(lq()\(rq). Example: \(lq!(~t Mutt-ng|~c Mutt-ng) ~f elkins\(rq.
+(\(lq()\(rq). Example: \(lq!(~t Madmutt|~c Madmutt) ~f elkins\(rq.
 .SS Simple Patterns
 .PP
-Mutt-ng understands the following simple patterns:
+Madmutt understands the following simple patterns:
 .PP
 .TS
 l l.
@@ -476,13 +476,13 @@ two-digit date, optionally followed by a two-digit month, optionally
 followed by a year specifications.  Omitted fields default to the
 current month and year.
 .PP
-Mutt-ng understands either two or four digit year specifications.  When
-given a two-digit year, Mutt-ng will interpret values less than 70 as
+Madmutt understands either two or four digit year specifications.  When
+given a two-digit year, Madmutt will interpret values less than 70 as
 lying in the 21st century (i.e., \(lq38\(rq means 2038 and not 1938,
 and \(lq00\(rq is interpreted as 2000), and values
 greater than or equal to 70 as lying in the 20th century.
 .PP
-Note that this behaviour \fIis\fP Y2K compliant, but that Mutt-ng
+Note that this behaviour \fIis\fP Y2K compliant, but that Madmutt
 \fIdoes\fP have a Y2.07K problem.
 .PP
 If a date range consists of a single date, the operator in question
index 38bd4c7..2f0b895 100644 (file)
@@ -6,15 +6,15 @@
 .BR mailcap (5),
 .BR maildir (5),
 .BR mbox (5),
-.BR muttng (1),
+.BR madmutt (1),
 .BR printf (3),
 .BR regex (7),
 .BR strftime (3)
 .PP
-The Mutt-ng Manual
+The Madmutt Manual
 .PP
-The Mutt-ng home page: http://www.muttng.org
+The Madmutt home page: http://www.muttng.org
 .SH AUTHOR
 .PP
-Michael Elkins, and others.  Use <mutt-ng-devel@lists.berlios.de> to contact
+Michael Elkins, and others.  Use <Madmutt-devel@lists.berlios.de> to contact
 the developers.
index 9ed2597..370d18d 100644 (file)
@@ -1,8 +1,8 @@
 This document descibes what to do after allplying a patch
 
-If you want to add patches to Mutt-ng just add the name
+If you want to add patches to Madmutt just add the name
 of the patch to the PATCHES file after applying the patch. 
-Mutt-ng recognizes this patch automatically and shows it 
+Madmutt recognizes this patch automatically and shows it 
 in --help e.g.
 
 Every patch name should have the format:
index f89fb1f..e196464 100644 (file)
--- a/dotlock.c
+++ b/dotlock.c
@@ -273,7 +273,7 @@ static void END_PRIVILEGED (void)
 
 static void usage (const char *av0)
 {
-  fprintf (stderr, "dotlock [Mutt-ng %s]\n", VERSION);
+  fprintf (stderr, "dotlock [Madmutt %s]\n", VERSION);
   fprintf (stderr, "usage: %s [-t|-f|-u|-d] [-p] [-r <retries>] file\n", av0);
 
   fputs ("\noptions:"
diff --git a/init.c b/init.c
index 7de40b8..69de16b 100644 (file)
--- a/init.c
+++ b/init.c
@@ -2791,15 +2791,15 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   /* Process the global rc file if it exists and the user hasn't explicity
      requested not to via "-n".  */
   if (!skip_sys_rc) {
-    snprintf (buffer, sizeof(buffer), "%s/Muttngrc-%s", SYSCONFDIR,
+    snprintf (buffer, sizeof(buffer), "%s/Madmuttrc-%s", SYSCONFDIR,
               MUTT_VERSION);
     if (access (buffer, F_OK) == -1)
-      snprintf (buffer, sizeof(buffer), "%s/Muttngrc", SYSCONFDIR);
+      snprintf (buffer, sizeof(buffer), "%s/Madmuttrc", SYSCONFDIR);
     if (access (buffer, F_OK) == -1)
-      snprintf (buffer, sizeof(buffer), "%s/Muttngrc-%s", PKGDATADIR,
+      snprintf (buffer, sizeof(buffer), "%s/Madmuttrc-%s", PKGDATADIR,
                 MUTT_VERSION);
     if (access (buffer, F_OK) == -1)
-      snprintf (buffer, sizeof(buffer), "%s/Muttngrc", PKGDATADIR);
+      snprintf (buffer, sizeof(buffer), "%s/Madmuttrc", PKGDATADIR);
     if (access (buffer, F_OK) != -1) {
       if (source_rc (buffer, &err) != 0) {
         fputs (err.data, stderr);
diff --git a/init.h b/init.h
index 65d5e1f..82fab85 100644 (file)
--- a/init.h
+++ b/init.h
@@ -152,7 +152,7 @@ struct option_t MuttVars[] = {
    ** The default file in which to save aliases created by the 
    ** ``$create-alias'' function.
    ** .pp
-   ** \fBNote:\fP Mutt-ng will not automatically source this file; you must
+   ** \fBNote:\fP Madmutt will not automatically source this file; you must
    ** explicitly use the ``$source'' command for it to be executed.
    */
   {"alias_format", DT_STR, R_NONE, UL &AliasFmt, "%4n %2f %t %-10a   %r"},
@@ -198,19 +198,19 @@ struct option_t MuttVars[] = {
   {"ascii_chars", DT_BOOL, R_BOTH, OPTASCIICHARS, "no" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will use plain ASCII characters when displaying thread
+   ** If \fIset\fP, Madmutt will use plain ASCII characters when displaying thread
    ** and attachment trees, instead of the default \fTACS\fP characters.
    */
   {"askbcc", DT_BOOL, R_NONE, OPTASKBCC, "no" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will prompt you for blind-carbon-copy (Bcc) recipients
+   ** If \fIset\fP, Madmutt will prompt you for blind-carbon-copy (Bcc) recipients
    ** before editing an outgoing message.
    */
   {"askcc", DT_BOOL, R_NONE, OPTASKCC, "no" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will prompt you for carbon-copy (Cc) recipients before
+   ** If \fIset\fP, Madmutt will prompt you for carbon-copy (Cc) recipients before
    ** editing the body of an outgoing message.
    */
   {"assumed_charset", DT_STR, R_NONE, UL &AssumedCharset, "us-ascii"},
@@ -237,7 +237,7 @@ struct option_t MuttVars[] = {
    ** Availability: NNTP
    **
    ** .pp
-   ** If \fIset\fP, Mutt-ng will prompt you for the \fTFollowup-To:\fP header
+   ** If \fIset\fP, Madmutt will prompt you for the \fTFollowup-To:\fP header
    ** field before editing the body of an outgoing news article.
    */
   {"nntp_ask_x_comment_to", DT_BOOL, R_NONE, OPTASKXCOMMENTTO, "no" },
@@ -246,7 +246,7 @@ struct option_t MuttVars[] = {
    ** Availability: NNTP
    **
    ** .pp
-   ** If \fIset\fP, Mutt-ng will prompt you for the \fTX-Comment-To:\fP header
+   ** If \fIset\fP, Madmutt will prompt you for the \fTX-Comment-To:\fP header
    ** field before editing the body of an outgoing news article.
    */
 #endif
@@ -297,10 +297,10 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** If this variable is \fIunset\fP, when operating (saving, printing, piping,
-   ** etc) on a list of tagged attachments, Mutt-ng will concatenate the
+   ** etc) on a list of tagged attachments, Madmutt will concatenate the
    ** attachments and will operate on them as a single attachment. The
    ** ``$$attach_sep'' separator is added after each attachment. When \fIset\fP,
-   ** Mutt-ng will operate on the attachments one by one.
+   ** Madmutt will operate on the attachments one by one.
    */
   {"attribution", DT_STR, R_NONE, UL &Attribution, "On %d, %n wrote:"},
   /*
@@ -312,7 +312,7 @@ struct option_t MuttVars[] = {
   {"autoedit", DT_BOOL, R_NONE, OPTAUTOEDIT, "no" },
   /*
    ** .pp
-   ** When \fIset\fP along with ``$$edit_headers'', Mutt-ng will skip the initial
+   ** When \fIset\fP along with ``$$edit_headers'', Madmutt will skip the initial
    ** send-menu and allow you to immediately begin editing the body of your
    ** message.  The send-menu may still be accessed once you have finished
    ** editing the body of your message.
@@ -330,12 +330,12 @@ struct option_t MuttVars[] = {
   {"beep", DT_BOOL, R_NONE, OPTBEEP, "yes" },
   /*
    ** .pp
-   ** When this variable is \fIset\fP, Mutt-ng will beep when an error occurs.
+   ** When this variable is \fIset\fP, Madmutt will beep when an error occurs.
    */
   {"beep_new", DT_BOOL, R_NONE, OPTBEEPNEW, "no" },
   /*
    ** .pp
-   ** When this variable is \fIset\fP, Mutt-ng will beep whenever it prints a message
+   ** When this variable is \fIset\fP, Madmutt will beep whenever it prints a message
    ** notifying you of new mail.  This is independent of the setting of the
    ** ``$$beep'' variable.
    */
@@ -350,7 +350,7 @@ struct option_t MuttVars[] = {
   {"bounce_delivered", DT_BOOL, R_NONE, OPTBOUNCEDELIVERED, "yes" },
   /*
    ** .pp
-   ** When this variable is \fIset\fP, Mutt-ng will include 
+   ** When this variable is \fIset\fP, Madmutt will include 
    ** \fTDelivered-To:\fP header fields when bouncing messages.
    ** Postfix users may wish to \fIunset\fP this variable.
    */
@@ -370,7 +370,7 @@ struct option_t MuttVars[] = {
    ** Availability: NNTP
    **
    ** .pp
-   ** If this variable is \fIset\fP, Mutt-ng will mark all articles in a newsgroup
+   ** If this variable is \fIset\fP, Madmutt will mark all articles in a newsgroup
    ** as read when you leaving it.
    */
 #endif
@@ -385,7 +385,7 @@ struct option_t MuttVars[] = {
    ** \fBNote:\fP this option only affects \fImaildir\fP and \fIMH\fP style
    ** mailboxes.
    ** .pp
-   ** When \fIset\fP, Mutt-ng will check for new mail delivered while the
+   ** When \fIset\fP, Madmutt will check for new mail delivered while the
    ** mailbox is open.  Especially with MH mailboxes, this operation can
    ** take quite some time since it involves scanning the directory and
    ** checking each file to see if it has already been looked at.  If it's
@@ -394,7 +394,7 @@ struct option_t MuttVars[] = {
   {"collapse_unread", DT_BOOL, R_NONE, OPTCOLLAPSEUNREAD, "yes" },
   /*
    ** .pp
-   ** When \fIunset\fP, Mutt-ng will not collapse a thread if it contains any
+   ** When \fIunset\fP, Madmutt will not collapse a thread if it contains any
    ** unread messages.
    */
   {"count_attachments", DT_BOOL, R_NONE, OPTCOUNTATTACH, "yes"},
@@ -412,10 +412,10 @@ struct option_t MuttVars[] = {
   {"uncollapse_jump", DT_BOOL, R_NONE, OPTUNCOLLAPSEJUMP, "no" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will jump to the next unread message, if any,
+   ** When \fIset\fP, Madmutt will jump to the next unread message, if any,
    ** when the current thread is \fIun\fPcollapsed.
    */
-  {"compose_format", DT_STR, R_BOTH, UL &ComposeFormat, "-- Mutt-ng: Compose  [Approx. msg size: %l   Atts: %a]%>-"},
+  {"compose_format", DT_STR, R_BOTH, UL &ComposeFormat, "-- Madmutt: Compose  [Approx. msg size: %l   Atts: %a]%>-"},
   /*
    ** .pp
    ** Controls the format of the status line displayed in the ``compose''
@@ -426,7 +426,7 @@ struct option_t MuttVars[] = {
    ** .dt %a .dd total number of attachments 
    ** .dt %h .dd local hostname
    ** .dt %l .dd approximate size (in bytes) of the current message
-   ** .dt %v .dd Mutt-ng version string
+   ** .dt %v .dd Madmutt version string
    ** .de
    ** .pp
    ** See the text describing the ``$$status_format'' option for more 
@@ -435,27 +435,27 @@ struct option_t MuttVars[] = {
   {"config_charset", DT_STR, R_NONE, UL &ConfigCharset, "" },
   /*
    ** .pp
-   ** When defined, Mutt-ng will recode commands in rc files from this
+   ** When defined, Madmutt will recode commands in rc files from this
    ** encoding.
    */
   {"confirmappend", DT_BOOL, R_NONE, OPTCONFIRMAPPEND, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will prompt for confirmation when appending messages to
+   ** When \fIset\fP, Madmutt will prompt for confirmation when appending messages to
    ** an existing mailbox.
    */
   {"confirmcreate", DT_BOOL, R_NONE, OPTCONFIRMCREATE, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will prompt for confirmation when saving messages to a
+   ** When \fIset\fP, Madmutt will prompt for confirmation when saving messages to a
    ** mailbox which does not yet exist before creating it.
    */
   {"connect_timeout", DT_NUM, R_NONE, UL &ConnectTimeout, "30" },
   /*
    ** .pp
-   ** Causes Mutt-ng to timeout a network connection (for IMAP or POP) after this
+   ** Causes Madmutt to timeout a network connection (for IMAP or POP) after this
    ** many seconds if the connection is not able to be established.  A negative
-   ** value causes Mutt-ng to wait indefinitely for the connection to succeed.
+   ** value causes Madmutt to wait indefinitely for the connection to succeed.
    */
   {"content_type", DT_STR, R_NONE, UL &ContentType, "text/plain"},
   /*
@@ -475,7 +475,7 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** This variable controls the use the GPGME enabled crypto backends.
-   ** If it is \fIset\fP and Mutt-ng was build with gpgme support, the gpgme code for
+   ** If it is \fIset\fP and Madmutt was build with gpgme support, the gpgme code for
    ** S/MIME and PGP will be used instead of the classic code.
    ** .pp
    ** \fBNote\fP: You need to use this option in your \fT.madmuttrc\fP configuration
@@ -485,7 +485,7 @@ struct option_t MuttVars[] = {
   {"crypt_autopgp", DT_BOOL, R_NONE, OPTCRYPTAUTOPGP, "yes" },
   /*
    ** .pp
-   ** This variable controls whether or not Mutt-ng may automatically enable
+   ** This variable controls whether or not Madmutt may automatically enable
    ** PGP encryption/signing for messages.  See also ``$$crypt_autoencrypt'',
    ** ``$$crypt_replyencrypt'',
    ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''.
@@ -493,7 +493,7 @@ struct option_t MuttVars[] = {
   {"crypt_autosmime", DT_BOOL, R_NONE, OPTCRYPTAUTOSMIME, "yes" },
   /*
    ** .pp
-   ** This variable controls whether or not Mutt-ng may automatically enable
+   ** This variable controls whether or not Madmutt may automatically enable
    ** S/MIME encryption/signing for messages. See also ``$$crypt_autoencrypt'',
    ** ``$$crypt_replyencrypt'',
    ** ``$$crypt_autosign'', ``$$crypt_replysign'' and ``$$smime_is_default''.
@@ -568,14 +568,14 @@ struct option_t MuttVars[] = {
   {"delete_untag", DT_BOOL, R_NONE, OPTDELETEUNTAG, "yes" },
   /*
    ** .pp
-   ** If this option is \fIset\fP, Mutt-ng will untag messages when marking them
+   ** If this option is \fIset\fP, Madmutt will untag messages when marking them
    ** for deletion.  This applies when you either explicitly delete a message,
    ** or when you save it to another folder.
    */
   {"digest_collapse", DT_BOOL, R_NONE, OPTDIGESTCOLLAPSE, "yes" },
   /*
    ** .pp
-   ** If this option is \fIset\fP, Mutt-ng's received-attachments menu will not show the subparts of
+   ** If this option is \fIset\fP, Madmutt's received-attachments menu will not show the subparts of
    ** individual messages in a multipart/digest.  To see these subparts, press 'v' on that menu.
    */
   {"display_filter", DT_PATH, R_PAGER, UL &DisplayFilter, ""},
@@ -593,7 +593,7 @@ struct option_t MuttVars[] = {
    **
    ** .pp
    ** Contains the path of the \fTmadmutt_dotlock(1)\fP binary to be used by
-   ** Mutt-ng.
+   ** Madmutt.
    */
 #endif
   {"dsn_notify", DT_STR, R_NONE, UL &DsnNotify, ""},
@@ -626,7 +626,7 @@ struct option_t MuttVars[] = {
   {"duplicate_threads", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTDUPTHREADS, "yes" },
   /*
    ** .pp
-   ** This variable controls whether Mutt-ng, when sorting by threads, threads
+   ** This variable controls whether Madmutt, when sorting by threads, threads
    ** messages with the same \fTMessage-ID:\fP header field together.
    ** If it is \fIset\fP, it will indicate that it thinks they are duplicates
    ** of each other with an equals sign in the thread diagram.
@@ -659,20 +659,20 @@ struct option_t MuttVars[] = {
   {"editor", DT_PATH, R_NONE, UL &Editor, "" },
   /*
    ** .pp
-   ** This variable specifies which editor is used by Mutt-ng.
+   ** This variable specifies which editor is used by Madmutt.
    ** It defaults to the value of the \fT$$$VISUAL\fP, or \fT$$$EDITOR\fP, environment
    ** variable, or to the string "\fTvi\fP" if neither of those are set.
    */
   {"encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, "no" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will \fTquoted-printable\fP encode messages when
+   ** When \fIset\fP, Madmutt will \fTquoted-printable\fP encode messages when
    ** they contain the string ``\fTFrom \fP'' (note the trailing space)
    ** in the beginning of a line. Useful to avoid the tampering certain mail
    ** delivery and transport agents tend to do with messages.
    **
    ** .pp
-   ** \fBNote:\fP as Mutt-ng currently violates RfC3676 defining
+   ** \fBNote:\fP as Madmutt currently violates RfC3676 defining
    ** \fTformat=flowed\fP, it's <em/strongly/ advised to \fIset\fP
    ** this option although discouraged by the standard. Alternatively,
    ** you must take care of space-stuffing <tt/From / lines (with a trailing
@@ -682,7 +682,7 @@ struct option_t MuttVars[] = {
   {"use_envelope_from", DT_BOOL, R_NONE, OPTENVFROM, "no" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will use ``$$envelope_from_address'' as the
+   ** When \fIset\fP, Madmutt will use ``$$envelope_from_address'' as the
    ** \fIenvelope\fP sender if that is set, otherwise it will attempt to
    ** derive it from the "From:" header.
    **
@@ -771,7 +771,7 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** Controls whether or not the \fTMail-Followup-To:\fP header field is
-   ** generated when sending mail.  When \fIset\fP, Mutt-ng will generate this
+   ** generated when sending mail.  When \fIset\fP, Madmutt will generate this
    ** field when you are replying to a known mailing list, specified with
    ** the ``subscribe'' or ``$lists'' commands or detected by common mailing list
    ** headers.
@@ -803,7 +803,7 @@ struct option_t MuttVars[] = {
   {"force_name", DT_BOOL, R_NONE, OPTFORCENAME, "no" },
   /*
    ** .pp
-   ** This variable is similar to ``$$save_name'', except that Mutt-ng will
+   ** This variable is similar to ``$$save_name'', except that Madmutt will
    ** store a copy of your outgoing message by the username of the address
    ** you are sending to even if that mailbox does not exist.
    ** .pp
@@ -812,7 +812,7 @@ struct option_t MuttVars[] = {
   {"force_buffy_check", DT_BOOL, R_NONE, OPTFORCEBUFFYCHECK, "no" },
   /*
    ** .pp
-   ** When \fIset\fP, it causes Mutt-ng to check for new mail when the
+   ** When \fIset\fP, it causes Madmutt to check for new mail when the
    ** \fIbuffy-list\fP command is invoked. When \fIunset\fP, \fIbuffy_list\fP
    ** will just list all mailboxes which are already known to have new mail.
    ** .pp
@@ -856,24 +856,24 @@ struct option_t MuttVars[] = {
    ** is unset.
    ** .pp
    ** E.g. you can use 
-   ** \fTsend-hook Mutt-ng-devel@lists.berlios.de 'my_hdr From: Foo Bar <foo@bar.fb>'\fP
-   ** when replying to the Mutt-ng developer's mailing list and Mutt-ng takes this email address.
+   ** \fTsend-hook Madmutt-devel@lists.berlios.de 'my_hdr From: Foo Bar <foo@bar.fb>'\fP
+   ** when replying to the Madmutt developer's mailing list and Madmutt takes this email address.
    ** .pp
    ** Defaults to the contents of the environment variable \fT$$$EMAIL\fP.
    */
   {"gecos_mask", DT_RX, R_NONE, UL &GecosMask, "^[^,]*"},
   /*
    ** .pp
-   ** A regular expression used by Mutt-ng to parse the GECOS field of a password
+   ** A regular expression used by Madmutt to parse the GECOS field of a password
    ** entry when expanding the alias.  By default the regular expression is set
    ** to ``\fT^[^,]*\fP'' which will return the string up to the first ``\fT,\fP'' encountered.
    ** If the GECOS field contains a string like "lastname, firstname" then you
    ** should do: \fTset gecos_mask=".*"\fP.
    ** .pp
    ** This can be useful if you see the following behavior: you address a e-mail
-   ** to user ID stevef whose full name is Steve Franklin.  If Mutt-ng expands 
+   ** to user ID stevef whose full name is Steve Franklin.  If Madmutt expands 
    ** stevef to ``Franklin'' stevef@foo.bar then you should set the gecos_mask to
-   ** a regular expression that will match the whole name so Mutt-ng will expand
+   ** a regular expression that will match the whole name so Madmutt will expand
    ** ``Franklin'' to ``Franklin, Steve''.
    */
 #ifdef USE_NNTP
@@ -911,7 +911,7 @@ struct option_t MuttVars[] = {
   {"header", DT_BOOL, R_NONE, OPTHEADER, "no" },
   /*
    ** .pp
-   ** When \fIset\fP, this variable causes Mutt-ng to include the header
+   ** When \fIset\fP, this variable causes Madmutt to include the header
    ** of the message you are replying to into the edit buffer.
    ** The ``$$weed'' setting applies.
    */
@@ -923,14 +923,14 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fBNote:\fP The binding will not be displayed correctly if the
    ** function is bound to a sequence rather than a single keystroke.  Also,
-   ** the help line may not be updated if a binding is changed while Mutt-ng is
+   ** the help line may not be updated if a binding is changed while Madmutt is
    ** running.  Since this variable is primarily aimed at new users, neither
    ** of these should present a major problem.
    */
   {"hidden_host", DT_BOOL, R_NONE, OPTHIDDENHOST, "no" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will skip the host name part of ``$$hostname'' variable
+   ** When \fIset\fP, Madmutt will skip the host name part of ``$$hostname'' variable
    ** when adding the domain part to addresses.  This variable does not
    ** affect the generation of \fTMessage-ID:\fP header fields, and it will not lead to the 
    ** cut-off of first-level domains.
@@ -938,33 +938,33 @@ struct option_t MuttVars[] = {
   {"hide_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDELIMITED, "no" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will not show the presence of messages that are hidden
+   ** When \fIset\fP, Madmutt will not show the presence of messages that are hidden
    ** by limiting, in the thread tree.
    */
   {"hide_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDEMISSING, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will not show the presence of missing messages in the
+   ** When \fIset\fP, Madmutt will not show the presence of missing messages in the
    ** thread tree.
    */
   {"hide_thread_subject", DT_BOOL, R_TREE|R_INDEX, OPTHIDETHREADSUBJECT, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will not show the subject of messages in the thread
+   ** When \fIset\fP, Madmutt will not show the subject of messages in the thread
    ** tree that have the same subject as their parent or closest previously
    ** displayed sibling.
    */
   {"hide_top_limited", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPLIMITED, "no" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will not show the presence of messages that are hidden
+   ** When \fIset\fP, Madmutt will not show the presence of messages that are hidden
    ** by limiting, at the top of threads in the thread tree.  Note that when
    ** $$hide_missing is \fIset\fP, this option will have no effect.
    */
   {"hide_top_missing", DT_BOOL, R_TREE|R_INDEX, OPTHIDETOPMISSING, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will not show the presence of missing messages at the
+   ** When \fIset\fP, Madmutt will not show the presence of missing messages at the
    ** top of threads in the thread tree.  Note that when $$hide_limited is
    ** \fIset\fP, this option will have no effect.
    */
@@ -995,7 +995,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** Affects the behaviour of the \fIreply\fP function when replying to
    ** messages from mailing lists.  When \fIset\fP, if the ``\fTReply-To:\fP'' header field is
-   ** set to the same value as the ``\fTTo:\fP'' header field, Mutt-ng assumes that the
+   ** set to the same value as the ``\fTTo:\fP'' header field, Madmutt assumes that the
    ** ``\fTReply-To:\fP'' header field was set by the mailing list to automate responses
    ** to the list, and will ignore this field.  To direct a response to the
    ** mailing list when this option is set, use the \fIlist-reply\fP
@@ -1007,21 +1007,21 @@ struct option_t MuttVars[] = {
   {"imap_authenticators", DT_STR, R_NONE, UL &ImapAuthenticators, "" },
   /*
    ** .pp
-   ** This is a colon-delimited list of authentication methods Mutt-ng may
-   ** attempt to use to log in to an IMAP server, in the order Mutt-ng should
+   ** This is a colon-delimited list of authentication methods Madmutt may
+   ** attempt to use to log in to an IMAP server, in the order Madmutt should
    ** try them.  Authentication methods are either ``\fTlogin\fP'' or the right
    ** side of an IMAP ``\fTAUTH=\fP'' capability string, e.g. ``\fTdigest-md5\fP'',
    ** ``\fTgssapi\fP'' or ``\fTcram-md5\fP''. This parameter is case-insensitive.
    ** .pp
    ** If this
-   ** parameter is \fIunset\fP (the default) Mutt-ng will try all available methods,
+   ** parameter is \fIunset\fP (the default) Madmutt will try all available methods,
    ** in order from most-secure to least-secure.
    ** .pp
    ** Example: \fTset imap_authenticators="gssapi:cram-md5:login"\fP
    ** .pp
-   ** \fBNote:\fP Mutt-ng will only fall back to other authentication methods if
+   ** \fBNote:\fP Madmutt will only fall back to other authentication methods if
    ** the previous methods are unavailable. If a method is available but
-   ** authentication fails, Mutt-ng will not connect to the IMAP server.
+   ** authentication fails, Madmutt will not connect to the IMAP server.
    */
   { "imap_check_subscribed",  DT_BOOL, R_NONE, OPTIMAPCHECKSUBSCRIBED, "no" },
   /*
@@ -1040,7 +1040,7 @@ struct option_t MuttVars[] = {
   {"imap_headers", DT_STR, R_INDEX, UL &ImapHeaders, "" },
   /*
    ** .pp
-   ** Mutt-ng requests these header fields in addition to the default headers
+   ** Madmutt requests these header fields in addition to the default headers
    ** (``DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE
    ** CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES X-LABEL'') from IMAP
    ** servers before displaying the ``index'' menu. You may want to add more
@@ -1058,9 +1058,9 @@ struct option_t MuttVars[] = {
   {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, "900" },
   /*
    ** .pp
-   ** This variable specifies the maximum amount of time in seconds that Mutt-ng
+   ** This variable specifies the maximum amount of time in seconds that Madmutt
    ** will wait before polling open IMAP connections, to prevent the server
-   ** from closing them before Mutt-ng has finished with them.
+   ** from closing them before Madmutt has finished with them.
    ** .pp
    ** The default is
    ** well within the RFC-specified minimum amount of time (30 minutes) before
@@ -1087,14 +1087,14 @@ struct option_t MuttVars[] = {
   {"imap_mail_check", DT_NUM, R_NONE, UL &ImapBuffyTimeout, "300" },
   /*
    ** .pp
-   ** This variable configures how often (in seconds) Mutt-ng should look for
+   ** This variable configures how often (in seconds) Madmutt should look for
    ** new mail in IMAP folders. This is split from the ``$mail_check'' variable
    ** to generate less traffic and get more accurate information for local folders.
    */
   {"imap_pass", DT_STR, R_NONE, UL &ImapPass, "" },
   /*
    ** .pp
-   ** Specifies the password for your IMAP account.  If \fIunset\fP, Mutt-ng will
+   ** Specifies the password for your IMAP account.  If \fIunset\fP, Madmutt will
    ** prompt you for your password when you invoke the fetch-mail function.
    ** .pp
    ** \fBWarning\fP: you should only use this option when you are on a
@@ -1104,16 +1104,16 @@ struct option_t MuttVars[] = {
   {"imap_passive", DT_BOOL, R_NONE, OPTIMAPPASSIVE, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will not open new IMAP connections to check for new
-   ** mail.  Mutt-ng will only check for new mail over existing IMAP
+   ** When \fIset\fP, Madmutt will not open new IMAP connections to check for new
+   ** mail.  Madmutt will only check for new mail over existing IMAP
    ** connections.  This is useful if you don't want to be prompted to
-   ** user/password pairs on Mutt-ng invocation, or if opening the connection
+   ** user/password pairs on Madmutt invocation, or if opening the connection
    ** is slow.
    */
   {"imap_peek", DT_BOOL, R_NONE, OPTIMAPPEEK, "yes" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will avoid implicitly marking your mail as read whenever
+   ** If \fIset\fP, Madmutt will avoid implicitly marking your mail as read whenever
    ** you fetch a message from the server. This is generally a good thing,
    ** but can make closing an IMAP folder somewhat slower. This option
    ** exists to appease speed freaks.
@@ -1121,13 +1121,13 @@ struct option_t MuttVars[] = {
   {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, "ask-yes" },
   /*
    ** .pp
-   ** Controls whether or not Mutt-ng will try to reconnect to IMAP server when
+   ** Controls whether or not Madmutt will try to reconnect to IMAP server when
    ** the connection is lost.
    */
   {"imap_servernoise", DT_BOOL, R_NONE, OPTIMAPSERVERNOISE, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will display warning messages from the IMAP
+   ** When \fIset\fP, Madmutt will display warning messages from the IMAP
    ** server as error messages. Since these messages are often
    ** harmless, or generated due to configuration problems on the
    ** server which are out of the users' hands, you may wish to suppress
@@ -1144,9 +1144,9 @@ struct option_t MuttVars[] = {
   {"implicit_autoview", DT_BOOL, R_NONE, OPTIMPLICITAUTOVIEW, "no" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will look for a mailcap entry with the
+   ** If \fIset\fP, Madmutt will look for a mailcap entry with the
    ** ``\fTcopiousoutput\fP'' flag set for \fIevery\fP MIME attachment it doesn't have
-   ** an internal viewer defined for.  If such an entry is found, Mutt-ng will
+   ** an internal viewer defined for.  If such an entry is found, Madmutt will
    ** use the viewer defined in that entry to convert the body part to text
    ** form.
    */
@@ -1159,7 +1159,7 @@ struct option_t MuttVars[] = {
   {"include_onlyfirst", DT_BOOL, R_NONE, OPTINCLUDEONLYFIRST, "no" },
   /*
    ** .pp
-   ** Controls whether or not Mutt-ng includes only the first attachment
+   ** Controls whether or not Madmutt includes only the first attachment
    ** of the message you are replying.
    */
   {"indent_string", DT_STR, R_NONE, UL &Prefix, "> "},
@@ -1177,7 +1177,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** ``Format strings'' are similar to the strings used in the ``C''
    ** function \fTprintf(3)\fP to format output (see the man page for more detail).
-   ** The following sequences are defined in Mutt-ng:
+   ** The following sequences are defined in Madmutt:
    ** .pp
    ** .dl
    ** .dt %a .dd address of the author
@@ -1206,7 +1206,7 @@ struct option_t MuttVars[] = {
    ** .dt %M .dd number of hidden messages if the thread is collapsed.
    ** .dt %N .dd message score
    ** .dt %n .dd author's real name (or address if missing)
-   ** .dt %O .dd (_O_riginal save folder)  Where Mutt-ng would formerly have
+   ** .dt %O .dd (_O_riginal save folder)  Where Madmutt would formerly have
    **            stashed the message: list name or recipient name if no list
    ** .dt %s .dd subject of the message
    ** .dt %S .dd status of the message (N/D/d/!/r/\(as)
@@ -1246,7 +1246,7 @@ struct option_t MuttVars[] = {
    **
    ** .pp
    ** If \fIset\fP, specifies the program and arguments used to deliver news posted
-   ** by Mutt-ng.  Otherwise, Mutt-ng posts article using current connection.
+   ** by Madmutt.  Otherwise, Madmutt posts article using current connection.
    ** The following \fTprintf(3)\fP-style sequence is understood:
    ** .pp
    ** .ts
@@ -1299,7 +1299,7 @@ struct option_t MuttVars[] = {
   {"mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, "5" },
   /*
    ** .pp
-   ** This variable configures how often (in seconds) Mutt-ng should look for
+   ** This variable configures how often (in seconds) Madmutt should look for
    ** new mail.
    ** .pp
    ** \fBNote:\fP This does not apply to IMAP mailboxes, see $$imap_mail_check.
@@ -1308,12 +1308,12 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** This variable specifies which files to consult when attempting to
-   ** display MIME bodies not directly supported by Mutt-ng.
+   ** display MIME bodies not directly supported by Madmutt.
    */
   {"mailcap_sanitize", DT_BOOL, R_NONE, OPTMAILCAPSANITIZE, "yes" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will restrict possible characters in mailcap \fT%\fP expandos
+   ** If \fIset\fP, Madmutt will restrict possible characters in mailcap \fT%\fP expandos
    ** to a well-defined set of safe characters.  This is the safe setting,
    ** but we are not sure it doesn't break some more advanced MIME stuff.
    ** .pp
@@ -1341,7 +1341,7 @@ struct option_t MuttVars[] = {
    ** Availability: Header Cache
    **
    ** .pp
-   ** Check for Maildir unaware programs other than Mutt-ng having modified maildir
+   ** Check for Maildir unaware programs other than Madmutt having modified maildir
    ** files when the header cache is in use. This incurs one \fTstat(2)\fP per
    ** message every time the folder is opened.
    */
@@ -1386,10 +1386,10 @@ struct option_t MuttVars[] = {
   {"mark_old", DT_BOOL, R_BOTH, OPTMARKOLD, "yes" },
   /*
    ** .pp
-   ** Controls whether or not Mutt-ng marks \fInew\fP \fBunread\fP
+   ** Controls whether or not Madmutt marks \fInew\fP \fBunread\fP
    ** messages as \fIold\fP if you exit a mailbox without reading them.
    ** .pp
-   ** With this option \fIset\fP, the next time you start Mutt-ng, the messages
+   ** With this option \fIset\fP, the next time you start Madmutt, the messages
    ** will show up with an "O" next to them in the ``index'' menu,
    ** indicating that they are old.
    */
@@ -1535,7 +1535,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** This variable controls how message counts are printed when the sidebar
    ** is enabled. If this variable is \fIempty\fP (\fIand only if\fP), no numbers
-   ** will be printed \fIand\fP Mutt-ng won't frequently count mail (which
+   ** will be printed \fIand\fP Madmutt won't frequently count mail (which
    ** may be a great speedup esp. with mbox-style mailboxes.)
    ** .pp
    ** The following \fTprintf(3)\fP-like sequences are supported all of which
@@ -1576,7 +1576,7 @@ struct option_t MuttVars[] = {
   {"metoo", DT_BOOL, R_NONE, OPTMETOO, "no" },
   /*
    ** .pp
-   ** If \fIunset\fP, Mutt-ng will remove your address (see the ``alternates''
+   ** If \fIunset\fP, Madmutt will remove your address (see the ``alternates''
    ** command) from the list of recipients when replying to a message.
    */
   {"menu_context", DT_NUM, R_NONE, UL &MenuContext, "0" },
@@ -1603,7 +1603,7 @@ struct option_t MuttVars[] = {
   {"meta_key", DT_BOOL, R_NONE, OPTMETAKEY, "no" },
   /*
    ** .pp
-   ** If \fIset\fP, forces Mutt-ng to interpret keystrokes with the high bit (bit 8)
+   ** If \fIset\fP, forces Madmutt to interpret keystrokes with the high bit (bit 8)
    ** set as if the user had pressed the \fTESC\fP key and whatever key remains
    ** after having the high bit removed.  For example, if the key pressed
    ** has an ASCII value of \fT0xf8\fP, then this is treated as if the user had
@@ -1614,7 +1614,7 @@ struct option_t MuttVars[] = {
   {"mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, "no" },
   /*
    ** .pp
-   ** When \fIunset\fP, Mutt-ng will mimic mh's behaviour and rename deleted messages
+   ** When \fIunset\fP, Madmutt will mimic mh's behaviour and rename deleted messages
    ** to \fI,<old file name>\fP in mh folders instead of really deleting
    ** them.  If the variable is set, the message files will simply be
    ** deleted.
@@ -1710,7 +1710,7 @@ struct option_t MuttVars[] = {
   {"move", DT_QUAD, R_NONE, OPT_MOVE, "ask-no" },
   /*
    ** .pp
-   ** Controls whether or not Mutt-ng will move read messages
+   ** Controls whether or not Madmutt will move read messages
    ** from your spool mailbox to your ``$$mbox'' mailbox, or as a result of
    ** a ``$mbox-hook'' command.
    */
@@ -1725,7 +1725,7 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** This is the format for the ``local part'' of the \fTMessage-ID:\fP header
-   ** field generated by Mutt-ng. If this variable is empty, no \fTMessage-ID:\fP
+   ** field generated by Madmutt. If this variable is empty, no \fTMessage-ID:\fP
    ** headers will be generated. The '%'
    ** character marks that certain data will be added to the string, similar to
    ** \fTprintf(3)\fP. The following characters are allowed:
@@ -1764,7 +1764,7 @@ struct option_t MuttVars[] = {
    ** Availability: NNTP
    **
    ** .pp
-   ** This variable points to directory where Mutt-ng will cache news
+   ** This variable points to directory where Madmutt will cache news
    ** article headers. If \fIunset\fP, headers will not be saved at all
    ** and will be reloaded each time when you enter a newsgroup.
    ** .pp
@@ -1837,7 +1837,7 @@ struct option_t MuttVars[] = {
    **
    ** .pp
    ** Your login name on the NNTP server.  If \fIunset\fP and the server requires
-   ** authentification, Mutt-ng will prompt you for your account name.
+   ** authentification, Madmutt will prompt you for your account name.
    */
   {"nntp_pass", DT_STR, R_NONE, UL &NntpPass, ""},
   /*
@@ -1858,7 +1858,7 @@ struct option_t MuttVars[] = {
    **
    ** .pp
    ** The time in seconds until any operations on a newsgroup except posting a new
-   ** article will cause a recheck for new news. If set to 0, Mutt-ng will
+   ** article will cause a recheck for new news. If set to 0, Madmutt will
    ** recheck on each operation in index (stepping, read article, etc.).
    */
   {"nntp_reconnect", DT_QUAD, R_NONE, OPT_NNTPRECONNECT, "ask-yes" },
@@ -1867,7 +1867,7 @@ struct option_t MuttVars[] = {
    ** Availability: NNTP
    **
    ** .pp
-   ** Controls whether or not Mutt-ng will try to reconnect to a newsserver when the
+   ** Controls whether or not Madmutt will try to reconnect to a newsserver when the
    ** was connection lost.
    */
 #endif
@@ -1889,7 +1889,7 @@ struct option_t MuttVars[] = {
    ** like to use.
    ** .pp
    ** Using an external pager may have some disadvantages: Additional
-   ** keystrokes are necessary because you can't call Mutt-ng functions
+   ** keystrokes are necessary because you can't call Madmutt functions
    ** directly from the pager, and screen resizes cause lines longer than
    ** the screen width to be badly formatted in the help menu.
    */
@@ -1898,7 +1898,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** This variable controls the number of lines of context that are given
    ** when displaying the next or previous page in the internal pager.  By
-   ** default, Mutt-ng will display the line after the last one on the screen
+   ** default, Madmutt will display the line after the last one on the screen
    ** at the top of the next page (0 lines of context).
    */
   {"pager_format", DT_STR, R_PAGER, UL &PagerFmt, "-%Z- %C/%m: %-20.20n   %s"},
@@ -1934,7 +1934,7 @@ struct option_t MuttVars[] = {
   {"crypt_autosign", DT_BOOL, R_NONE, OPTCRYPTAUTOSIGN, "no" },
   /*
    ** .pp
-   ** Setting this variable will cause Mutt-ng to always attempt to
+   ** Setting this variable will cause Madmutt to always attempt to
    ** cryptographically sign outgoing messages.  This can be overridden
    ** by use of the \fIpgp-menu\fP, when signing is not required or
    ** encryption is requested as well. If ``$$smime_is_default'' is \fIset\fP,
@@ -1945,7 +1945,7 @@ struct option_t MuttVars[] = {
   {"crypt_autoencrypt", DT_BOOL, R_NONE, OPTCRYPTAUTOENCRYPT, "no" },
   /*
    ** .pp
-   ** Setting this variable will cause Mutt-ng to always attempt to PGP
+   ** Setting this variable will cause Madmutt to always attempt to PGP
    ** encrypt outgoing messages.  This is probably only useful in
    ** connection to the \fIsend-hook\fP command.  It can be overridden
    ** by use of the \fIpgp-menu\fP, when encryption is not required or
@@ -1957,7 +1957,7 @@ struct option_t MuttVars[] = {
   {"pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, "yes" },
   /*
    ** .pp
-   ** Setting this variable will cause Mutt-ng to ignore OpenPGP subkeys. Instead,
+   ** Setting this variable will cause Madmutt to ignore OpenPGP subkeys. Instead,
    ** the principal key will inherit the subkeys' capabilities. \fIUnset\fP this
    ** if you want to play interesting key selection games.
    ** (PGP only)
@@ -1985,14 +1985,14 @@ struct option_t MuttVars[] = {
    ** which are encrypted. This makes sense in combination with
    ** ``$$crypt_replyencrypt'', because it allows you to sign all
    ** messages which are automatically encrypted.  This works around
-   ** the problem noted in ``$$crypt_replysign'', that Mutt-ng is not able
+   ** the problem noted in ``$$crypt_replysign'', that Madmutt is not able
    ** to find out whether an encrypted message is also signed.
    ** (Crypto only)
    */
   {"crypt_timestamp", DT_BOOL, R_NONE, OPTCRYPTTIMESTAMP, "yes" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will include a time stamp in the lines surrounding
+   ** If \fIset\fP, Madmutt will include a time stamp in the lines surrounding
    ** PGP or S/MIME output, so spoofing such lines is more difficult.
    ** If you are using colors to mark these lines, and rely on these,
    ** you may \fIunset\fP this setting.
@@ -2001,7 +2001,7 @@ struct option_t MuttVars[] = {
   {"pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, "no" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will use a possibly-running gpg-agent process.
+   ** If \fIset\fP, Madmutt will use a possibly-running gpg-agent process.
    ** (PGP only)
    */
   {"crypt_verify_sig", DT_QUAD, R_NONE, OPT_VERIFYSIG, "yes" },
@@ -2015,10 +2015,10 @@ struct option_t MuttVars[] = {
   {"smime_is_default", DT_BOOL, R_NONE, OPTSMIMEISDEFAULT, "no" },
   /*
    ** .pp
-   ** The default behaviour of Mutt-ng is to use PGP on all auto-sign/encryption
+   ** The default behaviour of Madmutt is to use PGP on all auto-sign/encryption
    ** operations. To override and to use OpenSSL instead this must be \fIset\fP.
    ** .pp
-   ** However, this has no effect while replying, since Mutt-ng will automatically 
+   ** However, this has no effect while replying, since Madmutt will automatically 
    ** select the same application that was used to sign/encrypt the original
    ** message.
    ** .pp
@@ -2036,8 +2036,8 @@ struct option_t MuttVars[] = {
   {"smime_decrypt_use_default_key", DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, "yes" },
   /*
    ** .pp
-   ** If \fIset\fP (default) this tells Mutt-ng to use the default key for decryption. Otherwise,
-   ** if manage multiple certificate-key-pairs, Mutt-ng will try to use the mailbox-address
+   ** If \fIset\fP (default) this tells Madmutt to use the default key for decryption. Otherwise,
+   ** if manage multiple certificate-key-pairs, Madmutt will try to use the mailbox-address
    ** to determine the key to use. It will ask you to supply a key, if it can't find one.
    ** (S/MIME only)
    */
@@ -2074,7 +2074,7 @@ struct option_t MuttVars[] = {
   {"pgp_check_exit", DT_BOOL, R_NONE, OPTPGPCHECKEXIT, "yes" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will check the exit code of the PGP subprocess when
+   ** If \fIset\fP, Madmutt will check the exit code of the PGP subprocess when
    ** signing or encrypting.  A non-zero exit code means that the
    ** subprocess failed.
    ** (PGP only)
@@ -2099,13 +2099,13 @@ struct option_t MuttVars[] = {
   {"pgp_autoinline", DT_BOOL, R_NONE, OPTPGPAUTOINLINE, "no" },
   /*
    ** .pp
-   ** This option controls whether Mutt-ng generates old-style inline
+   ** This option controls whether Madmutt generates old-style inline
    ** (traditional) PGP encrypted or signed messages under certain
    ** circumstances.  This can be overridden by use of the \fIpgp-menu\fP,
    ** when inline is not required.
    ** .pp
-   ** Note that Mutt-ng might automatically use PGP/MIME for messages
-   ** which consist of more than a single MIME part.  Mutt-ng can be
+   ** Note that Madmutt might automatically use PGP/MIME for messages
+   ** which consist of more than a single MIME part.  Madmutt can be
    ** configured to ask before sending PGP/MIME messages when inline
    ** (traditional) would not work.
    ** See also: ``$$pgp_mime_auto''.
@@ -2117,16 +2117,16 @@ struct option_t MuttVars[] = {
   {"pgp_replyinline", DT_BOOL, R_NONE, OPTPGPREPLYINLINE, "no" },
   /*
    ** .pp
-   ** Setting this variable will cause Mutt-ng to always attempt to
+   ** Setting this variable will cause Madmutt to always attempt to
    ** create an inline (traditional) message when replying to a
    ** message which is PGP encrypted/signed inline.  This can be
    ** overridden by use of the \fIpgp-menu\fP, when inline is not
    ** required.  This option does not automatically detect if the
-   ** (replied-to) message is inline; instead it relies on Mutt-ng
+   ** (replied-to) message is inline; instead it relies on Madmutt
    ** internals for previously checked/flagged messages.
    ** .pp
-   ** Note that Mutt-ng might automatically use PGP/MIME for messages
-   ** which consist of more than a single MIME part.  Mutt-ng can be
+   ** Note that Madmutt might automatically use PGP/MIME for messages
+   ** which consist of more than a single MIME part.  Madmutt can be
    ** configured to ask before sending PGP/MIME messages when inline
    ** (traditional) would not work.
    ** See also: ``$$pgp_mime_auto''.
@@ -2139,7 +2139,7 @@ struct option_t MuttVars[] = {
   {"pgp_show_unusable", DT_BOOL, R_NONE, OPTPGPSHOWUNUSABLE, "yes" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will display non-usable keys on the PGP key selection
+   ** If \fIset\fP, Madmutt will display non-usable keys on the PGP key selection
    ** menu.  This includes keys which have been revoked, have expired, or
    ** have been marked as ``disabled'' by the user.
    ** (PGP only)
@@ -2155,7 +2155,7 @@ struct option_t MuttVars[] = {
   {"pgp_strict_enc", DT_BOOL, R_NONE, OPTPGPSTRICTENC, "yes" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will automatically encode PGP/MIME signed messages as
+   ** If \fIset\fP, Madmutt will automatically encode PGP/MIME signed messages as
    ** \fTquoted-printable\fP.  Please note that unsetting this variable may
    ** lead to problems with non-verifyable PGP signatures, so only change
    ** this if you know what you are doing.
@@ -2188,7 +2188,7 @@ struct option_t MuttVars[] = {
   {"pgp_mime_auto", DT_QUAD, R_NONE, OPT_PGPMIMEAUTO, "ask-yes" },
   /*
    ** .pp
-   ** This option controls whether Mutt-ng will prompt you for
+   ** This option controls whether Madmutt will prompt you for
    ** automatically sending a (signed/encrypted) message using
    ** PGP/MIME when inline (traditional) fails (for any reason).
    ** .pp
@@ -2199,11 +2199,11 @@ struct option_t MuttVars[] = {
   {"pgp_auto_decode", DT_BOOL, R_NONE, OPTPGPAUTODEC, "no" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will automatically attempt to decrypt traditional PGP
+   ** If \fIset\fP, Madmutt will automatically attempt to decrypt traditional PGP
    ** messages whenever the user performs an operation which ordinarily would
    ** result in the contents of the message being operated on.  For example,
    ** if the user displays a pgp-traditional message which has not been manually
-   ** checked with the check-traditional-pgp function, Mutt-ng will automatically
+   ** checked with the check-traditional-pgp function, Madmutt will automatically
    ** check the message for traditional pgp.
    */
 
@@ -2236,7 +2236,7 @@ struct option_t MuttVars[] = {
   {"pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, "" },
   /*
    ** .pp
-   ** This command is invoked whenever Mutt-ng will need public key information.
+   ** This command is invoked whenever Madmutt will need public key information.
    ** \fT%r\fP is the only \fTprintf(3)\fP-like sequence used with this format.
    ** (PGP only)
    */
@@ -2308,7 +2308,7 @@ struct option_t MuttVars[] = {
    ** \fTgpg --list-keys --with-colons\fP.
    ** .pp
    ** This format is also generated by the \fTpgpring\fP utility which comes 
-   ** with Mutt-ng.
+   ** with Madmutt.
    ** (PGP only)
    */
   {"pgp_list_pubring_command", DT_STR, R_NONE, UL &PgpListPubringCommand, "" },
@@ -2319,7 +2319,7 @@ struct option_t MuttVars[] = {
    ** \fTgpg --list-keys --with-colons\fP.
    ** .pp
    ** This format is also generated by the \fTpgpring\fP utility which comes 
-   ** with Mutt-ng.
+   ** with Madmutt.
    ** (PGP only)
    */
   {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, "yes" },
@@ -2351,7 +2351,7 @@ struct option_t MuttVars[] = {
   {"smime_keys", DT_PATH, R_NONE, UL &SmimeKeys, "" },
   /*
    ** .pp
-   ** Since there is no pubring/secring as with PGP, Mutt-ng has to handle
+   ** Since there is no pubring/secring as with PGP, Madmutt has to handle
    ** storage ad retrieval of keys/certs by itself. This is very basic right now,
    ** and stores keys and certificates in two different directories, both
    ** named as the hash-value retrieved from OpenSSL. There is an index file
@@ -2369,7 +2369,7 @@ struct option_t MuttVars[] = {
   {"smime_certificates", DT_PATH, R_NONE, UL &SmimeCertificates, "" },
   /*
    ** .pp
-   ** Since there is no pubring/secring as with PGP, Mutt-ng has to handle
+   ** Since there is no pubring/secring as with PGP, Madmutt has to handle
    ** storage and retrieval of keys by itself. This is very basic right
    ** now, and keys and certificates are stored in two different
    ** directories, both named as the hash-value retrieved from
@@ -2489,7 +2489,7 @@ struct option_t MuttVars[] = {
    **
    ** .pp
    ** Defines the username to use with SMTP AUTH.  Setting this variable will
-   ** cause Mutt-ng to attempt to use SMTP AUTH when sending.
+   ** cause Madmutt to attempt to use SMTP AUTH when sending.
    */
   {"smtp_auth_password", DT_SYN, R_NONE, UL "smtp_pass", 0},
   {"smtp_pass", DT_STR, R_NONE, UL &SmtpAuthPass, "" },
@@ -2542,7 +2542,7 @@ struct option_t MuttVars[] = {
    ** will try to start TLS and continue without TLS in case of an error.
    **
    **.pp
-   ** Muttng still needs to have SSL support enabled in order to use it.
+   ** Madmutt still needs to have SSL support enabled in order to use it.
    */
 #endif
 #if defined(USE_SSL) || defined(USE_GNUTLS)
@@ -2560,7 +2560,7 @@ struct option_t MuttVars[] = {
   {"ssl_force_tls", DT_BOOL, R_NONE, OPTSSLFORCETLS, "no" },
   /*
    ** .pp
-   ** If this variable is \fIset\fP, Mutt-ng will require that all connections
+   ** If this variable is \fIset\fP, Madmutt will require that all connections
    ** to remote servers be encrypted. Furthermore it will attempt to
    ** negotiate TLS even if the server does not advertise the capability,
    ** since it would otherwise have to abort the connection anyway. This
@@ -2572,8 +2572,8 @@ struct option_t MuttVars[] = {
    ** Availability: SSL or GNUTLS
    **
    ** .pp
-   ** If \fIset\fP (the default), Mutt-ng will attempt to use STARTTLS on servers
-   ** advertising the capability. When \fIunset\fP, Mutt-ng will not attempt to
+   ** If \fIset\fP (the default), Madmutt will attempt to use STARTTLS on servers
+   ** advertising the capability. When \fIunset\fP, Madmutt will not attempt to
    ** use STARTTLS regardless of the server's capabilities.
    */
   {"certificate_file", DT_PATH, R_NONE, UL &SslCertFile, "~/.mutt_certificates"},
@@ -2601,7 +2601,7 @@ struct option_t MuttVars[] = {
    ** Availability: SSL
    **
    ** .pp
-   ** If set to \fIyes\fP, Mutt-ng will use CA certificates in the
+   ** If set to \fIyes\fP, Madmutt will use CA certificates in the
    ** system-wide certificate store when checking if server certificate 
    ** is signed by a trusted CA.
    */
@@ -2670,8 +2670,8 @@ struct option_t MuttVars[] = {
    ** Used in connection with the \fIpipe-message\fP command and the ``tag-
    ** prefix'' or ``tag-prefix-cond'' operators. 
    ** If this variable is \fIunset\fP, when piping a list of
-   ** tagged messages Mutt-ng will concatenate the messages and will pipe them
-   ** as a single folder.  When \fIset\fP, Mutt-ng will pipe the messages one by one.
+   ** tagged messages Madmutt will concatenate the messages and will pipe them
+   ** as a single folder.  When \fIset\fP, Madmutt will pipe the messages one by one.
    ** In both cases the messages are piped in the current sorted order,
    ** and the ``$$pipe_sep'' separator is added after each message.
    */
@@ -2679,7 +2679,7 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** Used in connection with the \fIpipe-message\fP command.  When \fIunset\fP,
-   ** Mutt-ng will pipe the messages without any preprocessing. When \fIset\fP, Mutt-ng
+   ** Madmutt will pipe the messages without any preprocessing. When \fIset\fP, Madmutt
    ** will weed headers and will attempt to PGP/MIME decode the messages
    ** first.
    */
@@ -2692,13 +2692,13 @@ struct option_t MuttVars[] = {
   {"pop_authenticators", DT_STR, R_NONE, UL &PopAuthenticators, "" },
   /*
    ** .pp
-   ** This is a colon-delimited list of authentication methods Mutt-ng may
-   ** attempt to use to log in to an POP server, in the order Mutt-ng should
+   ** This is a colon-delimited list of authentication methods Madmutt may
+   ** attempt to use to log in to an POP server, in the order Madmutt should
    ** try them.  Authentication methods are either ``\fTuser\fP'', ``\fTapop\fP''
    ** or any SASL mechanism, eg ``\fTdigest-md5\fP'', ``\fTgssapi\fP'' or ``\fTcram-md5\fP''.
    ** .pp
    ** This parameter is case-insensitive. If this parameter is \fIunset\fP
-   ** (the default) Mutt-ng will try all available methods, in order from
+   ** (the default) Madmutt will try all available methods, in order from
    ** most-secure to least-secure.
    ** .pp
    ** Example: \fTset pop_authenticators="digest-md5:apop:user"\fP
@@ -2706,23 +2706,23 @@ struct option_t MuttVars[] = {
   {"pop_auth_try_all", DT_BOOL, R_NONE, OPTPOPAUTHTRYALL, "yes" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will try all available methods. When \fIunset\fP, Mutt-ng will
+   ** If \fIset\fP, Madmutt will try all available methods. When \fIunset\fP, Madmutt will
    ** only fall back to other authentication methods if the previous
    ** methods are unavailable. If a method is available but authentication
-   ** fails, Mutt-ng will not connect to the POP server.
+   ** fails, Madmutt will not connect to the POP server.
    */
   {"pop_checkinterval", DT_SYN, R_NONE, UL "pop_mail_check", 0},
   {"pop_mail_check", DT_NUM, R_NONE, UL &PopCheckTimeout, "60" },
   /*
    ** .pp
-   ** This variable configures how often (in seconds) Mutt-ng should look for
+   ** This variable configures how often (in seconds) Madmutt should look for
    ** new mail.
    */
   {"pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, "ask-no" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will delete successfully downloaded messages from the POP
-   ** server when using the ``fetch-mail'' function.  When \fIunset\fP, Mutt-ng will
+   ** If \fIset\fP, Madmutt will delete successfully downloaded messages from the POP
+   ** server when using the ``fetch-mail'' function.  When \fIunset\fP, Madmutt will
    ** download messages but also leave them on the POP server.
    */
   {"pop_host", DT_STR, R_NONE, UL &PopHost, ""},
@@ -2740,14 +2740,14 @@ struct option_t MuttVars[] = {
   {"pop_last", DT_BOOL, R_NONE, OPTPOPLAST, "no" },
   /*
    ** .pp
-   ** If this variable is \fIset\fP, Mutt-ng will try to use the ``\fTLAST\fP'' POP command
+   ** If this variable is \fIset\fP, Madmutt will try to use the ``\fTLAST\fP'' POP command
    ** for retrieving only unread messages from the POP server when using
    ** the ``fetch-mail'' function.
    */
   {"pop_reconnect", DT_QUAD, R_NONE, OPT_POPRECONNECT, "ask-yes" },
   /*
    ** .pp
-   ** Controls whether or not Mutt-ng will try to reconnect to a POP server if the
+   ** Controls whether or not Madmutt will try to reconnect to a POP server if the
    ** connection is lost.
    */
   {"pop_user", DT_STR, R_NONE, UL &PopUser, "" },
@@ -2760,7 +2760,7 @@ struct option_t MuttVars[] = {
   {"pop_pass", DT_STR, R_NONE, UL &PopPass, ""},
   /*
    ** .pp
-   ** Specifies the password for your POP account.  If \fIunset\fP, Mutt-ng will
+   ** Specifies the password for your POP account.  If \fIunset\fP, Madmutt will
    ** prompt you for your password when you open POP mailbox.
    ** .pp
    ** \fBNote:\fP Storing passwords in a configuration file
@@ -2770,7 +2770,7 @@ struct option_t MuttVars[] = {
   {"post_indent_string", DT_STR, R_NONE, UL &PostIndentString, ""},
   /*
    ** .pp
-   ** Similar to the ``$$attribution'' variable, Mutt-ng will append this
+   ** Similar to the ``$$attribution'' variable, Madmutt will append this
    ** string after the inclusion of a message which is being replied to.
    */
 #ifdef USE_NNTP
@@ -2780,7 +2780,7 @@ struct option_t MuttVars[] = {
    ** Availability: NNTP
    **
    ** .pp
-   ** If set to \fIyes\fP, Mutt-ng will post articles to newsgroup that have
+   ** If set to \fIyes\fP, Madmutt will post articles to newsgroup that have
    ** not permissions to post (e.g. moderated).
    ** .pp
    ** \fBNote:\fP if the newsserver
@@ -2797,18 +2797,18 @@ struct option_t MuttVars[] = {
   {"postponed", DT_PATH, R_NONE, UL &Postponed, "~/postponed"},
   /*
    ** .pp
-   ** Mutt-ng allows you to indefinitely ``$postpone sending a message'' which
-   ** you are editing.  When you choose to postpone a message, Mutt-ng saves it
+   ** Madmutt allows you to indefinitely ``$postpone sending a message'' which
+   ** you are editing.  When you choose to postpone a message, Madmutt saves it
    ** in the mailbox specified by this variable.  Also see the ``$$postpone''
    ** variable.
    */
   {"preconnect", DT_STR, R_NONE, UL &Preconnect, "" },
   /*
    ** .pp
-   ** If \fIset\fP, a shell command to be executed if Mutt-ng fails to establish
+   ** If \fIset\fP, a shell command to be executed if Madmutt fails to establish
    ** a connection to the server. This is useful for setting up secure
    ** connections, e.g. with \fTssh(1)\fP. If the command returns a  nonzero
-   ** status, Mutt-ng gives up opening the server. Example:
+   ** status, Madmutt gives up opening the server. Example:
    ** .pp
    ** \fTpreconnect="ssh -f -q -L 1234:mailhost.net:143 mailhost.net
    **                sleep 20 < /dev/null > /dev/null"\fP
@@ -2822,7 +2822,7 @@ struct option_t MuttVars[] = {
   {"print", DT_QUAD, R_NONE, OPT_PRINT, "ask-no" },
   /*
    ** .pp
-   ** Controls whether or not Mutt-ng really prints messages.
+   ** Controls whether or not Madmutt really prints messages.
    ** This is set to \fIask-no\fP by default, because some people
    ** accidentally hit ``p'' often.
    */
@@ -2859,14 +2859,14 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** If you use an \fIexternal\fP ``$$pager'', setting this variable will
-   ** cause Mutt-ng to prompt you for a command when the pager exits rather
-   ** than returning to the index menu.  If \fIunset\fP, Mutt-ng will return to the
+   ** cause Madmutt to prompt you for a command when the pager exits rather
+   ** than returning to the index menu.  If \fIunset\fP, Madmutt will return to the
    ** index menu when the external pager exits.
    */
   {"query_command", DT_PATH, R_NONE, UL &QueryCmd, ""},
   /*
    ** .pp
-   ** This specifies the command that Mutt-ng will use to make external address
+   ** This specifies the command that Madmutt will use to make external address
    ** queries.  The string should contain a \fT%s\fP, which will be substituted
    ** with the query string the user types.  See ``$query'' for more
    ** information.
@@ -2875,7 +2875,7 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** This variable controls whether ``quit'' and ``exit'' actually quit
-   ** from Mutt-ng.  If it set to \fIyes\fP, they do quit, if it is set to \fIno\fP, they
+   ** from Madmutt.  If it set to \fIyes\fP, they do quit, if it is set to \fIno\fP, they
    ** have no effect, and if it is set to \fIask-yes\fP or \fIask-no\fP, you are
    ** prompted for confirmation when you try to quit.
    */
@@ -2906,9 +2906,9 @@ struct option_t MuttVars[] = {
   {"read_inc", DT_NUM, R_NONE, UL &ReadInc, "10" },
   /*
    ** .pp
-   ** If set to a value greater than 0, Mutt-ng will display which message it
+   ** If set to a value greater than 0, Madmutt will display which message it
    ** is currently on when reading a mailbox.  The message is printed after
-   ** \fIread_inc\fP messages have been read (e.g., if set to 25, Mutt-ng will
+   ** \fIread_inc\fP messages have been read (e.g., if set to 25, Madmutt will
    ** print a message when it reads message 25, and then again when it gets
    ** to message 50).  This variable is meant to indicate progress when
    ** reading large mailboxes which may take some time.
@@ -2937,7 +2937,7 @@ struct option_t MuttVars[] = {
   {"recall", DT_QUAD, R_NONE, OPT_RECALL, "ask-yes" },
   /*
    ** .pp
-   ** Controls whether or not Mutt-ng recalls postponed messages
+   ** Controls whether or not Madmutt recalls postponed messages
    ** when composing a new message.  Also see ``$$postponed''.
    ** .pp
    ** Setting this variable to \fIyes\fP is not generally useful, and thus not
@@ -2964,14 +2964,14 @@ struct option_t MuttVars[] = {
   {"reply_self", DT_BOOL, R_NONE, OPTREPLYSELF, "no" },
   /*
    ** .pp
-   ** If \fIunset\fP and you are replying to a message sent by you, Mutt-ng will
+   ** If \fIunset\fP and you are replying to a message sent by you, Madmutt will
    ** assume that you want to reply to the recipients of that message rather
    ** than to yourself.
    */
   {"reply_to", DT_QUAD, R_NONE, OPT_REPLYTO, "ask-yes" },
   /*
    ** .pp
-   ** If \fIset\fP, when replying to a message, Mutt-ng will use the address listed
+   ** If \fIset\fP, when replying to a message, Madmutt will use the address listed
    ** in the ``\fTReply-To:\fP'' header field as the recipient of the reply.  If \fIunset\fP,
    ** it will use the address in the ``\fTFrom:\fP'' header field instead.
    ** .pp 
@@ -2990,7 +2990,7 @@ struct option_t MuttVars[] = {
   {"reverse_alias", DT_BOOL, R_BOTH, OPTREVALIAS, "no" },
   /*
    ** .pp
-   ** This variable controls whether or not Mutt-ng will display the ``personal''
+   ** This variable controls whether or not Madmutt will display the ``personal''
    ** name from your aliases in the index menu if it finds an alias that
    ** matches the message's sender.  For example, if you have the following
    ** alias:
@@ -3021,15 +3021,15 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** This variable fine-tunes the behaviour of the $reverse_name feature.
-   ** When it is \fIset\fP, Mutt-ng will use the address from incoming messages as-is,
-   ** possibly including eventual real names.  When it is \fIunset\fP, Mutt-ng will
+   ** When it is \fIset\fP, Madmutt will use the address from incoming messages as-is,
+   ** possibly including eventual real names.  When it is \fIunset\fP, Madmutt will
    ** override any such real names with the setting of the $realname variable.
    */
   {"rfc2047_parameters", DT_BOOL, R_NONE, OPTRFC2047PARAMS, "no" },
   /*
    ** .pp
-   ** When this variable is \fIset\fP, Mutt-ng will decode RFC-2047-encoded MIME 
-   ** parameters. You want to set this variable when Mutt-ng suggests you
+   ** When this variable is \fIset\fP, Madmutt will decode RFC-2047-encoded MIME 
+   ** parameters. You want to set this variable when Madmutt suggests you
    ** to save attachments to files named like this:
    ** .pp
    **  \fT=?iso-8859-1?Q?file=5F=E4=5F991116=2Ezip?=\fP
@@ -3042,13 +3042,13 @@ struct option_t MuttVars[] = {
    ** wild.
    ** .pp
    ** Also note that setting this parameter will \fInot\fP have the effect 
-   ** that Mutt-ng \fIgenerates\fP this kind of encoding.  Instead, Mutt-ng will
+   ** that Madmutt \fIgenerates\fP this kind of encoding.  Instead, Madmutt will
    ** unconditionally use the encoding specified in RFC 2231.
    */
   {"save_address", DT_BOOL, R_NONE, OPTSAVEADDRESS, "no" },
   /*
    ** .pp
-   ** If \fIset\fP, Mutt-ng will take the sender's full address when choosing a
+   ** If \fIset\fP, Madmutt will take the sender's full address when choosing a
    ** default folder for saving a mail. If ``$$save_name'' or ``$$force_name''
    ** is \fIset\fP too, the selection of the fcc folder will be changed as well.
    */
@@ -3059,7 +3059,7 @@ struct option_t MuttVars[] = {
    ** when closed (the exception is ``$$spoolfile'' which is never removed).
    ** If \fIset\fP, mailboxes are never removed.
    ** .pp
-   ** \fBNote:\fP This only applies to mbox and MMDF folders, Mutt-ng does not
+   ** \fBNote:\fP This only applies to mbox and MMDF folders, Madmutt does not
    ** delete MH and Maildir directories.
    */
   {"save_name", DT_BOOL, R_NONE, OPTSAVENAME, "no" },
@@ -3087,8 +3087,8 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** Messages which have been assigned a score equal to or lower than the value
-   ** of this variable are automatically marked for deletion by Mutt-ng.  Since
-   ** Mutt-ng scores are always greater than or equal to zero, the default setting
+   ** of this variable are automatically marked for deletion by Madmutt.  Since
+   ** Madmutt scores are always greater than or equal to zero, the default setting
    ** of this variable will never mark a message for deletion.
    */
   {"score_threshold_flag", DT_NUM, R_NONE, UL &ScoreThresholdFlag, "9999" },
@@ -3101,14 +3101,14 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** Messages which have been assigned a score equal to or lower than the value
-   ** of this variable are automatically marked as read by Mutt-ng.  Since
-   ** Mutt-ng scores are always greater than or equal to zero, the default setting
+   ** of this variable are automatically marked as read by Madmutt.  Since
+   ** Madmutt scores are always greater than or equal to zero, the default setting
    ** of this variable will never mark a message read.
    */
   {"send_charset", DT_STR, R_NONE, UL &SendCharset, "us-ascii:iso-8859-1:utf-8"},
   /*
    ** .pp
-   ** A list of character sets for outgoing messages. Mutt-ng will use the
+   ** A list of character sets for outgoing messages. Madmutt will use the
    ** first character set into which the text can be converted exactly.
    ** If your ``$$charset'' is not \fTiso-8859-1\fP and recipients may not
    ** understand \fTUTF-8\fP, it is advisable to include in the list an
@@ -3119,8 +3119,8 @@ struct option_t MuttVars[] = {
   {"sendmail", DT_PATH, R_NONE, UL &Sendmail, SENDMAIL " -oem -oi"},
   /*
    ** .pp
-   ** Specifies the program and arguments used to deliver mail sent by Mutt-ng.
-   ** Mutt-ng expects that the specified program interprets additional
+   ** Specifies the program and arguments used to deliver mail sent by Madmutt.
+   ** Madmutt expects that the specified program interprets additional
    ** arguments as recipient addresses.
    */
   {"sendmail_wait", DT_NUM, R_NONE, UL &SendmailWait, "0" },
@@ -3129,7 +3129,7 @@ struct option_t MuttVars[] = {
    ** Specifies the number of seconds to wait for the ``$$sendmail'' process
    ** to finish before giving up and putting delivery in the background.
    ** .pp
-   ** Mutt-ng interprets the value of this variable as follows:
+   ** Madmutt interprets the value of this variable as follows:
    ** .dl
    ** .dt >0 .dd number of seconds to wait for sendmail to finish before continuing
    ** .dt 0  .dd wait forever for sendmail to finish
@@ -3188,7 +3188,7 @@ struct option_t MuttVars[] = {
    ** contains just your name. The reason for this is because many software
    ** packages use ``\fT-- \n\fP'' to detect your signature.
    ** .pp
-   ** For example, Mutt-ng has the ability to highlight
+   ** For example, Madmutt has the ability to highlight
    ** the signature in a different color in the builtin pager.
    */
   {"sig_on_top", DT_BOOL, R_NONE, OPTSIGONTOP, "no" },
@@ -3220,11 +3220,11 @@ struct option_t MuttVars[] = {
   {"simple_search", DT_STR, R_NONE, UL &SimpleSearch, "~f %s | ~s %s"},
   /*
    ** .pp
-   ** Specifies how Mutt-ng should expand a simple search into a real search
+   ** Specifies how Madmutt should expand a simple search into a real search
    ** pattern.  A simple search is one that does not contain any of the ~
    ** operators.  See ``$patterns'' for more information on search patterns.
    ** .pp
-   ** For example, if you simply type ``joe'' at a search or limit prompt, Mutt-ng
+   ** For example, if you simply type ``joe'' at a search or limit prompt, Madmutt
    ** will automatically expand it to the value specified by this variable.
    ** For the default value it would be:
    ** .pp
@@ -3293,7 +3293,7 @@ struct option_t MuttVars[] = {
    ** When sorting by threads, this variable controls how threads are sorted
    ** in relation to other threads, and how the branches of the thread trees
    ** are sorted.  This can be set to any value that ``$$sort'' can, except
-   ** threads (in that case, Mutt-ng will just use date-sent).  You can also
+   ** threads (in that case, Madmutt will just use date-sent).  You can also
    ** specify the ``last-'' prefix in addition to ``reverse-'' prefix, but last-
    ** must come after reverse-.  The last- prefix causes messages to be
    ** sorted against its siblings by which has the last descendant, using
@@ -3328,11 +3328,11 @@ struct option_t MuttVars[] = {
    ** .pp
    ** This variable is only useful when sorting by threads with
    ** ``$$strict_threads'' \fIunset\fP. In that case, it changes the heuristic
-   ** Mutt-ng uses to thread messages by subject.  With $$sort_re \fIset\fP,
-   ** Mutt-ng will only attach a message as the child of another message by
+   ** Madmutt uses to thread messages by subject.  With $$sort_re \fIset\fP,
+   ** Madmutt will only attach a message as the child of another message by
    ** subject if the subject of the child message starts with a substring
    ** matching the setting of ``$$reply_regexp''. With $$sort_re \fIunset\fP,
-   ** Mutt-ng will attach the message whether or not this is the case,
+   ** Madmutt will attach the message whether or not this is the case,
    ** as long as the non-``$$reply_regexp'' parts of both messages are identical.
    */
   {"spam_separator", DT_STR, R_NONE, UL &SpamSep, ","},
@@ -3347,8 +3347,8 @@ struct option_t MuttVars[] = {
   {"spoolfile", DT_PATH, R_NONE, UL &Spoolfile, "" },
   /*
    ** .pp
-   ** If your spool mailbox is in a non-default place where Mutt-ng cannot find
-   ** it, you can specify its location with this variable.  Mutt-ng will
+   ** If your spool mailbox is in a non-default place where Madmutt cannot find
+   ** it, you can specify its location with this variable.  Madmutt will
    ** automatically set this variable to the value of the environment
    ** variable $$$MAIL if it is not set.
    */
@@ -3366,7 +3366,7 @@ struct option_t MuttVars[] = {
    ** opened in attach-message mode (Certain operations like composing
    ** a new mail, replying, forwarding, etc. are not permitted in this mode).
    */
-  {"status_format", DT_STR, R_BOTH, UL &Status, "-%r-Mutt-ng: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---"},
+  {"status_format", DT_STR, R_BOTH, UL &Status, "-%r-Madmutt: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---"},
   /*
    ** .pp
    ** Controls the format of the status line displayed in the \fIindex\fP
@@ -3395,7 +3395,7 @@ struct option_t MuttVars[] = {
    ** .dt %S  .dd current aux sorting method ($$sort_aux)
    ** .dt %t  .dd number of tagged messages *
    ** .dt %u  .dd number of unread messages *
-   ** .dt %v  .dd Mutt-ng version string
+   ** .dt %v  .dd Madmutt version string
    ** .dt %V  .dd currently active limit pattern, if any *
    ** .dt %>X .dd right justify the rest of the string and pad with "X"
    ** .dt %|X .dd pad to the end of the line with "X"
@@ -3435,7 +3435,7 @@ struct option_t MuttVars[] = {
    ** .pp
    **  \fT%_h\fP
    ** .pp
-   ** If you prefix the sequence character with a colon (\fT:\fP) character, Mutt-ng
+   ** If you prefix the sequence character with a colon (\fT:\fP) character, Madmutt
    ** will replace any dots in the expansion by underscores. This might be helpful 
    ** with IMAP folders that don't like dots in folder names.
    */
@@ -3454,7 +3454,7 @@ struct option_t MuttVars[] = {
    ** if ``$$edit_headers'' is unset.
    **
    ** .pp
-   ** If this variable is \fIset\fP, Mutt-ng is strict and allows anything to be
+   ** If this variable is \fIset\fP, Madmutt is strict and allows anything to be
    ** changed. If it's \fIunset\fP, all headers given will be prefixed with
    ** ``X-Mailto-'' and the message including headers will be shown in the editor
    ** regardless of what ``$$edit_headers'' is set to.
@@ -3487,14 +3487,14 @@ struct option_t MuttVars[] = {
   {"strip_was", DT_BOOL, R_NONE, OPTSTRIPWAS, "no" },
   /**
   ** .pp
-  ** When \fIset\fP, Mutt-ng will remove the trailing part of the ``\fTSubject:\fP''
+  ** When \fIset\fP, Madmutt will remove the trailing part of the ``\fTSubject:\fP''
   ** line which matches $$strip_was_regex when replying. This is useful to
   ** properly react on subject changes and reduce ``subject noise.'' (esp. in Usenet)
   **/
   {"strip_was_regex", DT_RX, R_NONE, UL &StripWasRegexp, "\\([Ww][Aa][RrSs]: .*\\)[ ]*$"},
   /**
   ** .pp
-  ** When non-empty and $$strip_was is \fIset\fP, Mutt-ng will remove this
+  ** When non-empty and $$strip_was is \fIset\fP, Madmutt will remove this
   ** trailing part of the ``Subject'' line when replying if it won't be empty
   ** afterwards.
   **/
@@ -3508,14 +3508,14 @@ struct option_t MuttVars[] = {
   {"suspend", DT_BOOL, R_NONE, OPTSUSPEND, "yes" },
   /*
    ** .pp
-   ** When \fIunset\fP, Mutt-ng won't stop when the user presses the terminal's
-   ** \fIsusp\fP key, usually \fTCTRL+Z\fP. This is useful if you run Mutt-ng
+   ** When \fIunset\fP, Madmutt won't stop when the user presses the terminal's
+   ** \fIsusp\fP key, usually \fTCTRL+Z\fP. This is useful if you run Madmutt
    ** inside an xterm using a command like ``\fTxterm -e madmutt\fP.''
    */
   {"text_flowed", DT_BOOL, R_NONE, OPTTEXTFLOWED, "no" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will generate \fTtext/plain; format=flowed\fP attachments.
+   ** When \fIset\fP, Madmutt will generate \fTtext/plain; format=flowed\fP attachments.
    ** This format is easier to handle for some mailing software, and generally
    ** just looks like ordinary text.  To actually make use of this format's 
    ** features, you'll need support in your editor.
@@ -3525,7 +3525,7 @@ struct option_t MuttVars[] = {
   {"thread_received", DT_BOOL, R_RESORT|R_RESORT_INIT|R_INDEX, OPTTHREADRECEIVED, "no" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng uses the date received rather than the date sent
+   ** When \fIset\fP, Madmutt uses the date received rather than the date sent
    ** to thread messages by subject.
    */
   {"thorough_search", DT_BOOL, R_NONE, OPTTHOROUGHSRC, "no" },
@@ -3545,15 +3545,15 @@ struct option_t MuttVars[] = {
   {"timeout", DT_NUM, R_NONE, UL &Timeout, "600" },
   /*
    ** .pp
-   ** This variable controls the \fInumber of seconds\fP Mutt-ng will wait
+   ** This variable controls the \fInumber of seconds\fP Madmutt will wait
    ** for a key to be pressed in the main menu before timing out and
-   ** checking for new mail.  A value of zero or less will cause Mutt-ng
+   ** checking for new mail.  A value of zero or less will cause Madmutt
    ** to never time out.
    */
   {"tmpdir", DT_PATH, R_NONE, UL &Tempdir, "" },
   /*
    ** .pp
-   ** This variable allows you to specify where Mutt-ng will place its
+   ** This variable allows you to specify where Madmutt will place its
    ** temporary files needed for displaying and composing messages.  If
    ** this variable is not set, the environment variable \fT$$$TMPDIR\fP is
    ** used.  If \fT$$$TMPDIR\fP is not set then "\fT/tmp\fP" is used.
@@ -3585,7 +3585,7 @@ struct option_t MuttVars[] = {
   {"tunnel", DT_STR, R_NONE, UL &Tunnel, "" },
   /*
    ** .pp
-   ** Setting this variable will cause Mutt-ng to open a pipe to a command
+   ** Setting this variable will cause Madmutt to open a pipe to a command
    ** instead of a raw socket. You may be able to use this to set up
    ** preauthenticated connections to your IMAP/POP3 server. Example:
    ** .pp
@@ -3597,7 +3597,7 @@ struct option_t MuttVars[] = {
   {"umask", DT_NUM, R_NONE, UL &Umask, "0077" },
   /*
    ** .pp
-   ** This sets the umask that will be used by Mutt-ng when creating all
+   ** This sets the umask that will be used by Madmutt when creating all
    ** kinds of files. If \fIunset\fP, the default value is \fT077\fP.
    */
   {"use_8bitmime", DT_BOOL, R_NONE, OPTUSE8BITMIME, "no" },
@@ -3608,21 +3608,21 @@ struct option_t MuttVars[] = {
    ** 8.8.x) or in connection with the SMTP support via libESMTP.
    ** Otherwise you may not be able to send mail.
    ** .pp
-   ** When \fIset\fP, Mutt-ng will either invoke ``$$sendmail'' with the \fT-B8BITMIME\fP
+   ** When \fIset\fP, Madmutt will either invoke ``$$sendmail'' with the \fT-B8BITMIME\fP
    ** flag when sending 8-bit messages to enable ESMTP negotiation or tell
    ** libESMTP to do so.
    */
   {"use_domain", DT_BOOL, R_NONE, OPTUSEDOMAIN, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will qualify all local addresses (ones without the
+   ** When \fIset\fP, Madmutt will qualify all local addresses (ones without the
    ** @host portion) with the value of ``$$hostname''.  If \fIunset\fP, no
    ** addresses will be qualified.
    */
   {"use_from", DT_BOOL, R_NONE, OPTUSEFROM, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will generate the ``\fTFrom:\fP'' header field when
+   ** When \fIset\fP, Madmutt will generate the ``\fTFrom:\fP'' header field when
    ** sending messages. If \fIunset\fP, no ``\fTFrom:\fP'' header field will be
    ** generated unless the user explicitly sets one using the ``$my_hdr''
    ** command.
@@ -3634,7 +3634,7 @@ struct option_t MuttVars[] = {
    ** Availability: IDN
    **
    ** .pp
-   ** When \fIset\fP, Mutt-ng will show you international domain names decoded.
+   ** When \fIset\fP, Madmutt will show you international domain names decoded.
    ** .pp
    ** \fBNote:\fP You can use IDNs for addresses even if this is \fIunset\fP.
    ** This variable only affects decoding.
@@ -3644,8 +3644,8 @@ struct option_t MuttVars[] = {
   {"use_ipv6", DT_BOOL, R_NONE, OPTUSEIPV6, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will look for IPv6 addresses of hosts it tries to
-   ** contact.  If this option is \fIunset\fP, Mutt-ng will restrict itself to IPv4 addresses.
+   ** When \fIset\fP, Madmutt will look for IPv6 addresses of hosts it tries to
+   ** contact.  If this option is \fIunset\fP, Madmutt will restrict itself to IPv4 addresses.
    ** Normally, the default should work.
    */
 #endif /* HAVE_GETADDRINFO */
@@ -3653,14 +3653,14 @@ struct option_t MuttVars[] = {
   {"agent_string", DT_BOOL, R_NONE, OPTXMAILER, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will add a ``\fTUser-Agent:\fP'' header to outgoing
-   ** messages, indicating which version of Mutt-ng was used for composing
+   ** When \fIset\fP, Madmutt will add a ``\fTUser-Agent:\fP'' header to outgoing
+   ** messages, indicating which version of Madmutt was used for composing
    ** them.
    */
   {"wait_key", DT_BOOL, R_NONE, OPTWAITKEY, "yes" },
   /*
    ** .pp
-   ** Controls whether Mutt-ng will ask you to press a key after \fIshell-
+   ** Controls whether Madmutt will ask you to press a key after \fIshell-
    ** escape\fP, \fIpipe-message\fP, \fIpipe-entry\fP, \fIprint-message\fP,
    ** and \fIprint-entry\fP commands.
    ** .pp
@@ -3668,13 +3668,13 @@ struct option_t MuttVars[] = {
    ** that the corresponding mailcap entry has a \fTneedsterminal\fP flag,
    ** and the external program is interactive.
    ** .pp
-   ** When \fIset\fP, Mutt-ng will always ask for a key. When \fIunset\fP, Mutt-ng will wait
+   ** When \fIset\fP, Madmutt will always ask for a key. When \fIunset\fP, Madmutt will wait
    ** for a key only if the external command returned a non-zero status.
    */
   {"weed", DT_BOOL, R_NONE, OPTWEED, "yes" },
   /*
    ** .pp
-   ** When \fIset\fP, Mutt-ng will weed headers when displaying, forwarding,
+   ** When \fIset\fP, Madmutt will weed headers when displaying, forwarding,
    ** printing, or replying to messages.
    */
   {"wrap_search", DT_BOOL, R_NONE, OPTWRAPSEARCH, "yes" },
@@ -3689,7 +3689,7 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** Controls the size of the margin remaining at the right side of
-   ** the terminal when Mutt-ng's pager does smart wrapping.
+   ** the terminal when Madmutt's pager does smart wrapping.
    */
   {"write_inc", DT_NUM, R_NONE, UL &WriteInc, "10" },
   /*
@@ -3703,7 +3703,7 @@ struct option_t MuttVars[] = {
   {"write_bcc", DT_BOOL, R_NONE, OPTWRITEBCC, "yes" },
   /*
    ** .pp
-   ** Controls whether Mutt-ng writes out the Bcc header when preparing
+   ** Controls whether Madmutt writes out the Bcc header when preparing
    ** messages to be sent.  Exim users may wish to \fIunset\fP this.
    */
   {"xterm_icon", DT_STR, R_BOTH, UL &XtermIcon, "M%?n?AIL&ail?"},
@@ -3716,7 +3716,7 @@ struct option_t MuttVars[] = {
   {"xterm_set_titles", DT_BOOL, R_BOTH, OPTXTERMSETTITLES, "no" },
   /*
    ** .pp
-   ** Controls whether Mutt-ng sets the xterm title bar and icon name
+   ** Controls whether Madmutt sets the xterm title bar and icon name
    ** (as long as you're in an appropriate terminal). The default must
    ** be \fIunset\fP to force in the validity checking.
    */
@@ -3724,8 +3724,8 @@ struct option_t MuttVars[] = {
   /*
    ** .pp
    ** If $$xterm_set_titles is \fIset\fP, this string will be used to
-   ** set the title when leaving Mutt-ng. For terminal-based programs,
-   ** there's no easy and portable way to read the current title so Mutt-ng
+   ** set the title when leaving Madmutt. For terminal-based programs,
+   ** there's no easy and portable way to read the current title so Madmutt
    ** cannot read it upon startup and restore it when exiting.
    **
    ** .pp
@@ -3734,7 +3734,7 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fTset xterm_leave = "`test x$$$DISPLAY != x && xprop -id $$$WINDOWID | grep WM_NAME | cut -d '"' -f 2`"\fP
    */
-  {"xterm_title", DT_STR, R_BOTH, UL &XtermTitle, "Mutt-ng with %?m?%m messages&no messages?%?n? [%n New]?"},
+  {"xterm_title", DT_STR, R_BOTH, UL &XtermTitle, "Madmutt with %?m?%m messages&no messages?%?n? [%n New]?"},
   /*
    ** .pp
    ** Controls the format of the title bar of the xterm provided that
@@ -3748,7 +3748,7 @@ struct option_t MuttVars[] = {
    ** Availability: NNTP
    **
    ** .pp
-   ** If \fIset\fP, Mutt-ng will add a ``\fTX-Comment-To:\fP'' header field
+   ** If \fIset\fP, Madmutt will add a ``\fTX-Comment-To:\fP'' header field
    ** (that contains full name of the original article author) to articles that 
    ** you followup to.
    */
index 6034ef9..4d4d393 100644 (file)
@@ -49,7 +49,7 @@ void debug_start (const char* basedir) {
     t = time (NULL);
     setbuf (DebugFile, NULL);   /* don't buffer the debugging output! */
     fprintf (DebugFile,
-             "Mutt-ng %s started at %s\nDebugging at level %d\n\n",
+             "Madmutt %s started at %s\nDebugging at level %d\n\n",
              MUTT_VERSION, asctime (localtime (&t)), DebugLevel);
   }
 }
diff --git a/main.c b/main.c
index 30148f0..5b1c674 100644 (file)
--- a/main.c
+++ b/main.c
@@ -88,12 +88,12 @@ extern int optind;
 
 static const char *ReachingUs = N_("\
 To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
-To visit the Mutt-ng homepage go to http://www.muttng.org.\n\
+To visit the Madmutt homepage go to http://www.muttng.org.\n\
 To report a bug, please use the fleang(1) utility.\n");
 
 static const char *Notice = N_("\
 Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
-Mutt-ng comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\
+Madmutt comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\
 Mutt is free software, and you are welcome to redistribute it\n\
 under certain conditions; type `madmutt -vv' for details.\n");
 
@@ -172,11 +172,11 @@ options:\n\
   -g <server>\tspecify a newsserver (if compiled with NNTP)\n\
   -G\t\tselect a newsgroup (if compiled with NNTP)\n\
   -H <file>\tspecify a draft file to read header and body from\n\
-  -i <file>\tspecify a file which Mutt-ng should include in the body");
+  -i <file>\tspecify a file which Madmutt should include in the body");
   puts _("\
-  -d <level>\t specify debugging level of Mutt-ng\n\
+  -d <level>\t specify debugging level of Madmutt\n\
   -m <type>\tspecify a default mailbox type\n\
-  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n\
+  -n\t\tcauses Madmutt not to read the system Madmuttrc\n\
   -p\t\trecall a postponed message\n\
   -Q <variable>\tquery a configuration variable\n\
   -R\t\topen mailbox in read-only mode\n\
@@ -461,7 +461,7 @@ static void show_version (void)
 
   puts (_(ReachingUs));
 
-  puts (_("MadMutt is based on Mutt-ng wich was based on Mutt before\n"));
+  puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
 
   exit (0);
 }
index b6d00fe..96c2c53 100644 (file)
@@ -26,7 +26,7 @@
 #define REDRAW_SIGWINCH                (1<<7)
 #define REDRAW_SIDEBAR         (1<<8)
 
-#define M_MODEFMT "-- Mutt-ng: %s"
+#define M_MODEFMT "-- Madmutt: %s"
 
 typedef struct menu_t {
   char *title;                  /* the title of this menu */
index f4654df..7803776 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -1219,7 +1219,7 @@ const char *mutt_make_version (int full)
 
   if (full)
     snprintf (vstring, sizeof (vstring),
-              "Mutt-ng %s-r%s (based on Mutt 1.5.11)",
+              "Madmutt %s-r%s (based on Mutt 1.5.11)",
               MUTT_VERSION, MUTT_REVISION);
   else
     snprintf (vstring, sizeof (vstring), "mutt-ng/%s-r%s",
index 6c613eb..51f22d6 100644 (file)
--- a/status.c
+++ b/status.c
@@ -55,7 +55,7 @@ static char *get_sort_str (char *buf, size_t buflen, int method)
  * %s = current sorting method ($sort)
  * %S = current aux sorting method ($sort_aux)
  * %t = # of tagged messages [option]
- * %v = Mutt-ng version 
+ * %v = Madmutt version 
  * %V = currently active limit pattern [option] */
 static const char *status_format_str (char *buf, size_t buflen, char op,
                                       const char *src, const char *prefix,