Rocco Rutte:
authorpdmef <pdmef@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Thu, 15 Sep 2005 04:36:28 +0000 (04:36 +0000)
committerpdmef <pdmef@e385b8ad-14ed-0310-8656-cc95a2468c6d>
Thu, 15 Sep 2005 04:36:28 +0000 (04:36 +0000)
- manual update: rework the key definition zoo to prefixes C- and -E (for LaTeX) (via <muttng-doc:key/>)
- manual update: add example layouts to convention section in intro chapter
- manual update: remove 'unbound' or 'not bound' as key definitions
- manual update: update Hacking Documentation
- manual update: add <muttng-doc:special/>
- manual update: don't use any XML code within verbatim environments
- manual update: add manual-tex.xsl to transform XML into LaTeX that actually runs through without error ('make manual-ng.(pdf|ps)') (most of the logic is done much shorter in muttng.sty) (pdflatex runs just fine, latex required breakurl.sty, tex4ht should work)

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@526 e385b8ad-14ed-0310-8656-cc95a2468c6d

VERSION.svn
doc/Makefile.in
doc/manual.txt
doc/manual.xml.head
doc/manual.xml.tail
doc/muttng-manual.xsl
doc/muttng-tex.xsl [new file with mode: 0644]
doc/muttng.sty [new file with mode: 0644]

index 97a0533..6bf9900 100644 (file)
@@ -1 +1 @@
-524
+526
index f227f25..4d35221 100644 (file)
@@ -45,12 +45,14 @@ DISTFILES = Makefile.in dotlock.man         \
        muttrc.man.tail                 \
        mbox.man                        \
        mmdf.man                        \
-       manual.xml.head         \
-       manual.xml.tail         \
+       manual.xml.head                 \
+       manual.xml.tail                 \
        instdoc.sh.in                   \
        patch-notes.txt                 \
        smime-notes.txt                 \
        muttng-manual.xsl               \
+       muttng-tex.xsl                  \
+       muttng.sty                      \
        html.xsl chunk.xsl
 
 BUILT_DISTFILES = stamp-doc-xml stamp-doc-man stamp-doc-chunked \
@@ -124,6 +126,24 @@ manual.tex stamp-doc-tex: manual.xml
        fi
        touch stamp-doc-tex
 
+manual-ng.tex: manual.xml muttng-tex.xsl
+       xsltproc -o manual-ng.tex muttng-tex.xsl manual-pre.xml
+
+manual-ng.pdf: manual-ng.tex muttng.sty
+       pdflatex -file-line-error manual-ng.tex
+       pdflatex -file-line-error manual-ng.tex
+       touch manual-ng.idx
+       makeindex -s muttng.ist -o manual-ng.ind manual-ng.idx
+       pdflatex -file-line-error manual-ng.tex
+
+manual-ng.ps: manual-ng.tex muttng.sty
+       latex -file-line-error manual-ng.tex
+       latex -file-line-error manual-ng.tex
+       touch manual-ng.idx
+       makeindex -s muttng.ist -o manual-ng.ind manual-ng.idx
+       latex -file-line-error manual-ng.tex
+       dvips -o manual-ng.ps manual-ng.dvi
+
 clean: 
        rm -f *~ *.html *.orig *.rej stamp-doc-* *.ps mutt.1 muttrc.man
        rm -f *.aux *.log *.tex *.out
index 0daa7bb..4b3d0f1 100644 (file)
@@ -8,7 +8,7 @@
 
    <me@cs.hmc.edu>
 
-   version devel-r513
+   version devel-r522
 
    Abstract
 
@@ -502,15 +502,21 @@ Chapter 1. Introduction
      o Configuration and environment variables will be printed 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.
+       only while environment variables are upper-case only. $imap_mail_check
+       is a configuration variable while $EDITOR is an environment variable.
 
-     o Muttng-specific commands are enclosed in <> and printed in a
-       typewriter font, too.
+     o Muttng-specific functions are enclosed in <> and printed in a
+       typewriter font, too, as in <sync-mailbox>.
 
      o As common for UNIX-like environments, references to manual pages are
        printed with the section enclosed in braces, as in vi(1) or
        muttngrc(5). Execute man [section] [name] to view the manual page.
 
+     o Keys are presented in the following way: ordinary keys are just given
+       as-is, e.g. q. Control characters are prefixed with C- (e.g. the
+       screen can be redraw by pressing C-L) and E- for Escape, e.g. a folder
+       can be opened read-only with E-c.
+
    If, while reading this fine manual, you find any inconsistencies of
    whatever kind, please contact the developers via
    <mutt-ng-devel@lists.berlios.de> to report it.
@@ -796,29 +802,29 @@ Chapter 2. Getting Started
 
    Table 2.2. Line Editor Functions
 
-   Key            Function          Description
-   ^A or <Home>   <bol>             move to the start of the line
-   ^B or <Left>   <backward-char>   move back one char
-   Esc B          <backward-word>   move back one word
-   ^D or <Delete> <delete-char>     delete the char under the cursor
-   ^E or <End>    <eol>             move to the end of the line
-   ^F or <Right>  <forward-char>    move forward one char
-   Esc F          <forward-word>    move forward one word
-   <Tab>          <complete>        complete filename or alias
-   ^T             <complete-query>  complete address with query
-   ^K             <kill-eol>        delete to the end of the line
-   ESC d          <kill-eow>        delete to the end of the word
-   ^W             <kill-word>       kill the word in front of the cursor
-   ^U             <kill-line>       delete entire line
-   ^V             <quote-char>      quote the next typed key
-   <Up>           <history-up>      recall previous string from history
-   <Down>         <history-down>    recall next string from history
-   <BackSpace>    <backspace>       kill the char in front of the cursor
-   Esc u          <upcase-word>     convert word to upper case
-   Esc l          <downcase-word>   convert word to lower case
-   Esc c          <capitalize-word> capitalize the word
-   ^G             n/a               abort
-   <Return>       n/a               finish editing
+   Key           Function          Description
+   C-A or Home   <bol>             move to the start of the line
+   C-B or Left   <backward-char>   move back one char
+   E-B           <backward-word>   move back one word
+   C-D or Delete <delete-char>     delete the char under the cursor
+   C-E or End    <eol>             move to the end of the line
+   C-F or Right  <forward-char>    move forward one char
+   E-F           <forward-word>    move forward one word
+   Tab           <complete>        complete filename or alias
+   C-T           <complete-query>  complete address with query
+   C-K           <kill-eol>        delete to the end of the line
+   E-d           <kill-eow>        delete to the end of the word
+   C-W           <kill-word>       kill the word in front of the cursor
+   C-U           <kill-line>       delete entire line
+   C-V           <quote-char>      quote the next typed key
+   Up            <history-up>      recall previous string from history
+   Down          <history-down>    recall next string from history
+   BackSpace     <backspace>       kill the char in front of the cursor
+   E-u           <upcase-word>     convert word to upper case
+   E-l           <downcase-word>   convert word to lower case
+   E-c           <capitalize-word> capitalize the word
+   C-G                             abort
+   Return                          finish editing
 
    You can remap the editor functions using the bind command. For example, to
    make the Delete key delete the character in front of the cursor rather
@@ -840,36 +846,36 @@ Chapter 2. Getting Started
 
    Table 2.3. Most commonly used Index Bindings
 
-   Key      Function Description
-   c                 change to a different mailbox
-   ESC c             change to a folder in read-only mode
-   C                 copy the current message to another mailbox
-   ESC C             decode a message and copy it to a folder
-   ESC s             decode a message and save it to a folder
-   D                 delete messages matching a pattern
-   d                 delete the current message
-   F                 mark as important
-   l                 show messages matching a pattern
-   N                 mark message as new
-   o                 change the current sort method
-   O                 reverse sort the mailbox
-   q                 save changes and exit
-   s                 save-message
-   T                 tag messages matching a pattern
-   t                 toggle the tag on a message
-   ESC t             toggle tag on entire message thread
-   U                 undelete messages matching a pattern
-   u                 undelete-message
-   v                 view-attachments
-   x                 abort changes and exit
-   <Return>          display-message
-   <Tab>             jump to the next new or unread message
-   @                 show the author's full e-mail address
-   $                 save changes to mailbox
-   /                 search
-   ESC /             search-reverse
-   ^L                clear and redraw the screen
-   ^T                untag messages matching a pattern
+   Key    Function Description
+   c               change to a different mailbox
+   E-c             change to a folder in read-only mode
+   C               copy the current message to another mailbox
+   E-C             decode a message and copy it to a folder
+   E-s             decode a message and save it to a folder
+   D               delete messages matching a pattern
+   d               delete the current message
+   F               mark as important
+   l               show messages matching a pattern
+   N               mark message as new
+   o               change the current sort method
+   O               reverse sort the mailbox
+   q               save changes and exit
+   s               save-message
+   T               tag messages matching a pattern
+   t               toggle the tag on a message
+   E-t             toggle tag on entire message thread
+   U               undelete messages matching a pattern
+   u               undelete-message
+   v               view-attachments
+   x               abort changes and exit
+   Return          display-message
+   Tab             jump to the next new or unread message
+   @               show the author's full e-mail address
+   $               save changes to mailbox
+   /               search
+   E-/             search-reverse
+   C-L             clear and redraw the screen
+   C-T             untag messages matching a pattern
 
     5.1.1. Status Flags
 
@@ -958,19 +964,19 @@ Chapter 2. Getting Started
 
    Table 2.4. Most commonly used Pager Bindings
 
-   Key      Function Description
-   <Return>          go down one line
-   <Space>           display the next page (or next message if at the end of
-                     a message)
-   -                 go back to the previous page
-   n                 search for next match
-   S                 skip beyond quoted text
-   T                 toggle display of quoted text
-   ?                 show key bindings
-   /                 search for a regular expression (pattern)
-   ESC /             search backwards for a regular expression
-   \                 toggle search pattern coloring
-   ^                 jump to the top of the message
+   Key    Function Description
+   Return          go down one line
+   Space           display the next page (or next message if at the end of a
+                   message)
+   -               go back to the previous page
+   n               search for next match
+   S               skip beyond quoted text
+   T               toggle display of quoted text
+   ?               show key bindings
+   /               search for a regular expression (pattern)
+   E-/             search backwards for a regular expression
+   \               toggle search pattern coloring
+   ^               jump to the top of the message
 
    In addition, many of the functions from the index are available in the
    pager, such as delete-message or copy-message (this is one advantage over
@@ -979,8 +985,8 @@ Chapter 2. Getting Started
    Also, the internal pager supports a couple other advanced features. For
    one, it will accept and translate the ``standard'' nroff sequences forbold
    and underline. These sequences are a series of either the letter,
-   backspace (^H), the letter again for bold or the letter, backspace, ``_''
-   for denoting underline. Mutt-ng will attempt to display these in bold and
+   backspace (C-H), the letter again for bold or the letter, backspace, _ for
+   denoting underline. Mutt-ng will attempt to display these in bold and
    underline respectively if your terminal supports them. If not, you can use
    the bold and underline color objects to specify a color or mono attribute
    for them.
@@ -1026,21 +1032,21 @@ Chapter 2. Getting Started
 
    Table 2.7. Most commonly used thread-related bindings
 
-   Key   Function             Description
-   ^D    <delete-thread>      delete all messages in the current thread
-   ^U    <undelete-thread>    undelete all messages in the current thread
-   ^N    <next-thread>        jump to the start of the next thread
-   ^P    <previous-thread>    jump to the start of the previous thread
-   ^R    <read-thread>        mark the current thread as read
-   ESC d <delete-subthread>   delete all messages in the current subthread
-   ESC u <undelete-subthread> undelete all messages in the current subthread
-   ESC n <next-subthread>     jump to the start of the next subthread
-   ESC p <previous-subthread> jump to the start of the previous subthread
-   ESC r <read-subthread>     mark the current subthread as read
-   ESC t <tag-thread>         toggle the tag on the current thread
-   ESC v <collapse-thread>    toggle collapse for the current thread
-   ESC V <collapse-all>       toggle collapse for all threads
-   P     <parent-message>     jump to parent message in thread
+   Key Function             Description
+   C-D <delete-thread>      delete all messages in the current thread
+   C-U <undelete-thread>    undelete all messages in the current thread
+   C-N <next-thread>        jump to the start of the next thread
+   C-P <previous-thread>    jump to the start of the previous thread
+   C-R <read-thread>        mark the current thread as read
+   E-d <delete-subthread>   delete all messages in the current subthread
+   E-u <undelete-subthread> undelete all messages in the current subthread
+   E-n <next-subthread>     jump to the start of the next subthread
+   E-p <previous-subthread> jump to the start of the previous subthread
+   E-r <read-subthread>     mark the current subthread as read
+   E-t <tag-thread>         toggle the tag on the current thread
+   E-v <collapse-thread>    toggle collapse for the current thread
+   E-V <collapse-all>       toggle collapse for all threads
+   P   <parent-message>     jump to parent message in thread
 
    Note: Collapsing a thread displays only the first message in the thread
    and hides the others. This is useful when threads contain so many messages
@@ -1063,7 +1069,7 @@ Chapter 2. Getting Started
    $alias_file does not add the aliases specified there-in, you must also
    source the file.
 
-   <check-traditional-pgp> (default: ESC P)
+   <check-traditional-pgp> (default: E-P)
 
    This function will search the current message for content signed or
    encrypted with PGP the "traditional" way, that is, without proper MIME
@@ -1082,8 +1088,8 @@ Chapter 2. Getting Started
    finished editing, the changed message will be appended to the current
    folder, and the original message will be marked for deletion.
 
-   <edit-type> (default: ) (default: ^E on the attachment menu, and in the
-   pager and index menus; ^T on the compose menu)
+   <edit-type> (default: ) (default: C-E on the attachment menu, and in the
+   pager and index menus; C-T on the compose menu)
 
    This command is used to temporarily edit an attachment's content type to
    fix, for instance, bogus character set parameters. When invoked from the
@@ -1101,12 +1107,12 @@ Chapter 2. Getting Started
    configuration file. A common use is to check the settings of variables, or
    in conjunction with macro to change settings on the fly.
 
-   <extract-keys> (default: ^K)
+   <extract-keys> (default: C-K)
 
    This command extracts PGP public keys from the current or tagged
    message(s) and adds them to your PGP public key ring.
 
-   <forget-passphrase> (default: ^F)
+   <forget-passphrase> (default: C-F)
 
    This command wipes the passphrase(s) from memory. It is useful, if you
    misspelled the passphrase.
@@ -1126,7 +1132,7 @@ Chapter 2. Getting Started
    message(s) to it. The variables $pipe_decode, $pipe_split, $pipe_decode
    and $wait_key control the exact behavior of this function.
 
-   <resend-message> (default: ESC e)
+   <resend-message> (default: E-e)
 
    With resend-message, mutt takes the current message as a template for a
    new message. This function is best described as "recall from arbitrary
@@ -1164,14 +1170,14 @@ Chapter 2. Getting Started
 
    Table 2.8. Most commonly used Mail Composition Bindings
 
-   Key   Function      Description
-   m     <compose>     compose a new message
-   r     <reply>       reply to sender
-   g     <group-reply> reply to all recipients
-   L     <list-reply>  reply to mailing list address
-   f     <forward>     forward message
-   b     <bounce>      bounce (remail) message
-   ESC k <mail-key>    mail a PGP public key to someone
+   Key Function      Description
+   m   <compose>     compose a new message
+   r   <reply>       reply to sender
+   g   <group-reply> reply to all recipients
+   L   <list-reply>  reply to mailing list address
+   f   <forward>     forward message
+   b   <bounce>      bounce (remail) message
+   E-k <mail-key>    mail a PGP public key to someone
 
    Bouncing a message sends the message as is to the recipient you specify.
    Forwarding a message allows you to add comments or modify the message you
@@ -1239,27 +1245,27 @@ Chapter 2. Getting Started
 
    Table 2.9. Most commonly used Compose Menu Bindings
 
-   Key   Function            Description
-   a     <attach-file>       attach a file
-   A     <attach-message>    attach message(s) to the message
-   ESC k <attach-key>        attach a PGP public key
-   d     <edit-description>  edit description on attachment
-   D     <detach-file>       detach a file
-   t     <edit-to>           edit the To field
-   ESC f <edit-from>         edit the From field
-   r     <edit-reply-to>     edit the Reply-To field
-   c     <edit-cc>           edit the Cc field
-   b     <edit-bcc>          edit the Bcc field
-   y     <send-message>      send the message
-   s     <edit-subject>      edit the Subject
-   S     <smime-menu>        select S/MIME options
-   f     <edit-fcc>          specify an ``Fcc'' mailbox
-   p     <pgp-menu>          select PGP options
-   P     <postpone-message>  postpone this message until later
-   q     <quit>              quit (abort) sending the message
-   w     <write-fcc>         write the message to a folder
-   i     <ispell>            check spelling (if available on your system)
-   ^F    <forget-passphrase> wipe passphrase(s) from memory
+   Key Function            Description
+   a   <attach-file>       attach a file
+   A   <attach-message>    attach message(s) to the message
+   E-k <attach-key>        attach a PGP public key
+   d   <edit-description>  edit description on attachment
+   D   <detach-file>       detach a file
+   t   <edit-to>           edit the To field
+   E-f <edit-from>         edit the From field
+   r   <edit-reply-to>     edit the Reply-To field
+   c   <edit-cc>           edit the Cc field
+   b   <edit-bcc>          edit the Bcc field
+   y   <send-message>      send the message
+   s   <edit-subject>      edit the Subject
+   S   <smime-menu>        select S/MIME options
+   f   <edit-fcc>          specify an ``Fcc'' mailbox
+   p   <pgp-menu>          select PGP options
+   P   <postpone-message>  postpone this message until later
+   q   <quit>              quit (abort) sending the message
+   w   <write-fcc>         write the message to a folder
+   i   <ispell>            check spelling (if available on your system)
+   C-F <forget-passphrase> wipe passphrase(s) from memory
 
    Note: The attach-message function will prompt you for a folder to attach
    messages from. You can now tag messages in that folder and theywill be
@@ -1385,7 +1391,7 @@ Chapter 2. Getting Started
    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 ^G. When you do so, mutt will return to the compose
+   this prompt using C-G. When you do so, mutt will return to the compose
    screen.
 
    Once you have successfully finished the key selection, the message will be
@@ -1813,7 +1819,7 @@ Chapter 3. Configuration
    differ from different manual sources. Where the manual is installed in can
    be queried (already using such a variable) by running:
 
- muttng -Q muttng_docdir
muttng -Q muttng_docdir
 
    To extend the example for viewing the manual via self-defined variables,
    it can be made more readable and more portable by changing the real path
@@ -1874,7 +1880,7 @@ Chapter 3. Configuration
 
 4. Defining/Using aliases
 
-   Usage: aliaskeyaddress [, address,...]
+   Usage: aliaskey address [, address,...]
 
    It's usually very cumbersome to remember or type out the address of
    someone you are communicating with. Mutt-ng allows you to create
@@ -1885,7 +1891,7 @@ Chapter 3. Configuration
 
    To remove an alias or aliases (``*'' means all aliases):
 
-   unalias [* | key...]
+   Usage: unalias[* | key ... ]
 
  alias muttdude me@cs.hmc.edu (Michael Elkins)
  alias theguys manny, moe, jack
@@ -1925,7 +1931,7 @@ Chapter 3. Configuration
 
 5. Changing the default key bindings
 
-   Usage: bindmapkeyfunction
+   Usage: bindmap key function
 
    This command allows you to change the default key bindings (operation
    invoked when pressing a key).
@@ -2074,7 +2080,7 @@ Chapter 3. Configuration
 
 8. Keyboard macros
 
-   Usage: macromenukeysequence [description]
+   Usage: macromenu key sequence [description]
 
    Macros are useful when you would like a single key to perform a series of
    actions. When you press key in menu menu ,Mutt-ng will behave as if you
@@ -2088,10 +2094,10 @@ Chapter 3. Configuration
    key and sequence are expanded by the same rules as the bind. There are
    some additions however. The first is that control characters in sequence
    can also be specified as ^x. In order to get a caret (`^'') you need to
-   use ^^. Secondly, to specify a certain key such as up or to invoke a
-   function directly, you can use the format <key name> and <function name>
-   .For a listing of key names see the section on bind. Functions are listed
-   in the functions.
+   specify it twice. Secondly, to specify a certain key such as up or to
+   invoke a function directly, you can use the format <key name> and
+   <function name> .For a listing of key names see the section on bind.
+   Functions are listed in the functions.
 
    The advantage with using function names directly is that the macros
    willwork regardless of the current key bindings, so they are not dependent
@@ -2107,11 +2113,11 @@ Chapter 3. Configuration
 
 9. Using color and mono video attributes
 
-   Usage: colorobjectforegroundbackground [regexp]
+   Usage: colorobject foreground background [regexp]
 
-   Usage: color index foregroundbackgroundpattern
+   Usage: colorindex foreground pattern
 
-   Usage: uncolor index pattern[pattern...]
+   Usage: uncolorindex pattern [pattern ...]
 
    If your terminal supports color, you can spice up Mutt-ng by creating your
    own color scheme. To define the color of an object (type of information),
@@ -2210,11 +2216,11 @@ Chapter 3. Configuration
    If your terminal does not support color, it is still possible change the
    video attributes through the use of the ``mono'' command:
 
-   Usage: mono<object> <attribute>[regexp]
+   Usage: monoobject attribute [regexp]
 
-   Usage: mono index attributepattern
+   Usage: monoindex attribute pattern
 
-   Usage: unmono index pattern [pattern...]
+   Usage: unmonoindex pattern [pattern ...]
 
    where attribute is one of the following:
 
@@ -2230,9 +2236,9 @@ Chapter 3. Configuration
 
 10. Ignoring (weeding) unwanted message headers
 
-   Usage: ignorepattern [pattern...]
+   Usage: ignorepattern [pattern ...]
 
-   Usage: unignorepattern [pattern...]
+   Usage: unignorepattern [pattern ...]
 
    Messages often have many header fields added by automatic processing
    systems, or which may not seem useful to display on the screen. This
@@ -2260,9 +2266,9 @@ Chapter 3. Configuration
 
 11. Alternative addresses
 
-   Usage: alternatesregexp [regexp...]
+   Usage: alternatesregexp [regexp ...]
 
-   Usage: unalternatesregexp [regexp...]
+   Usage: unalternatesregexp [regexp ...]
 
    With various functions, mutt will treat messages differently, depending on
    whether you sent them or whether you received them from someone else. For
@@ -2384,13 +2390,13 @@ Chapter 3. Configuration
 
 13. Mailing lists
 
-   Usage: listsregexp [regexp...]
+   Usage: listsregexp [regexp ...]
 
-   Usage: unlistsregexp [regexp...]
+   Usage: unlistsregexp [regexp ...]
 
-   Usage: subscriberegexp [regexp...]
+   Usage: subscriberegexp [regexp ...]
 
-   Usage: unsubscriberegexp [regexp...]
+   Usage: unsubscriberegexp [regexp ...]
 
    Mutt-ng has a few nice features for using-lists. In order to take
    advantage of them, you must specify which addresses belong to mailing
@@ -2445,9 +2451,9 @@ Chapter 3. Configuration
 
 15. Defining mailboxes which receive mail
 
-   Usage: mailboxes [!]filename [filename...]
+   Usage: mailboxes[!]filename [filename ... ]
 
-   Usage: unmailboxes [!]filename [filename...]
+   Usage: unmailboxes[!]filename [filename ... ]
 
    This command specifies folders which can receive mail and which will be
    checked for new messages. By default, the main menu status bar displays
@@ -2479,7 +2485,7 @@ Chapter 3. Configuration
 
    Usage: my_hdrstring
 
-   Usage: unmy_hdrfield [field...]
+   Usage: unmy_hdrfield [field ...]
 
    The ``my_hdr'' command allows you to create your own header fields which
    will be added to every message you send.
@@ -2509,7 +2515,9 @@ Chapter 3. Configuration
 
 17. Defining the order of headers when viewing messages
 
-   Usage: hdr_orderheader1header2header3
+   Usage: hdr_orderheader header [header ...]
+
+   Usage: unhdr_order[ * | header header ...]
 
    With this command, you can specify an order in which mutt will attempt to
    present headers to you when viewing messages.
@@ -2549,7 +2557,9 @@ Chapter 3. Configuration
 
    See pattern-hook for information on the exact format of pattern.
 
-   Example: fcc-hook [@.]aol\\.com$ +spammers
+   Example:
+
+ fcc-hook [@.]aol\\.com$ +spammers
 
    The above will save a copy of all messages going to the aol.com domain to
    the `+spammers' mailbox by default. Also see the fcc-save-hook command.
@@ -2649,19 +2659,18 @@ Chapter 3. Configuration
 
  folder-hook . 'push <collapse-all>'
 
-
 25. Executing functions
 
-   Usage: execfunction [function...]
+   Usage: execfunction [function ... ]
 
    This command can be used to execute any function. Functions are listed in
    the functions. ``exec function'' is equivalent to ``push <function>''.
 
 26. Message Scoring
 
-   Usage: scorepatternvalue
+   Usage: scorepattern value
 
-   Usage: unscorepattern [pattern...]
+   Usage: unscorepattern [pattern ... ]
 
    In situations where you have to cope with a lot of emails, e.g. when you
    read many different mailing lists, and take part in discussions, it is
@@ -2720,7 +2729,7 @@ Chapter 3. Configuration
 
 27. Spam detection
 
-   Usage: spampatternformat
+   Usage: spampattern format
 
    Usage: nospampattern
 
@@ -2812,13 +2821,13 @@ Chapter 3. Configuration
 
 28. Setting variables
 
-   Usage: set [no|inv]variable[=value] [variable...]
+   Usage: set[no|inv]variable [=value] [variable...]
 
-   Usage: togglevariable [variable...]
+   Usage: togglevariable [variable ...]
 
-   Usage: unsetvariable [variable...]
+   Usage: unsetvariable [variable ...]
 
-   Usage: resetvariable [variable...]
+   Usage: resetvariable [variable ...]
 
    This command is used to set (and unset) variables. There are four basic
    types of variables: boolean, number, string and quadoption. boolean
@@ -2869,7 +2878,7 @@ Chapter 3. Configuration
 
 29. Reading initialization commands from another file
 
-   Usage: sourcefilename [filename...]
+   Usage: sourcefilename [filename ...]
 
    This command allows the inclusion of initialization commands from other
    files. For example, I place all of my aliases in ~/.mail_aliases so that I
@@ -2884,7 +2893,7 @@ Chapter 3. Configuration
 
 30. Removing hooks
 
-   Usage: unhook [* | hook-type]
+   Usage: unhook[* | hook-type]
 
    This command permits you to flush hooks you have previously defined. You
    can either remove all hooks by giving the ``*'' character as an argument,
@@ -3533,7 +3542,7 @@ Chapter 4. Advanced Usage
    my_hdr directive:
 
  send-hook . 'unmy_hdr From:'
- send-hook ~C'^b@b\.b$' my-hdr from: c@c.c
+ send-hook '~C ^b@b\.b$' my-hdr from: c@c.c
 
   5.1. Message Matching in Hooks
 
@@ -4657,14 +4666,18 @@ Chapter 5. Mutt-ng's MIME Support
  image/*;xv %s; test=RunningX; edit=xpaint %s
 
  # Convert images to text using the netpbm tools
- image/*;  (anytopnm %s | pnmscale -xysize 80 46 | ppmtopgm | pgmtopbm |
- pbmtoascii -1x2 ) 2>&1 ; copiousoutput
+ image/*;  (anytopnm %s | pnmscale -xysize 80 46 | ppmtopgm | \
+ pgmtopbm | pbmtoascii -1x2 ) 2>&1 ; copiousoutput
 
  # Send excel spreadsheets to my NT box
  application/ms-excel; open.pl %s
 
 4. MIME Autoview
 
+   Usage: auto_viewmime-type [mime-type ...]
+
+   Usage: unauto_viewmime-type [mime-type ...]
+
    In addition to explicitly telling Mutt-ng to view an attachment with
    theMIME viewer defined in the mailcap file, Mutt-ng has support for
    automatically viewing MIME attachments while in the pager.
@@ -4697,6 +4710,10 @@ Chapter 5. Mutt-ng's MIME Support
 
 5. MIME Multipart/Alternative
 
+   Usage: alternative_ordermime-type [mime-type ...]
+
+   Usage: unalternative_ordermime-type [mime-type ...]
+
    Mutt-ng 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
@@ -4716,6 +4733,10 @@ Chapter 5. Mutt-ng's MIME Support
 
 6. MIME Lookup
 
+   Usage: mime_lookupmime-type [mime-type ...]
+
+   Usage: unmime_lookupmime-type [mime-type ...]
+
    Mutt-ng'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
@@ -6033,17 +6054,14 @@ Chapter 7. Reference
    The file which includes random data that is used to initialize SSL library
    functions.
 
-64. $envelope_from
+64. $envelope_from_address
 
-   Type: boolean
+   Type: e-mail address
 
-   Default: no
+   Default: ""
 
-   When set, Mutt-ng will try to derive the message's envelope sender from
-   the ``From:'' header field. Note that this information is passed to the
-   sendmail command using the ``-f" command line switch, so don't set this
-   option if you are using that switch in $sendmail yourself, or if the
-   sendmail on your machine doesn't support that command line switch.
+   Manually sets the envelope sender for outgoing messages. This value is
+   ignored if ``$use_envelope_from'' is unset.
 
 65. $escape
 
@@ -7371,7 +7389,7 @@ Chapter 7. Reference
 
    Type: system property
 
-   Value: 513
+   Value: 522
 
    This is a read-only system property and specifies muttng's subversion
    revision string.
@@ -9228,23 +9246,7 @@ Chapter 7. Reference
    This command is used to verify S/MIME signatures of type
    application/x-pkcs7-mime. (S/MIME only)
 
-302. $smtp_envelope
-
-   Type: string
-
-   Default: ""
-
-   Availability: SMTP
-
-   If this variable is non-empty, it'll be used as the envelope sender. If
-   it's empty (the default), the value of the regular From: header will be
-   used.
-
-   This may be necessary as some providers don't allow for arbitrary values
-   as the envelope sender but only a particular one which may not be the same
-   as the user's desired From: header.
-
-303. $smtp_host
+302. $smtp_host
 
    Type: string
 
@@ -9256,7 +9258,7 @@ Chapter 7. Reference
    invoking the sendmail binary. Setting this variable overrides the value of
    ``$sendmail'', and any associated variables.
 
-304. $smtp_pass
+303. $smtp_pass
 
    Type: string
 
@@ -9271,7 +9273,7 @@ Chapter 7. Reference
    since the superuser of your machine may read it regardless of the file's
    permissions.
 
-305. $smtp_port
+304. $smtp_port
 
    Type: number
 
@@ -9285,7 +9287,7 @@ Chapter 7. Reference
    Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP
    servers will probably desire 587, the mail submission port.
 
-306. $smtp_use_tls
+305. $smtp_use_tls
 
    Type: string
 
@@ -9299,7 +9301,7 @@ Chapter 7. Reference
    to start TLS and continue without TLS in case of an error. Muttng still
    needs to have SSL support enabled in order to use it.
 
-307. $smtp_user
+306. $smtp_user
 
    Type: string
 
@@ -9310,7 +9312,7 @@ Chapter 7. Reference
    Defines the username to use with SMTP AUTH. Setting this variable will
    cause Mutt-ng to attempt to use SMTP AUTH when sending.
 
-308. $sort
+307. $sort
 
    Type: sort order
 
@@ -9333,7 +9335,7 @@ Chapter 7. Reference
    You may optionally use the ``reverse-'' prefix to specify reverse sorting
    order (example: set sort=reverse-date-sent).
 
-309. $sort_alias
+308. $sort_alias
 
    Type: sort order
 
@@ -9347,7 +9349,7 @@ Chapter 7. Reference
     unsorted (leave in order specified in .muttrc)
 
 
-310. $sort_aux
+309. $sort_aux
 
    Type: sort order
 
@@ -9370,7 +9372,7 @@ Chapter 7. Reference
    not the right thing to do, but kept to not break any existing
    configuration setting).
 
-311. $sort_browser
+310. $sort_browser
 
    Type: sort order
 
@@ -9388,7 +9390,7 @@ Chapter 7. Reference
    You may optionally use the ``reverse-'' prefix to specify reverse sorting
    order (example: set sort_browser=reverse-date).
 
-312. $sort_re
+311. $sort_re
 
    Type: boolean
 
@@ -9403,7 +9405,7 @@ Chapter 7. Reference
    whether or not this is the case, as long as the non-``$reply_regexp''
    parts of both messages are identical.
 
-313. $spam_separator
+312. $spam_separator
 
    Type: string
 
@@ -9414,7 +9416,7 @@ Chapter 7. Reference
    matches value for the spam label. If set, each successive match will
    append to the previous, using ``spam_separator'' as a separator.
 
-314. $spoolfile
+313. $spoolfile
 
    Type: path
 
@@ -9425,7 +9427,7 @@ Chapter 7. Reference
    automatically set this variable to the value of the environment variable
    $MAIL if it is not set.
 
-315. $ssl_ca_certificates_file
+314. $ssl_ca_certificates_file
 
    Type: path
 
@@ -9437,7 +9439,7 @@ Chapter 7. Reference
 
    Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
 
-316. $ssl_client_cert
+315. $ssl_client_cert
 
    Type: path
 
@@ -9447,7 +9449,7 @@ Chapter 7. Reference
 
    The file containing a client certificate and its associated private key.
 
-317. $ssl_force_tls
+316. $ssl_force_tls
 
    Type: boolean
 
@@ -9459,7 +9461,7 @@ Chapter 7. Reference
    otherwise have to abort the connection anyway. This option supersedes
    ``$ssl_starttls''.
 
-318. $ssl_min_dh_prime_bits
+317. $ssl_min_dh_prime_bits
 
    Type: number
 
@@ -9471,7 +9473,7 @@ Chapter 7. Reference
    use in any Diffie-Hellman key exchange. A value of 0 will use the default
    from the GNUTLS library.
 
-319. $ssl_starttls
+318. $ssl_starttls
 
    Type: quadoption
 
@@ -9483,7 +9485,7 @@ Chapter 7. Reference
    advertising the capability. When unset, Mutt-ng will not attempt to use
    STARTTLS regardless of the server's capabilities.
 
-320. $ssl_use_sslv2
+319. $ssl_use_sslv2
 
    Type: boolean
 
@@ -9494,7 +9496,7 @@ Chapter 7. Reference
    This variables specifies whether to attempt to use SSLv2 in the SSL
    authentication process.
 
-321. $ssl_use_sslv3
+320. $ssl_use_sslv3
 
    Type: boolean
 
@@ -9505,7 +9507,7 @@ Chapter 7. Reference
    This variables specifies whether to attempt to use SSLv3 in the SSL
    authentication process.
 
-322. $ssl_use_tlsv1
+321. $ssl_use_tlsv1
 
    Type: boolean
 
@@ -9516,7 +9518,7 @@ Chapter 7. Reference
    This variables specifies whether to attempt to use TLSv1 in the SSL
    authentication process.
 
-323. $ssl_usesystemcerts
+322. $ssl_usesystemcerts
 
    Type: boolean
 
@@ -9528,7 +9530,7 @@ Chapter 7. Reference
    certificate store when checking if server certificate is signed by a
    trusted CA.
 
-324. $status_chars
+323. $status_chars
 
    Type: string
 
@@ -9545,7 +9547,7 @@ Chapter 7. Reference
    (Certain operations like composing a new mail, replying, forwarding, etc.
    are not permitted in this mode).
 
-325. $status_format
+324. $status_format
 
    Type: string
 
@@ -9689,7 +9691,7 @@ Chapter 7. Reference
    will replace any dots in the expansion by underscores. This might be
    helpful with IMAP folders that don't like dots in folder names.
 
-326. $status_on_top
+325. $status_on_top
 
    Type: boolean
 
@@ -9698,7 +9700,7 @@ Chapter 7. Reference
    Setting this variable causes the ``status bar'' to be displayed on the
    first line of the screen rather than near the bottom.
 
-327. $strict_mailto
+326. $strict_mailto
 
    Type: boolean
 
@@ -9713,7 +9715,7 @@ Chapter 7. Reference
    ``X-Mailto-'' and the message including headers will be shown in the
    editor regardless of what ``$edit_headers'' is set to.
 
-328. $strict_mime
+327. $strict_mime
 
    Type: boolean
 
@@ -9728,7 +9730,7 @@ Chapter 7. Reference
    *text to a single space to prevent the display of MIME-encoded
    ``Subject:'' header field from being devided into multiple lines.
 
-329. $strict_threads
+328. $strict_threads
 
    Type: boolean
 
@@ -9742,7 +9744,7 @@ Chapter 7. Reference
    which will get grouped together. See also ``$sort_re'' for a less drastic
    way of controlling this behaviour.
 
-330. $strip_was
+329. $strip_was
 
    Type: boolean
 
@@ -9752,7 +9754,7 @@ Chapter 7. Reference
    which matches $strip_was_regex when replying. This is useful to properly
    react on subject changes and reduce ``subject noise.'' (esp. in Usenet)
 
-331. $strip_was_regex
+330. $strip_was_regex
 
    Type: regular expression
 
@@ -9762,7 +9764,7 @@ Chapter 7. Reference
    part of the ``Subject'' line when replying if it won't be empty
    afterwards.
 
-332. $stuff_quoted
+331. $stuff_quoted
 
    Type: boolean
 
@@ -9772,7 +9774,7 @@ Chapter 7. Reference
    ``stuffed'', i.e. a space will be inserted between the quote characters
    and the actual text.
 
-333. $suspend
+332. $suspend
 
    Type: boolean
 
@@ -9782,7 +9784,7 @@ Chapter 7. Reference
    key, usually CTRL+Z. This is useful if you run Mutt-ng inside an xterm
    using a command like ``xterm -e muttng.''
 
-334. $text_flowed
+333. $text_flowed
 
    Type: boolean
 
@@ -9795,7 +9797,7 @@ Chapter 7. Reference
 
    Note that $indent_string is ignored when this option is set.
 
-335. $thorough_search
+334. $thorough_search
 
    Type: boolean
 
@@ -9806,7 +9808,7 @@ Chapter 7. Reference
    decoded before searching. If unset, messages are searched as they appear
    in the folder.
 
-336. $thread_received
+335. $thread_received
 
    Type: boolean
 
@@ -9815,7 +9817,7 @@ Chapter 7. Reference
    When set, Mutt-ng uses the date received rather than the date sent to
    thread messages by subject.
 
-337. $tilde
+336. $tilde
 
    Type: boolean
 
@@ -9824,7 +9826,7 @@ Chapter 7. Reference
    When set, the internal-pager will pad blank lines to the bottom of the
    screen with a tilde (~).
 
-338. $timeout
+337. $timeout
 
    Type: number
 
@@ -9834,7 +9836,7 @@ Chapter 7. Reference
    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 to never time out.
 
-339. $tmpdir
+338. $tmpdir
 
    Type: path
 
@@ -9845,7 +9847,7 @@ Chapter 7. Reference
    not set, the environment variable $TMPDIR is used. If $TMPDIR is not set
    then "/tmp" is used.
 
-340. $to_chars
+339. $to_chars
 
    Type: string
 
@@ -9862,7 +9864,7 @@ Chapter 7. Reference
    character is used to indicate when a mail was sent to a mailing-list
    you're subscribe to (default: L).
 
-341. $trash
+340. $trash
 
    Type: path
 
@@ -9875,7 +9877,7 @@ Chapter 7. Reference
    Note: When you delete a message in the trash folder, it is really deleted,
    so that there is no way to recover mail.
 
-342. $tunnel
+341. $tunnel
 
    Type: string
 
@@ -9890,7 +9892,7 @@ Chapter 7. Reference
    Note: For this example to work you must be able to log in to the remote
    machine without having to enter a password.
 
-343. $umask
+342. $umask
 
    Type: number
 
@@ -9899,7 +9901,7 @@ Chapter 7. Reference
    This sets the umask that will be used by Mutt-ng when creating all kinds
    of files. If unset, the default value is 077.
 
-344. $uncollapse_jump
+343. $uncollapse_jump
 
    Type: boolean
 
@@ -9908,7 +9910,7 @@ Chapter 7. Reference
    When set, Mutt-ng will jump to the next unread message, if any, when the
    current thread is uncollapsed.
 
-345. $use_8bitmime
+344. $use_8bitmime
 
    Type: boolean
 
@@ -9923,7 +9925,7 @@ Chapter 7. Reference
    flag when sending 8-bit messages to enable ESMTP negotiation or tell
    libESMTP to do so.
 
-346. $use_domain
+345. $use_domain
 
    Type: boolean
 
@@ -9933,6 +9935,20 @@ Chapter 7. Reference
    portion) with the value of ``$hostname''. If unset, no addresses will be
    qualified.
 
+346. $use_envelope_from
+
+   Type: boolean
+
+   Default: no
+
+   When set, mutt-ng will use ``$envelope_from_address'' as the envelope
+   sender if that is set, otherwise it will attempt to derive it from the
+   "From:" header.
+
+   Note: This information is passed to sendmail command using the "-f"
+   command line switch and passed to the SMTP server for libESMTP (if support
+   is compiled in).
+
 347. $use_from
 
    Type: boolean
@@ -10105,9 +10121,9 @@ Chapter 7. Reference
 
    Function          Default Key Description
    <bottom-page>     L           move to the bottom of the page
-   <current-bottom>  not bound   move current entry to bottom of page
-   <current-middle>  not bound   move current entry to middle of page
-   <current-top>     not bound   move current entry to top of page
+   <current-bottom>              move current entry to bottom of page
+   <current-middle>              move current entry to middle of page
+   <current-top>                 move current entry to top of page
    <enter-command>   :           enter a muttngrc command
    <exit>            q           exit this menu
    <first-entry>     =           move to the first entry
@@ -10121,20 +10137,20 @@ Chapter 7. Reference
    <next-line>       >           scroll down one line
    <next-page>       z           move to the next page
    <previous-entry>  k           move to the previous entry
-   <previous-line>   <           scroll up one line
+   <previous-line>   >           scroll up one line
    <previous-page>   Z           move to the previous page
-   <refresh>         ^L          clear and redraw the screen
+   <refresh>         C-L         clear and redraw the screen
    <search>          /           search for a regular expression
    <search-next>     n           search for next match
-   <search-opposite> not bound   search for next match in opposite direction
-   <search-reverse>  ESC /       search backwards for a regular expression
-   <select-entry>    RET         select the current entry
+   <search-opposite>             search for next match in opposite direction
+   <search-reverse>  E-/         search backwards for a regular expression
+   <select-entry>    Return      select the current entry
    <shell-escape>    !           run a program in a subshell
    <tag-entry>       t           toggle the tag on the current entry
    <tag-prefix>      ;           apply next command to tagged entries
-   <tag-prefix-cond> not bound   apply next function ONLY to tagged messages
+   <tag-prefix-cond>             apply next function ONLY to tagged messages
    <top-page>        H           move to the top of the page
-   <what-key>        not bound   display the keycode for a key press
+   <what-key>                    display the keycode for a key press
 
   5.2. index
 
@@ -10143,79 +10159,79 @@ Chapter 7. Reference
    Function                   Default Key Description
    <bounce-message>           b           remail a message to another user
    <change-folder>            c           open a different folder
-   <change-folder-readonly>   ESC c       open a different folder in read
+   <change-folder-readonly>   E-c         open a different folder in read
                                           only mode
-   <check-traditional-pgp>    ESC P       check for classic pgp
+   <check-traditional-pgp>    E-P         check for classic pgp
    <clear-flag>               W           clear a status flag from a message
    <copy-message>             C           copy a message to a file/mailbox
    <create-alias>             a           create an alias from a message
                                           sender
-   <decode-copy>              ESC C       decode a message and copy it to a
+   <decode-copy>              E-C         decode a message and copy it to a
                                           file/mailbox
-   <decode-save>              ESC s       decode a message and save it to a
+   <decode-save>              E-s         decode a message and save it to a
                                           file/mailbox
    <delete-message>           d           delete the current entry
    <delete-pattern>           D           delete messages matching a pattern
-   <delete-subthread>         ESC d       delete all messages in subthread
-   <delete-thread>            ^D          delete all messages in thread
+   <delete-subthread>         E-d         delete all messages in subthread
+   <delete-thread>            C-D         delete all messages in thread
    <display-address>          @           display full address of sender
    <display-toggle-weed>      h           display message and toggle header
                                           weeding
-   <display-message>          RET         display a message
+   <display-message>          Return      display a message
    <edit>                     e           edit the current message
-   <edit-type>                ^E          edit the current message's
+   <edit-type>                C-E         edit the current message's
                                           Content-Type
    <exit>                     x           exit without saving changes
-   <extract-keys>             ^K          extract PGP public keys
+   <extract-keys>             C-K         extract PGP public keys
    <fetch-mail>               G           retrieve mail from POP server
    <flag-message>             F           toggle a message's 'important' flag
-   <forget-passphrase>        ^F          wipe PGP passphrase from memory
+   <forget-passphrase>        C-F         wipe PGP passphrase from memory
    <forward-message>          f           forward a message with comments
    <group-reply>              g           reply to all recipients
    <limit>                    l           show only messages matching a
                                           pattern
    <list-reply>               L           reply to specified mailing list
    <mail>                     m           compose a new mail message
-   <mail-key>                 ESC k       mail a PGP public key
-   <next-new>                 not bound   jump to the next new message
-   <next-new-then-unread>     TAB         jump to the next new or unread
+   <mail-key>                 E-k         mail a PGP public key
+   <next-new>                             jump to the next new message
+   <next-new-then-unread>     Tab         jump to the next new or unread
                                           message
-   <next-subthread>           ESC n       jump to the next subthread
-   <next-thread>              ^N          jump to the next thread
+   <next-subthread>           E-n         jump to the next subthread
+   <next-thread>              C-N         jump to the next thread
    <next-undeleted>           j           move to the next undeleted message
-   <next-unread>              not bound   jump to the next unread message
+   <next-unread>                          jump to the next unread message
    <parent-message>           P           jump to parent message in thread
    <pipe-message>             |           pipe message/attachment to a shell
                                           command
-   <previous-new>             not bound   jump to the previous new message
-   <previous-new-then-unread> ESC TAB     jump to the previous new or unread
+   <previous-new>                         jump to the previous new message
+   <previous-new-then-unread> E-Tab       jump to the previous new or unread
                                           message
    <previous-page>            Z           move to the previous page
-   <previous-subthread>       ESC p       jump to previous subthread
-   <previous-thread>          ^P          jump to previous thread
+   <previous-subthread>       E-p         jump to previous subthread
+   <previous-thread>          C-P         jump to previous thread
    <previous-undeleted>       k           move to the last undelete message
-   <previous-unread>          not bound   jump to the previous unread message
+   <previous-unread>                      jump to the previous unread message
    <print-message>            p           print the current entry
    <query>                    Q           query external program for
                                           addresses
    <quit>                     q           save changes to mailbox and quit
-   <read-subthread>           ESC r       mark the current subthread as read
-   <read-thread>              ^R          mark the current thread as read
+   <read-subthread>           E-r         mark the current subthread as read
+   <read-thread>              C-R         mark the current thread as read
    <recall-message>           R           recall a postponed message
    <reply>                    r           reply to a message
-   <resend-message>           ESC e       resend message and preserve MIME
+   <resend-message>           E-e         resend message and preserve MIME
                                           structure
    <save-message>             s           save message/attachment to a file
    <set-flag>                 w           set a status flag on a message
    <show-version>             V           show the Mutt-ng version number and
                                           date
-   <show-limit>               ESC l       show currently active limit
+   <show-limit>               E-l         show currently active limit
                                           pattern, if any
    <sort-mailbox>             o           sort messages
    <sort-reverse>             O           sort messages in reverse order
    <sync-mailbox>             $           save changes to mailbox
    <tag-pattern>              T           tag messages matching a pattern
-   <tag-thread>               ESC t       tag/untag all messages in the
+   <tag-thread>               E-t         tag/untag all messages in the
                                           current thread
    <toggle-new>               N           toggle a message's 'new' flag
    <toggle-write>             %           toggle whether the mailbox will be
@@ -10223,9 +10239,9 @@ Chapter 7. Reference
    <undelete-message>         u           undelete the current entry
    <undelete-pattern>         U           undelete messages matching a
                                           pattern
-   <undelete-subthread>       ESC u       undelete all messages in subthread
-   <undelete-thread>          ^U          undelete all messages in thread
-   <untag-pattern>            ^T          untag messages matching a pattern
+   <undelete-subthread>       E-u         undelete all messages in subthread
+   <undelete-thread>          C-U         undelete all messages in thread
+   <untag-pattern>            C-T         untag messages matching a pattern
    <view-attachments>         v           show MIME attachments
 
   5.3. pager
@@ -10233,77 +10249,77 @@ Chapter 7. Reference
    Table 7.6. Reference: Default Pager Function Bindings
 
    Function                   Default Key Description
-   <bottom>                   not bound   jump to the bottom of the message
+   <bottom>                               jump to the bottom of the message
    <bounce-message>           b           remail a message to another user
    <change-folder>            c           open a different folder
-   <change-folder-readonly>   ESC c       open a different folder in read
+   <change-folder-readonly>   E-c         open a different folder in read
                                           only mode
-   <check-traditional-pgp>    ESC P       check for classic pgp
+   <check-traditional-pgp>    E-P         check for classic pgp
    <copy-message>             C           copy a message to a file/mailbox
    <create-alias>             a           create an alias from a message
-   <senderdecode-copy>        ESC C       decode a message and copy it to a
+   <senderdecode-copy>        E-C         decode a message and copy it to a
                                           file/mailbox
-   <decode-save>              ESC s       decode a message and save it to a
+   <decode-save>              E-s         decode a message and save it to a
                                           file/mailbox
    <delete-message>           d           delete the current entry
-   <delete-subthread>         ESC d       delete all messages in subthread
-   <delete-thread>            ^D          delete all messages in thread
+   <delete-subthread>         E-d         delete all messages in subthread
+   <delete-thread>            C-D         delete all messages in thread
    <display-address>          @           display full address of sender
    <display-toggle-weed>      h           display message and toggle header
                                           weeding
    <edit>                     e           edit the current message
-   <edit-type>                ^E          edit the current message's
+   <edit-type>                C-E         edit the current message's
                                           Content-Type
    <enter-command>            :           enter a muttngrc command
    <exit>                     i           return to the main-menu
-   <extract-keys>             ^K          extract PGP public keys
+   <extract-keys>             C-K         extract PGP public keys
    <flag-message>             F           toggle a message's 'important' flag
-   <forget-passphrase>        ^F          wipe PGP passphrase from memory
+   <forget-passphrase>        C-F         wipe PGP passphrase from memory
    <forward-message>          f           forward a message with comments
    <group-reply>              g           reply to all recipients
-   <half-up>                  not bound   move up one-half page
-   <half-down>                not bound   move down one-half page
+   <half-up>                              move up one-half page
+   <half-down>                            move down one-half page
    <help>                     ?           this screen
    <list-reply>               L           reply to specified mailing list
    <mail>                     m           compose a new mail message
-   <mail-key>                 ESC k       mail a PGP public key
+   <mail-key>                 E-k         mail a PGP public key
    <mark-as-new>              N           toggle a message's 'new' flag
-   <next-line>                RET         scroll down one line
+   <next-line>                Return      scroll down one line
    <next-entry>               J           move to the next entry
-   <next-new>                 not bound   jump to the next new message
-   <next-new-then-unread>     TAB         jump to the next new or unread
+   <next-new>                             jump to the next new message
+   <next-new-then-unread>     Tab         jump to the next new or unread
                                           message
-   <next-page>                not bound   move to the next page
-   <next-subthread>           ESC n       jump to the next subthread
-   <next-thread>              ^N          jump to the next thread
+   <next-page>                            move to the next page
+   <next-subthread>           E-n         jump to the next subthread
+   <next-thread>              C-N         jump to the next thread
    <next-undeleted>           j           move to the next undeleted message
-   <next-unread>              not bound   jump to the next unread message
+   <next-unread>                          jump to the next unread message
    <parent-message>           P           jump to parent message in thread
    <pipe-message>             |           pipe message/attachment to a shell
                                           command
    <previous-line>            BackSpace   scroll up one line
    <previous-entry>           K           move to the previous entry
-   <previous-new>             not bound   jump to the previous new message
-   <previous-new-then-unread> not bound   jump to the previous new or unread
+   <previous-new>                         jump to the previous new message
+   <previous-new-then-unread>             jump to the previous new or unread
                                           message
    <previous-page>            -           move to the previous page
-   <previous-subthread>       ESC p       jump to previous subthread
-   <previous-thread>          ^P          jump to previous thread
+   <previous-subthread>       E-p         jump to previous subthread
+   <previous-thread>          C-P         jump to previous thread
    <previous-undeleted>       k           move to the last undelete message
-   <previous-unread>          not bound   jump to the previous unread message
+   <previous-unread>                      jump to the previous unread message
    <print-message>            p           print the current entry
    <quit>                     Q           save changes to mailbox and quit
-   <read-subthread>           ESC r       mark the current subthread as read
-   <read-thread>              ^R          mark the current thread as read
+   <read-subthread>           E-r         mark the current subthread as read
+   <read-thread>              C-R         mark the current thread as read
    <recall-message>           R           recall a postponed message
-   <redraw-screen>            ^L          clear and redraw the screen
+   <redraw-screen>            C-L         clear and redraw the screen
    <reply>                    r           reply to a message
    <save-message>             s           save message/attachment to a file
    <search>                   /           search for a regular expression
    <search-next>              n           search for next match
-   <search-opposite>          not bound   search for next match in opposite
+   <search-opposite>                      search for next match in opposite
                                           direction
-   <search-reverse>           ESC /       search backwards for a regular
+   <search-reverse>           E-/         search backwards for a regular
                                           expression
    <search-toggle>            \           toggle search pattern coloring
    <shell-escape>             !           invoke a command in a subshell
@@ -10315,8 +10331,8 @@ Chapter 7. Reference
    <toggle-quoted>            T           toggle display of quoted text
    <top>                      ^           jump to the top of the message
    <undelete-message>         u           undelete the current entry
-   <undelete-subthread>       ESC u       undelete all messages in subthread
-   <undelete-thread>          ^U          undelete all messages in thread
+   <undelete-subthread>       E-u         undelete all messages in subthread
+   <undelete-thread>          C-U         undelete all messages in thread
    <view-attachments>         v           show MIME attachments
 
   5.4. alias
@@ -10326,7 +10342,7 @@ Chapter 7. Reference
    Function         Default Key Description
    <search>         /           search for a regular expression
    <search-next>    n           search for next match
-   <search-reverse> ESC /       search backwards for a regular expression
+   <search-reverse> E-/         search backwards for a regular expression
 
   5.5. query
 
@@ -10339,8 +10355,8 @@ Chapter 7. Reference
    <query-append>    A           append new query results to current results
    <search>          /           search for a regular expression
    <search-next>     n           search for next match
-   <search-opposite> not bound   search for next match in opposite direction
-   <search-reverse>  ESC /       search backwards for a regular expression
+   <search-opposite>             search for next match in opposite direction
+   <search-reverse>  E-/         search backwards for a regular expression
 
   5.6. attach
 
@@ -10352,8 +10368,8 @@ Chapter 7. Reference
    <delete-entry>        d           delete the current entry
    <display-toggle-weed> h           display message and toggle header
                                      weeding
-   <edit-type>           ^E          edit the current entry's Content-Type
-   <extract-keys>        ^K          extract PGP public keys
+   <edit-type>           C-E         edit the current entry's Content-Type
+   <extract-keys>        C-K         extract PGP public keys
    <forward-message>     f           forward a message with comments
    <group-reply>         g           reply to all recipients
    <list-reply>          L           reply to specified mailing list
@@ -10361,11 +10377,11 @@ Chapter 7. Reference
                                      command
    <print-entry>         p           print the current entry
    <reply>               r           reply to a message
-   <resend-message>      ESC e       resend message and preserve MIME
+   <resend-message>      E-e         resend message and preserve MIME
                                      structure
    <save-entry>          s           save message/attachment to a file
    <undelete-entry>      u           undelete the current entry
-   <view-attach>         RET         view attachment using mailcap entry if
+   <view-attach>         Return      view attachment using mailcap entry if
                                      necessary
    <view-mailcap>        m           force viewing of attachment using
                                      mailcap
@@ -10378,7 +10394,7 @@ Chapter 7. Reference
    Function              Default Key Description
    <attach-file>         a           attach a file(s) to this message
    <attach-message>      A           attach message(s) to this message
-   <attach-key>          ESC k       attach a PGP public key
+   <attach-key>          E-k         attach a PGP public key
    <copy-file>           C           save message/attachment to a file
    <detach-file>         D           delete the current entry
    <display-toggle-weed> h           display message and toggle header
@@ -10386,21 +10402,21 @@ Chapter 7. Reference
    <edit-bcc>            b           edit the BCC list
    <edit-cc>             c           edit the CC list
    <edit-description>    d           edit attachment description
-   <edit-encoding>       ^E          edit attachment transfer-encoding
+   <edit-encoding>       C-E         edit attachment transfer-encoding
    <edit-fcc>            f           enter a file to save a copy of this
                                      message in
-   <edit-from>           ESC f       edit the from: field
-   <edit-file>           ^X e        edit the file to be attached
+   <edit-from>           E-f         edit the from: field
+   <edit-file>           C-X e       edit the file to be attached
    <edit-headers>        E           edit the message with headers
    <edit>                e           edit the message
    <edit-mime>           m           edit attachment using mailcap entry
    <edit-reply-to>       r           edit the Reply-To field
    <edit-subject>        s           edit the subject of this message
    <edit-to>             t           edit the TO list
-   <edit-type>           ^T          edit attachment type
+   <edit-type>           C-T         edit attachment type
    <filter-entry>        F           filter attachment through a shell
                                      command
-   <forget-passphrase>   ^F          wipe PGP passphrase from memory
+   <forget-passphrase>   C-F         wipe PGP passphrase from memory
    <ispell>              i           run ispell on the message
    <new-mime>            n           compose new attachment using mailcap
                                      entry
@@ -10413,7 +10429,7 @@ Chapter 7. Reference
    <send-message>        y           send the message
    <toggle-unlink>       u           toggle whether to delete file after
                                      sending it
-   <view-attach>         RET         view attachment using mailcap entry if
+   <view-attach>         Return      view attachment using mailcap entry if
                                      necessary
    <write-fcc>           w           write the message to a folder
 
@@ -10431,17 +10447,17 @@ Chapter 7. Reference
 
    Function            Default Key Description
    <change-dir>        c           change directories
-   <check-new>         TAB         check mailboxes for new mail
+   <check-new>         Tab         check mailboxes for new mail
    <enter-mask>        m           enter a file mask
    <search>            /           search for a regular expression
    <search-next>       n           search for next match
-   <search-reverse>    ESC /       search backwards for a regular expression
+   <search-reverse>    E-/         search backwards for a regular expression
    <select-new>        N           select a new file in this directory
    <sort>              o           sort messages
    <sort-reverse>      O           sort messages in reverse order
-   <toggle-mailboxes>  TAB         toggle whether to browse mailboxes or all
+   <toggle-mailboxes>  Tab         toggle whether to browse mailboxes or all
                                    files
-   <view-file>         SPACE       view file
+   <view-file>         Space       view file
    <subscribe>         s           subscribe to current mailbox (IMAP Only)
    <unsubscribe>       u           unsubscribe to current mailbox (IMAP Only)
    <toggle-subscribed> T           toggle view all/subscribed mailboxes (IMAP
@@ -10461,40 +10477,40 @@ Chapter 7. Reference
 
    Function          Default Key Description
    <backspace>       BackSpace   delete the char in front of the cursor
-   <backward-char>   ^B          move the cursor one character to the left
-   <backward-word>   ESC b       move the cursor to the previous word
-   <bol>             ^A          jump to the beginning of the line
+   <backward-char>   C-B         move the cursor one character to the left
+   <backward-word>   E-b         move the cursor to the previous word
+   <bol>             C-A         jump to the beginning of the line
    <buffy-cycle>     Space       cycle among incoming mailboxes
-   <capitalize-word> ESC c       uppercase the first character in the word
-   <complete>        TAB         complete filename or alias
-   <complete-query>  ^T          complete address with query
-   <delete-char>     ^D          delete the char under the cursor
-   <downcase-word>   ESC l       lowercase all characters in current word
-   <eol>             ^E          jump to the end of the line
-   <forward-char>    ^F          move the cursor one character to the right
-   <forward-word>    ESC f       move the cursor to the next word
-   <history-down>    not bound   scroll down through the history list
-   <history-up>      not bound   scroll up through the history list
-   <kill-eol>        ^K          delete chars from cursor to end of line
-   <kill-eow>        ESC d       delete chars from cursor to end of word
-   <kill-line>       ^U          delete all chars on the line
-   <kill-word>       ^W          delete the word in front of the cursor
-   <quote-char>      ^V          quote the next typed key
-   <transpose-chars> not bound   transpose character under cursor with
+   <capitalize-word> E-c         uppercase the first character in the word
+   <complete>        Tab         complete filename or alias
+   <complete-query>  C-T         complete address with query
+   <delete-char>     C-D         delete the char under the cursor
+   <downcase-word>   E-l         lowercase all characters in current word
+   <eol>             C-E         jump to the end of the line
+   <forward-char>    C-F         move the cursor one character to the right
+   <forward-word>    E-f         move the cursor to the next word
+   <history-down>                scroll down through the history list
+   <history-up>                  scroll up through the history list
+   <kill-eol>        C-K         delete chars from cursor to end of line
+   <kill-eow>        E-d         delete chars from cursor to end of word
+   <kill-line>       C-U         delete all chars on the line
+   <kill-word>       C-W         delete the word in front of the cursor
+   <quote-char>      C-V         quote the next typed key
+   <transpose-chars>             transpose character under cursor with
                                  previous
-   <upcase-word>     ESC u       uppercase all characters in current word
+   <upcase-word>     E-u         uppercase all characters in current word
 
   5.12. sidebar
 
    Table 7.15. Referene: Default Sidebar Function Bindings
 
-   Key  Function              Description
-   none <sidebar-scroll-up>   Scrolls the mailbox list up 1 page
-   none <sidebar-scroll-down> Scrolls the mailbox list down 1 page
-   none <sidebar-next>        Highlights the next mailbox
-   none <sidebar-next-new>    Highlights the next mailbox with new mail
-   none <sidebar-previous>    Highlights the previous mailbox
-   none <sidebar-open>        Opens the currently highlighted mailbox
+   Key Function              Description
+       <sidebar-scroll-up>   Scrolls the mailbox list up 1 page
+       <sidebar-scroll-down> Scrolls the mailbox list down 1 page
+       <sidebar-next>        Highlights the next mailbox
+       <sidebar-next-new>    Highlights the next mailbox with new mail
+       <sidebar-previous>    Highlights the previous mailbox
+       <sidebar-open>        Opens the currently highlighted mailbox
 
 Appendix A. Acknowledgments
 
@@ -10506,7 +10522,8 @@ Appendix A. Acknowledgments
 
      o Vikas Agnihotri <vikasa@writeme.com>
      o Francois Berjon < Francois.Berjon@aar.alcatel-alsthom.fr>
-     o Aric Blumer <aric@fore.com>, John Capo < jc@irbs.com >
+     o Aric Blumer <aric@fore.com>
+     o John Capo <jc@irbs.com>
      o David Champion <dgc@uchicago.edu>
      o Brendan Cully <brendan@kublai.com>
      o Liviu Daia <daia@stoilow.imar.ro>
@@ -10564,8 +10581,8 @@ Appendix A. Acknowledgments
 Appendix B. Hacking Documentation
 
    This manual is written in XML and transformed via a XSLT stylesheet into
-   valid DocBook/XML to be again transformed via a XSLT stylesheet into the
-   final formats.
+   valid DocBook/XML and/or LaTeX to be again transformed via a XSLT
+   stylesheet into the final formats.
 
    This two pass processing is required to keep the file size low and to
    sanitize use, i.e. drastically lower the typing overhead.
@@ -10584,50 +10601,50 @@ Appendix B. Hacking Documentation
 
            References to environment variables. The name parameter must
            contain upper-case letters only without the dollar sign as it'll
-           be added automatically. Auto-indexing under Environment Variables
-           is done.
+           be added automatically. Auto-indexing is done.
 
    <muttng-doc:hook name=""/>
 
            References to hooks. The string -hook will be added automatically
            to the value given in the name parameter. All entries will be
-           auto-indexed under Hooks.
-
-   <muttng-doc:command name=""/>
-
-           References to configuration commands. The name is given via the
-           name parameter and will be auto-indexed under Configuration
-           Commands.
+           auto-indexed.
 
    <muttng-doc:pattern name="" [full="1"]/>
 
            References to patterns. The name parameter must only contain the
            letter/symbol for the pattern as the tilde symbol/equal sign will
-           be added automatically. Auto-indexing is done under Patterns. If
-           the full is given the equal sign as well as tilde will be printed
+           be added automatically. Auto-indexing is done. If the full
+           parameter is given the equal sign as well as tilde will be printed
            for a fully complete reference.
 
-   <muttng-doc:funcdef name="" key=""/>
+   <muttng-doc:key [mod="C|E"]>key</muttng-doc:key>
+
+           Referencing a key.. Because it's somewhat untrivial to always get
+           the right escaping for LaTeX, there's a tag for it. The optional
+           modifiers C or E stand for Control and Escape respectively. To
+           still allow escaping, the actual key sequences must be given
+           within the tag.
+
+   <muttng-doc:funcdef name=""/>
 
            Defining a command.. It's used to define a command with the name
-           given in the name parameter and a default key binding given via
-           key. The string will be automatically enclosed in <>.
-           Auto-indexing is done under Functions. Also an anchor with id
-           func-[name] will be added with [name] being the value of the name
-           parameter.
+           given in the name parameter. The default key binding must be given
+           via <muttng-doc:key/> (see above). The string will be
+           automatically enclosed in <>. Auto-indexing is done. Also an
+           anchor with id func-[name] will be added with [name] being the
+           value of the name parameter.
 
    <muttng-doc:funcref name=""/>
 
            References to functions.. This is practically the same as the
            above except that there's no anchor defined.
 
-   <muttng-doc:vardef name="" id=""/>
+   <muttng-doc:vardef name=""/>
 
            Defining a variable. This is to be used by makedoc only to define
            a command with a given name and XML-normalized link given via id.
-           Auto-indexing is done under Configuration Variables. The name
-           parameter's value will be prefixed with a dollar sign as for
-           environment variables.
+           Auto-indexing is done. The name parameter's value will be prefixed
+           with a dollar sign as for environment variables.
 
    <muttng-doc:varref name=""/>
 
@@ -10646,1456 +10663,1611 @@ Appendix B. Hacking Documentation
 
            References to RfC documents. Use this to produce links to RfC
            document with number given as the num parameter. A link to
-           <http://www.faqs.org/> will be made. Auto-indexing is not done
-           yet.
+           <http://www.faqs.org/> will be made. Auto-indexing is done under
+           RfC.
+
+   <muttng-doc:cmddef name="" [noanchor="1"]/>
+
+           Defining a configuration command. The name of the command is given
+           as the name parameter. In case a single command has multiple
+           possible calling sequences, specify noanchor="1" for subsequent
+           use. Auto-indexing is done. Specify the arguments within the tag.
+
+   <muttng-doc:cmdref name=""/>
+
+           References to configuration commands. Use this to refer to
+           commands as it builds the proper internal reference name.
+           Auto-indexing is done.
+
+   <muttng-doc:lstconf/>, <muttng-doc:lstmail/>, <muttng-doc:lstshell/>
+
+           Screen layout by context. These are used to specify environments
+           for different types of screen output. For DocBook output, all of
+           these simply map to <screen/>. But as a possible future migration
+           to LaTeX may be ahead, different languages defined for the
+           listings.sty packages may be used to have proper syntax
+           highlighting for these so that there must be a context sensitive
+           distinction.
+
+   <muttng-doc:special [docbook=""] [latex=""]/>
+
+           This is intended for specifying special strings for either
+           DocBook/XML or LaTeX.
+
+   Additional notes follow.
+
+     o To not fully bloat the XSL stylesheet procuding the LaTeX code, all
+       tables must have an attribute called texstr which is directly passed
+       to longtable.
 
 Index
 
-  C
+  Symbols
+
+   ~$/ =$, Patterns
+
+   ~*/ =*, Patterns
+
+   ~=/ ==, Patterns
+
+   ~A/ =A, Patterns
+
+   ~b/ =b, Complex Patterns, Patterns
+
+   ~B/ =B, Patterns
+
+   ~c/ =c, Patterns
+
+   ~C/ =C, Patterns
+
+   ~d/ =d, Patterns and Dates, Patterns
+
+   ~D/ =D, Patterns
+
+   ~E/ =E, Patterns
+
+   ~e/ =e, Patterns
+
+   ~f/ =f, Complex Patterns, Patterns
+
+   ~F/ =F, Patterns
+
+   ~g/ =g, Patterns
+
+   ~G/ =G, Patterns
+
+   ~H/ =H, Spam detection, Patterns
+
+   ~h/ =h, Patterns
+
+   ~i/ =i, Patterns
+
+   ~k/ =k, Patterns
+
+   ~L/ =L, Patterns
+
+   ~l/ =l, Patterns
+
+   ~m/ =m, Patterns
+
+   ~M/ =M, Patterns
+
+   ~n/ =n, Message Scoring, Patterns
+
+   ~N/ =N, Patterns
+
+   ~O/ =O, Patterns
+
+   ~p/ =p, Patterns
+
+   ~P/ =P, Patterns
+
+   ~Q/ =Q, Patterns
+
+   ~R/ =R, Patterns
 
+   ~r/ =r, Patterns
+
+   ~s/ =s, Complex Patterns, Patterns
+
+   ~S/ =S, Patterns
+
+   ~T/ =T, Patterns
+
+   ~t/ =t, Patterns
+
+   ~U/ =U, Complex Patterns, Patterns
+
+   ~u/ =u, Patterns
+
+   ~v/ =v, Patterns
+
+   ~V/ =V, Patterns
+
+   ~w/ =w, Patterns
+
+   ~x/ =x, Complex Patterns, Patterns
+
+   ~y/ =y, Handling Mailing Lists, Patterns
+
+   ~z/ =z, Patterns
+
+  A
+
+   $abort_noattach , $abort_noattach
+
+   $abort_nosubject , $abort_nosubject
+
+   $abort_unmodified , $abort_unmodified
+
+   account-hook, Managing multiple IMAP/POP/NNTP accounts (OPTIONAL),
    Configuration Commands
 
-                alias, Miscellaneous Functions, Defining/Using aliases,
-                Configuration Commands
+   $agent_string , Configuration variables
 
-                alternates, Alternative addresses, Configuration Commands
+   $agent_string , $agent_string
 
-                alternative_order, Configuration Commands
+   alias, Miscellaneous Functions, Defining/Using aliases, Configuration
+   Commands
 
-                auto_view, The Pager, Optional Fields, Search Order, MIME
-                Multipart/Alternative, Configuration Commands
+   $alias_file, Miscellaneous Functions, Defining/Using aliases
 
-                bind, Editing Input Fields, Changing the default key
-                bindings, Keyboard macros, Configuration Commands
+   $alias_file , $alias_file
 
-                color, The Pager, Using color and mono video attributes,
-                Configuration Commands
+   $alias_format , $alias_format
 
-                exec, Executing functions, Configuration Commands
+   $allow_8bit , $allow_8bit
 
-                hdr_order, Defining the order of headers when viewing
-                messages, Configuration Commands
+   $allow_ansi , $allow_ansi
 
-                ignore, Miscellaneous Functions, Ignoring (weeding) unwanted
-                message headers, Configuration Commands
+   alternates, Alternative addresses, Configuration Commands
 
-                lists, Miscellaneous Functions, Mailing lists, Handling
-                Mailing Lists, Configuration Commands
+   alternative_order, MIME Multipart/Alternative, Configuration Commands
 
-                macro, Miscellaneous Functions, Keyboard macros, Adding key
-                sequences to the keyboard buffer, Using Tags, Configuration
-                Commands
+   append-hook, Compressed folders Support (OPTIONAL), Append a message to a
+   compressed mailbox, Encrypted folders, Configuration Commands
 
-                mailboxes, Defining mailboxes which receive mail,
-                Configuration Commands
+   $arrow_cursor , $arrow_cursor
 
-                mime_lookup, Configuration Commands
+   $ascii_chars , $ascii_chars
 
-                mono, Using color and mono video attributes, Configuration
-                Commands
+   $askbcc , $askbcc
 
-                my_hdr, User defined headers, Configuration Commands
+   $askcc , $askcc
 
-                nospam, Spam detection, Configuration Commands
+   $assumed_charset , $assumed_charset
 
-                push, Adding key sequences to the keyboard buffer, Using
-                Tags, Configuration Commands
+   <attach-file>, Composing new messages, compose
 
-                reset, Setting variables, Configuration Commands
+   <attach-key>, Composing new messages, compose
 
-                score, Message Scoring, Configuration Commands
+   <attach-message>, Composing new messages, compose
 
-                set, Setting variables, Configuration Commands
+   $attach_format , $attach_format
 
-                source, Miscellaneous Functions, Defining/Using aliases,
-                Reading initialization commands from another file,
-                Configuration Commands
+   $attach_remind_regexp , $attach_remind_regexp
 
-                spam, Spam detection, Configuration Commands
+   $attach_sep , $attach_sep
 
-                subscribe, Mailing lists, Configuration Commands
+   $attach_split , $attach_split
 
-                toggle, Setting variables, Configuration Commands
+   $attribution, Change settings based upon message recipients, $attribution
 
-                unalias, Configuration Commands
+   $auto_tag, Using Tags
 
-                unalternates, Alternative addresses, Configuration Commands
+   $autoedit , $autoedit
 
-                unalternative_order, Configuration Commands
+   $auto_tag , $auto_tag
 
-                unauto_view, Configuration Commands
+   auto_view, The Pager, Optional Fields, Search Order, MIME Autoview, MIME
+   Multipart/Alternative, Configuration Commands
 
-                uncolor, Using color and mono video attributes, Configuration
-                Commands
+  B
 
-                unhdr_order, Configuration Commands
+   <backspace>, Editing Input Fields, editor
 
-                unhook, Removing hooks, Configuration Commands
+   <backward-char>, Editing Input Fields, editor
 
-                unignore, Ignoring (weeding) unwanted message headers,
-                Configuration Commands
+   <backward-word>, Editing Input Fields, editor
 
-                unlists, Mailing lists, Configuration Commands
+   $beep , $beep
 
-                unmailboxes, Defining mailboxes which receive mail
+   $beep_new , $beep_new
 
-                unmime_lookup, Configuration Commands
+   bind, Editing Input Fields, Changing the default key bindings, Keyboard
+   macros, Configuration Commands
 
-                unmono, Using color and mono video attributes, Configuration
-                Commands
+   <bol>, Editing Input Fields, editor
 
-                unmy_hdr, User defined headers, Configuration Commands
+   <bottom>, pager
 
-                unscore, Message Scoring, Configuration Commands
+   <bottom-page>, generic
 
-                unset, Setting variables, Configuration Commands
+   <bounce>, Sending Mail, $bounce
 
-                unsubscribe, Mailing lists, Configuration Commands
+   <bounce-message>, index, pager, attach
 
-   Configuration Variables
+   $bounce_delivered , $bounce_delivered
 
-                $abort_noattach , $abort_noattach
+   $braille_friendly , $braille_friendly
 
-                $abort_nosubject , $abort_nosubject
+   <buffy-cycle>, editor
 
-                $abort_unmodified , $abort_unmodified
+  C
 
-                $agent_string , Configuration variables, $agent_string
+   <capitalize-word>, Editing Input Fields, editor
 
-                $alias_file, Miscellaneous Functions, Defining/Using aliases,
-                $alias_file
+   $certificate_file , $certificate_file
 
-                $alias_format , $alias_format
+   <change-dir>, browser
 
-                $allow_8bit , $allow_8bit
+   <change-folder>, index, pager
 
-                $allow_ansi , $allow_ansi
+   <change-folder-readonly>, index, pager
 
-                $arrow_cursor , $arrow_cursor
+   $charset , $charset
 
-                $ascii_chars , $ascii_chars
+   charset-hook, Defining aliases for character sets, Configuration Commands
 
-                $askbcc , $askbcc
+   <check-new>, browser
 
-                $askcc , $askcc
+   <check-traditional-pgp>, Miscellaneous Functions, index, pager
 
-                $assumed_charset , $assumed_charset
+   $check_new , $check_new
 
-                $attach_format , $attach_format
+   <clear-flag>, index
 
-                $attach_remind_regexp , $attach_remind_regexp
+   close-hook, Compressed folders Support (OPTIONAL), Write a compressed
+   mailbox, Append a message to a compressed mailbox, Configuration Commands
 
-                $attach_sep , $attach_sep
+   <collapse-all>, Threaded Mode
 
-                $attach_split , $attach_split
+   <collapse-parts>, attach
 
-                $attribution, Change settings based upon message recipients,
-                $attribution
+   <collapse-thread>, Threaded Mode
 
-                $autoedit , $autoedit
+   $collapse_unread , $collapse_unread
 
-                $auto_tag, Using Tags, $auto_tag
+   color, The Pager, Using color and mono video attributes, Configuration
+   Commands
 
-                $beep , $beep
+   $COLORFGBG, Using color and mono video attributes
 
-                $beep_new , $beep_new
+   <complete>, Editing Input Fields, editor
 
-                $bounce , $bounce
+   <complete-query>, Editing Input Fields, editor
 
-                $bounce_delivered , $bounce_delivered
+   <compose>, Sending Mail
 
-                $braille_friendly , $braille_friendly
+   $compose_format , $compose_format
 
-                $certificate_file , $certificate_file
+   $config_charset , $config_charset
 
-                $charset , $charset
+   $confirmappend , $confirmappend
 
-                $check_new , $check_new
+   $confirmcreate , $confirmcreate
 
-                $collapse_unread , $collapse_unread
+   $connect_timeout , $connect_timeout
 
-                $compose_format , $compose_format
+   $content_type , $content_type
 
-                $config_charset , $config_charset
+   $copy , $copy
 
-                $confirmappend , $confirmappend
+   <copy-file>, compose
 
-                $confirmcreate , $confirmcreate
+   <copy-message>, index, pager
 
-                $connect_timeout , $connect_timeout
+   <create-alias>, Miscellaneous Functions, Defining/Using aliases, index,
+   pager, query
 
-                $content_type , $content_type
+   $crypt_autoencrypt , Configuration variables
 
-                $copy , $copy
+   $crypt_autosign , Configuration variables
 
-                $crypt_autoencrypt , Configuration variables,
-                $crypt_autoencrypt
+   crypt-hook, Choosing the cryptographic key of the recipient, Configuration
+   Commands
 
-                $crypt_autopgp , $crypt_autopgp
+   $crypt_replyencrypt , Configuration variables
 
-                $crypt_autosign , Configuration variables, $crypt_autosign
+   $crypt_replysign , Configuration variables
 
-                $crypt_autosmime , $crypt_autosmime
+   $crypt_replysignencrypted , Configuration variables
 
-                $crypt_replyencrypt , Configuration variables,
-                $crypt_replyencrypt
+   $crypt_verify_sig , Configuration variables
 
-                $crypt_replysign , Configuration variables, $crypt_replysign
+   $crypt_autoencrypt , $crypt_autoencrypt
 
-                $crypt_replysignencrypted , Configuration variables,
-                $crypt_replysignencrypted
+   $crypt_autopgp , $crypt_autopgp
 
-                $crypt_timestamp , $crypt_timestamp
+   $crypt_autosign , $crypt_autosign
 
-                $crypt_use_gpgme , $crypt_use_gpgme
+   $crypt_autosmime , $crypt_autosmime
 
-                $crypt_verify_sig , Configuration variables,
-                $crypt_verify_sig
+   $crypt_replyencrypt , $crypt_replyencrypt
 
-                $date_format , $date_format
+   $crypt_replysign , $crypt_replysign
 
-                $debug_level , $debug_level
+   $crypt_replysignencrypted , $crypt_replysignencrypted
 
-                $default_hook , $default_hook
+   $crypt_timestamp , $crypt_timestamp
 
-                $delete , $delete
+   $crypt_use_gpgme , $crypt_use_gpgme
 
-                $delete_space, Additional Notes, $delete_space
+   $crypt_verify_sig , $crypt_verify_sig
 
-                $delete_untag , $delete_untag
+   <current-bottom>, generic
 
-                $digest_collapse , $digest_collapse
+   <current-middle>, generic
 
-                $display_filter , $display_filter
+   <current-top>, generic
 
-                $dotlock_program , $dotlock_program
+  D
 
-                $dsn_notify, Delivery Status Notification (DSN) Support,
-                $dsn_notify
+   $date_format , $date_format
 
-                $dsn_return, Delivery Status Notification (DSN) Support,
-                $dsn_return
+   $debug_level , $debug_level
 
-                $duplicate_threads , $duplicate_threads
+   <decode-copy>, index
 
-                $editor , $editor
+   <decode-save>, index, pager
 
-                $editor_headers, Editing the message header, Defining/Using
-                aliases, $editor_headers
+   default-hook, Message Matching in Hooks
 
-                $edit_headers, Editing the message header, User defined
-                headers, mailto:-style links, Configuration variables,
-                $edit_headers
+   $default_hook , $default_hook
 
-                $encode_from , $encode_from
+   $delete , $delete
 
-                $entropy_file , $entropy_file
+   <delete-char>, Editing Input Fields, editor
 
-                $envelope_from , $envelope_from
+   <delete-entry>, attach, postpone
 
-                $escape , $escape
+   <delete-message>, index, pager
 
-                $fast_reply , $fast_reply
+   <delete-pattern>, index
 
-                $fcc_attach , $fcc_attach
+   $delete_space, Additional Notes
 
-                $fcc_clear , $fcc_clear
+   <delete-subthread>, Threaded Mode, index, pager
 
-                $file_charset , $file_charset
+   <delete-thread>, Threaded Mode, index, pager
 
-                $folder, Configuration Variables, Defining mailboxes which
-                receive mail, Mailbox Shortcuts, $folder
+   $delete_space , $delete_space
 
-                $folder_format , $folder_format
+   $delete_untag , $delete_untag
 
-                $followup_to, Mailing lists, Handling Mailing Lists,
-                $followup_to
+   <detach-file>, Composing new messages, compose
 
-                $force_buffy_check , $force_buffy_check
+   $digest_collapse , $digest_collapse
 
-                $force_name , $force_name
+   <display-address>, index, pager
 
-                $forward_decode , Configuration variables, $forward_decode
+   <display-message>, index
 
-                $forward_decrypt , Configuration variables, $forward_decrypt
+   <display-toggle-weed>, Miscellaneous Functions, index, pager, attach,
+   compose
 
-                $forward_edit , $forward_edit
+   $display_filter , $display_filter
 
-                $forward_format , Configuration variables, $forward_format
+   $dotlock_program , $dotlock_program
 
-                $forward_quote , Configuration variables, $forward_quote
+   <downcase-word>, Editing Input Fields, editor
 
-                $from , $from
+   $dsn_notify, Delivery Status Notification (DSN) Support
 
-                $gecos_mask , $gecos_mask
+   $dsn_return, Delivery Status Notification (DSN) Support
 
-                $hdrs , $hdrs
+   $dsn_notify , $dsn_notify
 
-                $header , $header
+   $dsn_return , $dsn_return
 
-                $header_cache , $header_cache
+   $duplicate_threads , $duplicate_threads
 
-                $header_cache_compress , $header_cache_compress
+  E
 
-                $help , $help
+   <edit>, Miscellaneous Functions, index, pager, compose
 
-                $hidden_host , $hidden_host
+   <edit-bcc>, Composing new messages, compose
 
-                $hide_limited , $hide_limited
+   <edit-cc>, Composing new messages, compose
 
-                $hide_missing , $hide_missing
+   <edit-description>, Composing new messages, compose
 
-                $hide_thread_subject , $hide_thread_subject
+   <edit-encoding>, compose
 
-                $hide_top_limited , $hide_top_limited
+   <edit-fcc>, Composing new messages, compose
 
-                $hide_top_missing , $hide_top_missing
+   <edit-file>, compose
 
-                $history , $history
+   <edit-from>, Composing new messages, compose
 
-                $honor_followup_to, Miscellaneous Functions, Handling Mailing
-                Lists, $honor_followup_to
+   $edit_headers, Editing the message header, User defined headers,
+   mailto:-style links, Configuration variables, compose
 
-                $hostname , $hostname
+   <edit-mime>, compose
 
-                $ignore_list_reply_to , $ignore_list_reply_to
+   <edit-reply-to>, Composing new messages, compose
 
-                $imap_authenticators, Authentication, $imap_authenticators
+   <edit-subject>, Composing new messages, compose
 
-                $imap_check_subscribed , $imap_check_subscribed
+   <edit-to>, Composing new messages, compose
 
-                $imap_delim_chars , $imap_delim_chars
+   <edit-type>, Miscellaneous Functions, index, pager, attach, compose
 
-                $imap_headers , $imap_headers
+   $EDITOR, Manual Conventions, Composing new messages
 
-                $imap_home_namespace, Configuration Variables,
-                $imap_home_namespace
+   $editor , $editor
 
-                $imap_keepalive , $imap_keepalive
+   $editor_headers, Editing the message header, Defining/Using aliases
 
-                $imap_list_subscribed, IMAP Support (OPTIONAL),
-                $imap_list_subscribed
+   $editor_headers , $editor_headers
 
-                $imap_login , $imap_login
+   $edit_headers , $edit_headers
 
-                $imap_mail_check, Conditional parts, IMAP Support (OPTIONAL),
-                $imap_mail_check
+   $encode_from , $encode_from
 
-                $imap_pass, Authentication, $imap_pass
+   <enter-command>, Miscellaneous Functions, generic, pager
 
-                $imap_passive , $imap_passive
+   <enter-mask>, browser
 
-                $imap_peek , $imap_peek
+   $entropy_file , $entropy_file
 
-                $imap_reconnect , $imap_reconnect
+   $envelope_from_address, $envelope_from_address
 
-                $imap_servernoise , $imap_servernoise
+   <eol>, Editing Input Fields, editor
 
-                $imap_user, Authentication, $imap_user
+   $escape , $escape
 
-                $implicit_autoview , $implicit_autoview
+   exec, Executing functions, Configuration Commands
 
-                $include , $include
+   <exit>, generic, index, pager
 
-                $include_onlyfirst , $include_onlyfirst
+   <extract-keys>, Miscellaneous Functions, index, pager, attach
 
-                $indent_string , Configuration variables, $indent_string
+  F
 
-                $index_format, Threaded Mode, Spam detection, Handling
-                Mailing Lists, Configuration variables, $index_format
+   $fast_reply , $fast_reply
 
-                $ispell , $ispell
+   fcc-hook, Specify default Fcc: mailbox when composing, Specify default
+   save filename and default Fcc: mailbox at once, Using Hooks, Message
+   Matching in Hooks, Configuration Commands
 
-                $keep_flagged , $keep_flagged
+   fcc-save-hook, Specify default save filename, Specify default Fcc: mailbox
+   when composing, Specify default save filename and default Fcc: mailbox at
+   once, Using Hooks, Configuration Commands
 
-                $list_reply , $list_reply
+   $fcc_attach , $fcc_attach
 
-                $locale, Change settings based upon message recipients,
-                $locale
+   $fcc_clear , $fcc_clear
 
-                $mailcap_path, mailcap, $mailcap_path
+   <fetch-mail>, index
 
-                $mailcap_sanitize, Secure use of mailcap, mailcap,
-                $mailcap_sanitize
+   $file_charset , $file_charset
 
-                $maildir_header_cache_verify , $maildir_header_cache_verify
+   <filter-entry>, compose
 
-                $maildir_trash , $maildir_trash
+   <first-entry>, Moving Around in Menus, generic
 
-                $mail_check , $mail_check
+   <flag-message>, index, pager
 
-                $markers , $markers
+   $folder, Configuration Variables, Defining mailboxes which receive mail,
+   Mailbox Shortcuts, $folder
 
-                $mark_old , $mark_old
+   folder-hook, Setting variables based upon mailbox, Spam detection, Using
+   Hooks, Managing multiple IMAP/POP/NNTP accounts (OPTIONAL), Configuration
+   Commands
 
-                $mask , $mask
+   $folder_format , $folder_format
 
-                $max_display_recips , $max_display_recips
+   $followup_to, Mailing lists, Handling Mailing Lists
 
-                $max_line_length , $max_line_length
+   $followup_to , $followup_to
 
-                $mbox, Mailbox Shortcuts, $mbox
+   $force_buffy_check , $force_buffy_check
 
-                $mbox_type, Mailbox Formats, Append a message to a compressed
-                mailbox, $mbox_type
+   $force_name , $force_name
 
-                $menu_context , $menu_context
+   <forget-passphrase>, Miscellaneous Functions, Composing new messages,
+   index, pager, compose
 
-                $menu_move_off , $menu_move_off
+   <forward>, Sending Mail
 
-                $menu_scroll , $menu_scroll
+   <forward-char>, Editing Input Fields, editor
 
-                $message_format , Configuration variables, $message_format
+   $forward_decode , Configuration variables
 
-                $meta_key , $meta_key
+   $forward_decrypt , Configuration variables
 
-                $metoo , $metoo
+   $forward_format , Configuration variables
 
-                $mh_purge , $mh_purge
+   <forward-message>, index, pager, attach
 
-                $mh_seq_flagged , $mh_seq_flagged
+   $forward_quote , Configuration variables
 
-                $mh_seq_replied , $mh_seq_replied
+   <forward-word>, Editing Input Fields, editor
 
-                $mh_seq_unseen , $mh_seq_unseen
+   $forward_decode , $forward_decode
 
-                $mime_forward , Configuration variables, $mime_forward
+   $forward_decrypt , $forward_decrypt
 
-                $mime_forward_decode , $mime_forward_decode
+   $forward_edit , $forward_edit
 
-                $mime_forward_rest , $mime_forward_rest
+   $forward_format , $forward_format
 
-                $mixmaster , $mixmaster
+   $forward_quote , $forward_quote
 
-                $mix_entry_format, Sending anonymous messages via mixmaster,
-                $mix_entry_format
+   $from , $from
 
-                $move , $move
+  G
 
-                $msgid_format, Message-ID: headers, $msgid_format
+   $gecos_mask , $gecos_mask
 
-                $muttng_bindir , $muttng_bindir
+   <group-reply>, Sending Mail, index, pager, attach
 
-                $muttng_docdir , $muttng_docdir
+  H
 
-                $muttng_folder_name , $muttng_folder_name
+   <half-down>, generic, pager
 
-                $muttng_folder_path , $muttng_folder_path
+   <half-up>, generic, pager
 
-                $muttng_hcache_backend , $muttng_hcache_backend
+   $hdrs , $hdrs
 
-                $muttng_pwd , $muttng_pwd
+   hdr_order, Defining the order of headers when viewing messages,
+   Configuration Commands
 
-                $muttng_revision , $muttng_revision
+   $header , $header
 
-                $muttng_sysconfdir , $muttng_sysconfdir
+   $header_cache , $header_cache
 
-                $muttng_version , $muttng_version
+   $header_cache_compress , $header_cache_compress
 
-                $narrow_tree , $narrow_tree
+   <help>, Moving Around in Menus, $help, generic, pager
 
-                $net_inc , $net_inc
+   $hidden_host , $hidden_host
 
-                $nntp_ask_followup_to , Configuration variables,
-                $nntp_ask_followup_to
+   $hide_limited , $hide_limited
 
-                $nntp_ask_x_comment_to , Configuration variables,
-                $nntp_ask_x_comment_to
+   $hide_missing , $hide_missing
 
-                $nntp_cache_dir , Configuration variables, $nntp_cache_dir
+   $hide_thread_subject , $hide_thread_subject
 
-                $nntp_catchup , Configuration variables, $nntp_catchup
+   $hide_top_limited , $hide_top_limited
 
-                $nntp_context , $nntp_context
+   $hide_top_missing , $hide_top_missing
 
-                $nntp_followup_to_poster , Configuration variables,
-                $nntp_followup_to_poster
+   $history , $history
 
-                $nntp_group_index_format , Configuration variables,
-                $nntp_group_index_format
+   <history-down>, Editing Input Fields, editor
 
-                $nntp_host , Configuration variables, $nntp_host
+   <history-up>, Editing Input Fields, editor
 
-                $nntp_inews , Configuration variables, $nntp_inews
+   $HOME, MIME Type configuration with mime.types, MIME Viewer configuration
+   with mailcap
 
-                $nntp_load_description , $nntp_load_description
+   $honor_followup_to, Miscellaneous Functions, Handling Mailing Lists
 
-                $nntp_mail_check , Configuration variables, $nntp_mail_check
+   $honor_followup_to , $honor_followup_to
 
-                $nntp_mime_subject , Configuration variables,
-                $nntp_mime_subject
+   $HOSTNAME, Environment Variables
 
-                $nntp_newsrc, NNTP Support (OPTIONAL), Configuration
-                variables, $nntp_newsrc
+   $hostname , $hostname
 
-                $nntp_pass , $nntp_pass
+  I
 
-                $nntp_post_moderated , Configuration variables,
-                $nntp_post_moderated
+   iconv-hook, Defining aliases for character sets
 
-                $nntp_reconnect , $nntp_reconnect
+   ignore, Miscellaneous Functions, Ignoring (weeding) unwanted message
+   headers, Configuration Commands
 
-                $nntp_save_unsubscribed , Configuration variables,
-                $nntp_save_unsubscribed
+   $ignore_list_reply_to , $ignore_list_reply_to
 
-                $nntp_show_new_news , Configuration variables,
-                $nntp_show_new_news
+   $imap_authenticators, Authentication
 
-                $nntp_show_only_unread , Configuration variables,
-                $nntp_show_only_unread
+   $imap_home_namespace, Configuration Variables
 
-                $nntp_user , $nntp_user
+   $imap_list_subscribed, IMAP Support (OPTIONAL)
 
-                $nntp_x_comment_to , Configuration variables,
-                $nntp_x_comment_to
+   $imap_mail_check, Manual Conventions, Conditional parts, IMAP Support
+   (OPTIONAL)
 
-                $operating_system , $operating_system
+   $imap_pass, Authentication
 
-                $pager , $pager
+   $imap_user, Authentication
 
-                $pager_context , $pager_context
+   $imap_authenticators , $imap_authenticators
 
-                $pager_format , $pager_format
+   $imap_check_subscribed , $imap_check_subscribed
 
-                $pager_index_lines, Conditional parts, $pager_index_lines
+   $imap_delim_chars , $imap_delim_chars
 
-                $pager_stop , $pager_stop
+   $imap_headers , $imap_headers
 
-                $pgp_autoinline , Configuration variables, $pgp_autoinline
+   $imap_home_namespace , $imap_home_namespace
 
-                $pgp_auto_decode , $pgp_auto_decode
+   $imap_keepalive , $imap_keepalive
 
-                $pgp_check_exit , $pgp_check_exit
+   $imap_list_subscribed , $imap_list_subscribed
 
-                $pgp_clearsign_command , $pgp_clearsign_command
+   $imap_login , $imap_login
 
-                $pgp_decode_command , $pgp_decode_command
+   $imap_mail_check , $imap_mail_check
 
-                $pgp_decrypt_command , $pgp_decrypt_command
+   $imap_pass , $imap_pass
 
-                $pgp_encrypt_only_command , $pgp_encrypt_only_command
+   $imap_passive , $imap_passive
 
-                $pgp_encrypt_sign_command , $pgp_encrypt_sign_command
+   $imap_peek , $imap_peek
 
-                $pgp_entry_format, Using Mutt-ng with PGP, $pgp_entry_format
+   $imap_reconnect , $imap_reconnect
 
-                $pgp_export_command , $pgp_export_command
+   $imap_servernoise , $imap_servernoise
 
-                $pgp_getkeys_command , $pgp_getkeys_command
+   $imap_user , $imap_user
 
-                $pgp_good_sign , $pgp_good_sign
+   $implicit_autoview , $implicit_autoview
 
-                $pgp_ignore_subkeys , $pgp_ignore_subkeys
+   $include , $include
 
-                $pgp_import_command , $pgp_import_command
+   $include_onlyfirst , $include_onlyfirst
 
-                $pgp_list_pubring_command , $pgp_list_pubring_command
+   $indent_string , Configuration variables
 
-                $pgp_list_secring_command , $pgp_list_secring_command
+   $indent_string , $indent_string
 
-                $pgp_long_ids , $pgp_long_ids
+   $index_format, Threaded Mode, Spam detection, Handling Mailing Lists,
+   Configuration variables
 
-                $pgp_mime_auto , $pgp_mime_auto
+   $index_format , $index_format
 
-                $pgp_replyinline , Configuration variables, $pgp_replyinline
+   <ispell>, Composing new messages, $ispell, compose
 
-                $pgp_retainable_sigs , $pgp_retainable_sigs
+  J
 
-                $pgp_show_unusable , $pgp_show_unusable
+   <jump>, generic
 
-                $pgp_sign_as, Using Mutt-ng with PGP, $pgp_sign_as
+  K
 
-                $pgp_sign_command , $pgp_sign_command
+   $keep_flagged , $keep_flagged
 
-                $pgp_sort_keys , $pgp_sort_keys
+   <kill-eol>, Editing Input Fields, editor
 
-                $pgp_strict_enc , $pgp_strict_enc
+   <kill-eow>, Editing Input Fields, editor
 
-                $pgp_timeout , $pgp_timeout
+   <kill-line>, Editing Input Fields, editor
 
-                $pgp_use_gpg_agent , $pgp_use_gpg_agent
+   <kill-word>, Editing Input Fields, editor
 
-                $pgp_verify_command , $pgp_verify_command
+  L
 
-                $pgp_verify_key_command , $pgp_verify_key_command
+   <last-entry>, Moving Around in Menus, generic
 
-                $pipe_decode, Miscellaneous Functions, $pipe_decode
+   <limit>, index
 
-                $pipe_sep , $pipe_sep
+   <list-reply>, Miscellaneous Functions, Sending Mail, index, pager, attach
 
-                $pipe_split, Miscellaneous Functions, $pipe_split
+   lists, Miscellaneous Functions, Mailing lists, Handling Mailing Lists,
+   Configuration Commands
 
-                $pop_authenticators , $pop_authenticators
+   $list_reply , $list_reply
 
-                $pop_auth_try_all , $pop_auth_try_all
+   $locale, Change settings based upon message recipients, $locale
 
-                $pop_delete , $pop_delete
+  M
 
-                $pop_host , $pop_host
+   macro, Miscellaneous Functions, Keyboard macros, Adding key sequences to
+   the keyboard buffer, Using Tags, Configuration Commands
 
-                $pop_last , $pop_last
+   <mail>, index, pager, query
 
-                $pop_mail_check, POP3 Support (OPTIONAL), Configuration
-                variables, $pop_mail_check
+   <mail-key>, Sending Mail, index, pager
 
-                $pop_pass , $pop_pass
+   mailboxes, Defining mailboxes which receive mail, Configuration Commands
 
-                $pop_reconnect , $pop_reconnect
+   $mailcap_path, mailcap
 
-                $pop_user , $pop_user
+   $mailcap_sanitize, Secure use of mailcap, mailcap
 
-                $postpone, Postponing Mail, $postpone
+   $mailcap_path , $mailcap_path
 
-                $postponed, Postponing Mail, $postponed
+   $mailcap_sanitize , $mailcap_sanitize
 
-                $post_indent_string , Configuration variables,
-                $post_indent_string
+   $maildir_header_cache_verify , $maildir_header_cache_verify
 
-                $preconnect , $preconnect
+   $maildir_trash , $maildir_trash
 
-                $print , $print
+   $mail_check , $mail_check
 
-                $print_command , Configuration variables, $print_command
+   <mark-as-new>, pager
 
-                $print_decode , $print_decode
+   $markers , $markers
 
-                $print_split , $print_split
+   $mark_old , $mark_old
 
-                $prompt_after , $prompt_after
+   $mask , $mask
 
-                $query_command, External Address Queries, $query_command
+   $max_display_recips , $max_display_recips
 
-                $quit , $quit
+   $max_line_length , $max_line_length
 
-                $quote_empty , $quote_empty
+   $mbox, Mailbox Shortcuts, $mbox
 
-                $quote_quoted , $quote_quoted
+   mbox-hook, Using Multiple spool mailboxes, Using Hooks, Configuration
+   Commands
 
-                $quote_regexp, Miscellaneous Functions, Using color and mono
-                video attributes, $quote_regexp
+   $mbox_type, Mailbox Formats, Append a message to a compressed mailbox
 
-                $read_inc , $read_inc
+   $mbox_type , $mbox_type
 
-                $read_only , $read_only
+   $menu_context , $menu_context
 
-                $realname , $realname
+   $menu_move_off , $menu_move_off
 
-                $recall , $recall
+   $menu_scroll , $menu_scroll
 
-                $record, Environment Variables, Specify default Fcc: mailbox
-                when composing, Mailbox Shortcuts, $record
+   $message_format , Configuration variables
 
-                $reply_regexp , $reply_regexp
+   message-hook, Change settings before formatting a message, Using Hooks,
+   Message Matching in Hooks, MIME Autoview, Configuration Commands
 
-                $reply_self , $reply_self
+   $message_format , $message_format
 
-                $reply_to, Alternative addresses, Handling Mailing Lists,
-                $reply_to
+   $meta_key , $meta_key
 
-                $resolve , $resolve
+   $metoo , $metoo
 
-                $reverse_alias , $reverse_alias
+   $mh_purge , $mh_purge
 
-                $reverse_name , $reverse_name
+   $mh_seq_flagged , $mh_seq_flagged
 
-                $reverse_realname , $reverse_realname
+   $mh_seq_replied , $mh_seq_replied
 
-                $rfc2047_parameters , $rfc2047_parameters
+   $mh_seq_unseen , $mh_seq_unseen
 
-                $save_address , $save_address
+   <middle-page>, generic
 
-                $save_empty, Compressed folders Support (OPTIONAL),
-                $save_empty
+   $mime_forward , Configuration variables
 
-                $save_name , $save_name
+   $mime_forward , $mime_forward
 
-                $score , $score
+   $mime_forward_decode , $mime_forward_decode
 
-                $score_threshold_delete, Message Scoring,
-                $score_threshold_delete
+   $mime_forward_rest , $mime_forward_rest
 
-                $score_threshold_flag, Message Scoring, $score_threshold_flag
+   mime_lookup, MIME Lookup, Configuration Commands
 
-                $score_threshold_read, Message Scoring, $score_threshold_read
+   $mix_entry_format, Sending anonymous messages via mixmaster
 
-                $sendmail, Change settings based upon message recipients,
-                $sendmail
+   $mixmaster , $mixmaster
 
-                $sendmail_wait , $sendmail_wait
+   $mix_entry_format , $mix_entry_format
 
-                $send_charset , $send_charset
+   mono, Using color and mono video attributes, Configuration Commands
 
-                $shell , $shell
+   $move , $move
 
-                $sidebar_boundary , $sidebar_boundary
+   $msgid_format, Message-ID: headers
 
-                $sidebar_delim , $sidebar_delim
+   $msgid_format , $msgid_format
 
-                $sidebar_newmail_only , $sidebar_newmail_only
+   $muttng_bindir , $muttng_bindir
 
-                $sidebar_number_format , $sidebar_number_format
+   $muttng_docdir , $muttng_docdir
 
-                $sidebar_shorten_hierarchy , Configuration variables,
-                $sidebar_shorten_hierarchy
+   $muttng_folder_name , $muttng_folder_name
 
-                $sidebar_visible , $sidebar_visible
+   $muttng_folder_path , $muttng_folder_path
 
-                $sidebar_width , $sidebar_width
+   $muttng_hcache_backend , $muttng_hcache_backend
 
-                $signature, Change settings based upon message recipients,
-                $signature
+   $muttng_pwd , $muttng_pwd
 
-                $signoff_string , $signoff_string
+   $muttng_revision , $muttng_revision
 
-                $sig_dashes , $sig_dashes
+   $muttng_sysconfdir , $muttng_sysconfdir
 
-                $sig_on_top , $sig_on_top
+   $muttng_version , $muttng_version
 
-                $simple_search , $simple_search
+   my_hdr, User defined headers, Configuration Commands
 
-                $sleep_time , $sleep_time
+  N
 
-                $smart_wrap , $smart_wrap
+   $narrow_tree , $narrow_tree
 
-                $smileys , $smileys
+   $net_inc , $net_inc
 
-                $smime_ask_cert_label , $smime_ask_cert_label
+   <new-mime>, compose
 
-                $smime_ca_location , $smime_ca_location
+   <next-entry>, Moving Around in Menus, generic, pager
 
-                $smime_certificates , $smime_certificates
+   <next-line>, generic, pager
 
-                $smime_decrypt_command , $smime_decrypt_command
+   <next-new>, index, pager
 
-                $smime_decrypt_use_default_key ,
-                $smime_decrypt_use_default_key
+   <next-new-then-unread>, index, pager
 
-                $smime_default_key , Configuration variables,
-                $smime_default_key
+   <next-page>, generic, pager
 
-                $smime_encrypt_command , $smime_encrypt_command
+   <next-subthread>, Threaded Mode, index, pager
 
-                $smime_encrypt_with , $smime_encrypt_with
+   <next-thread>, Threaded Mode, index, pager
 
-                $smime_get_cert_command , $smime_get_cert_command
+   <next-undeleted>, index, pager
 
-                $smime_get_cert_email_command , $smime_get_cert_email_command
+   <next-unread>, index, pager
 
-                $smime_get_signer_cert_command ,
-                $smime_get_signer_cert_command
+   $nntp_ask_followup_to , Configuration variables
 
-                $smime_import_cert_command , $smime_import_cert_command
+   $nntp_ask_x_comment_to , Configuration variables
 
-                $smime_is_default , $smime_is_default
+   $nntp_cache_dir , Configuration variables
 
-                $smime_keys , $smime_keys
+   $nntp_catchup , Configuration variables
 
-                $smime_pk7out_command , $smime_pk7out_command
+   $nntp_followup_to_poster , Configuration variables
 
-                $smime_sign_command , $smime_sign_command
+   $nntp_group_index_format , Configuration variables
 
-                $smime_sign_opaque_command , $smime_sign_opaque_command
+   $nntp_host , Configuration variables
 
-                $smime_timeout , $smime_timeout
+   $nntp_inews , Configuration variables
 
-                $smime_verify_command , $smime_verify_command
+   $nntp_mail_check , Configuration variables
 
-                $smime_verify_opaque_command , $smime_verify_opaque_command
+   $nntp_mime_subject , Configuration variables
 
-                $smtp_envelope, SMTP Support (OPTIONAL), $smtp_envelope
+   $nntp_newsrc, NNTP Support (OPTIONAL), Configuration variables
 
-                $smtp_host, SMTP Support (OPTIONAL), $smtp_host
+   $nntp_post_moderated , Configuration variables
 
-                $smtp_pass, SMTP Support (OPTIONAL), Configuration variables,
-                $smtp_pass
+   $nntp_save_unsubscribed , Configuration variables
 
-                $smtp_port , $smtp_port
+   $nntp_show_new_news , Configuration variables
 
-                $smtp_user, SMTP Support (OPTIONAL), Configuration variables,
-                $smtp_user
+   $nntp_show_only_unread , Configuration variables
 
-                $smtp_use_tls, SMTP Support (OPTIONAL), $smtp_use_tls
+   $nntp_x_comment_to , Configuration variables
 
-                $sort , $sort
+   $NNTPSERVER, NNTP Support (OPTIONAL)
 
-                $sort_alias , $sort_alias
+   $nntp_ask_followup_to , $nntp_ask_followup_to
 
-                $sort_aux , $sort_aux
+   $nntp_ask_x_comment_to , $nntp_ask_x_comment_to
 
-                $sort_browser , $sort_browser
+   $nntp_cache_dir , $nntp_cache_dir
 
-                $sort_re , $sort_re
+   $nntp_catchup , $nntp_catchup
 
-                $spam_separator , $spam_separator
+   $nntp_context , $nntp_context
 
-                $spoolfile, Setting variables based upon mailbox, Defining
-                mailboxes which receive mail, Mailbox Shortcuts, POP3 Support
-                (OPTIONAL), $spoolfile
+   $nntp_followup_to_poster , $nntp_followup_to_poster
 
-                $ssl_ca_certificates_file , $ssl_ca_certificates_file
+   $nntp_group_index_format , $nntp_group_index_format
 
-                $ssl_client_cert , $ssl_client_cert
+   $nntp_host , $nntp_host
 
-                $ssl_force_tls , $ssl_force_tls
+   $nntp_inews , $nntp_inews
 
-                $ssl_min_dh_prime_bits , $ssl_min_dh_prime_bits
+   $nntp_load_description , $nntp_load_description
 
-                $ssl_starttls , $ssl_starttls
+   $nntp_mail_check , $nntp_mail_check
 
-                $ssl_usesystemcerts , $ssl_usesystemcerts
+   $nntp_mime_subject , $nntp_mime_subject
 
-                $ssl_use_sslv2 , $ssl_use_sslv2
+   $nntp_newsrc , $nntp_newsrc
 
-                $ssl_use_sslv3 , $ssl_use_sslv3
+   $nntp_pass , $nntp_pass
 
-                $ssl_use_tlsv1 , $ssl_use_tlsv1
+   $nntp_post_moderated , $nntp_post_moderated
 
-                $status_chars , $status_chars
+   $nntp_reconnect , $nntp_reconnect
 
-                $status_format, Composing new messages, Introduction,
-                $status_format
+   $nntp_save_unsubscribed , $nntp_save_unsubscribed
 
-                $status_on_top , $status_on_top
+   $nntp_show_new_news , $nntp_show_new_news
 
-                $strict_mailto, mailto:-style links, $strict_mailto
+   $nntp_show_only_unread , $nntp_show_only_unread
 
-                $strict_mime , $strict_mime
+   $nntp_user , $nntp_user
 
-                $strict_threads, Threaded Mode, $strict_threads
+   $nntp_x_comment_to , $nntp_x_comment_to
 
-                $strip_was , $strip_was
+   nospam, Spam detection, Configuration Commands
 
-                $strip_was_regex , $strip_was_regex
+  O
 
-                $stuff_quoted , $stuff_quoted
+   open-hook, Compressed folders Support (OPTIONAL), Open a compressed
+   mailbox for reading, Write a compressed mailbox, Append a message to a
+   compressed mailbox, Configuration Commands
 
-                $suspend , $suspend
+   $operating_system , $operating_system
 
-                $text_flowed , $text_flowed
+  P
 
-                $thorough_search , $thorough_search
+   <page-down>, Moving Around in Menus
 
-                $thread_received , $thread_received
+   <page-up>, Moving Around in Menus
 
-                $tilde , $tilde
+   $pager , $pager
 
-                $timeout, IMAP Support (OPTIONAL), $timeout
+   $pager_index_lines, Conditional parts
 
-                $tmpdir, Temporary Files, $tmpdir
+   $pager_context , $pager_context
 
-                $to_chars, Status Flags, $to_chars
+   $pager_format , $pager_format
 
-                $trash , $trash
+   $pager_index_lines , $pager_index_lines
 
-                $tunnel , $tunnel
+   $pager_stop , $pager_stop
 
-                $umask, Temporary Files, $umask
+   <parent-message>, Threaded Mode, index, pager
 
-                $uncollapse_jump , $uncollapse_jump
+   pattern-hook, Specify default save filename, Specify default Fcc: mailbox
+   when composing, Change settings based upon message recipients, Change
+   settings before formatting a message
 
-                $use_8bitmime, SMTP Support (OPTIONAL), $use_8bitmime
+   $pgp_autoinline , Configuration variables
 
-                $use_domain , $use_domain
+   $pgp_entry_format, Using Mutt-ng with PGP
 
-                $use_from , $use_from
+   <pgp-menu>, Composing new messages, compose
 
-                $use_idn , $use_idn
+   $pgp_replyinline , Configuration variables
 
-                $use_ipv6 , $use_ipv6
+   $pgp_sign_as, Using Mutt-ng with PGP
 
-                $visual , $visual
+   $pgp_autoinline , $pgp_autoinline
 
-                $wait_key, Miscellaneous Functions, Optional Fields,
-                $wait_key
+   $pgp_auto_decode , $pgp_auto_decode
 
-                $weed, Miscellaneous Functions, $weed
+   $pgp_check_exit , $pgp_check_exit
 
-                $wrapmargin , $wrapmargin
+   $pgp_clearsign_command , $pgp_clearsign_command
 
-                $wrap_search , $wrap_search
+   $pgp_decode_command , $pgp_decode_command
 
-                $write_bcc , $write_bcc
+   $pgp_decrypt_command , $pgp_decrypt_command
 
-                $write_inc , $write_inc
+   $pgp_encrypt_only_command , $pgp_encrypt_only_command
 
-                $xterm_icon , $xterm_icon
+   $pgp_encrypt_sign_command , $pgp_encrypt_sign_command
 
-                $xterm_leave , $xterm_leave
+   $pgp_entry_format , $pgp_entry_format
 
-                $xterm_set_titles , $xterm_set_titles
+   $pgp_export_command , $pgp_export_command
 
-                $xterm_title , $xterm_title
+   $pgp_getkeys_command , $pgp_getkeys_command
 
-  E
+   $pgp_good_sign , $pgp_good_sign
 
-   Environment Variables
+   $pgp_ignore_subkeys , $pgp_ignore_subkeys
 
-                $COLORFGBG, Using color and mono video attributes
+   $pgp_import_command , $pgp_import_command
 
-                $EDITOR, Composing new messages
+   $pgp_list_pubring_command , $pgp_list_pubring_command
 
-                $HOME, MIME Type configuration with mime.types, MIME Viewer
-                configuration with mailcap
+   $pgp_list_secring_command , $pgp_list_secring_command
 
-                $HOSTNAME, Environment Variables
+   $pgp_long_ids , $pgp_long_ids
 
-                $NNTPSERVER, NNTP Support (OPTIONAL)
+   $pgp_mime_auto , $pgp_mime_auto
 
-                $VISUAL, Composing new messages
+   $pgp_replyinline , $pgp_replyinline
 
-  F
+   $pgp_retainable_sigs , $pgp_retainable_sigs
 
-   Functions
+   $pgp_show_unusable , $pgp_show_unusable
 
-                <attach-file>, Composing new messages, compose
+   $pgp_sign_as , $pgp_sign_as
 
-                <attach-key>, Composing new messages, compose
+   $pgp_sign_command , $pgp_sign_command
 
-                <attach-message>, Composing new messages, compose
+   $pgp_sort_keys , $pgp_sort_keys
 
-                <backspace>, Editing Input Fields, editor
+   $pgp_strict_enc , $pgp_strict_enc
 
-                <backward-char>, Editing Input Fields, editor
+   $pgp_timeout , $pgp_timeout
 
-                <backward-word>, Editing Input Fields, editor
+   $pgp_use_gpg_agent , $pgp_use_gpg_agent
 
-                <bol>, Editing Input Fields, editor
+   $pgp_verify_command , $pgp_verify_command
 
-                <bottom-page>, generic
+   $pgp_verify_key_command , $pgp_verify_key_command
 
-                <bottom>, pager
+   $pipe_decode, Miscellaneous Functions
 
-                <bounce-message>, index, pager, attach
+   <pipe-entry>, attach, compose
 
-                <bounce>, Sending Mail
+   <pipe-message>, Miscellaneous Functions, index, pager
 
-                <buffy-cycle>, editor
+   $pipe_split, Miscellaneous Functions
 
-                <capitalize-word>, Editing Input Fields, editor
+   $pipe_decode , $pipe_decode
 
-                <change-dir>, browser
+   $pipe_sep , $pipe_sep
 
-                <change-folder-readonly>, index, pager
+   $pipe_split , $pipe_split
 
-                <change-folder>, index, pager
+   $pop_mail_check, POP3 Support (OPTIONAL), Configuration variables
 
-                <check-new>, browser
+   $pop_authenticators , $pop_authenticators
 
-                <check-traditional-pgp>, Miscellaneous Functions, index,
-                pager
+   $pop_auth_try_all , $pop_auth_try_all
 
-                <clear-flag>, index
+   $pop_delete , $pop_delete
 
-                <collapse-all>, Threaded Mode
+   $pop_host , $pop_host
 
-                <collapse-parts>, attach
+   $pop_last , $pop_last
 
-                <collapse-thread>, Threaded Mode
+   $pop_mail_check , $pop_mail_check
 
-                <complete-query>, Editing Input Fields, editor
+   $pop_pass , $pop_pass
 
-                <complete>, Editing Input Fields, editor
+   $pop_reconnect , $pop_reconnect
 
-                <compose>, Sending Mail
+   $pop_user , $pop_user
 
-                <copy-file>, compose
+   $post_indent_string , Configuration variables
 
-                <copy-message>, index, pager
+   $postpone, Postponing Mail, $postpone
 
-                <create-alias>, Miscellaneous Functions, Defining/Using
-                aliases, index, pager, query
+   <postpone-message>, Composing new messages, compose
 
-                <current-bottom>, generic
+   $postponed, Postponing Mail, $postponed
 
-                <current-middle>, generic
+   $post_indent_string , $post_indent_string
 
-                <current-top>, generic
+   $preconnect , $preconnect
 
-                <decode-copy>, index
+   <previous-entry>, Moving Around in Menus, generic, pager
 
-                <decode-save>, index, pager
+   <previous-line>, generic, pager
 
-                <delete-char>, Editing Input Fields, editor
+   <previous-new>, index, pager
 
-                <delete-entry>, attach, postpone
+   <previous-new-then-unread>, index, pager
 
-                <delete-message>, index, pager
+   <previous-page>, generic, index, pager
 
-                <delete-pattern>, index
+   <previous-subthread>, Threaded Mode, index, pager
 
-                <delete-subthread>, Threaded Mode, index, pager
+   <previous-thread>, Threaded Mode, index, pager
 
-                <delete-thread>, Threaded Mode, index, pager
+   <previous-undeleted>, index, pager
 
-                <detach-file>, Composing new messages, compose
+   <previous-unread>, index, pager
 
-                <display-address>, index, pager
+   $print , $print
 
-                <display-message>, index
+   $print_command , Configuration variables
 
-                <display-toggle-weed>, Miscellaneous Functions, index, pager,
-                attach, compose
+   <print-entry>, attach, compose
 
-                <downcase-word>, Editing Input Fields, editor
+   <print-message>, index, pager
 
-                <edit-bcc>, Composing new messages, compose
+   $print_command , $print_command
 
-                <edit-cc>, Composing new messages, compose
+   $print_decode , $print_decode
 
-                <edit-description>, Composing new messages, compose
+   $print_split , $print_split
 
-                <edit-encoding>, compose
+   $prompt_after , $prompt_after
 
-                <edit-fcc>, Composing new messages, compose
+   push, Adding key sequences to the keyboard buffer, Using Tags,
+   Configuration Commands
 
-                <edit-file>, compose
+  Q
 
-                <edit-from>, Composing new messages, compose
+   <query>, index, query
 
-                <edit-headers>, compose
+   <query-append>, query
 
-                <edit-mime>, compose
+   $query_command, External Address Queries
 
-                <edit-reply-to>, Composing new messages, compose
+   $query_command , $query_command
 
-                <edit-subject>, Composing new messages, compose
+   <quit>, Moving Around in Menus, Composing new messages, $quit, index,
+   pager
 
-                <edit-to>, Composing new messages, compose
+   <quote-char>, Editing Input Fields, editor
 
-                <edit-type>, Miscellaneous Functions, index, pager, attach,
-                compose
+   $quote_regexp, Miscellaneous Functions, Using color and mono video
+   attributes
 
-                <edit>, Miscellaneous Functions, index, pager, compose
+   $quote_empty , $quote_empty
 
-                <enter-command>, Miscellaneous Functions, generic, pager
+   $quote_quoted , $quote_quoted
 
-                <enter-mask>, browser
+   $quote_regexp , $quote_regexp
 
-                <eol>, Editing Input Fields, editor
+  R
 
-                <exit>, generic, index, pager
+   <read-subthread>, Threaded Mode, index, pager
 
-                <extract-keys>, Miscellaneous Functions, index, pager, attach
+   <read-thread>, Threaded Mode, index, pager
 
-                <fetch-mail>, index
+   $read_inc , $read_inc
 
-                <filter-entry>, compose
+   $read_only , $read_only
 
-                <first-entry>, Moving Around in Menus, generic
+   $realname , $realname
 
-                <flag-message>, index, pager
+   $recall , $recall
 
-                <forget-passphrase>, Miscellaneous Functions, Composing new
-                messages, index, pager, compose
+   <recall-message>, index, pager
 
-                <forward-char>, Editing Input Fields, editor
+   $record, Environment Variables, Specify default Fcc: mailbox when
+   composing, Mailbox Shortcuts, $record
 
-                <forward-message>, index, pager, attach
+   <redraw-screen>, pager
 
-                <forward-word>, Editing Input Fields, editor
+   <refresh>, generic
 
-                <forward>, Sending Mail
+   <rename-file>, compose
 
-                <group-reply>, Sending Mail, index, pager, attach
+   <reply>, Sending Mail, index, pager, attach
 
-                <half-down>, generic, pager
+   reply-hook, Change settings based upon message recipients, Configuration
+   Commands
 
-                <half-up>, generic, pager
+   $reply_to, Alternative addresses, Handling Mailing Lists
 
-                <help>, Moving Around in Menus, generic, pager
+   $reply_regexp , $reply_regexp
 
-                <history-down>, Editing Input Fields, editor
+   $reply_self , $reply_self
 
-                <history-up>, Editing Input Fields, editor
+   $reply_to , $reply_to
 
-                <ispell>, Composing new messages, compose
+   <resend-message>, Miscellaneous Functions, The Attachment Menu, index,
+   attach
 
-                <jump>, generic
+   reset, Setting variables, Configuration Commands
 
-                <kill-eol>, Editing Input Fields, editor
+   $resolve , $resolve
 
-                <kill-eow>, Editing Input Fields, editor
+   $reverse_alias , $reverse_alias
 
-                <kill-line>, Editing Input Fields, editor
+   $reverse_name , $reverse_name
 
-                <kill-word>, Editing Input Fields, editor
+   $reverse_realname , $reverse_realname
 
-                <last-entry>, Moving Around in Menus, generic
+   RfC
 
-                <limit>, index
+                1524, MIME Viewer configuration with mailcap, Command
+                Expansion, mailcap
 
-                <list-reply>, Miscellaneous Functions, Sending Mail, index,
-                pager, attach
+                1894, Delivery Status Notification (DSN) Support
 
-                <mail-key>, Sending Mail, index, pager
+                2822, Again: Scoring
 
-                <mail>, index, pager, query
+                3676, Sending
 
-                <mark-as-new>, pager
+                822, User defined headers
 
-                <middle-page>, generic
+   $rfc2047_parameters , $rfc2047_parameters
 
-                <new-mime>, compose
+  S
 
-                <next-entry>, Moving Around in Menus, generic, pager
+   $save_empty, Compressed folders Support (OPTIONAL)
 
-                <next-line>, generic, pager
+   <save-entry>, attach
 
-                <next-new-then-unread>, index, pager
+   save-hook, Specify default save filename, Specify default save filename
+   and default Fcc: mailbox at once, Using Hooks, Message Matching in Hooks,
+   Mailbox Shortcuts, Configuration Commands
 
-                <next-new>, index, pager
+   <save-message>, index, pager
 
-                <next-page>, generic, pager
+   $save_address , $save_address
 
-                <next-subthread>, Threaded Mode, index, pager
+   $save_empty , $save_empty
 
-                <next-thread>, Threaded Mode, index, pager
+   $save_name , $save_name
 
-                <next-undeleted>, index, pager
+   score, Message Scoring, Configuration Commands, $score
 
-                <next-unread>, index, pager
+   $score_threshold_delete, Message Scoring
 
-                <page-down>, Moving Around in Menus
+   $score_threshold_flag, Message Scoring
 
-                <page-up>, Moving Around in Menus
+   $score_threshold_read, Message Scoring
 
-                <parent-message>, Threaded Mode, index, pager
+   $score_threshold_delete , $score_threshold_delete
 
-                <pgp-menu>, Composing new messages, compose
+   $score_threshold_flag , $score_threshold_flag
 
-                <pipe-entry>, attach, compose
+   $score_threshold_read , $score_threshold_read
 
-                <pipe-message>, Miscellaneous Functions, index, pager
+   <search>, generic, pager, alias, query, browser
 
-                <postpone-message>, Composing new messages, compose
+   <search-next>, generic, pager, alias, query, browser
 
-                <previous-entry>, Moving Around in Menus, generic, pager
+   <search-opposite>, generic, pager, query
 
-                <previous-line>, generic, pager
+   <search-reverse>, generic, pager, alias, query, browser
 
-                <previous-new-then-unread>, index, pager
+   <search-toggle>, pager
 
-                <previous-new>, index, pager
+   <select-entry>, generic
 
-                <previous-page>, generic, index, pager
+   <select-new>, browser
 
-                <previous-subthread>, Threaded Mode, index, pager
+   send-hook, Change settings based upon message recipients, Using Hooks,
+   Message Matching in Hooks, Configuration Commands
 
-                <previous-thread>, Threaded Mode, index, pager
+   <send-message>, Composing new messages, compose
 
-                <previous-undeleted>, index, pager
+   send2-hook, Change settings based upon message recipients
 
-                <previous-unread>, index, pager
+   <senderdecode-copy>, pager
 
-                <print-entry>, attach, compose
+   $sendmail, Change settings based upon message recipients, $sendmail
 
-                <print-message>, index, pager
+   $sendmail_wait , $sendmail_wait
 
-                <query-append>, query
+   $send_charset , $send_charset
 
-                <query>, index, query
+   set, Setting variables, Configuration Commands
 
-                <quit>, Moving Around in Menus, Composing new messages,
-                index, pager
+   <set-flag>, index
 
-                <quote-char>, Editing Input Fields, editor
+   $shell , $shell
 
-                <read-subthread>, Threaded Mode, index, pager
+   <shell-escape>, Miscellaneous Functions, generic, pager
 
-                <read-thread>, Threaded Mode, index, pager
+   <show-limit>, index
 
-                <recall-message>, index, pager
+   <show-version>, index, pager
 
-                <redraw-screen>, pager
+   <sidebar-next>, sidebar
 
-                <refresh>, generic
+   <sidebar-next-new>, sidebar
 
-                <rename-file>, compose
+   <sidebar-open>, sidebar
 
-                <reply>, Sending Mail, index, pager, attach
+   <sidebar-previous>, sidebar
 
-                <resend-message>, Miscellaneous Functions, The Attachment
-                Menu, index, attach
+   <sidebar-scroll-down>, sidebar
 
-                <save-entry>, attach
+   <sidebar-scroll-up>, sidebar
 
-                <save-message>, index, pager
+   $sidebar_shorten_hierarchy , Configuration variables
 
-                <search-next>, generic, pager, alias, query, browser
+   $sidebar_boundary , $sidebar_boundary
 
-                <search-opposite>, generic, pager, query
+   $sidebar_delim , $sidebar_delim
 
-                <search-reverse>, generic, pager, alias, query, browser
+   $sidebar_newmail_only , $sidebar_newmail_only
 
-                <search-toggle>, pager
+   $sidebar_number_format , $sidebar_number_format
 
-                <search>, generic, pager, alias, query, browser
+   $sidebar_shorten_hierarchy , $sidebar_shorten_hierarchy
 
-                <select-entry>, generic
+   $sidebar_visible , $sidebar_visible
 
-                <select-new>, browser
+   $sidebar_width , $sidebar_width
 
-                <send-message>, Composing new messages, compose
+   $signature, Change settings based upon message recipients, $signature
 
-                <senderdecode-copy>, pager
+   $signoff_string , $signoff_string
 
-                <set-flag>, index
+   $sig_dashes , $sig_dashes
 
-                <shell-escape>, Miscellaneous Functions, generic, pager
+   $sig_on_top , $sig_on_top
 
-                <show-limit>, index
+   $simple_search , $simple_search
 
-                <show-version>, index, pager
+   <skip-quoted>, Miscellaneous Functions, pager
 
-                <sidebar-next-new>, sidebar
+   $sleep_time , $sleep_time
 
-                <sidebar-next>, sidebar
+   $smart_wrap , $smart_wrap
 
-                <sidebar-open>, sidebar
+   $smileys , $smileys
 
-                <sidebar-previous>, sidebar
+   $smime_default_key , Configuration variables
 
-                <sidebar-scroll-down>, sidebar
+   <smime-menu>, Composing new messages
 
-                <sidebar-scroll-up>, sidebar
+   $smime_ask_cert_label , $smime_ask_cert_label
 
-                <skip-quoted>, Miscellaneous Functions, pager
+   $smime_ca_location , $smime_ca_location
 
-                <smime-menu>, Composing new messages
+   $smime_certificates , $smime_certificates
 
-                <sort-mailbox>, index
+   $smime_decrypt_command , $smime_decrypt_command
 
-                <sort-reverse>, index, browser
+   $smime_decrypt_use_default_key , $smime_decrypt_use_default_key
 
-                <sort>, browser
+   $smime_default_key , $smime_default_key
 
-                <subscribe>, browser
+   $smime_encrypt_command , $smime_encrypt_command
 
-                <sync-mailbox>, index, pager
+   $smime_encrypt_with , $smime_encrypt_with
 
-                <tag-entry>, generic
+   $smime_get_cert_command , $smime_get_cert_command
 
-                <tag-message>, pager
+   $smime_get_cert_email_command , $smime_get_cert_email_command
 
-                <tag-pattern>, index
+   $smime_get_signer_cert_command , $smime_get_signer_cert_command
 
-                <tag-prefix-cond>, generic
+   $smime_import_cert_command , $smime_import_cert_command
 
-                <tag-prefix>, generic
+   $smime_is_default , $smime_is_default
 
-                <tag-thread>, Threaded Mode, index
+   $smime_keys , $smime_keys
 
-                <toggle-mailboxes>, browser
+   $smime_pk7out_command , $smime_pk7out_command
 
-                <toggle-new>, index
+   $smime_sign_command , $smime_sign_command
 
-                <toggle-quoted>, Miscellaneous Functions, pager
+   $smime_sign_opaque_command , $smime_sign_opaque_command
 
-                <toggle-subscribed>, browser
+   $smime_timeout , $smime_timeout
 
-                <toggle-unlink>, compose
+   $smime_verify_command , $smime_verify_command
 
-                <toggle-write>, index
+   $smime_verify_opaque_command , $smime_verify_opaque_command
 
-                <top-page>, generic
+   $smtp_envelope, SMTP Support (OPTIONAL)
 
-                <top>, pager
+   $smtp_host, SMTP Support (OPTIONAL)
 
-                <transpose-chars>, editor
+   $smtp_pass, SMTP Support (OPTIONAL), Configuration variables
 
-                <undelete-entry>, attach, postpone
+   $smtp_use_tls, SMTP Support (OPTIONAL)
 
-                <undelete-message>, index, pager
+   $smtp_user, SMTP Support (OPTIONAL), Configuration variables
 
-                <undelete-pattern>, index
+   $smtp_host , $smtp_host
 
-                <undelete-subthread>, Threaded Mode, index, pager
+   $smtp_pass , $smtp_pass
 
-                <undelete-thread>, Threaded Mode, index, pager
+   $smtp_port , $smtp_port
 
-                <unsubscribe>, browser
+   $smtp_user , $smtp_user
 
-                <untag-pattern>, index
+   $smtp_use_tls , $smtp_use_tls
 
-                <upcase-word>, Editing Input Fields, editor
+   $sort , $sort, browser
 
-                <verify-key>, pgp
+   <sort-mailbox>, index
 
-                <view-attach>, attach, compose
+   <sort-reverse>, index, browser
 
-                <view-attachments>, index, pager
+   $sort_alias , $sort_alias
 
-                <view-file>, browser
+   $sort_aux , $sort_aux
 
-                <view-mailcap>, attach
+   $sort_browser , $sort_browser
 
-                <view-name>, pgp
+   $sort_re , $sort_re
 
-                <view-text>, attach
+   source, Miscellaneous Functions, Defining/Using aliases, Reading
+   initialization commands from another file, Configuration Commands
 
-                <what-key>, generic
+   spam, Spam detection, Configuration Commands
 
-                <write-fcc>, Composing new messages, compose
+   $spam_separator , $spam_separator
 
-  H
+   $spoolfile, Setting variables based upon mailbox, Defining mailboxes which
+   receive mail, Mailbox Shortcuts, POP3 Support (OPTIONAL), $spoolfile
 
-   Hooks
+   $ssl_ca_certificates_file , $ssl_ca_certificates_file
 
-                account-hook, Managing multiple IMAP/POP/NNTP accounts
-                (OPTIONAL), Configuration Commands
+   $ssl_client_cert , $ssl_client_cert
 
-                append-hook, Compressed folders Support (OPTIONAL), Append a
-                message to a compressed mailbox, Encrypted folders,
-                Configuration Commands
+   $ssl_force_tls , $ssl_force_tls
 
-                charset-hook, Defining aliases for character sets,
-                Configuration Commands
+   $ssl_min_dh_prime_bits , $ssl_min_dh_prime_bits
 
-                close-hook, Compressed folders Support (OPTIONAL), Write a
-                compressed mailbox, Append a message to a compressed mailbox,
-                Configuration Commands
+   $ssl_starttls , $ssl_starttls
 
-                crypt-hook, Choosing the cryptographic key of the recipient,
-                Configuration Commands
+   $ssl_usesystemcerts , $ssl_usesystemcerts
 
-                default-hook, Message Matching in Hooks
+   $ssl_use_sslv2 , $ssl_use_sslv2
 
-                fcc-hook, Specify default Fcc: mailbox when composing,
-                Specify default save filename and default Fcc: mailbox at
-                once, Using Hooks, Message Matching in Hooks, Configuration
-                Commands
+   $ssl_use_sslv3 , $ssl_use_sslv3
 
-                fcc-save-hook, Specify default save filename, Specify default
-                Fcc: mailbox when composing, Specify default save filename
-                and default Fcc: mailbox at once, Using Hooks, Configuration
-                Commands
+   $ssl_use_tlsv1 , $ssl_use_tlsv1
 
-                folder-hook, Setting variables based upon mailbox, Spam
-                detection, Using Hooks, Managing multiple IMAP/POP/NNTP
-                accounts (OPTIONAL), Configuration Commands
+   $status_format, Composing new messages, Introduction
 
-                iconv-hook, Defining aliases for character sets
+   $status_chars , $status_chars
 
-                mbox-hook, Using Multiple spool mailboxes, Using Hooks,
-                Configuration Commands
+   $status_format , $status_format
 
-                message-hook, Change settings before formatting a message,
-                Using Hooks, Message Matching in Hooks, MIME Autoview,
-                Configuration Commands
+   $status_on_top , $status_on_top
 
-                open-hook, Compressed folders Support (OPTIONAL), Open a
-                compressed mailbox for reading, Write a compressed mailbox,
-                Append a message to a compressed mailbox, Configuration
-                Commands
+   $strict_mailto, mailto:-style links
 
-                pattern-hook, Specify default save filename, Specify default
-                Fcc: mailbox when composing, Change settings based upon
-                message recipients, Change settings before formatting a
-                message
+   $strict_threads, Threaded Mode
 
-                reply-hook, Change settings based upon message recipients,
-                Configuration Commands
+   $strict_mailto , $strict_mailto
 
-                save-hook, Specify default save filename, Specify default
-                save filename and default Fcc: mailbox at once, Using Hooks,
-                Message Matching in Hooks, Mailbox Shortcuts, Configuration
-                Commands
+   $strict_mime , $strict_mime
 
-                send-hook, Change settings based upon message recipients,
-                Using Hooks, Message Matching in Hooks, Configuration
-                Commands
+   $strict_threads , $strict_threads
 
-                send2-hook, Change settings based upon message recipients
+   $strip_was , $strip_was
 
-  P
+   $strip_was_regex , $strip_was_regex
+
+   $stuff_quoted , $stuff_quoted
+
+   subscribe, Mailing lists, Configuration Commands, browser
+
+   $suspend , $suspend
+
+   <sync-mailbox>, Manual Conventions, index, pager
+
+  T
+
+   <tag-entry>, generic
+
+   <tag-message>, pager
 
-   Patterns
+   <tag-pattern>, index
+
+   <tag-prefix>, generic
+
+   <tag-prefix-cond>, generic
+
+   <tag-thread>, Threaded Mode, index
+
+   $text_flowed , $text_flowed
+
+   $thorough_search , $thorough_search
+
+   $thread_received , $thread_received
+
+   $tilde , $tilde
+
+   $timeout, IMAP Support (OPTIONAL), $timeout
+
+   $tmpdir, Temporary Files, $tmpdir
+
+   $to_chars, Status Flags
+
+   toggle, Setting variables, Configuration Commands
+
+   <toggle-mailboxes>, browser
+
+   <toggle-new>, index
+
+   <toggle-quoted>, Miscellaneous Functions, pager
+
+   <toggle-subscribed>, browser
+
+   <toggle-unlink>, compose
+
+   <toggle-write>, index
+
+   <top>, pager
+
+   <top-page>, generic
+
+   $to_chars , $to_chars
+
+   <transpose-chars>, editor
+
+   $trash , $trash
+
+   $tunnel , $tunnel
+
+  U
+
+   $umask, Temporary Files, $umask
+
+   unalias, Defining/Using aliases, Configuration Commands
+
+   unalternates, Alternative addresses, Configuration Commands
+
+   unalternative_order, MIME Multipart/Alternative, Configuration Commands
+
+   unauto_view, MIME Autoview, Configuration Commands
+
+   $uncollapse_jump , $uncollapse_jump
+
+   uncolor, Using color and mono video attributes, Configuration Commands
+
+   <undelete-entry>, attach, postpone
+
+   <undelete-message>, index, pager
+
+   <undelete-pattern>, index
+
+   <undelete-subthread>, Threaded Mode, index, pager
+
+   <undelete-thread>, Threaded Mode, index, pager
+
+   unhdr_order, Defining the order of headers when viewing messages,
+   Configuration Commands
 
-                ~$/ =$, Patterns
+   unhook, Removing hooks, Configuration Commands
 
-                ~*/ =*, Again: Scoring, Patterns
+   unignore, Ignoring (weeding) unwanted message headers, Configuration
+   Commands
 
-                ~=/ ==, Patterns
+   unlists, Mailing lists, Configuration Commands
 
-                ~A/ =A, Change settings before formatting a message, Patterns
+   unmailboxes, Defining mailboxes which receive mail
 
-                ~b/ =b, Complex Patterns, Patterns
+   unmime_lookup, MIME Lookup, Configuration Commands
 
-                ~B/ =B, Patterns
+   unmono, Using color and mono video attributes, Configuration Commands
 
-                ~C/ =C, Using Hooks, Patterns
+   unmy_hdr, User defined headers, Configuration Commands
 
-                ~c/ =c, Patterns
+   unscore, Message Scoring, Configuration Commands
 
-                ~d/ =d, Patterns and Dates, Patterns
+   unset, Setting variables, Configuration Commands
 
-                ~D/ =D, Patterns
+   unsubscribe, Mailing lists, Configuration Commands, browser
 
-                ~E/ =E, Patterns
+   <untag-pattern>, index
 
-                ~e/ =e, Patterns
+   <upcase-word>, Editing Input Fields, editor
 
-                ~f/ =f, Change settings before formatting a message, Message
-                Scoring, Complex Patterns, Patterns
+   $use_8bitmime, SMTP Support (OPTIONAL)
 
-                ~F/ =F, Patterns
+   $use_8bitmime , $use_8bitmime
 
-                ~g/ =g, Patterns
+   $use_domain , $use_domain
 
-                ~G/ =G, Patterns
+   $use_envelope_from , $use_envelope_from
 
-                ~H/ =H, Spam detection, Patterns
+   $use_from , $use_from
 
-                ~h/ =h, Patterns
+   $use_idn , $use_idn
 
-                ~i/ =i, Patterns
+   $use_ipv6 , $use_ipv6
 
-                ~k/ =k, Patterns
+  V
 
-                ~L/ =L, Patterns
+   <verify-key>, pgp
 
-                ~l/ =l, Patterns
+   <view-attach>, attach, compose
 
-                ~m/ =m, Patterns
+   <view-attachments>, index, pager
 
-                ~M/ =M, Patterns
+   <view-file>, browser
 
-                ~n/ =n, Message Scoring, Patterns
+   <view-mailcap>, attach
 
-                ~N/ =N, Patterns
+   <view-name>, pgp
 
-                ~O/ =O, Patterns
+   <view-text>, attach
 
-                ~p/ =p, Patterns
+   $VISUAL, Composing new messages
 
-                ~P/ =P, Patterns
+   $visual , $visual
 
-                ~Q/ =Q, Patterns
+  W
 
-                ~R/ =R, Patterns
+   $wait_key, Miscellaneous Functions, Optional Fields
 
-                ~r/ =r, Patterns
+   $wait_key , $wait_key
 
-                ~s/ =s, Complex Patterns, Patterns
+   $weed, Miscellaneous Functions, $weed
 
-                ~S/ =S, Patterns
+   <what-key>, generic
 
-                ~t/ =t, Message Matching in Hooks, Patterns
+   $wrapmargin , $wrapmargin
 
-                ~T/ =T, Patterns
+   $wrap_search , $wrap_search
 
-                ~U/ =U, Complex Patterns, Patterns
+   <write-fcc>, Composing new messages, compose
 
-                ~u/ =u, Patterns
+   $write_bcc , $write_bcc
 
-                ~v/ =v, Patterns
+   $write_inc , $write_inc
 
-                ~V/ =V, Patterns
+  X
 
-                ~w/ =w, Patterns
+   $xterm_icon , $xterm_icon
 
-                ~x/ =x, Complex Patterns, Patterns
+   $xterm_leave , $xterm_leave
 
-                ~y/ =y, Handling Mailing Lists, Patterns
+   $xterm_set_titles , $xterm_set_titles
 
-                ~z/ =z, Patterns
+   $xterm_title , $xterm_title
index fc5033f..f41e61e 100644 (file)
             in a typewriter font and both prefixed with a dollar sign as
             it's common for UNIX-like environments. Configuration
             variables are lower-case only while environment variables
-            are upper-case only.</para>
+            are upper-case only. <muttng-doc:varref
+              name="imap-mail-check"/> is a configuration variable while
+            <muttng-doc:envvar name="EDITOR"/> is an environment
+            variable.</para>
         </listitem>
         <listitem>
-          <para>Muttng-specific commands are enclosed in
+          <para>Muttng-specific functions are enclosed in
           <literal>&lt;&gt;</literal> and printed in a typewriter font,
-          too.</para>
+          too, as in <muttng-doc:funcref name="sync-mailbox"/>.</para>
         </listitem>
         <listitem>
           <para>As common for UNIX-like environments, references to
               name="muttngrc" sect="5"/>. Execute <literal>man [section]
               [name]</literal> to view the manual page.</para>
         </listitem>
+        <listitem>
+          <para>Keys are presented in the following way: ordinary keys
+            are just given as-is, e.g.
+            <muttng-doc:key>q</muttng-doc:key>. Control characters are
+            prefixed with <literal>C-</literal> (e.g. the screen can be
+            redraw by pressing <muttng-doc:key
+              mod="C">L</muttng-doc:key>) and <literal>E-</literal> for
+            Escape, e.g. a folder can be opened read-only with
+            <muttng-doc:key mod="E">c</muttng-doc:key>.
+          </para>
+        </listitem>
       </itemizedlist>
     </para>
 
     
     <para>
 
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l|l">
         <title>Most commonly used movement bindings</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
         </thead>
         <tbody>
           <row>
-            <entry><literal>j</literal> or <literal>Down</literal></entry>
+            <entry><muttng-doc:key>j</muttng-doc:key> or <muttng-doc:key>Down</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="next-entry"/></entry>
             <entry>move to the next entry</entry>
           </row>
           <row>
-            <entry><literal>k</literal> or <literal>Up</literal></entry>
+            <entry><muttng-doc:key>k</muttng-doc:key> or <muttng-doc:key>Up</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="previous-entry"/></entry>
             <entry>move to the previous entry</entry>
           </row>
           <row>
-            <entry><literal>z</literal> or <literal>PageDn</literal></entry>
+            <entry><muttng-doc:key>z</muttng-doc:key> or <muttng-doc:key>PageDn</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="page-down"/></entry>
             <entry>go to the next page</entry>
           </row>
           <row>
-            <entry><literal>Z</literal> or <literal>PageUp</literal></entry>
+            <entry><muttng-doc:key>Z</muttng-doc:key> or <muttng-doc:key>PageUp</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="page-up"/></entry>
             <entry>go to the previous page</entry>
           </row>
           <row>
-            <entry><literal>=</literal> or <literal>Home</literal></entry>
+            <entry><muttng-doc:key>=</muttng-doc:key> or <muttng-doc:key>Home</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="first-entry"/></entry>
             <entry>jump to the first entry</entry>
           </row>
           <row>
-            <entry><literal>*</literal> or <literal>End</literal></entry>
+            <entry><muttng-doc:key>*</muttng-doc:key> or <muttng-doc:key>End</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="last-entry"/></entry>
             <entry>jump to the last entry</entry>
           </row>
           <row>
-            <entry><literal>q</literal></entry>
+            <entry><muttng-doc:key>q</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="quit"/></entry>
             <entry>exit the current menu</entry>
           </row>
           <row>
-            <entry><literal>?</literal></entry>
+            <entry><muttng-doc:key>?</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="help"/></entry>
             <entry>list all key bindings for the current menu</entry>
           </row>
     
     <para>
 
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l|l">
         <title>Line Editor Functions</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
         </thead>
         <tbody>
           <row>
-            <entry><literal>^A or &#60;Home&#62;  </literal></entry>
+            <entry><muttng-doc:key mod="C">A</muttng-doc:key> or <muttng-doc:key>Home</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="bol"/></entry>
             <entry>move to the start of the line</entry>
           </row>
           <row>
-            <entry><literal>^B or &#60;Left&#62;   </literal></entry>
+            <entry><muttng-doc:key mod="C">B</muttng-doc:key> or <muttng-doc:key>Left</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="backward-char"/>
             </entry><entry>move back one char</entry>
           </row>
           <row>
-            <entry><literal>Esc B  </literal></entry>
+            <entry><muttng-doc:key mod="E">B</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="backward-word"/></entry>
             <entry>move back one word</entry>
           </row>
           <row>
-            <entry><literal>^D or &#60;Delete&#62;  </literal></entry>
+            <entry><muttng-doc:key mod="C">D</muttng-doc:key> or <muttng-doc:key>Delete</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="delete-char"/></entry>
             <entry>delete the char under the cursor</entry>
           </row>
           <row>
-            <entry><literal>^E or &#60;End&#62;   </literal></entry>
+            <entry><muttng-doc:key mod="C">E</muttng-doc:key> or <muttng-doc:key>End</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="eol"/></entry>
             <entry>move to the end of the line</entry>
           </row>
           <row>
-            <entry><literal>^F or &#60;Right&#62;  </literal></entry>
+            <entry><muttng-doc:key mod="C">F</muttng-doc:key> or <muttng-doc:key>Right</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="forward-char"/></entry>
             <entry>move forward one char</entry>
           </row>
           <row>
-            <entry><literal>Esc F </literal></entry>
+            <entry><muttng-doc:key mod="E">F</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="forward-word"/></entry>
             <entry>move forward one word</entry>
           </row>
           <row>
-            <entry><literal>&#60;Tab&#62;</literal></entry>
+            <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="complete"/></entry>
             <entry>complete filename or alias</entry>
           </row>
           <row>
-            <entry><literal>^T</literal></entry>
+            <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="complete-query"/></entry>
             <entry>complete address with query</entry>
           </row>
           <row>
-            <entry><literal>^K</literal></entry>
+            <entry><muttng-doc:key mod="C">K</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="kill-eol"/></entry>
             <entry>delete to the end of the line</entry>
           </row>
           <row>
-            <entry><literal>ESC d </literal></entry>
+            <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="kill-eow"/></entry>
             <entry>delete to the end of the word</entry>
           </row>
           <row>
-            <entry><literal>^W</literal></entry>
+            <entry><muttng-doc:key mod="C">W</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="kill-word"/></entry>
             <entry>kill the word in front of the cursor</entry>
           </row>
           <row>
-            <entry><literal>^U</literal></entry>
+            <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="kill-line"/></entry>
             <entry>delete entire line</entry>
           </row>
           <row>
-            <entry><literal>^V</literal></entry>
+            <entry><muttng-doc:key mod="C">V</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="quote-char"/></entry>
             <entry>quote the next typed key</entry>
           </row>
           <row>
-            <entry><literal>&#60;Up&#62;</literal></entry>
+            <entry><muttng-doc:key>Up</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="history-up"/></entry>
             <entry>recall previous string from history</entry>
           </row>
           <row>
-            <entry><literal>&#60;Down&#62;</literal></entry>
+            <entry><muttng-doc:key>Down</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="history-down"/></entry>
             <entry>recall next string from history</entry>
           </row>
           <row>
-            <entry><literal>&#60;BackSpace&#62;</literal></entry>
+            <entry><muttng-doc:key>BackSpace</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="backspace"/></entry>
             <entry>kill the char in front of the cursor</entry>
           </row>
           <row>
-            <entry><literal>Esc u        </literal></entry>
+            <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="upcase-word"/></entry>
             <entry>convert word to upper case</entry>
           </row>
           <row>
-            <entry><literal>Esc l        </literal></entry>
+            <entry><muttng-doc:key mod="E">l</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="downcase-word"/></entry>
             <entry>convert word to lower case</entry>
           </row>
           <row>
-            <entry><literal>Esc c        </literal></entry>
+            <entry><muttng-doc:key mod="E">c</muttng-doc:key></entry>
             <entry><muttng-doc:funcref name="capitalize-word"/></entry>
             <entry>capitalize the word</entry>
           </row>
           <row>
-            <entry><literal>^G</literal></entry>
-            <entry><literal>n/a</literal></entry>
+            <entry><muttng-doc:key mod="C">G</muttng-doc:key></entry>
+            <entry></entry>
             <entry>abort</entry>
           </row>
           <row>
-            <entry><literal>&#60;Return&#62;</literal></entry>
-            <entry><literal>n/a</literal></entry>
+            <entry><muttng-doc:key>Return</muttng-doc:key></entry>
+            <entry></entry>
             <entry>finish editing</entry>
           </row>
         </tbody>
       
       <para>
 
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l|l">
         <title>Most commonly used Index Bindings</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
         </thead>
         <tbody>
           <row>
-            <entry><literal>c</literal></entry>
+            <entry><muttng-doc:key>c</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>change to a different mailbox</entry>
           </row>
           <row>
-            <entry><literal>ESC c    </literal></entry>
+            <entry><muttng-doc:key mod="E">c</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>change to a folder in read-only mode</entry>
           </row>
           <row>
-            <entry><literal>C</literal></entry>
+            <entry><muttng-doc:key>C</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>copy the current message to another mailbox</entry>
           </row>
           <row>
-            <entry><literal>ESC C     </literal></entry>
+            <entry><muttng-doc:key mod="E">C</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>decode a message and copy it to a folder</entry>
           </row>
           <row>
-            <entry><literal>ESC s    </literal></entry>
+            <entry><muttng-doc:key mod="E">s</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>decode a message and save it to a folder</entry>
           </row>
           <row>
-            <entry><literal>D</literal></entry>
+            <entry><muttng-doc:key>D</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>delete messages matching a pattern</entry>
           </row>
           <row>
-            <entry><literal>d</literal></entry>
+            <entry><muttng-doc:key>d</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>delete the current message</entry>
           </row>
           <row>
-            <entry><literal>F</literal></entry>
+            <entry><muttng-doc:key>F</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>mark as important</entry>
           </row>
           <row>
-            <entry><literal>l</literal></entry>
+            <entry><muttng-doc:key>l</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>show messages matching a pattern</entry>
           </row>
           <row>
-            <entry><literal>N</literal></entry>
+            <entry><muttng-doc:key>N</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>mark message as new</entry>
           </row>
           <row>
-            <entry><literal>o</literal></entry>
+            <entry><muttng-doc:key>o</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>change the current sort method</entry>
           </row>
           <row>
-            <entry><literal>O</literal></entry>
+            <entry><muttng-doc:key>O</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>reverse sort the mailbox</entry>
           </row>
           <row>
-            <entry><literal>q</literal></entry>
+            <entry><muttng-doc:key>q</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>save changes and exit</entry>
           </row>
           <row>
-            <entry><literal>s</literal></entry>
+            <entry><muttng-doc:key>s</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>save-message</entry>
           </row>
           <row>
-            <entry><literal>T</literal></entry>
+            <entry><muttng-doc:key>T</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>tag messages matching a pattern</entry>
           </row>
           <row>
-            <entry><literal>t</literal></entry>
+            <entry><muttng-doc:key>t</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle the tag on a message</entry>
           </row>
           <row>
-            <entry><literal>ESC t  </literal></entry>
+            <entry><muttng-doc:key mod="E">t</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle tag on entire message thread</entry>
           </row>
           <row>
-            <entry><literal>U</literal></entry>
+            <entry><muttng-doc:key>U</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>undelete messages matching a pattern</entry>
           </row>
           <row>
-            <entry><literal>u</literal></entry>
+            <entry><muttng-doc:key>u</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>undelete-message</entry>
           </row>
           <row>
-            <entry><literal>v</literal></entry>
+            <entry><muttng-doc:key>v</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>view-attachments</entry>
           </row>
           <row>
-            <entry><literal>x</literal></entry>
+            <entry><muttng-doc:key>x</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>abort changes and exit</entry>
           </row>
           <row>
-            <entry><literal>&#60;Return&#62;</literal></entry>
+            <entry><muttng-doc:key>Return</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>display-message</entry>
           </row>
           <row>
-            <entry><literal>&#60;Tab&#62;</literal></entry>
+            <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>jump to the next new or unread message</entry>
           </row>
           <row>
-            <entry><literal>@</literal></entry>
+            <entry><muttng-doc:key>@</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>show the author's full e-mail address</entry>
           </row>
           <row>
-            <entry><literal>$</literal></entry>
+            <entry><muttng-doc:key>$</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>save changes to mailbox</entry>
           </row>
           <row>
-            <entry><literal>/</literal></entry>
+            <entry><muttng-doc:key>/</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search</entry>
           </row>
           <row>
-            <entry><literal>ESC /     </literal></entry>
+            <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search-reverse</entry>
           </row>
           <row>
-            <entry><literal>^L</literal></entry>
+            <entry><muttng-doc:key mod="C">L</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>clear and redraw the screen</entry>
           </row>
           <row>
-            <entry><literal>^T</literal></entry>
+            <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>untag messages matching a pattern</entry>
           </row>
       
       <para>
 
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l|l">
         <title>Most commonly used Pager Bindings</title>
         <tgroup cols="3" align="left" colsep="1" rowsep="1">
         <thead>
         </thead>
         <tbody>
           <row>
-            <entry><literal>&#60;Return&#62;</literal></entry>
+            <entry><muttng-doc:key>Return</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>go down one line</entry>
           </row>
           <row>
-            <entry><literal>&#60;Space&#62;</literal></entry>
+            <entry><muttng-doc:key>Space</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>display the next page (or next message if at the end of a message)</entry>
           </row>
           <row>
-            <entry><literal>-</literal></entry>
+            <entry><muttng-doc:key>-</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>go back to the previous page</entry>
           </row>
           <row>
-            <entry><literal>n</literal></entry>
+            <entry><muttng-doc:key>n</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search for next match</entry>
           </row>
           <row>
-            <entry><literal>S</literal></entry>
+            <entry><muttng-doc:key>S</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>skip beyond quoted text</entry>
           </row>
           <row>
-            <entry><literal>T</literal></entry>
+            <entry><muttng-doc:key>T</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle display of quoted text</entry>
           </row>
           <row>
-            <entry><literal>?</literal></entry>
+            <entry><muttng-doc:key>?</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>show key bindings</entry>
           </row>
           <row>
-            <entry><literal>/</literal></entry>
+            <entry><muttng-doc:key>/</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search for a regular expression (pattern)</entry>
           </row>
           <row>
-            <entry><literal>ESC /   </literal></entry>
+            <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>search backwards for a regular expression</entry>
           </row>
           <row>
-            <entry><literal>\</literal></entry>
+            <entry><muttng-doc:key>\</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>toggle search pattern coloring</entry>
           </row>
           <row>
-            <entry><literal>^</literal></entry>
+            <entry><muttng-doc:key>^</muttng-doc:key></entry>
             <entry><literal></literal></entry>
             <entry>jump to the top of the message</entry>
           </row>
       </para>
       
       <para>
-        Also, the internal pager supports a couple other advanced features.
-        For
-        one, it will accept and translate the ``standard'' nroff sequences
-        forbold and underline. These sequences are a series of either the
-        letter,
-        backspace (^H), the letter again for bold or the letter,
-        backspace,
-        ``_'' for denoting underline. Mutt-ng will attempt to display
-        these
-        in bold and underline respectively if your terminal supports them. If
-        not, you can use the bold and underline <muttng-doc:cmdref name="color"/>
-        objects to specify a color or mono attribute for them.
+        Also, the internal pager supports a couple other advanced
+        features.  For one, it will accept and translate the
+        ``standard'' nroff sequences forbold and underline. These
+        sequences are a series of either the letter, backspace
+        (<muttng-doc:key mod="C">H</muttng-doc:key>), the letter again for bold
+        or the letter, backspace, <muttng-doc:key>_</muttng-doc:key> for denoting
+        underline. Mutt-ng will attempt to display these in bold and
+        underline respectively if your terminal supports them. If not,
+        you can use the bold and underline <muttng-doc:cmdref
+          name="color"/> objects to specify a color or mono attribute
+        for them.
       </para>
       
       <para>
       
       <para>
 
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l">
         <title>ANSI Escape Sequences</title>
         <tgroup cols="2" align="left" colsep="1" rowsep="1">
         <thead>
     </table>
 
     
-      <table frame="none" rowsep="1">
+      <table frame="none" rowsep="1" texstr="l|l">
         <title>ANSI Colors</title>
         <tgroup cols="2" align="left" colsep="1" rowsep="1">
         <thead>
         
         <para>
 
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Most commonly used thread-related bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           </thead>
           <tbody>
             <row>
-              <entry><literal>^D</literal></entry>
+              <entry><muttng-doc:key mod="C">D</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="delete-thread"/></entry>
                 <entry>delete all messages in the current  thread</entry>
               </row>
             <row>
-              <entry><literal>^U</literal></entry>
+              <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="undelete-thread"/></entry>
                 <entry>undelete all messages in the current thread</entry>
               </row>
             <row>
-              <entry><literal>^N</literal></entry>
+              <entry><muttng-doc:key mod="C">N</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="next-thread"/></entry>
                 <entry>jump to the start of the next thread</entry>
               </row>
             <row>
-              <entry><literal>^P</literal></entry>
+              <entry><muttng-doc:key mod="C">P</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="previous-thread"/></entry>
                 <entry>jump to the start of the previous thread</entry>
               </row>
             <row>
-              <entry><literal>^R</literal></entry>
+              <entry><muttng-doc:key mod="C">R</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="read-thread"/></entry>
                 <entry>mark the current thread as read</entry>
               </row>
             <row>
-              <entry><literal>ESC d </literal></entry>
+              <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="delete-subthread"/></entry>
                 <entry>delete all messages in the current subthread</entry>
               </row>
             <row>
-              <entry><literal>ESC u </literal></entry>
+              <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="undelete-subthread"/></entry>
                 <entry>undelete all messages in the current subthread</entry>
               </row>
             <row>
-              <entry><literal>ESC n </literal></entry>
+              <entry><muttng-doc:key mod="E">n</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="next-subthread"/></entry>
                 <entry>jump to the start of the next subthread</entry>
               </row>
             <row>
-              <entry><literal>ESC p </literal></entry>
+              <entry><muttng-doc:key mod="E">p</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="previous-subthread"/></entry>
                 <entry>jump to the start of the previous subthread</entry>
               </row>
             <row>
-              <entry><literal>ESC r </literal></entry>
+              <entry><muttng-doc:key mod="E">r</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="read-subthread"/></entry>
                 <entry>mark the current subthread as read </entry>
               </row>
             <row>
-              <entry><literal>ESC t </literal></entry>
+              <entry><muttng-doc:key mod="E">t</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="tag-thread"/></entry>
                 <entry>toggle the tag on the current thread</entry>
               </row>
             <row>
-              <entry><literal>ESC v </literal></entry>
+              <entry><muttng-doc:key mod="E">v</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="collapse-thread"/></entry>
                 <entry>toggle collapse for the current thread</entry>
               </row>
             <row>
-              <entry><literal>ESC V </literal></entry>
+              <entry><muttng-doc:key mod="E">V</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="collapse-all"/></entry>
                 <entry>toggle collapse for all threads</entry>
               </row>
             <row>
-              <entry><literal>P</literal></entry>
+              <entry><muttng-doc:key>P</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="parent-message"/></entry>
                 <entry>jump to parent message in thread</entry>
               </row>
         <title>Miscellaneous Functions</title>
         
         <para>
-          <muttng-doc:funcdef name="create-alias" key="a"/>
+          <muttng-doc:funcdef name="create-alias"><muttng-doc:key>a</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="check-traditional-pgp" key="ESC P"/>
+          <muttng-doc:funcdef name="check-traditional-pgp"><muttng-doc:key mod="E">P</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="display-toggle-weed" key="h"/>
+          <muttng-doc:funcdef name="display-toggle-weed"><muttng-doc:key>h</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="edit" key="e"/>
+          <muttng-doc:funcdef name="edit"><muttng-doc:key>e</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         
         <para>
           <muttng-doc:funcdef name="edit-type"/>
-          (default: <literal>^E</literal> on the attachment menu, and in the pager and index
-          menus; <literal>^T</literal> on the compose menu)
+          (default: <muttng-doc:key mod="C">E</muttng-doc:key> on the attachment menu, and in the pager and index
+          menus; <muttng-doc:key mod="C">T</muttng-doc:key> on the compose menu)
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="enter-command" key=":"/>
+          <muttng-doc:funcdef name="enter-command"><muttng-doc:key>:</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="extract-keys" key="^K"/>
+          <muttng-doc:funcdef name="extract-keys"><muttng-doc:key mod="C">K</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="forget-passphrase" key="^F"/>
+          <muttng-doc:funcdef name="forget-passphrase"><muttng-doc:key mod="C">F</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="list-reply" key="L"/>
+          <muttng-doc:funcdef name="list-reply"><muttng-doc:key>L</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="resend-message" key="ESC e"/>
+          <muttng-doc:funcdef name="resend-message"><muttng-doc:key mod="E">e</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="shell-escape" key="!"/>
+          <muttng-doc:funcdef name="shell-escape"><muttng-doc:key>!</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="toggle-quoted" key="T"/>
+          <muttng-doc:funcdef name="toggle-quoted"><muttng-doc:key>T</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
         </para>
         
         <para>
-          <muttng-doc:funcdef name="skip-quoted" key="S"/>
+          <muttng-doc:funcdef name="skip-quoted"><muttng-doc:key>S</muttng-doc:key></muttng-doc:funcdef>
         </para>
         
         <para>
       
       <para>
 
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Most commonly used Mail Composition Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           </thead>
           <tbody>
             <row>
-              <entry><literal>m</literal></entry>
+              <entry><muttng-doc:key>m</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="compose"/></entry>
               <entry>compose a new message</entry>
             </row>
             <row>
-              <entry><literal>r</literal></entry>
+              <entry><muttng-doc:key>r</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="reply"/></entry>
               <entry>reply to sender</entry>
             </row>
             <row>
-              <entry><literal>g</literal></entry>
+              <entry><muttng-doc:key>g</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="group-reply"/></entry>
               <entry>reply to all recipients</entry>
             </row>
             <row>
-              <entry><literal>L</literal></entry>
+              <entry><muttng-doc:key>L</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="list-reply"/></entry>
               <entry>reply to mailing list address</entry>
             </row>
             <row>
-              <entry><literal>f</literal></entry>
+              <entry><muttng-doc:key>f</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="forward"/></entry>
               <entry>forward message</entry>
             </row>
             <row>
-              <entry><literal>b</literal></entry>
+              <entry><muttng-doc:key>b</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="bounce"/></entry>
               <entry>bounce (remail) message</entry>
             </row>
             <row>
-              <entry><literal>ESC k  </literal></entry>
+              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="mail-key"/></entry>
               <entry>mail a PGP public key to someone</entry>
             </row>
         <title>Composing new messages</title>
         
         <para>
-          When you want to send an email using mutt-ng, simply press <literal>m</literal> on
+          When you want to send an email using mutt-ng, simply press <muttng-doc:key>m</muttng-doc:key> on
           your keyboard. Then, mutt-ng asks for the recipient via a prompt in
           the last line:
         </para>
@@ -1976,13 +1989,13 @@ set editor = "emacs"</muttng-doc:lstconf>
         </para>
         
         <para>
-          At this point, you can add more attachments, pressing <literal>a</literal>, you
-          can edit the recipient addresses, pressing <literal>t</literal> for
+          At this point, you can add more attachments, pressing <muttng-doc:key>a</muttng-doc:key>, you
+          can edit the recipient addresses, pressing <muttng-doc:key>t</muttng-doc:key> for
           the "To:" field,
-          <literal>c</literal> for the "Cc:" field, and <literal>b</literal>
+          <muttng-doc:key>c</muttng-doc:key> for the "Cc:" field, and <muttng-doc:key>b</muttng-doc:key>
           for the "Bcc: field. You can
-          also edit the subject the subject by simply pressing <literal>s</literal> or the
-          email message that you've entered before by pressing <literal>e</literal>. You will
+          also edit the subject the subject by simply pressing <muttng-doc:key>s</muttng-doc:key> or the
+          email message that you've entered before by pressing <muttng-doc:key>e</muttng-doc:key>. You will
           then again return to the editor. You can even edit the sender, by
           pressing
           <literal>&lt;esc&gt;f</literal>, but this shall only be used with
@@ -2010,7 +2023,7 @@ set edit_headers</muttng-doc:lstconf>
         
         <para>
 
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Most commonly used Compose Menu Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
@@ -2022,102 +2035,102 @@ set edit_headers</muttng-doc:lstconf>
           </thead>
           <tbody>
             <row>
-              <entry><literal>a</literal></entry>
+              <entry><muttng-doc:key>a</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="attach-file"/></entry>
               <entry>attach a file</entry>
             </row>
             <row>
-              <entry><literal>A</literal></entry>
+              <entry><muttng-doc:key>A</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="attach-message"/></entry>
               <entry>attach message(s) to the message</entry>
             </row>
             <row>
-              <entry><literal>ESC k  </literal></entry>
+              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="attach-key"/></entry>
               <entry>attach a PGP public key</entry>
             </row>
             <row>
-              <entry><literal>d</literal></entry>
+              <entry><muttng-doc:key>d</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-description"/></entry>
               <entry>edit description on attachment</entry>
             </row>
             <row>
-              <entry><literal>D</literal></entry>
+              <entry><muttng-doc:key>D</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="detach-file"/></entry>
               <entry>detach a file</entry>
             </row>
             <row>
-              <entry><literal>t</literal></entry>
+              <entry><muttng-doc:key>t</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-to"/></entry>
               <entry>edit the To field</entry>
             </row>
             <row>
-              <entry><literal>ESC f </literal></entry>
+              <entry><muttng-doc:key mod="E">f</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-from"/></entry>
               <entry>edit the From field</entry>
             </row>
             <row>
-              <entry><literal>r</literal></entry>
+              <entry><muttng-doc:key>r</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-reply-to"/></entry>
               <entry>edit the Reply-To field</entry>
             </row>
             <row>
-              <entry><literal>c</literal></entry>
+              <entry><muttng-doc:key>c</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-cc"/></entry>
               <entry>edit the Cc field</entry>
             </row>
             <row>
-              <entry><literal>b</literal></entry>
+              <entry><muttng-doc:key>b</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-bcc"/></entry>
               <entry>edit the Bcc field</entry>
             </row>
             <row>
-              <entry><literal>y</literal></entry>
+              <entry><muttng-doc:key>y</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="send-message"/></entry>
               <entry>send the message</entry>
             </row>
             <row>
-              <entry><literal>s</literal></entry>
+              <entry><muttng-doc:key>s</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-subject"/></entry>
               <entry>edit the Subject</entry>
             </row>
             <row>
-              <entry><literal>S</literal></entry>
+              <entry><muttng-doc:key>S</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="smime-menu"/></entry>
               <entry>select S/MIME options</entry>
             </row>
             <row>
-              <entry><literal>f</literal></entry>
+              <entry><muttng-doc:key>f</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="edit-fcc"/></entry>
               <entry>specify an ``Fcc'' mailbox</entry>
             </row>
             <row>
-              <entry><literal>p</literal></entry>
+              <entry><muttng-doc:key>p</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="pgp-menu"/></entry>
               <entry>select PGP options</entry>
             </row>
             <row>
-              <entry><literal>P</literal></entry>
+              <entry><muttng-doc:key>P</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="postpone-message"/></entry>
               <entry>postpone this message until later</entry>
             </row>
             <row>
-              <entry><literal>q</literal></entry>
+              <entry><muttng-doc:key>q</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="quit"/></entry>
               <entry>quit (abort) sending the message</entry>
             </row>
             <row>
-              <entry><literal>w</literal></entry>
+              <entry><muttng-doc:key>w</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="write-fcc"/></entry>
               <entry>write the message to a folder</entry>
             </row>
             <row>
-              <entry><literal>i</literal></entry>
+              <entry><muttng-doc:key>i</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="ispell"/></entry>
               <entry>check spelling (if available on your system)</entry>
             </row>
             <row>
-              <entry><literal>^F</literal></entry>
+              <entry><muttng-doc:key mod="C">F</muttng-doc:key></entry>
               <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
               <entry>wipe passphrase(s) from memory</entry>
             </row>
@@ -2154,7 +2167,7 @@ set edit_headers</muttng-doc:lstconf>
           
           <para>
             When you want to reply to an email message, select it in the index
-            menu and then press <literal>r</literal>. Mutt-ng's behaviour is
+            menu and then press <muttng-doc:key>r</muttng-doc:key>. Mutt-ng's behaviour is
             then similar to the 
             behaviour when you compose a message: first, you will be asked for
             the recipient, then for the subject, and then, mutt-ng will start
@@ -2239,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 <literal>g</literal>
-            instead of <literal>r</literal> to do a reply,
+            functionalityensures that when you press <muttng-doc:key>g</muttng-doc:key>
+            instead of <muttng-doc:key>r</muttng-doc:key> to do a reply,
             each and every recipient that is contained in the original message
             will receive a copy of the message, either as normal recipient or
             as "Cc:" recipient.
@@ -2263,7 +2276,7 @@ set attribution = "attribution="* %n &lt;%a&gt; [%(%y-%m-%d %H:%M)]:"</muttng-do
           </para>
           
           <para>
-            To do a list reply, simply press <literal>L</literal>. If the email
+            To do a list reply, simply press <muttng-doc:key>L</muttng-doc:key>. If the email
             contains
             a <literal>Mail-Followup-To:</literal> header, its value will be
             used as reply
@@ -2378,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 <literal>^G</literal>.  When
+          usually, abort this prompt using <muttng-doc:key mod="C">G</muttng-doc:key>.  When
           you do so, mutt will
           return to the compose screen.
         </para>
@@ -2401,7 +2414,7 @@ Pgp: [E | S | S id]</muttng-doc:lstmail>
           flags:
 
 
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l">
           <title>PGP Key Menu Flags</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
@@ -2511,7 +2524,7 @@ Pgp: [E | S | S id]</muttng-doc:lstmail>
           and
           <literal>chain-next</literal> functions, which are by default bound
           to the left
-          and right arrows and to the <literal>h</literal> and <literal>l</literal> keys (think vi
+          and right arrows and to the <muttng-doc:key>h</muttng-doc:key> and <muttng-doc:key>l</muttng-doc:key> keys (think vi
           keyboard bindings).  To insert a remailer at the current chain
           position, use the <literal>insert</literal> function.  To append a
           remailer behind
@@ -2562,7 +2575,7 @@ Pgp: [E | S | S id]</muttng-doc:lstmail>
       
       <para>
         The first one is regular forwarding, as you probably know it from
-        other mail clients. You simply press <literal>f</literal>, enter the
+        other mail clients. You simply press <muttng-doc:key>f</muttng-doc:key>, enter the
         recipient
         email address, the subject of the forwarded email, and then you can
         edit the message to be forwarded in the editor. The forwarded
@@ -2573,11 +2586,11 @@ Pgp: [E | S | S id]</muttng-doc:lstmail>
       <para>
         
         <muttng-doc:lstmail>
------ Forwarded message from Lucas User &#60;luser@example.com&#62; -----
+----- Forwarded message from Lucas User &lt;luser@example.com&gt; -----
 
-From: Lucas User &#60;luser@example.com&#62;
+From: Lucas User &lt;luser@example.com&gt;
 Date: Thu, 02 Dec 2004 03:08:34 +0100
-To: Michael Random &#60;mrandom@example.com&#62;
+To: Michael Random &lt;mrandom@example.com&gt;
 Subject: Re: blackmail
 
 Pay me EUR 50,000.- cash or your favorite stuffed animal will die
@@ -2599,7 +2612,7 @@ a horrible death.
         another
         address, it will be sent in practically the same format you send it
         (except for headers that are created during transporting the
-        message). To bounce a message, press <literal>b</literal> and enter the
+        message). To bounce a message, press <muttng-doc:key>b</muttng-doc:key> and enter the
         recipient
         email address. By default, you are then asked whether you really
         want to bounce the message to the specified recipient. If you answer
@@ -3500,7 +3513,7 @@ set alias_file=~/.mail_aliases</muttng-doc:lstconf>
       
       <para>
         
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l">
           <title>Alternative Key Names</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
@@ -3515,11 +3528,11 @@ set alias_file=~/.mail_aliases</muttng-doc:lstconf>
               <entry>tab</entry>
             </row>
             <row>
-              <entry><literal>&#60;tab&#62;</literal></entry>
+              <entry><literal>&lt;tab&gt;</literal></entry>
               <entry>tab</entry>
             </row>
             <row>
-              <entry><literal>&#60;backtab&#62;</literal></entry>
+              <entry><literal>&lt;backtab&gt;</literal></entry>
               <entry>backtab / shift-tab</entry>
             </row>
             <row>
@@ -3535,71 +3548,71 @@ set alias_file=~/.mail_aliases</muttng-doc:lstconf>
               <entry>escape</entry>
             </row>
             <row>
-              <entry><literal>&#60;esc&#62;</literal></entry>
+              <entry><literal>&lt;esc&gt;</literal></entry>
               <entry>escape</entry>
             </row>
             <row>
-              <entry><literal>&#60;up&#62;</literal></entry>
+              <entry><literal>&lt;up&gt;</literal></entry>
               <entry>up arrow</entry>
             </row>
             <row>
-              <entry><literal>&#60;down&#62;</literal></entry>
+              <entry><literal>&lt;down&gt;</literal></entry>
               <entry>down arrow</entry>
             </row>
             <row>
-              <entry><literal>&#60;left&#62;</literal></entry>
+              <entry><literal>&lt;left&gt;</literal></entry>
               <entry>left arrow</entry>
             </row>
             <row>
-              <entry><literal>&#60;right&#62;</literal></entry>
+              <entry><literal>&lt;right&gt;</literal></entry>
               <entry>right arrow</entry>
             </row>
             <row>
-              <entry><literal>&#60;pageup&#62;</literal></entry>
+              <entry><literal>&lt;pageup&gt;</literal></entry>
               <entry>Page Up</entry>
             </row>
             <row>
-              <entry><literal>&#60;pagedown&#62;</literal></entry>
+              <entry><literal>&lt;pagedown&gt;</literal></entry>
               <entry>Page Down</entry>
             </row>
             <row>
-              <entry><literal>&#60;backspace&#62;</literal></entry>
+              <entry><literal>&lt;backspace&gt;</literal></entry>
               <entry>Backspace</entry>
             </row>
             <row>
-              <entry><literal>&#60;delete&#62;</literal></entry>
+              <entry><literal>&lt;delete&gt;</literal></entry>
               <entry>Delete</entry>
             </row>
             <row>
-              <entry><literal>&#60;insert&#62;</literal></entry>
+              <entry><literal>&lt;insert&gt;</literal></entry>
               <entry>Insert</entry>
             </row>
             <row>
-              <entry><literal>&#60;enter&#62;</literal></entry>
+              <entry><literal>&lt;enter&gt;</literal></entry>
               <entry>Enter</entry>
             </row>
             <row>
-              <entry><literal>&#60;return&#62;</literal></entry>
+              <entry><literal>&lt;return&gt;</literal></entry>
               <entry>Return</entry>
             </row>
             <row>
-              <entry><literal>&#60;home&#62;</literal></entry>
+              <entry><literal>&lt;home&gt;</literal></entry>
               <entry>Home</entry>
             </row>
             <row>
-              <entry><literal>&#60;end&#62;</literal></entry>
+              <entry><literal>&lt;end&gt;</literal></entry>
               <entry>End</entry>
             </row>
             <row>
-              <entry><literal>&#60;space&#62;</literal></entry>
+              <entry><literal>&lt;space&gt;</literal></entry>
               <entry>Space bar</entry>
             </row>
             <row>
-              <entry><literal>&#60;f1&#62;</literal></entry>
+              <entry><literal>&lt;f1&gt;</literal></entry>
               <entry>function key 1</entry>
             </row>
             <row>
-              <entry><literal>&#60;f10&#62;</literal></entry>
+              <entry><literal>&lt;f10&gt;</literal></entry>
               <entry>function key 10</entry>
             </row>
           </tbody>
@@ -3755,22 +3768,18 @@ folder-hook . set sort=date-sent</muttng-doc:lstconf>
       </para>
       
       <para>
-        <emphasis>key</emphasis> and <emphasis>sequence</emphasis> are expanded
-        by the same rules as the <muttng-doc:cmdref name="bind"/>.  There are
-        some additions however.  The
-        first is that control characters in <emphasis>sequence</emphasis> can
-        also be specified
-        as <emphasis>^x</emphasis>.  In order to get a caret (`^'')
-        you need to use
-        <emphasis>^^</emphasis>.  Secondly, to specify a certain key
-        such as <emphasis>up</emphasis>
-        or to invoke a function directly, you can use the format
+        <emphasis>key</emphasis> and <emphasis>sequence</emphasis> are
+        expanded by the same rules as the <muttng-doc:cmdref
+          name="bind"/>.  There are some additions however.  The first
+        is that control characters in <emphasis>sequence</emphasis> can
+        also be specified as <literal>^x</literal>.  In order to get a
+        caret (`^'') you need to specify it twice.  Secondly,
+        to specify a certain key such as <emphasis>up</emphasis> or to
+        invoke a function directly, you can use the format
         <emphasis>&lt;key name&gt;</emphasis> and <emphasis>&lt;function
-          name&gt;
-        </emphasis>
-        .For a listing of key
-        names see the section on <muttng-doc:cmdref name="bind"/>.  Functions
-        are listed in the <link linkend="functions">functions</link>.
+          name&gt; </emphasis> .For a listing of key names see the
+        section on <muttng-doc:cmdref name="bind"/>.  Functions are
+        listed in the <link linkend="functions">functions</link>.
       </para>
       
       <para>
@@ -4830,16 +4839,18 @@ save-hook aol\\.com$ +spam</muttng-doc:lstconf>
       </para>
       
       <para>
-        Example: <literal><muttng-doc:hook name="fcc"/> [@.]aol\\.com$
-          +spammers
-        </literal>
+        Example:
+      </para>
+
+      <para>
+        <muttng-doc:lstconf>
+fcc-hook [@.]aol\\.com$ +spammers</muttng-doc:lstconf>
       </para>
       
       <para>
-        The above will save a copy of all messages going to the aol.com domain
-        to
-        the `+spammers' mailbox by default.  Also see the <muttng-doc:hook name="fcc-save"/>
-        command.
+        The above will save a copy of all messages going to the aol.com
+        domain to the `+spammers' mailbox by default.  Also see the
+        <muttng-doc:hook name="fcc-save"/> command.
       </para>
       
       <para>
@@ -4988,8 +4999,8 @@ save-hook aol\\.com$ +spam</muttng-doc:lstconf>
         Example:
         
         <muttng-doc:lstconf>
-message-hook <muttng-doc:pattern name="A"/> 'set pager=builtin'
-message-hook '<muttng-doc:pattern name="f"/> freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</muttng-doc:lstconf>
+message-hook ~A 'set pager=builtin'
+message-hook '~f freshmeat-news' 'set pager="less \"+/^  subject:.*\""'</muttng-doc:lstconf>
         
       </para>
       
@@ -5047,8 +5058,7 @@ message-hook '<muttng-doc:pattern name="f"/> freshmeat-news' 'set pager="less \"
         will automatically collapse all threads when entering a folder:
 
         <muttng-doc:lstconf>
-folder-hook . 'push &lt;collapse-all&gt;'
-        </muttng-doc:lstconf>
+folder-hook . 'push &lt;collapse-all&gt;'</muttng-doc:lstconf>
 
       </para>
       
@@ -5108,8 +5118,8 @@ folder-hook . 'push &lt;collapse-all&gt;'
       <para>
         
         <muttng-doc:lstconf>
-score "<muttng-doc:pattern name="f"/> nion@muttng\.org" 50
-score "<muttng-doc:pattern name="f"/> @sco\.com" -100</muttng-doc:lstconf>
+score "~f nion@muttng\.org" 50
+score "~f @sco\.com" -100</muttng-doc:lstconf>
         
       </para>
       
@@ -5122,7 +5132,7 @@ score "<muttng-doc:pattern name="f"/> @sco\.com" -100</muttng-doc:lstconf>
       <para>
         
         <muttng-doc:lstconf>
-score "<muttng-doc:pattern name="f"/> santaclaus@northpole\.int" =666</muttng-doc:lstconf>
+score "~f santaclaus@northpole\.int" =666</muttng-doc:lstconf>
         
       </para>
       
@@ -5197,8 +5207,8 @@ score "<muttng-doc:pattern name="f"/> santaclaus@northpole\.int" =666</muttng-do
       <para>
         
         <muttng-doc:lstconf>
-color index  black   yellow  "<muttng-doc:pattern name="n"/> 10-"
-color index  red     yellow  "<muttng-doc:pattern name="n"/> 100-"</muttng-doc:lstconf>
+color index  black   yellow  "~n 10-"
+color index  red     yellow  "~n 100-"</muttng-doc:lstconf>
         
       </para>
       
@@ -6269,7 +6279,7 @@ ifndef feature_slang 'source ~/.mutt-ng/setup-ncurses'</muttng-doc:lstconf>
       <para>
         It must be noted that in this table, <literal>EXPR</literal> is
         a regular expression. For ranges, the forms
-        <literal>&lt;[MAX]</literal>, <literal>&gt;&#62;[MIN]</literal>,
+        <literal>&lt;[MAX]</literal>, <literal>&gt;&gt;[MIN]</literal>,
         <literal> [MIN]-</literal> and <literal>-[MAX]</literal> are
         also possible.
       </para>
@@ -6576,7 +6586,7 @@ set status_format = "%v on %h: %B %?n?%n new? ...</muttng-doc:lstconf>
         <para>
           
           <screen>
-%?&#60;item&#62;?&#60;string if nonzero&#62;?</screen>
+%?&lt;item&gt;?&lt;string if nonzero&gt;?</screen>
           
         </para>
         
@@ -6602,7 +6612,7 @@ set status_format = "%v on %h: %B %?n?%n new? ...</muttng-doc:lstconf>
         <para>
           
           <screen>
-%?&#60;item&#62;?&#60;string if nonzero&#62;&#38;&#60;string if zero&#62;?</screen>
+%?&lt;item&gt;?&lt;string if nonzero&gt;&#38;&lt;string if zero&gt;?</screen>
           
         </para>
         
@@ -6765,7 +6775,7 @@ 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 %&#62; (%v on %h)"</muttng-doc:lstconf>
+set status_format = "%B: %?n?%n&amp;no? new messages %&gt; (%v on %h)"</muttng-doc:lstconf>
                   
                 </para>
               </listitem>
@@ -6912,7 +6922,7 @@ set status_format = "%B: %?n?%n&amp;no? new messages %&#62; (%v on %h)"</muttng-
         
         <muttng-doc:lstconf>
 send-hook . 'unmy_hdr From:'
-send-hook <muttng-doc:pattern name="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</muttng-doc:lstconf>
         
       </para>
       
@@ -6946,7 +6956,7 @@ send-hook <muttng-doc:pattern name="C"/>'^b@b\.b$' my-hdr from: c@c.c</muttng-do
           mail to a specific address, you could do something like:
           
           <muttng-doc:lstconf>
-send-hook '<muttng-doc:pattern name="t"/> ^me@cs\.hmc\.edu$' 'my-hdr From: Mutt-ng User &#60;user@host&#62;'</muttng-doc:lstconf>
+send-hook '~t ^me@cs\.hmc\.edu$' 'my-hdr From: Mutt-ng User &lt;user@host&gt;'</muttng-doc:lstconf>
           
           which would execute the given command when sending mail to
           <emphasis>me@cs.hmc.edu</emphasis>.
@@ -7841,7 +7851,7 @@ imap://imapserver:port/INBOX</screen>
         If compiled with ``--enable-nntp'' option, Mutt-ng can read news from
         a newsserver via NNTP.  You can open a newsgroup with the
         ``change-newsgroup'' function from the index/pager which is by default
-        bound to <literal>i</literal>.
+        bound to <muttng-doc:key>i</muttng-doc:key>.
       </para>
       
       <para>
@@ -7881,7 +7891,7 @@ imap://imapserver:port/INBOX</screen>
         <para>
           
           <muttng-doc:lstconf>
-score <muttng-doc:pattern name="*"/> =42</muttng-doc:lstconf>
+score ~* =42</muttng-doc:lstconf>
           
         </para>
         
@@ -7893,7 +7903,7 @@ score <muttng-doc:pattern name="*"/> =42</muttng-doc:lstconf>
         <para>
           
           <muttng-doc:lstconf>
-score !<muttng-doc:pattern name="*"/> =42</muttng-doc:lstconf>
+score !~* =42</muttng-doc:lstconf>
           
         </para>
         
@@ -8093,9 +8103,9 @@ macro pager \cb |urlview\n</muttng-doc:lstconf>
       <para>
         
         <muttng-doc:lstconf>
-open-hook \\.gz$ "gzip -cd %f &#62; %t" 
-close-hook \\.gz$ "gzip -c %t &#62; %f"
-append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </muttng-doc:lstconf>
+open-hook \\.gz$ "gzip -cd %f &gt; %t" 
+close-hook \\.gz$ "gzip -c %t &gt; %f"
+append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </muttng-doc:lstconf>
         
       </para>
       
@@ -8164,8 +8174,7 @@ append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </muttng-doc:lstconf>
         <para>
           
           <muttng-doc:lstconf>
-open-hook \\.gz$ "gzip -cd %f &#62; %t" 
-</muttng-doc:lstconf>
+open-hook \\.gz$ "gzip -cd %f &gt; %t"</muttng-doc:lstconf>
           
         </para>
         
@@ -8214,7 +8223,7 @@ open-hook \\.gz$ "gzip -cd %f &#62; %t"
         <para>
           
           <muttng-doc:lstconf>
-close-hook \\.gz$ "gzip -c %t &#62; %f"</muttng-doc:lstconf>
+close-hook \\.gz$ "gzip -c %t &gt; %f"</muttng-doc:lstconf>
           
         </para>
         
@@ -8264,7 +8273,7 @@ close-hook \\.gz$ "gzip -c %t &#62; %f"</muttng-doc:lstconf>
         <para>
           
           <muttng-doc:lstconf>
-append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </muttng-doc:lstconf>
+append-hook \\.gz$ "gzip -c %t &gt;&gt; %f" </muttng-doc:lstconf>
           
         </para>
         
@@ -8306,9 +8315,8 @@ append-hook \\.gz$ "gzip -c %t &#62;&#62; %f" </muttng-doc:lstconf>
         <para>
           
           <muttng-doc:lstconf>
-open-hook  \\.pgp$ "pgp -f &#60; %f &#62; %t"
-close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &#60; %t &#62; %f"
-</muttng-doc:lstconf>
+open-hook  \\.pgp$ "pgp -f &lt; %f &gt; %t"
+close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &lt; %t &gt; %f"</muttng-doc:lstconf>
           
         </para>
         
@@ -8456,8 +8464,8 @@ close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId &#60; %t &#62; %f"
           Attachments appear as follows:
           
           <screen>
-1 [text/plain, 7bit, 1K]             /tmp/mutt-euler-8082-0 &#60;no description&#62;
-2 [applica/x-gunzip, base64, 422K]   ~/src/mutt-0.85.tar.gz &#60;no description&#62;</screen>
+1 [text/plain, 7bit, 1K]             /tmp/mutt-euler-8082-0 &lt;no description&gt;
+2 [applica/x-gunzip, base64, 422K]   ~/src/mutt-0.85.tar.gz &lt;no description&gt;</screen>
           
         </para>
         
@@ -9066,8 +9074,8 @@ Content-Type: text/plain; charset=iso-8859-1</muttng-doc:lstmail>
           
           <screen>>
 # I'm always running X :)
-video/*;        xanim %s &#62; /dev/null
-image/*;        xv %s &#62; /dev/null
+video/*;        xanim %s &gt; /dev/null
+image/*;        xv %s &gt; /dev/null
 
 # I'm always running netscape (if my computer had more memory, maybe)
 text/html;      netscape -remote 'openURL(%s)'</screen>
@@ -9083,7 +9091,7 @@ text/html;      netscape -remote 'openURL(%s)'</screen>
           <screen>
 # Use xanim to view all videos   Xanim produces a header on startup,
 # send that to /dev/null so I don't see it
-video/*;        xanim %s &#62; /dev/null
+video/*;        xanim %s &gt; /dev/null
 
 # Send html to a running netscape by remote
 text/html;      netscape -remote 'openURL(%s)'; test=RunningNetscape
@@ -9109,8 +9117,8 @@ image/jpeg;xv %s; x-mozilla-flags=internal
 image/*;xv %s; test=RunningX; edit=xpaint %s
 
 # Convert images to text using the netpbm tools
-image/*;  (anytopnm %s | pnmscale -xysize 80 46 | ppmtopgm | pgmtopbm |
-pbmtoascii -1x2 ) 2&#62;&#38;1 ; copiousoutput
+image/*;  (anytopnm %s | pnmscale -xysize 80 46 | ppmtopgm | \
+pgmtopbm | pbmtoascii -1x2 ) 2&gt;&#38;1 ; copiousoutput
 
 # Send excel spreadsheets to my NT box
 application/ms-excel; open.pl %s</screen>
@@ -9551,7 +9559,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       
       <para>
         
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l">
           <title>Reference: Command Line Options</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
@@ -9719,7 +9727,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
 
       <para>
 
-        <table frame="none" rowsep="1" id="tab-patterns">
+        <table frame="none" rowsep="1" id="tab-patterns" texstr="l|l|l">
           <title>Reference: Patterns</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
@@ -10331,7 +10339,7 @@ mailto:joe@host?Attach=~/.gnupg/secring.gpg</screen>
       <para>
         <anchor id="sect-obsolete"/>
 
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l">
           <title>Reference: Obsolete Variables</title>
           <tgroup cols="2" align="left" colsep="1" rowsep="1">
           <thead>
index 986a7b7..b98aeb7 100644 (file)
@@ -28,7 +28,7 @@
         
         <para>
           
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Reference: Default Generic Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           <tbody>
             <row>
               <entry><muttng-doc:funcref name="bottom-page"/></entry>
-              <entry><literal>L</literal></entry>
+              <entry><muttng-doc:key>L</muttng-doc:key></entry>
               <entry>move to the bottom of the page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="current-bottom"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>move current entry to bottom of page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="current-middle"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>move current entry to middle of page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="current-top"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>move current entry to top of page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="enter-command"/></entry>
-              <entry><literal>:</literal></entry>
+              <entry><muttng-doc:key>:</muttng-doc:key></entry>
               <entry>enter a muttngrc command</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="exit"/></entry>
-              <entry><literal>q</literal></entry>
+              <entry><muttng-doc:key>q</muttng-doc:key></entry>
               <entry>exit this menu</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="first-entry"/></entry>
-              <entry><literal>=</literal></entry>
+              <entry><muttng-doc:key>=</muttng-doc:key></entry>
               <entry>move to the first entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="half-down"/></entry>
-              <entry><literal>]</literal></entry>
+              <entry><muttng-doc:key>]</muttng-doc:key></entry>
               <entry>scroll down 1/2 page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="half-up"/></entry>
-              <entry><literal>[</literal></entry>
+              <entry><muttng-doc:key>[</muttng-doc:key></entry>
               <entry>scroll up 1/2 page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="help"/></entry>
-              <entry><literal>?</literal></entry>
+              <entry><muttng-doc:key>?</muttng-doc:key></entry>
               <entry>this screen</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="jump"/></entry>
-              <entry><literal>number</literal></entry>
+              <entry><muttng-doc:key>number</muttng-doc:key></entry>
               <entry>jump to an index number</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="last-entry"/></entry>
-              <entry><literal>*</literal></entry>
+              <entry><muttng-doc:key>*</muttng-doc:key></entry>
               <entry>move to the last entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="middle-page"/></entry>
-              <entry><literal>M</literal></entry>
+              <entry><muttng-doc:key>M</muttng-doc:key></entry>
               <entry>move to the middle of the page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-entry"/></entry>
-              <entry><literal>j</literal></entry>
+              <entry><muttng-doc:key>j</muttng-doc:key></entry>
               <entry>move to the next entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-line"/></entry>
-              <entry><literal>&gt;</literal></entry>
+              <entry><muttng-doc:key>></muttng-doc:key></entry>
               <entry>scroll down one line</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-page"/></entry>
-              <entry><literal>z</literal></entry>
+              <entry><muttng-doc:key>z</muttng-doc:key></entry>
               <entry>move to the next page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-entry"/></entry>
-              <entry><literal>k</literal></entry>
+              <entry><muttng-doc:key>k</muttng-doc:key></entry>
               <entry>move to the previous entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-line"/></entry>
-              <entry><literal>&lt;</literal></entry>
+              <entry><muttng-doc:key>></muttng-doc:key></entry>
               <entry>scroll up one line</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-page"/></entry>
-              <entry><literal>Z</literal></entry>
+              <entry><muttng-doc:key>Z</muttng-doc:key></entry>
               <entry>move to the previous page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="refresh"/></entry>
-              <entry><literal>^L</literal></entry>
+              <entry><muttng-doc:key mod="C">L</muttng-doc:key></entry>
               <entry>clear and redraw the screen</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search"/></entry>
-              <entry><literal>/</literal></entry>
+              <entry><muttng-doc:key>/</muttng-doc:key></entry>
               <entry>search for a regular expression</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-next"/></entry>
-              <entry><literal>n</literal></entry>
+              <entry><muttng-doc:key>n</muttng-doc:key></entry>
               <entry>search for next match</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-opposite"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>search for next match in opposite direction</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-reverse"/></entry>
-              <entry><literal>ESC /</literal></entry>
+              <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
               <entry>search backwards for a regular expression</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="select-entry"/></entry>
-              <entry><literal>RET</literal></entry>
+              <entry><muttng-doc:key>Return</muttng-doc:key></entry>
               <entry>select the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="shell-escape"/></entry>
-              <entry><literal>!</literal></entry>
+              <entry><muttng-doc:key>!</muttng-doc:key></entry>
               <entry>run a program in a subshell</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="tag-entry"/></entry>
-              <entry><literal>t</literal></entry>
+              <entry><muttng-doc:key>t</muttng-doc:key></entry>
               <entry>toggle the tag on the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="tag-prefix"/></entry>
-              <entry><literal>;</literal></entry>
+              <entry><muttng-doc:key>;</muttng-doc:key></entry>
               <entry>apply next command to tagged entries</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="tag-prefix-cond"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>apply next function ONLY to tagged messages</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="top-page"/></entry>
-              <entry><literal>H</literal></entry>
+              <entry><muttng-doc:key>H</muttng-doc:key></entry>
               <entry>move to the top of the page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="what-key"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>display the keycode for a key press</entry>
             </row>
                   </tbody>
         
         <para>
           
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Reference: Default Index Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           <tbody>
             <row>
               <entry><muttng-doc:funcref name="bounce-message"/></entry>
-              <entry><literal>b</literal></entry>
+              <entry><muttng-doc:key>b</muttng-doc:key></entry>
               <entry>remail a message to another user</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="change-folder"/></entry>
-              <entry><literal>c</literal></entry>
+              <entry><muttng-doc:key>c</muttng-doc:key></entry>
               <entry>open a different folder</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="change-folder-readonly"/></entry>
-              <entry><literal>ESC c</literal></entry>
+              <entry><muttng-doc:key mod="E">c</muttng-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><literal>ESC P</literal></entry>
+              <entry><muttng-doc:key mod="E">P</muttng-doc:key></entry>
               <entry>check for classic pgp</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="clear-flag"/></entry>
-              <entry><literal>W</literal></entry>
+              <entry><muttng-doc:key>W</muttng-doc:key></entry>
               <entry>clear a status flag from a message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="copy-message"/></entry>
-              <entry><literal>C</literal></entry>
+              <entry><muttng-doc:key>C</muttng-doc:key></entry>
               <entry>copy a message to a file/mailbox</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="create-alias"/></entry>
-              <entry><literal>a</literal></entry>
+              <entry><muttng-doc:key>a</muttng-doc:key></entry>
               <entry>create an alias from a message sender</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="decode-copy"/></entry>
-              <entry><literal>ESC C</literal></entry>
+              <entry><muttng-doc:key mod="E">C</muttng-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><literal>ESC s</literal></entry>
+              <entry><muttng-doc:key mod="E">s</muttng-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><literal>d</literal></entry>
+              <entry><muttng-doc:key>d</muttng-doc:key></entry>
               <entry>delete the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="delete-pattern"/></entry>
-              <entry><literal>D</literal></entry>
+              <entry><muttng-doc:key>D</muttng-doc:key></entry>
               <entry>delete messages matching a pattern</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="delete-subthread"/></entry>
-              <entry><literal>ESC d</literal></entry>
+              <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
               <entry>delete all messages in subthread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="delete-thread"/></entry>
-              <entry><literal>^D</literal></entry>
+              <entry><muttng-doc:key mod="C">D</muttng-doc:key></entry>
               <entry>delete all messages in thread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="display-address"/></entry>
-              <entry><literal>@</literal></entry>
+              <entry><muttng-doc:key>@</muttng-doc:key></entry>
               <entry>display full address of sender</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
-              <entry><literal>h</literal></entry>
+              <entry><muttng-doc:key>h</muttng-doc:key></entry>
               <entry>display message and toggle header weeding</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="display-message"/></entry>
-              <entry><literal>RET</literal></entry>
+              <entry><muttng-doc:key>Return</muttng-doc:key></entry>
               <entry>display a message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit"/></entry>
-              <entry><literal>e</literal></entry>
+              <entry><muttng-doc:key>e</muttng-doc:key></entry>
               <entry>edit the current message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-type"/></entry>
-              <entry><literal>^E</literal></entry>
+              <entry><muttng-doc:key mod="C">E</muttng-doc:key></entry>
               <entry>edit the current message's Content-Type</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="exit"/></entry>
-              <entry><literal>x</literal></entry>
+              <entry><muttng-doc:key>x</muttng-doc:key></entry>
               <entry>exit without saving changes</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="extract-keys"/></entry>
-              <entry><literal>^K</literal></entry>
+              <entry><muttng-doc:key mod="C">K</muttng-doc:key></entry>
               <entry>extract PGP public keys</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="fetch-mail"/></entry>
-              <entry><literal>G</literal></entry>
+              <entry><muttng-doc:key>G</muttng-doc:key></entry>
               <entry>retrieve mail from POP server</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="flag-message"/></entry>
-              <entry><literal>F</literal></entry>
+              <entry><muttng-doc:key>F</muttng-doc:key></entry>
               <entry>toggle a message's 'important' flag</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
-              <entry><literal>^F</literal></entry>
+              <entry><muttng-doc:key mod="C">F</muttng-doc:key></entry>
               <entry>wipe PGP passphrase from memory</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="forward-message"/></entry>
-              <entry><literal>f</literal></entry>
+              <entry><muttng-doc:key>f</muttng-doc:key></entry>
               <entry>forward a message with comments</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="group-reply"/></entry>
-              <entry><literal>g</literal></entry>
+              <entry><muttng-doc:key>g</muttng-doc:key></entry>
               <entry>reply to all recipients</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="limit"/></entry>
-              <entry><literal>l</literal></entry>
+              <entry><muttng-doc:key>l</muttng-doc:key></entry>
               <entry>show only messages matching a pattern</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="list-reply"/></entry>
-              <entry><literal>L</literal></entry>
+              <entry><muttng-doc:key>L</muttng-doc:key></entry>
               <entry>reply to specified mailing list</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="mail"/></entry>
-              <entry><literal>m</literal></entry>
+              <entry><muttng-doc:key>m</muttng-doc:key></entry>
               <entry>compose a new mail message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="mail-key"/></entry>
-              <entry><literal>ESC k</literal></entry>
+              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
               <entry>mail a PGP public key</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-new"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>jump to the next new message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-new-then-unread"/></entry>
-              <entry><literal>TAB</literal></entry>
+              <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
               <entry>jump to the next new or unread message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-subthread"/></entry>
-              <entry><literal>ESC n</literal></entry>
+              <entry><muttng-doc:key mod="E">n</muttng-doc:key></entry>
               <entry>jump to the next subthread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-thread"/></entry>
-              <entry><literal>^N</literal></entry>
+              <entry><muttng-doc:key mod="C">N</muttng-doc:key></entry>
               <entry>jump to the next thread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-undeleted"/></entry>
-              <entry><literal>j</literal></entry>
+              <entry><muttng-doc:key>j</muttng-doc:key></entry>
               <entry>move to the next undeleted message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-unread"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>jump to the next unread message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="parent-message"/></entry>
-              <entry><literal>P</literal></entry>
+              <entry><muttng-doc:key>P</muttng-doc:key></entry>
               <entry>jump to parent message in thread </entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="pipe-message"/></entry>
-              <entry><literal>|</literal></entry>
+              <entry><muttng-doc:key>|</muttng-doc:key></entry>
               <entry>pipe message/attachment to a shell command</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-new"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>jump to the previous new message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-new-then-unread"/></entry>
-              <entry><literal>ESC TAB</literal></entry>
+              <entry><muttng-doc:key mod="E">Tab</muttng-doc:key></entry>
               <entry>jump to the previous new or unread message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-page"/></entry>
-              <entry><literal>Z</literal></entry>
+              <entry><muttng-doc:key>Z</muttng-doc:key></entry>
               <entry>move to the previous page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-subthread"/></entry>
-              <entry><literal>ESC p</literal></entry>
+              <entry><muttng-doc:key mod="E">p</muttng-doc:key></entry>
               <entry>jump to previous subthread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-thread"/></entry>
-              <entry><literal>^P</literal></entry>
+              <entry><muttng-doc:key mod="C">P</muttng-doc:key></entry>
               <entry>jump to previous thread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-undeleted"/></entry>
-              <entry><literal>k</literal></entry>
+              <entry><muttng-doc:key>k</muttng-doc:key></entry>
               <entry>move to the last undelete message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-unread"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>jump to the previous unread message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="print-message"/></entry>
-              <entry><literal>p</literal></entry>
+              <entry><muttng-doc:key>p</muttng-doc:key></entry>
               <entry>print the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="query"/></entry>
-              <entry><literal>Q</literal></entry>
+              <entry><muttng-doc:key>Q</muttng-doc:key></entry>
               <entry>query external program for addresses</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="quit"/></entry>
-              <entry><literal>q</literal></entry>
+              <entry><muttng-doc:key>q</muttng-doc:key></entry>
               <entry>save changes to mailbox and quit</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="read-subthread"/></entry>
-              <entry><literal>ESC r</literal></entry>
+              <entry><muttng-doc:key mod="E">r</muttng-doc:key></entry>
               <entry>mark the current subthread as read</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="read-thread"/></entry>
-              <entry><literal>^R</literal></entry>
+              <entry><muttng-doc:key mod="C">R</muttng-doc:key></entry>
               <entry>mark the current thread as read</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="recall-message"/></entry>
-              <entry><literal>R</literal></entry>
+              <entry><muttng-doc:key>R</muttng-doc:key></entry>
               <entry>recall a postponed message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="reply"/></entry>
-              <entry><literal>r</literal></entry>
+              <entry><muttng-doc:key>r</muttng-doc:key></entry>
               <entry>reply to a message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="resend-message"/></entry>
-              <entry><literal>ESC e</literal></entry>
+              <entry><muttng-doc:key mod="E">e</muttng-doc:key></entry>
               <entry>resend message and preserve MIME structure</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="save-message"/></entry>
-              <entry><literal>s</literal></entry>
+              <entry><muttng-doc:key>s</muttng-doc:key></entry>
               <entry>save message/attachment to a file</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="set-flag"/></entry>
-              <entry><literal>w</literal></entry>
+              <entry><muttng-doc:key>w</muttng-doc:key></entry>
               <entry>set a status flag on a message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="show-version"/></entry>
-              <entry><literal>V</literal></entry>
+              <entry><muttng-doc:key>V</muttng-doc:key></entry>
               <entry>show the Mutt-ng version number and date</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="show-limit"/></entry>
-              <entry><literal>ESC l</literal></entry>
+              <entry><muttng-doc:key mod="E">l</muttng-doc:key></entry>
               <entry>show currently active limit pattern, if any</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="sort-mailbox"/></entry>
-              <entry><literal>o</literal></entry>
+              <entry><muttng-doc:key>o</muttng-doc:key></entry>
               <entry>sort messages</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="sort-reverse"/></entry>
-              <entry><literal>O</literal></entry>
+              <entry><muttng-doc:key>O</muttng-doc:key></entry>
               <entry>sort messages in reverse order</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="sync-mailbox"/></entry>
-              <entry><literal>$</literal></entry>
+              <entry><muttng-doc:key>$</muttng-doc:key></entry>
               <entry>save changes to mailbox</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="tag-pattern"/></entry>
-              <entry><literal>T</literal></entry>
+              <entry><muttng-doc:key>T</muttng-doc:key></entry>
               <entry>tag messages matching a pattern</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="tag-thread"/></entry>
-              <entry><literal>ESC t</literal></entry>
+              <entry><muttng-doc:key mod="E">t</muttng-doc:key></entry>
               <entry>tag/untag all messages in the current thread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="toggle-new"/></entry>
-              <entry><literal>N</literal></entry>
+              <entry><muttng-doc:key>N</muttng-doc:key></entry>
               <entry>toggle a message's 'new' flag</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="toggle-write"/></entry>
-              <entry><literal>%</literal></entry>
+              <entry><muttng-doc:key>%</muttng-doc:key></entry>
               <entry>toggle whether the mailbox will be rewritten</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="undelete-message"/></entry>
-              <entry><literal>u</literal></entry>
+              <entry><muttng-doc:key>u</muttng-doc:key></entry>
               <entry>undelete the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="undelete-pattern"/></entry>
-              <entry><literal>U</literal></entry>
+              <entry><muttng-doc:key>U</muttng-doc:key></entry>
               <entry>undelete messages matching a pattern</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="undelete-subthread"/></entry>
-              <entry><literal>ESC u</literal></entry>
+              <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
               <entry>undelete all messages in subthread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="undelete-thread"/></entry>
-              <entry><literal>^U</literal></entry>
+              <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
               <entry>undelete all messages in thread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="untag-pattern"/></entry>
-              <entry><literal>^T</literal></entry>
+              <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
               <entry>untag messages matching a pattern</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="view-attachments"/></entry>
-              <entry><literal>v</literal></entry>
+              <entry><muttng-doc:key>v</muttng-doc:key></entry>
               <entry>show MIME attachments</entry>
             </row>
                   </tbody>
         
         <para>
           
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Reference: Default Pager Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           <tbody>
             <row>
               <entry><muttng-doc:funcref name="bottom"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>jump to the bottom of the message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="bounce-message"/></entry>
-              <entry><literal>b</literal></entry>
+              <entry><muttng-doc:key>b</muttng-doc:key></entry>
               <entry>remail a message to another user</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="change-folder"/></entry>
-              <entry><literal>c  </literal></entry>
+              <entry><muttng-doc:key>c</muttng-doc:key></entry>
               <entry>open a different folder</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="change-folder-readonly"/></entry>
-              <entry><literal>ESC c</literal></entry>
+              <entry><muttng-doc:key mod="E">c</muttng-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><literal>ESC P</literal></entry>
+              <entry><muttng-doc:key mod="E">P</muttng-doc:key></entry>
               <entry>check for classic pgp</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="copy-message"/></entry>
-              <entry><literal>C</literal></entry>
+              <entry><muttng-doc:key>C</muttng-doc:key></entry>
               <entry>copy a message to a file/mailbox</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="create-alias"/></entry>
-              <entry><literal>a</literal></entry>
+              <entry><muttng-doc:key>a</muttng-doc:key></entry>
               <entry>create an alias from a message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="senderdecode-copy"/></entry>
-              <entry><literal>ESC C</literal></entry>
+              <entry><muttng-doc:key mod="E">C</muttng-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><literal>ESC s</literal></entry>
+              <entry><muttng-doc:key mod="E">s</muttng-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><literal>d</literal></entry>
+              <entry><muttng-doc:key>d</muttng-doc:key></entry>
               <entry>delete the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="delete-subthread"/></entry>
-              <entry><literal>ESC d</literal></entry>
+              <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
               <entry>delete all messages in subthread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="delete-thread"/></entry>
-              <entry><literal>^D</literal></entry>
+              <entry><muttng-doc:key mod="C">D</muttng-doc:key></entry>
               <entry>delete all messages in thread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="display-address"/></entry>
-              <entry><literal>@</literal></entry>
+              <entry><muttng-doc:key>@</muttng-doc:key></entry>
               <entry>display full address of sender</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
-              <entry><literal>h</literal></entry>
+              <entry><muttng-doc:key>h</muttng-doc:key></entry>
               <entry>display message and toggle header weeding</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit"/></entry>
-              <entry><literal>e</literal></entry>
+              <entry><muttng-doc:key>e</muttng-doc:key></entry>
               <entry>edit the current message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-type"/></entry>
-              <entry><literal>^E</literal></entry>
+              <entry><muttng-doc:key mod="C">E</muttng-doc:key></entry>
               <entry>edit the current message's             Content-Type</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="enter-command"/></entry>
-              <entry><literal>:</literal></entry>
+              <entry><muttng-doc:key>:</muttng-doc:key></entry>
               <entry>enter a muttngrc command</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="exit"/></entry>
-              <entry><literal>i</literal></entry>
+              <entry><muttng-doc:key>i</muttng-doc:key></entry>
               <entry>return to the main-menu</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="extract-keys"/></entry>
-              <entry><literal>^K</literal></entry>
+              <entry><muttng-doc:key mod="C">K</muttng-doc:key></entry>
               <entry>extract PGP public keys</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="flag-message"/></entry>
-              <entry><literal>F</literal></entry>
+              <entry><muttng-doc:key>F</muttng-doc:key></entry>
               <entry>toggle a message's 'important' flag</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
-              <entry><literal>^F</literal></entry>
+              <entry><muttng-doc:key mod="C">F</muttng-doc:key></entry>
               <entry>wipe PGP passphrase from memory</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="forward-message"/></entry>
-              <entry><literal>f</literal></entry>
+              <entry><muttng-doc:key>f</muttng-doc:key></entry>
               <entry>forward a message with comments</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="group-reply"/></entry>
-              <entry><literal>g</literal></entry>
+              <entry><muttng-doc:key>g</muttng-doc:key></entry>
               <entry>reply to all recipients</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="half-up"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>move up one-half page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="half-down"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>move down one-half page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="help"/></entry>
-              <entry><literal>?</literal></entry>
+              <entry><muttng-doc:key>?</muttng-doc:key></entry>
               <entry>this screen</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="list-reply"/></entry>
-              <entry><literal>L</literal></entry>
+              <entry><muttng-doc:key>L</muttng-doc:key></entry>
               <entry>reply to specified mailing list</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="mail"/></entry>
-              <entry><literal>m</literal></entry>
+              <entry><muttng-doc:key>m</muttng-doc:key></entry>
               <entry>compose a new mail message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="mail-key"/></entry>
-              <entry><literal>ESC k</literal></entry>
+              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
               <entry>mail a PGP public key</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="mark-as-new"/></entry>
-              <entry><literal>N</literal></entry>
+              <entry><muttng-doc:key>N</muttng-doc:key></entry>
               <entry>toggle a message's 'new' flag</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-line"/></entry>
-              <entry><literal>RET</literal></entry>
+              <entry><muttng-doc:key>Return</muttng-doc:key></entry>
               <entry>scroll down one line</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-entry"/></entry>
-              <entry><literal>J</literal></entry>
+              <entry><muttng-doc:key>J</muttng-doc:key></entry>
               <entry>move to the next entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-new"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>jump to the next new message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-new-then-unread"/></entry>
-              <entry><literal>TAB</literal></entry>
+              <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
               <entry>jump to the next new or unread message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-page"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>move to the next page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-subthread"/></entry>
-              <entry><literal>ESC n</literal></entry>
+              <entry><muttng-doc:key mod="E">n</muttng-doc:key></entry>
               <entry>jump to the next subthread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-thread"/></entry>
-              <entry><literal>^N</literal></entry>
+              <entry><muttng-doc:key mod="C">N</muttng-doc:key></entry>
               <entry>jump to the next thread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-undeleted"/></entry>
-              <entry><literal>j</literal></entry>
+              <entry><muttng-doc:key>j</muttng-doc:key></entry>
               <entry>move to the next undeleted message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="next-unread"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>jump to the next unread message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="parent-message"/></entry>
-              <entry><literal>P</literal></entry>
+              <entry><muttng-doc:key>P</muttng-doc:key></entry>
               <entry>jump to parent message in thread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="pipe-message"/></entry>
-              <entry><literal></literal>|</entry>
+              <entry><muttng-doc:key>|</muttng-doc:key></entry>
               <entry>pipe message/attachment to a shell command</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-line"/></entry>
-              <entry><literal>BackSpace</literal></entry>
+              <entry><muttng-doc:key>BackSpace</muttng-doc:key></entry>
               <entry>scroll up one line</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-entry"/></entry>
-              <entry><literal>K</literal></entry>
+              <entry><muttng-doc:key>K</muttng-doc:key></entry>
               <entry>move to the previous entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-new"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>jump to the previous new message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-new-then-unread"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>jump to the previous new or unread message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-page"/></entry>
-              <entry><literal>-</literal></entry>
+              <entry><muttng-doc:key>-</muttng-doc:key></entry>
               <entry>move to the previous page</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-subthread"/></entry>
-              <entry><literal>ESC p</literal></entry>
+              <entry><muttng-doc:key mod="E">p</muttng-doc:key></entry>
               <entry>jump to previous subthread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-thread"/></entry>
-              <entry><literal>^P</literal></entry>
+              <entry><muttng-doc:key mod="C">P</muttng-doc:key></entry>
               <entry>jump to previous thread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-undeleted"/></entry>
-              <entry><literal>k</literal></entry>
+              <entry><muttng-doc:key>k</muttng-doc:key></entry>
               <entry>move to the last undelete message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="previous-unread"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>jump to the previous unread message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="print-message"/></entry>
-              <entry><literal>p</literal></entry>
+              <entry><muttng-doc:key>p</muttng-doc:key></entry>
               <entry>print the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="quit"/></entry>
-              <entry><literal>Q</literal></entry>
+              <entry><muttng-doc:key>Q</muttng-doc:key></entry>
               <entry>save changes to mailbox and quit</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="read-subthread"/></entry>
-              <entry><literal>ESC r</literal></entry>
+              <entry><muttng-doc:key mod="E">r</muttng-doc:key></entry>
               <entry>mark the current subthread as read</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="read-thread"/></entry>
-              <entry><literal>^R</literal></entry>
+              <entry><muttng-doc:key mod="C">R</muttng-doc:key></entry>
               <entry>mark the current thread as read</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="recall-message"/></entry>
-              <entry><literal>R</literal></entry>
+              <entry><muttng-doc:key>R</muttng-doc:key></entry>
               <entry>recall a postponed message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="redraw-screen"/></entry>
-              <entry><literal>^L</literal></entry>
+              <entry><muttng-doc:key mod="C">L</muttng-doc:key></entry>
               <entry>clear and redraw the screen</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="reply"/></entry>
-              <entry><literal>r</literal></entry>
+              <entry><muttng-doc:key>r</muttng-doc:key></entry>
               <entry>reply to a message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="save-message"/></entry>
-              <entry><literal>s</literal></entry>
+              <entry><muttng-doc:key>s</muttng-doc:key></entry>
               <entry>save message/attachment to a file</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search"/></entry>
-              <entry><literal>/</literal></entry>
+              <entry><muttng-doc:key>/</muttng-doc:key></entry>
               <entry>search for a regular expression</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-next"/></entry>
-              <entry><literal>n</literal></entry>
+              <entry><muttng-doc:key>n</muttng-doc:key></entry>
               <entry>search for next match</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-opposite"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>search for next match in opposite direction</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-reverse"/></entry>
-              <entry><literal>ESC /</literal></entry>
+              <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
               <entry>search backwards for a regular expression</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-toggle"/></entry>
-              <entry><literal>\</literal></entry>
+              <entry><muttng-doc:key>\</muttng-doc:key></entry>
               <entry>toggle search pattern coloring</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="shell-escape"/></entry>
-              <entry><literal>!</literal></entry>
+              <entry><muttng-doc:key>!</muttng-doc:key></entry>
               <entry>invoke a command in a subshell</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="show-version"/></entry>
-              <entry><literal>V</literal></entry>
+              <entry><muttng-doc:key>V</muttng-doc:key></entry>
               <entry>show the Mutt-ng version number and date</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="skip-quoted"/></entry>
-              <entry><literal>S</literal></entry>
+              <entry><muttng-doc:key>S</muttng-doc:key></entry>
               <entry>skip beyond quoted text</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="sync-mailbox"/></entry>
-              <entry><literal>$</literal></entry>
+              <entry><muttng-doc:key>$</muttng-doc:key></entry>
               <entry>save changes to mailbox</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="tag-message"/></entry>
-              <entry><literal>t</literal></entry>
+              <entry><muttng-doc:key>t</muttng-doc:key></entry>
               <entry>tag a message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="toggle-quoted"/></entry>
-              <entry><literal>T</literal></entry>
+              <entry><muttng-doc:key>T</muttng-doc:key></entry>
               <entry>toggle display of quoted text</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="top"/></entry>
-              <entry><literal>^</literal></entry>
+              <entry><muttng-doc:key>^</muttng-doc:key></entry>
               <entry>jump to the top of the message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="undelete-message"/></entry>
-              <entry><literal>u</literal></entry>
+              <entry><muttng-doc:key>u</muttng-doc:key></entry>
               <entry>undelete the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="undelete-subthread"/></entry>
-              <entry><literal>ESC u</literal></entry>
+              <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
               <entry>undelete all messages in subthread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="undelete-thread"/></entry>
-              <entry><literal>^U</literal></entry>
+              <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
               <entry>undelete all messages in thread</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="view-attachments"/></entry>
-              <entry><literal>v</literal></entry>
+              <entry><muttng-doc:key>v</muttng-doc:key></entry>
               <entry>show MIME attachments</entry>
             </row>
                   </tbody>
         
         <para>
           
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Reference: Default Alias Menu Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           <tbody>
             <row>
               <entry><muttng-doc:funcref name="search"/></entry>
-              <entry><literal>/</literal></entry>
+              <entry><muttng-doc:key>/</muttng-doc:key></entry>
               <entry>search for a regular expression</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-next"/></entry>
-              <entry><literal>n</literal></entry>
+              <entry><muttng-doc:key>n</muttng-doc:key></entry>
               <entry>search for next match</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-reverse"/></entry>
-              <entry><literal>ESC /</literal></entry>
+              <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
               <entry>search backwards for a regular expression</entry>
             </row>
                   </tbody>
         
         <para>
           
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Reference: Default Query Menu Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           <tbody>
             <row>
               <entry><muttng-doc:funcref name="create-alias"/></entry>
-              <entry><literal>a</literal></entry>
+              <entry><muttng-doc:key>a</muttng-doc:key></entry>
               <entry>create an alias from a message sender</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="mail"/></entry>
-              <entry><literal>m</literal></entry>
+              <entry><muttng-doc:key>m</muttng-doc:key></entry>
               <entry>compose a new mail message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="query"/></entry>
-              <entry><literal>Q</literal></entry>
+              <entry><muttng-doc:key>Q</muttng-doc:key></entry>
               <entry>query external program for addresses</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="query-append"/></entry>
-              <entry><literal>A</literal></entry>
+              <entry><muttng-doc:key>A</muttng-doc:key></entry>
               <entry>append new query results to current results</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search"/></entry>
-              <entry><literal>/</literal></entry>
+              <entry><muttng-doc:key>/</muttng-doc:key></entry>
               <entry>search for a regular expression</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-next"/></entry>
-              <entry><literal>n</literal></entry>
+              <entry><muttng-doc:key>n</muttng-doc:key></entry>
               <entry>search for next match</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-opposite"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>search for next match in opposite direction</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-reverse"/></entry>
-              <entry><literal>ESC /</literal></entry>
+              <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
               <entry>search backwards for a regular expression</entry>
             </row>
                   </tbody>
         
         <para>
           
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Reference: Default Attachment Menu Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           <tbody>
             <row>
               <entry><muttng-doc:funcref name="bounce-message"/></entry>
-              <entry><literal>b</literal></entry>
+              <entry><muttng-doc:key>b</muttng-doc:key></entry>
               <entry>remail a message to another user</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="collapse-parts"/></entry>
-              <entry><literal>v</literal></entry>
+              <entry><muttng-doc:key>v</muttng-doc:key></entry>
               <entry>toggle display of subparts</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="delete-entry"/></entry>
-              <entry><literal>d</literal></entry>
+              <entry><muttng-doc:key>d</muttng-doc:key></entry>
               <entry>delete the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
-              <entry><literal>h</literal></entry>
+              <entry><muttng-doc:key>h</muttng-doc:key></entry>
               <entry>display message and toggle header weeding</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-type"/></entry>
-              <entry><literal>^E</literal></entry>
+              <entry><muttng-doc:key mod="C">E</muttng-doc:key></entry>
               <entry>edit the current entry's Content-Type</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="extract-keys"/></entry>
-              <entry><literal>^K</literal></entry>
+              <entry><muttng-doc:key mod="C">K</muttng-doc:key></entry>
               <entry>extract PGP public keys</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="forward-message"/></entry>
-              <entry><literal>f</literal></entry>
+              <entry><muttng-doc:key>f</muttng-doc:key></entry>
               <entry>forward a message with comments</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="group-reply"/></entry>
-              <entry><literal>g</literal></entry>
+              <entry><muttng-doc:key>g</muttng-doc:key></entry>
               <entry>reply to all recipients</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="list-reply"/></entry>
-              <entry><literal>L</literal></entry>
+              <entry><muttng-doc:key>L</muttng-doc:key></entry>
               <entry>reply to specified mailing list</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="pipe-entry"/></entry>
-              <entry><literal>|</literal></entry>
+              <entry><muttng-doc:key>|</muttng-doc:key></entry>
               <entry>pipe message/attachment to a shell command</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="print-entry"/></entry>
-              <entry><literal>p</literal></entry>
+              <entry><muttng-doc:key>p</muttng-doc:key></entry>
               <entry>print the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="reply"/></entry>
-              <entry><literal>r</literal></entry>
+              <entry><muttng-doc:key>r</muttng-doc:key></entry>
               <entry>reply to a message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="resend-message"/></entry>
-              <entry><literal>ESC e</literal></entry>
+              <entry><muttng-doc:key mod="E">e</muttng-doc:key></entry>
               <entry>resend message and preserve MIME        structure</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="save-entry"/></entry>
-              <entry><literal>s</literal></entry>
+              <entry><muttng-doc:key>s</muttng-doc:key></entry>
               <entry>save message/attachment to a file</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="undelete-entry"/></entry>
-              <entry><literal>u</literal></entry>
+              <entry><muttng-doc:key>u</muttng-doc:key></entry>
               <entry>undelete the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="view-attach"/></entry>
-              <entry><literal>RET</literal></entry>
+              <entry><muttng-doc:key>Return</muttng-doc:key></entry>
               <entry>view attachment using mailcap entry if necessary</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="view-mailcap"/></entry>
-              <entry><literal>m</literal></entry>
+              <entry><muttng-doc:key>m</muttng-doc:key></entry>
               <entry>force viewing of attachment using mailcap</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="view-text"/></entry>
-              <entry><literal>T</literal></entry>
+              <entry><muttng-doc:key>T</muttng-doc:key></entry>
               <entry>view attachment as text</entry>
             </row>
                   </tbody>
         
         <para>
           
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Reference: Default Compose Menu Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           <tbody>
             <row>
               <entry><muttng-doc:funcref name="attach-file"/></entry>
-              <entry><literal>a</literal></entry>
+              <entry><muttng-doc:key>a</muttng-doc:key></entry>
               <entry>attach a file(s) to this message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="attach-message"/></entry>
-              <entry><literal>A</literal></entry>
+              <entry><muttng-doc:key>A</muttng-doc:key></entry>
               <entry>attach message(s) to this message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="attach-key"/></entry>
-              <entry><literal>ESC k</literal></entry>
+              <entry><muttng-doc:key mod="E">k</muttng-doc:key></entry>
               <entry>attach a PGP public key</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="copy-file"/></entry>
-              <entry><literal>C</literal></entry>
+              <entry><muttng-doc:key>C</muttng-doc:key></entry>
               <entry>save message/attachment to a file</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="detach-file"/></entry>
-              <entry><literal>D</literal></entry>
+              <entry><muttng-doc:key>D</muttng-doc:key></entry>
               <entry>delete the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="display-toggle-weed"/></entry>
-              <entry><literal>h</literal></entry>
+              <entry><muttng-doc:key>h</muttng-doc:key></entry>
               <entry>display message and toggle header weeding</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-bcc"/></entry>
-              <entry><literal>b</literal></entry>
+              <entry><muttng-doc:key>b</muttng-doc:key></entry>
               <entry>edit the BCC list</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-cc"/></entry>
-              <entry><literal>c</literal></entry>
+              <entry><muttng-doc:key>c</muttng-doc:key></entry>
               <entry>edit the CC list</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-description"/></entry>
-              <entry><literal>d</literal></entry>
+              <entry><muttng-doc:key>d</muttng-doc:key></entry>
               <entry>edit attachment description</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-encoding"/></entry>
-              <entry><literal>^E</literal></entry>
+              <entry><muttng-doc:key mod="C">E</muttng-doc:key></entry>
               <entry>edit attachment transfer-encoding</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-fcc"/></entry>
-              <entry><literal>f</literal></entry>
+              <entry><muttng-doc:key>f</muttng-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><literal>ESC f</literal></entry>
+              <entry><muttng-doc:key mod="E">f</muttng-doc:key></entry>
               <entry>edit the from: field</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-file"/></entry>
-              <entry><literal>^X e</literal></entry>
+              <entry><muttng-doc:key mod="C">X e</muttng-doc:key></entry>
               <entry>edit the file to be attached</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-headers"/></entry>
-              <entry><literal>E</literal></entry>
+              <entry><muttng-doc:key>E</muttng-doc:key></entry>
               <entry>edit the message with headers</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit"/></entry>
-              <entry><literal>e</literal></entry>
+              <entry><muttng-doc:key>e</muttng-doc:key></entry>
               <entry>edit the message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-mime"/></entry>
-              <entry><literal>m</literal></entry>
+              <entry><muttng-doc:key>m</muttng-doc:key></entry>
               <entry>edit attachment using mailcap entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-reply-to"/></entry>
-              <entry><literal>r</literal></entry>
+              <entry><muttng-doc:key>r</muttng-doc:key></entry>
               <entry>edit the Reply-To field</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-subject"/></entry>
-              <entry><literal>s</literal></entry>
+              <entry><muttng-doc:key>s</muttng-doc:key></entry>
               <entry>edit the subject of this message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-to"/></entry>
-              <entry><literal>t</literal></entry>
+              <entry><muttng-doc:key>t</muttng-doc:key></entry>
               <entry>edit the TO list</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="edit-type"/></entry>
-              <entry><literal>^T</literal></entry>
+              <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
               <entry>edit attachment type</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="filter-entry"/></entry>
-              <entry><literal>F</literal></entry>
+              <entry><muttng-doc:key>F</muttng-doc:key></entry>
               <entry>filter attachment through a shell command</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="forget-passphrase"/></entry>
-              <entry><literal>^F</literal></entry>
+              <entry><muttng-doc:key mod="C">F</muttng-doc:key></entry>
               <entry>wipe PGP passphrase from memory</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="ispell"/></entry>
-              <entry><literal>i</literal></entry>
+              <entry><muttng-doc:key>i</muttng-doc:key></entry>
               <entry>run ispell on the message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="new-mime"/></entry>
-              <entry><literal>n</literal></entry>
+              <entry><muttng-doc:key>n</muttng-doc:key></entry>
               <entry>compose new attachment using mailcap entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="pgp-menu"/></entry>
-              <entry><literal>p</literal></entry>
+              <entry><muttng-doc:key>p</muttng-doc:key></entry>
               <entry>show PGP options</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="pipe-entry"/></entry>
-              <entry><literal>|</literal></entry>
+              <entry><muttng-doc:key>|</muttng-doc:key></entry>
               <entry>pipe message/attachment to a shell command</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="postpone-message"/></entry>
-              <entry><literal>P</literal></entry>
+              <entry><muttng-doc:key>P</muttng-doc:key></entry>
               <entry>save this message to send later</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="print-entry"/></entry>
-              <entry><literal>l</literal></entry>
+              <entry><muttng-doc:key>l</muttng-doc:key></entry>
               <entry>print the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="rename-file"/></entry>
-              <entry><literal>R</literal></entry>
+              <entry><muttng-doc:key>R</muttng-doc:key></entry>
               <entry>rename/move an attached file</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="send-message"/></entry>
-              <entry><literal>y</literal></entry>
+              <entry><muttng-doc:key>y</muttng-doc:key></entry>
               <entry>send the message</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="toggle-unlink"/></entry>
-              <entry><literal>u</literal></entry>
+              <entry><muttng-doc:key>u</muttng-doc:key></entry>
               <entry>toggle whether to delete file after sending it</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="view-attach"/></entry>
-              <entry><literal>RET</literal></entry>
+              <entry><muttng-doc:key>Return</muttng-doc:key></entry>
               <entry>view attachment using mailcap entry if necessary</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="write-fcc"/></entry>
-              <entry><literal>w  </literal></entry>
+              <entry><muttng-doc:key>w</muttng-doc:key></entry>
               <entry>write the message to a folder</entry>
             </row>
                   </tbody>
         
         <para>
           
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Reference: Default Postpone Menu Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           <tbody>
             <row>
               <entry><muttng-doc:funcref name="delete-entry"/></entry>
-              <entry><literal>d</literal></entry>
+              <entry><muttng-doc:key>d</muttng-doc:key></entry>
               <entry>delete the current entry</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="undelete-entry"/></entry>
-              <entry><literal>u</literal></entry>
+              <entry><muttng-doc:key>u</muttng-doc:key></entry>
               <entry>undelete the current entry</entry>
             </row>
                   </tbody>
         
         <para>
           
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Reference: Default Browser Menu Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           <tbody>
             <row>
               <entry><muttng-doc:funcref name="change-dir"/></entry>
-              <entry><literal>c</literal></entry>
+              <entry><muttng-doc:key>c</muttng-doc:key></entry>
               <entry>change directories</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="check-new"/></entry>
-              <entry><literal>TAB</literal></entry>
+              <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
               <entry>check mailboxes for new mail</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="enter-mask"/></entry>
-              <entry><literal>m</literal></entry>
+              <entry><muttng-doc:key>m</muttng-doc:key></entry>
               <entry>enter a file mask</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search"/></entry>
-              <entry><literal>/</literal></entry>
+              <entry><muttng-doc:key>/</muttng-doc:key></entry>
               <entry>search for a regular expression</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-next"/></entry>
-              <entry><literal>n</literal></entry>
+              <entry><muttng-doc:key>n</muttng-doc:key></entry>
               <entry>search for next match</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="search-reverse"/></entry>
-              <entry><literal>ESC /</literal></entry>
+              <entry><muttng-doc:key mod="E">/</muttng-doc:key></entry>
               <entry>search backwards for a regular expression</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="select-new"/></entry>
-              <entry><literal>N</literal></entry>
+              <entry><muttng-doc:key>N</muttng-doc:key></entry>
               <entry>select a new file in this directory</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="sort"/></entry>
-              <entry><literal>o</literal></entry>
+              <entry><muttng-doc:key>o</muttng-doc:key></entry>
               <entry>sort messages</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="sort-reverse"/></entry>
-              <entry><literal>O</literal></entry>
+              <entry><muttng-doc:key>O</muttng-doc:key></entry>
               <entry>sort messages in reverse order</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="toggle-mailboxes"/></entry>
-              <entry><literal>TAB</literal></entry>
+              <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
               <entry>toggle whether to browse mailboxes or all files</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="view-file"/></entry>
-              <entry><literal>SPACE</literal></entry>
+              <entry><muttng-doc:key>Space</muttng-doc:key></entry>
               <entry>view file</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="subscribe"/></entry>
-              <entry><literal>s</literal></entry>
+              <entry><muttng-doc:key>s</muttng-doc:key></entry>
               <entry>subscribe to current mailbox (IMAP            Only)</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="unsubscribe"/></entry>
-              <entry><literal>u</literal></entry>
+              <entry><muttng-doc:key>u</muttng-doc:key></entry>
               <entry>unsubscribe to current mailbox (IMAP            Only)</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="toggle-subscribed"/></entry>
-              <entry><literal>T</literal></entry>
+              <entry><muttng-doc:key>T</muttng-doc:key></entry>
               <entry>toggle view all/subscribed mailboxes            (IMAP Only)</entry>
             </row>
                   </tbody>
         
         <para>
           
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Reference: Default PGP Menu Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           <tbody>
             <row>
               <entry><muttng-doc:funcref name="view-name"/></entry>
-              <entry><literal>%</literal></entry>
+              <entry><muttng-doc:key>%</muttng-doc:key></entry>
               <entry>view the key's user id</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="verify-key"/></entry>
-              <entry><literal>c</literal></entry>
+              <entry><muttng-doc:key>c</muttng-doc:key></entry>
               <entry>verify a PGP public key</entry>
             </row>
                   </tbody>
         
         <para>
           
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Reference: Default Editor Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           <tbody>
             <row>
               <entry><muttng-doc:funcref name="backspace"/></entry>
-              <entry><literal>BackSpace</literal></entry>
+              <entry><muttng-doc:key>BackSpace</muttng-doc:key></entry>
               <entry>delete the char in front of the cursor</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="backward-char"/></entry>
-              <entry><literal>^B</literal></entry>
+              <entry><muttng-doc:key mod="C">B</muttng-doc:key></entry>
               <entry>move the cursor one character to the left</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="backward-word"/></entry>
-              <entry><literal>ESC b</literal></entry>
+              <entry><muttng-doc:key mod="E">b</muttng-doc:key></entry>
               <entry>move the cursor to the previous word</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="bol"/></entry>
-              <entry><literal>^A</literal></entry>
+              <entry><muttng-doc:key mod="C">A</muttng-doc:key></entry>
               <entry>jump to the beginning of the line</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="buffy-cycle"/></entry>
-              <entry><literal>Space</literal></entry>
+              <entry><muttng-doc:key>Space</muttng-doc:key></entry>
               <entry>cycle among incoming mailboxes</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="capitalize-word"/></entry>
-              <entry><literal>ESC c</literal></entry>
+              <entry><muttng-doc:key mod="E">c</muttng-doc:key></entry>
               <entry>uppercase the first character in the word</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="complete"/></entry>
-              <entry><literal>TAB</literal></entry>
+              <entry><muttng-doc:key>Tab</muttng-doc:key></entry>
               <entry>complete filename or alias</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="complete-query"/></entry>
-              <entry><literal>^T</literal></entry>
+              <entry><muttng-doc:key mod="C">T</muttng-doc:key></entry>
               <entry>complete address with query</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="delete-char"/></entry>
-              <entry><literal>^D</literal></entry>
+              <entry><muttng-doc:key mod="C">D</muttng-doc:key></entry>
               <entry>delete the char under the cursor</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="downcase-word"/></entry>
-              <entry><literal>ESC l</literal></entry>
+              <entry><muttng-doc:key mod="E">l</muttng-doc:key></entry>
               <entry>lowercase all characters in current word</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="eol"/></entry>
-              <entry><literal>^E</literal></entry>
+              <entry><muttng-doc:key mod="C">E</muttng-doc:key></entry>
               <entry>jump to the end of the line</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="forward-char"/></entry>
-              <entry><literal>^F</literal></entry>
+              <entry><muttng-doc:key mod="C">F</muttng-doc:key></entry>
               <entry>move the cursor one character to the right</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="forward-word"/></entry>
-              <entry><literal>ESC f</literal></entry>
+              <entry><muttng-doc:key mod="E">f</muttng-doc:key></entry>
               <entry>move the cursor to the next word</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="history-down"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>scroll down through the history list</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="history-up"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>scroll up through the history list</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="kill-eol"/></entry>
-              <entry><literal>^K</literal></entry>
+              <entry><muttng-doc:key mod="C">K</muttng-doc:key></entry>
               <entry>delete chars from cursor to end of line</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="kill-eow"/></entry>
-              <entry><literal>ESC d</literal></entry>
+              <entry><muttng-doc:key mod="E">d</muttng-doc:key></entry>
               <entry>delete chars from cursor to end of word</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="kill-line"/></entry>
-              <entry><literal>^U</literal></entry>
+              <entry><muttng-doc:key mod="C">U</muttng-doc:key></entry>
               <entry>delete all chars on the line</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="kill-word"/></entry>
-              <entry><literal>^W</literal></entry>
+              <entry><muttng-doc:key mod="C">W</muttng-doc:key></entry>
               <entry>delete the word in front of the cursor</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="quote-char"/></entry>
-              <entry><literal>^V</literal></entry>
+              <entry><muttng-doc:key mod="C">V</muttng-doc:key></entry>
               <entry>quote the next typed key</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="transpose-chars"/></entry>
-              <entry><literal>not bound</literal></entry>
+              <entry></entry>
               <entry>transpose character under cursor with previous</entry>
             </row>
             <row>
               <entry><muttng-doc:funcref name="upcase-word"/></entry>
-              <entry><literal>ESC u</literal></entry>
+              <entry><muttng-doc:key mod="E">u</muttng-doc:key></entry>
               <entry>uppercase all characters in current word</entry>
             </row>
                   </tbody>
         <title>sidebar</title>
         
       <para>
-        <table frame="none" rowsep="1">
+        <table frame="none" rowsep="1" texstr="l|l|l">
           <title>Referene: Default Sidebar Function Bindings</title>
           <tgroup cols="3" align="left" colsep="1" rowsep="1">
           <thead>
           </thead>
           <tbody>
             <row>
-              <entry><literal>none</literal></entry>
+              <entry></entry>
               <entry><muttng-doc:funcref name="sidebar-scroll-up"/></entry>
               <entry>Scrolls the mailbox list up 1 page</entry>
             </row>
             <row>
-              <entry><literal>none</literal></entry>
+              <entry></entry>
               <entry><muttng-doc:funcref name="sidebar-scroll-down"/></entry>
               <entry>Scrolls the mailbox list down 1 page</entry>
             </row>
             <row>
-              <entry><literal>none</literal></entry>
+              <entry></entry>
               <entry><muttng-doc:funcref name="sidebar-next"/></entry>
               <entry>Highlights the next mailbox</entry>
             </row>
             <row>
-              <entry><literal>none</literal></entry>
+              <entry></entry>
               <entry><muttng-doc:funcref name="sidebar-next-new"/></entry>
               <entry>Highlights the next mailbox with new mail</entry>
             </row>
             <row>
-              <entry><literal>none</literal></entry>
+              <entry></entry>
               <entry><muttng-doc:funcref name="sidebar-previous"/></entry>
               <entry>Highlights the previous mailbox</entry>
             </row>
             <row>
-              <entry><literal>none</literal></entry>
+              <entry></entry>
               <entry><muttng-doc:funcref name="sidebar-open"/></entry>
               <entry>Opens the currently highlighted mailbox</entry>
             </row>
 
       <para>
         This manual is written in XML and transformed via a XSLT
-        stylesheet into valid DocBook/XML to be again transformed via a
+        stylesheet into valid DocBook/XML and/or <muttng-doc:special
+          docbook="LaTeX" latex="\LaTeX{}"/> to be again transformed via a
         XSLT stylesheet into the final formats.
       </para>
 
             </para></listitem>
           </varlistentry>
           <varlistentry>
-            <term><literal>&lt;muttng-doc:funcdef name="" key=""/&gt;</literal></term>
+            <term><literal>&lt;muttng-doc:key [mod="C|E"]&gt;key&lt;/muttng-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{}"/>,
+                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
+                escaping, the actual key sequences must be given within
+                the tag.
+            </para></listitem>
+          </varlistentry>
+          <varlistentry>
+            <term><literal>&lt;muttng-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 and a default key
-                binding given via <literal>key</literal>. The string
+                <literal>name</literal> parameter. The default key
+                binding must be given via
+                <literal>&lt;muttng-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
                 must be a context sensitive distinction.
             </para></listitem>
           </varlistentry>
+          <varlistentry>
+            <term><literal>&lt;muttng-doc:special [docbook=""] [latex=""]/&gt;</literal></term>
+            <listitem><para>
+                This is intended for specifying special strings for
+                either DocBook/XML or <muttng-doc:special
+                  docbook="LaTeX" latex="\LaTeX{}"/>.
+            </para></listitem>
+          </varlistentry>
 
         </variablelist>
       </para>
 
+      <para>
+        Additional notes follow.
+      </para>
+      
+      <para>
+        <itemizedlist>
+          <listitem>
+            <para>To not fully bloat the XSL stylesheet
+              procuding the <muttng-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>.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+
     </appendix>
 
     <index/>
index ad0a818..be48b95 100644 (file)
@@ -88,7 +88,7 @@
   </xsl:template>
 
   <xsl:template match="muttng-doc:funcdef">
-     <literal>&lt;<xsl:value-of select="@name"/>&gt;</literal> (default: <xsl:value-of select="@key"/>)
+     <literal>&lt;<xsl:value-of select="@name"/>&gt;</literal> (default: <xsl:apply-templates/>)
      <anchor id="func-{@name}"/>
      <indexterm>
        <primary sortas="{@name}"><literal>&lt;<xsl:value-of select="@name"/>&gt;</literal></primary>
     </screen>
   </xsl:template>
 
+  <xsl:template match="muttng-doc:key">
+    <literal>
+      <xsl:if test="@mod">
+        <xsl:value-of select="concat(@mod,'-')"/>
+      </xsl:if>
+      <xsl:apply-templates/>
+    </literal>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:special">
+    <xsl:value-of select="@docbook"/>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/doc/muttng-tex.xsl b/doc/muttng-tex.xsl
new file mode 100644 (file)
index 0000000..42f057b
--- /dev/null
@@ -0,0 +1,558 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- manual2latex.xsl                                   -->
+
+<!-- written for mutt-ng by:                            -->
+<!-- Rocco Rutte <pdmef@cs.tu-berlin.de>                -->
+
+<!-- the LaTeX-escaping code at the end is a            -->
+<!-- slight modification of mine but mostly             -->
+<!-- identical to:                                      -->
+<!-- http://www.w3.org/2004/04/xhlt91/                  -->
+
+<!-- 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   -->
+<!--       valid LaTeX code; most of the work is done   -->
+<!--       muttng.sty anyways...                        -->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:muttng-doc="http://mutt-ng.berlios.de/doc/#NS">
+
+  <xsl:output method="text" indent="no" output-encoding="utf-8"/>
+
+  <xsl:strip-space elements="*"/>
+
+  <!--{{{ Document header -->
+
+  <xsl:template match="book">
+    <xsl:text>
+      \documentclass[a4paper]{scrbook}
+      \usepackage{muttng}
+    </xsl:text>
+    <xsl:apply-templates select="bookinfo"/>
+    <xsl:apply-templates select="chapter"/>
+    <xsl:apply-templates select="appendix"/>
+    <xsl:text>
+      \printindex
+      \end{document}
+    </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="bookinfo">
+    <!-- dump stuff for titlepage -->
+    <xsl:text>
+      \author{</xsl:text>
+    <xsl:for-each select="author">
+      <xsl:apply-templates/>
+      <xsl:if test='following-sibling::author'>
+        <xsl:text> \and </xsl:text>
+      </xsl:if>
+    </xsl:for-each>
+    <xsl:text>}
+      \title{</xsl:text>
+    <xsl:apply-templates select="title" mode="toc"/>
+    <xsl:text>}</xsl:text>
+    <xsl:text>
+      \date{</xsl:text>
+    <xsl:apply-templates select="pubdate"/>
+    <xsl:text>}</xsl:text>
+
+    <!-- dump stuff for hyperref again -->
+    <xsl:text>
+      \ifpdf
+      \hypersetup{
+      pdfauthor={</xsl:text>
+    <xsl:for-each select="author">
+      <xsl:apply-templates select="email" mode="pdfinfo"/>
+      <xsl:text> (</xsl:text>
+      <xsl:apply-templates select="firstname" mode="pdfinfo"/>
+      <xsl:apply-templates select="surname" mode="pdfinfo"/>
+      <xsl:text>)</xsl:text>
+      <xsl:if test='following-sibling::author'>
+        <xsl:text>, </xsl:text>
+      </xsl:if>
+    </xsl:for-each>
+    <xsl:text>},
+      pdftitle={</xsl:text>
+    <xsl:apply-templates select="title" mode="toc"/>
+    <xsl:text>}
+      }
+      \fi
+    </xsl:text>
+    <xsl:text>
+      \begin{document}
+      \maketitle
+    </xsl:text>
+    <xsl:apply-templates select="abstract"/>
+    <xsl:text>
+      \tableofcontents
+      \listoftables
+    </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="pubdate">
+    <xsl:value-of select="."/><xsl:text> </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="abstract">
+    <xsl:text>\lowertitleback{</xsl:text>
+    <xsl:apply-templates select="para"/>
+    <xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <!--}}}-->
+
+  <!--{{{ Sectioning -->
+
+  <xsl:template match="chapter">
+    <xsl:text>
+      \chapter{</xsl:text>
+    <xsl:apply-templates select="title" mode="toc"/>
+    <xsl:text>}</xsl:text>
+    <xsl:if test="@id">
+      <xsl:text>\hypertarget{</xsl:text>
+      <xsl:value-of select="@id"/>
+      <xsl:text>}{}</xsl:text>
+    </xsl:if>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="appendix">
+    <xsl:text>
+      \myappendix
+      \chapter{</xsl:text>
+    <xsl:apply-templates select="title" mode="toc"/>
+    <xsl:text>}</xsl:text>
+    <xsl:if test="@id">
+      <xsl:text>\hypertarget{</xsl:text>
+      <xsl:value-of select="@id"/>
+      <xsl:text>}{}</xsl:text>
+    </xsl:if>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="sect1">
+    <xsl:text>
+      \section{</xsl:text>
+    <xsl:apply-templates select="title" mode="toc"/>
+    <xsl:text>}</xsl:text>
+    <xsl:if test="@id">
+      <xsl:text>\hypertarget{</xsl:text>
+      <xsl:value-of select="@id"/>
+      <xsl:text>}{}</xsl:text>
+    </xsl:if>
+    <xsl:text>
+
+    </xsl:text>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="sect2">
+    <xsl:text>
+      \subsection{</xsl:text>
+    <xsl:apply-templates select="title" mode="toc"/>
+    <xsl:text>}</xsl:text>
+    <xsl:if test="@id">
+      <xsl:text>\hypertarget{</xsl:text>
+      <xsl:value-of select="@id"/>
+      <xsl:text>}{}</xsl:text>
+    </xsl:if>
+    <xsl:text>
+
+    </xsl:text>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="title"/>
+
+  <xsl:template match="title" mode="toc">
+    <xsl:value-of select="."/>
+  </xsl:template>
+
+  <!--}}}-->
+
+  <!--{{{ DocBook misc. -->
+
+  <xsl:template match="firstname">
+    <xsl:value-of select="."/><xsl:text> </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="surname">
+    <xsl:value-of select="."/><xsl:text> </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="email">
+    <xsl:text>\mailto{</xsl:text><xsl:value-of
+      select="."/><xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="firstname" mode="pdfinfo">
+    <xsl:value-of select="."/><xsl:text> </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="surname" mode="pdfinfo">
+    <xsl:value-of select="."/>
+  </xsl:template>
+
+  <xsl:template match="email" mode="pdfinfo">
+    <xsl:value-of select="."/>
+  </xsl:template>
+
+  <xsl:template match="para">
+    <xsl:apply-templates/>
+    <xsl:text>
+    </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="screen">
+    <xsl:text>\begin{verbatim}</xsl:text>
+    <xsl:value-of select="text()"/><xsl:text>\end{verbatim}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="link">
+    <xsl:text>\hyperlink{</xsl:text>
+    <xsl:value-of select="@linkend"/>
+    <xsl:text>}{</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <!--}}}-->
+
+  <!--{{{ Text formatting -->
+
+  <xsl:template match="emphasis">
+    <xsl:choose>
+      <xsl:when test="@role='bold'">
+        <xsl:text>\textbf{</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>\textsl{</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:apply-templates/>
+    <xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="literal">
+    <xsl:text>\texttt{</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <!--}}}-->
+
+  <!--{{{ Lists -->
+
+  <xsl:template match="itemizedlist">
+    <xsl:text>
+      \begin{itemize}
+    </xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>
+      \end{itemize}
+    </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="orderedlist">
+    <xsl:text>
+      \begin{enumerate}
+    </xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>
+      \end{enumerate}
+    </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="variablelist">
+    <xsl:text>
+      \begin{description}
+    </xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>
+      \end{description}
+    </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="listitem">
+    <xsl:text>\item </xsl:text>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="varlistentry">
+    <xsl:text>\item[</xsl:text>
+    <xsl:apply-templates select="term"/>
+    <xsl:text>] </xsl:text>
+    <xsl:apply-templates select="listitem" mode="varterm"/>
+  </xsl:template>
+
+  <xsl:template match="term">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="listitem" mode="varterm">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <!--}}}-->
+
+  <!--{{{ Tables -->
+
+  <xsl:template match="table">
+    <xsl:text>
+      \begin{longtable}{</xsl:text>
+    <xsl:value-of select="@texstr"/>
+    <xsl:text>}
+    </xsl:text>
+    <xsl:apply-templates select="title" mode="table"/>
+    <xsl:if test="@id">
+      <xsl:text>
+        \hypertarget{</xsl:text>
+      <xsl:value-of select="@id"/>
+      <xsl:text>}{}</xsl:text>
+    </xsl:if>
+    <xsl:apply-templates select="tgroup"/>
+    <xsl:text>
+      \end{longtable}
+    </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="tgroup">
+    <xsl:apply-templates select="thead"/>
+    <xsl:apply-templates select="tbody"/>
+    <xsl:apply-templates select="title" mode="table"/>
+  </xsl:template>
+
+  <xsl:template match="thead">
+    <xsl:apply-templates select="row" mode="head"/>
+  </xsl:template>
+
+  <xsl:template match="tbody">
+    <xsl:apply-templates select="row" mode="body"/>
+  </xsl:template>
+
+  <xsl:template match="title" mode="table">
+    <xsl:text>\caption{</xsl:text>
+    <xsl:apply-templates/>
+    <xsl:text>} \\
+    </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="entry" mode="table">
+    <xsl:apply-templates/>
+    <xsl:if test="position()!=last()">
+      <xsl:text> &amp; </xsl:text>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="row" mode="head">
+    <xsl:apply-templates select="entry" mode="table"/>
+    <xsl:text> \\ \hline\hline
+      \endfirsthead
+      \endhead
+    </xsl:text>
+  </xsl:template>
+
+  <xsl:template match="row" mode="body">
+    <xsl:apply-templates select="entry" mode="table"/>
+    <xsl:if test="position()!=last()">
+      <xsl:text> \\ \hline</xsl:text>
+    </xsl:if>
+    <xsl:text>
+    </xsl:text>
+  </xsl:template>
+
+  <!--}}}-->
+
+  <!--{{{ muttng-doc namespace -->
+
+  <xsl:template match="muttng-doc:man">
+    <xsl:text>\man</xsl:text>
+     <xsl:if test="@sect">
+       <xsl:text>[</xsl:text><xsl:value-of
+         select="@sect"/><xsl:text>]</xsl:text>
+     </xsl:if>
+     <xsl:text>{</xsl:text>
+     <xsl:value-of select="@name"/>
+     <xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:web">
+    <xsl:text>\web{</xsl:text><xsl:value-of
+      select="@url"/><xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:envvar">
+    <xsl:text>\envvar{</xsl:text><xsl:value-of select="@name"/><xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:hook">
+    <xsl:text>\hook{</xsl:text><xsl:value-of select="@name"/><xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:cmddef">
+    <xsl:text>\cmddef{</xsl:text><xsl:value-of select="@name"/><xsl:text>}{</xsl:text>
+    <xsl:apply-templates/><xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:cmdref">
+    <xsl:text>\cmdref{</xsl:text><xsl:value-of select="@name"/><xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:funcref">
+    <xsl:text>\funcref{</xsl:text><xsl:value-of select="@name"/><xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:funcdef">
+    <xsl:text>\funcdef{</xsl:text><xsl:value-of select="@name"/>
+    <xsl:text>}{</xsl:text>
+    <xsl:apply-templates select="muttng-doc:key"/><xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:varref">
+    <xsl:text>\varref{</xsl:text><xsl:value-of select="translate(@name,'-','_')"/><xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:vardef">
+    <xsl:text>\vardef{</xsl:text>
+    <xsl:value-of select="@name"/>
+    <xsl:text>}
+    </xsl:text>
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:rfc">
+    <xsl:text>\rfc{</xsl:text><xsl:value-of select="@num"/><xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:lstconf">
+    <xsl:text>\begin{verbatim}</xsl:text>
+    <xsl:value-of select="text()"/><xsl:text>\end{verbatim}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:lstmail">
+    <xsl:text>\begin{verbatim}</xsl:text>
+    <xsl:value-of select="text()"/><xsl:text>\end{verbatim}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:lstshell">
+    <xsl:text>\begin{verbatim}</xsl:text>
+    <xsl:value-of select="text()"/><xsl:text>\end{verbatim}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:pattern">
+    <xsl:text>\pat</xsl:text>
+    <xsl:if test="@full='1'">
+      <xsl:text>[1]</xsl:text>
+    </xsl:if>
+    <xsl:text>{</xsl:text><xsl:value-of
+      select="@name"/><xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:key">
+    <xsl:text>\key{</xsl:text>
+    <xsl:if test="@mod">
+      <xsl:value-of select="@mod"/><xsl:text>-</xsl:text>
+    </xsl:if>
+    <xsl:apply-templates/>
+    <xsl:text>}</xsl:text>
+  </xsl:template>
+
+  <xsl:template match="muttng-doc:special">
+    <xsl:value-of select="@latex"/>
+  </xsl:template>
+
+  <!--}}}-->
+
+  <!--{{{ _slooooooow_ TeX escaping stolen from W3C -->
+
+  <xsl:template match="text()">
+    <xsl:call-template name="esc">
+      <xsl:with-param name="c" select='"#"'/>
+      <xsl:with-param name="s">
+        <xsl:call-template name="esc">
+          <xsl:with-param name="c" select='"$"'/>
+          <xsl:with-param name="s">
+            <xsl:call-template name="esc">
+              <xsl:with-param name="c" select='"%"'/>
+              <xsl:with-param name="s">
+                <xsl:call-template name="esc">
+                  <xsl:with-param name="c" select='"&amp;"'/>
+                  <xsl:with-param name="s">
+                    <xsl:call-template name="esc">
+                      <xsl:with-param name="c" select='"~"'/>
+                      <xsl:with-param name="s">
+                        <xsl:call-template name="esc">
+                          <xsl:with-param name="c" select='"_"'/>
+                          <xsl:with-param name="s">
+                            <xsl:call-template name="esc">
+                              <xsl:with-param name="c" select='"^"'/>
+                              <xsl:with-param name="s">
+                                <xsl:call-template name="esc">
+                                  <xsl:with-param name="c" select='"{"'/>
+                                  <xsl:with-param name="s">
+                                    <xsl:call-template name="esc">
+                                      <xsl:with-param name="c" select='"}"'/>
+                                      <xsl:with-param name="s">
+                                        <xsl:call-template name="esc">
+                                          <xsl:with-param name="c" select='"\"'/>
+                                          <xsl:with-param name="s" select='.'/>
+                                        </xsl:call-template>
+                                      </xsl:with-param>
+                                    </xsl:call-template>
+                                  </xsl:with-param>
+                                </xsl:call-template>
+                              </xsl:with-param>
+                            </xsl:call-template>
+                          </xsl:with-param>
+                        </xsl:call-template>
+                      </xsl:with-param>
+                    </xsl:call-template>
+                  </xsl:with-param>
+                </xsl:call-template>
+              </xsl:with-param>
+            </xsl:call-template>
+          </xsl:with-param>
+        </xsl:call-template>
+      </xsl:with-param>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="esc">
+    <xsl:param name="s"/>
+    <xsl:param name="c"/>
+
+    <xsl:choose>
+      <xsl:when test='contains($s, $c)'>
+        <xsl:value-of select='substring-before($s, $c)'/>
+
+        <xsl:choose>
+          <!-- XXX puke -->
+          <xsl:when test='$c = "\"'>
+            <xsl:text>\textbackslash </xsl:text>
+          </xsl:when>
+          <!-- XXX puke -->
+          <xsl:when test='$c = "~"'>
+            <xsl:text>\char126 </xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:text>\</xsl:text><xsl:value-of select='$c'/>
+          </xsl:otherwise>
+        </xsl:choose>
+
+        <xsl:call-template name="esc">
+          <xsl:with-param name='c' select='$c'/>
+          <xsl:with-param name='s' select='substring-after($s, $c)'/>
+      </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select='$s'/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!--}}}-->
+
+</xsl:stylesheet>
diff --git a/doc/muttng.sty b/doc/muttng.sty
new file mode 100644 (file)
index 0000000..36f2ab9
--- /dev/null
@@ -0,0 +1,85 @@
+% this is pseudo-package with some definitions exluded
+% from muttng-tex.xsl to muttng.sty
+% written for mutt-ng by:
+% Rocco Rutte <pdmef@cs.tu-berlin.de>
+
+% packages
+\usepackage[american]{babel}
+\usepackage{ifpdf,makeidx,listings,longtable,textcomp}
+\usepackage[utf-8]{inputenc}
+
+\ifpdf
+  % options for pdf output
+  \usepackage[pdftex]{graphicx,thumbpdf}
+  \usepackage{ae,varioref,hyperref}
+  \hypersetup{breaklinks=true}
+  \newcommand{\web}[1]{\href{#1}{\nolinkurl{<#1>}}}
+  \pdfcompresslevel=9
+\else
+  % options for non-pdf output
+  \usepackage[dvips]{graphicx,hyperref}
+  % we need a clue on breaking URLs here to always work:
+  % - hyperref does it for pdf output
+  % - breakurl does it for non-pdf + non-html output
+  % - don't do it for tex4ht output
+  \makeatletter
+  \@ifpackageloaded{tex4ht}
+    {
+      % when doing tex4ht output, there's no need to
+      % break URLs at all since browsers will do that
+      \newcommand{\web}[1]{\href{#1}{\texttt{<#1>}}}
+    }{
+      % when not producing tex4ht output (i.e. postscript),
+      % use breakurl.sty to break URLs
+      \usepackage{breakurl,varioref}
+      \newcommand{\web}[1]{\texttt{<}\burl{#1}\texttt{>}}
+    }
+  \makeatother
+\fi
+\usepackage{makeidx}
+
+% no variables in toc, please!
+\setcounter{tocdepth}{1}
+
+% really call \appendix only once
+\newcounter{app}
+\newcommand{\myappendix}[0]{
+  \ifnum\arabic{app}=0
+    \appendix
+  \fi
+  \addtocounter{app}{1}
+}
+
+% from here on, these implement the muttng-doc namespace,
+% see Hacking Documentation for details
+% muttng-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}}
+
+\newcommand{\mailto}[1]{\href{mailto:#1}{\texttt{<#1>}}}
+
+\newcommand{\man}[2][\empty]{\texttt{#2(\ifx#1\empty1\else#1\fi)}\index{#2@\texttt{#2(\ifx#1\empty1\else#1\fi)}}}
+
+\newcommand{\pat}[2][0]{\ifnum #1=0\texttt{\char126 #2}\else\texttt{\char126 #2/=#2}\fi\index{\char126 #2@\texttt{\char126 #2/=#2}}}
+
+\newcommand{\var}[1]{\uglyesc{$#1}\index{#1@\uglyesc{$#1}}}
+
+\newcommand{\envvar}[1]{\var{#1}}
+
+\newcommand{\hook}[1]{\hyperlink{#1-hook}{\texttt{#1-hook}}\index{#1-hook@\texttt{#1-hook}}}
+
+\newcommand{\cmddef}[2]{Usage: \uglyesc{#1} #2\hypertarget{cmd:#1}{}\index{#1@\uglyesc{#1}}}
+\newcommand{\cmdref}[1]{\hyperlink{cmd:#1}{\uglyesc{#1}}\index{#1@\uglyesc{#1}}}
+
+\newcommand{\funcdef}[2]{\texttt{<#1>} (default: \texttt{#2})\hypertarget{func:#1}{}\index{#1@\uglyesc{<#1>}}}
+\newcommand{\funcref}[1]{\hyperlink{func:#1}{\texttt{<#1>}}\index{#1@\uglyesc{<#1>}}}
+
+\newcommand{\vardef}[1]{\subsection{\uglyesc{$#1}}\hypertarget{#1}{}\index{#1@\uglyesc{$#1}}}
+\newcommand{\varref}[1]{\hyperlink{#1}{\uglyesc{$#1}}\index{#1@\uglyesc{$#1}}}
+
+\newcommand{\rfc}[1]{\href{http://www.faqs.org/rfcs/rfc#1.html}{RfC #1}\index{RfC!#1}}
+
+\newcommand{\key}[1]{\texttt{#1}}
+
+\makeindex