summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRocco Rutte <pdmef@gmx.net>2006-05-18 18:02:34 +0000
committerRocco Rutte <pdmef@gmx.net>2006-05-18 18:02:34 +0000
commit995ea883605c197c83e9cc6b4aef858a79a81eb3 (patch)
tree3883eea90031cefb51aad26c494ed01f845bcbc3
parentb871ee9bf1b27bb45e0435c824badc1bcd3d6bda (diff)
Properly use tables in manual where appropriate.
Now, lots of information which really deserves a table is just put into <screen/> sections with manual line breaks and things like that. This is ugly for several reasons including that the information stored there should be accessable straight from the table of contents. For the TOC, this patch switches to <book/> for the manual and uses a deeper split level so things actually look nicer. The only problem are tables which may be not so well supported when dumping the HTML to .txt but the DocBook->txt converter with table support is work-in-progress...
-rw-r--r--doc/chunk.xsl5
-rw-r--r--doc/manual.xml.head973
-rw-r--r--doc/manual.xml.tail838
-rw-r--r--makedoc.c4
4 files changed, 998 insertions, 822 deletions
diff --git a/doc/chunk.xsl b/doc/chunk.xsl
index ae0f6c9e..d473afd2 100644
--- a/doc/chunk.xsl
+++ b/doc/chunk.xsl
@@ -1,6 +1,7 @@
<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
- <xsl:param name="section.autolabel" select="1"></xsl:param>
- <xsl:param name="use.id.as.filename" select="1"></xsl:param>
+ <xsl:param name="section.autolabel" select="1"/>
+ <xsl:param name="use.id.as.filename" select="1"/>
+ <xsl:param name="chunk.section.depth" select="0"/>
</xsl:stylesheet>
diff --git a/doc/manual.xml.head b/doc/manual.xml.head
index bcdd5182..15a32957 100644
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -1,9 +1,9 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<article>
+<book>
-<articleinfo>
+<bookinfo>
<title>The Mutt E-Mail Client</title>
<author>
<firstname>Michael</firstname><surname>Elkins</surname>
@@ -16,9 +16,9 @@
``All mail clients suck. This one just sucks less.'' -me, circa 1995
</para>
</abstract>
-</articleinfo>
+</bookinfo>
-<sect1 id="intro">
+<chapter id="intro">
<title>Introduction</title>
<para>
@@ -29,7 +29,7 @@ expression searches and a powerful pattern matching language for selecting
groups of messages.
</para>
-<sect2>
+<sect1 id="homepage">
<title>Mutt Home Page</title>
<para>
@@ -39,9 +39,9 @@ url="http://www.mutt.org/"
>
</para>
-</sect2>
+</sect1>
-<sect2>
+<sect1 id="muttlists">
<title>Mailing Lists</title>
<para>
@@ -56,28 +56,19 @@ word <emphasis>subscribe</emphasis> in the body to
<listitem>
<para>
-<ulink
-url="mailto:mutt-announce-request@mutt.org"
->mutt-announce@mutt.org</ulink
-> -- low traffic list for announcements
+<email>mutt-announce-request@mutt.org</email> -- low traffic list for announcements
</para>
</listitem>
<listitem>
<para>
-<ulink
-url="mailto:mutt-users-request@mutt.org"
->mutt-users@mutt.org</ulink
-> -- help, bug reports and feature requests
+<email>mutt-users-request@mutt.org</email> -- help, bug reports and feature requests
</para>
</listitem>
<listitem>
<para>
-<ulink
-url="mailto:mutt-dev-request@mutt.org"
->mutt-dev@mutt.org</ulink
-> -- development mailing list
+<email>mutt-dev-request@mutt.org</email> -- development mailing list
</para>
</listitem>
@@ -91,9 +82,9 @@ forwarded to <emphasis>mutt-users</emphasis>, so you do not need to be subscribe
lists.
</para>
-</sect2>
+</sect1>
-<sect2>
+<sect1 id="distribution">
<title>Software Distribution Sites</title>
<para>
@@ -120,9 +111,9 @@ url="http://www.mutt.org/download.html"
>.
</para>
-</sect2>
+</sect1>
-<sect2>
+<sect1 id="irc">
<title>IRC</title>
<para>
@@ -131,9 +122,9 @@ Visit channel <emphasis>&num;mutt</emphasis> on
other people interested in Mutt.
</para>
-</sect2>
+</sect1>
-<sect2>
+<sect1 id="usenet">
<title>USENET</title>
<para>
@@ -143,14 +134,14 @@ url="news:comp.mail.mutt"
>.
</para>
-</sect2>
+</sect1>
-<sect2>
+<sect1 id="copyright">
<title>Copyright</title>
<para>
Mutt is Copyright (C) 1996-2005 Michael R. Elkins
-&lt;me@cs.hmc.edu&gt; and others
+<email>me@cs.hmc.edu</email> and others
</para>
<para>
@@ -173,11 +164,11 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</para>
-</sect2>
-
</sect1>
-<sect1 id="gettingstarted">
+</chapter>
+
+<chapter id="gettingstarted">
<title>Getting Started</title>
<para>
@@ -202,7 +193,7 @@ at the command line. There are various command-line options, see
either the mutt man page or the <link linkend="commandline">reference</link>.
</para>
-<sect2>
+<sect1 id="menus">
<title>Moving Around in Menus</title>
<para>
@@ -212,22 +203,30 @@ showing the common keys used to navigate menus in Mutt.
<para>
-<screen>
-j or Down next-entry move to the next entry
-k or Up previous-entry move to the previous entry
-z or PageDn page-down go to the next page
-Z or PageUp page-up go to the previous page
-= or Home first-entry jump to the first entry
-* or End last-entry jump to the last entry
-q quit exit the current menu
-? help list all keybindings for the current menu
-</screen>
+<table>
+<title>Most common navigation keys</title>
+<tgroup cols="3">
+<thead>
+<row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>j or Down</entry><entry>next-entry</entry><entry>move to the next entry</entry></row>
+<row><entry>k or Up</entry><entry>previous-entry</entry><entry>move to the previous entry</entry></row>
+<row><entry>z or PageDn</entry><entry>page-down</entry><entry>go to the next page</entry></row>
+<row><entry>Z or PageUp</entry><entry>page-up</entry><entry>go to the previous page</entry></row>
+<row><entry>= or Home</entry><entry>first-entry</entry><entry>jump to the first entry</entry></row>
+<row><entry>* or End</entry><entry>last-entry</entry><entry>jump to the last entry</entry></row>
+<row><entry>q</entry><entry>quit</entry><entry>exit the current menu</entry></row>
+<row><entry>?</entry><entry>help</entry><entry>list all keybindings for the current menu</entry></row>
+</tbody>
+</tgroup>
+</table>
</para>
-</sect2>
+</sect1>
-<sect2 id="editing">
+<sect1 id="editing">
<title>Editing Input Fields</title>
<para>
@@ -238,30 +237,38 @@ around while editing are very similar to those of Emacs.
<para>
-<screen>
-^A or &lt;Home&gt; bol move to the start of the line
-^B or &lt;Left&gt; backward-char move back one char
-Esc B backward-word move back one word
-^D or &lt;Delete&gt; delete-char delete the char under the cursor
-^E or &lt;End&gt; eol move to the end of the line
-^F or &lt;Right&gt; forward-char move forward one char
-Esc F forward-word move forward one word
-&lt;Tab&gt; 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 ot 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
-&lt;Up&gt; history-up recall previous string from history
-&lt;Down&gt; history-down recall next string from history
-&lt;BackSpace&gt; 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
-&lt;Return&gt; n/a finish editing
-</screen>
+<table>
+<title>Most common line editor keys</title>
+<tgroup cols="3">
+<thead>
+<row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>&circ;A or &lt;Home&gt;</entry><entry>bol</entry><entry>move to the start of the line</entry></row>
+<row><entry>&circ;B or &lt;Left&gt;</entry><entry>backward-char</entry><entry>move back one char</entry></row>
+<row><entry>Esc B</entry><entry>backward-word</entry><entry>move back one word</entry></row>
+<row><entry>&circ;D or &lt;Delete&gt;</entry><entry>delete-char</entry><entry>delete the char under the cursor</entry></row>
+<row><entry>&circ;E or &lt;End&gt;</entry><entry>eol</entry><entry>move to the end of the line</entry></row>
+<row><entry>&circ;F or &lt;Right&gt;</entry><entry>forward-char</entry><entry>move forward one char</entry></row>
+<row><entry>Esc F</entry><entry>forward-word</entry><entry>move forward one word</entry></row>
+<row><entry>&lt;Tab&gt;</entry><entry>complete</entry><entry>complete filename or alias</entry></row>
+<row><entry>&circ;T</entry><entry>complete-query</entry><entry>complete address with query</entry></row>
+<row><entry>&circ;K</entry><entry>kill-eol</entry><entry>delete to the end of the line</entry></row>
+<row><entry>ESC d</entry><entry>kill-eow</entry><entry>delete to the end ot the word</entry></row>
+<row><entry>&circ;W</entry><entry>kill-word</entry><entry>kill the word in front of the cursor</entry></row>
+<row><entry>&circ;U</entry><entry>kill-line</entry><entry>delete entire line</entry></row>
+<row><entry>&circ;V</entry><entry>quote-char</entry><entry>quote the next typed key</entry></row>
+<row><entry>&lt;Up&gt;</entry><entry>history-up</entry><entry>recall previous string from history</entry></row>
+<row><entry>&lt;Down&gt;</entry><entry>history-down</entry><entry>recall next string from history</entry></row>
+<row><entry>&lt;BackSpace&gt;</entry><entry>backspace</entry><entry>kill the char in front of the cursor</entry></row>
+<row><entry>Esc u</entry><entry>upcase-word</entry><entry>convert word to upper case</entry></row>
+<row><entry>Esc l</entry><entry>downcase-word</entry><entry>convert word to lower case</entry></row>
+<row><entry>Esc c</entry><entry>capitalize-word</entry><entry>capitalize the word</entry></row>
+<row><entry>&circ;G</entry><entry>n/a</entry><entry>abort</entry></row>
+<row><entry>&lt;Return&gt;</entry><entry>n/a</entry><entry>finish editing</entry></row>
+</tbody>
+</tgroup>
+</table>
</para>
@@ -276,9 +283,9 @@ front of the cursor rather than under, you could use
<literal>bind editor &lt;delete&gt; backspace</literal>
</para>
-</sect2>
+</sect1>
-<sect2>
+<sect1 id="reading">
<title>Reading Mail - The Index and Pager</title>
<para>
@@ -293,46 +300,54 @@ The next few sections describe the functions provided in each of these
modes.
</para>
-<sect3>
+<sect2>
<title>The Message Index</title>
<para>
-<screen>
-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
-&lt;Return&gt; display-message
-&lt;Tab&gt; 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
-</screen>
+<table>
+<title>Most common message index keys</title>
+<tgroup cols="2">
+<thead>
+<row><entry>Key</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>c</entry><entry>change to a different mailbox</entry></row>
+<row><entry>ESC c</entry><entry>change to a folder in read-only mode</entry></row>
+<row><entry>C</entry><entry>copy the current message to another mailbox</entry></row>
+<row><entry>ESC C</entry><entry>decode a message and copy it to a folder</entry></row>
+<row><entry>ESC s</entry><entry>decode a message and save it to a folder</entry></row>
+<row><entry>D</entry><entry>delete messages matching a pattern</entry></row>
+<row><entry>d</entry><entry>delete the current message</entry></row>
+<row><entry>F</entry><entry>mark as important</entry></row>
+<row><entry>l</entry><entry>show messages matching a pattern</entry></row>
+<row><entry>N</entry><entry>mark message as new</entry></row>
+<row><entry>o</entry><entry>change the current sort method</entry></row>
+<row><entry>O</entry><entry>reverse sort the mailbox</entry></row>
+<row><entry>q</entry><entry>save changes and exit</entry></row>
+<row><entry>s</entry><entry>save-message</entry></row>
+<row><entry>T</entry><entry>tag messages matching a pattern</entry></row>
+<row><entry>t</entry><entry>toggle the tag on a message</entry></row>
+<row><entry>ESC t</entry><entry>toggle tag on entire message thread</entry></row>
+<row><entry>U</entry><entry>undelete messages matching a pattern</entry></row>
+<row><entry>u</entry><entry>undelete-message</entry></row>
+<row><entry>v</entry><entry>view-attachments</entry></row>
+<row><entry>x</entry><entry>abort changes and exit</entry></row>
+<row><entry>&lt;Return&gt;</entry><entry>display-message</entry></row>
+<row><entry>&lt;Tab&gt;</entry><entry>jump to the next new or unread message</entry></row>
+<row><entry>@</entry><entry>show the author's full e-mail address</entry></row>
+<row><entry>$</entry><entry>save changes to mailbox</entry></row>
+<row><entry>/</entry><entry>search</entry></row>
+<row><entry>ESC /</entry><entry>search-reverse</entry></row>
+<row><entry>&circ;L</entry><entry>clear and redraw the screen</entry></row>
+<row><entry>&circ;T</entry><entry>untag messages matching a pattern</entry></row>
+</tbody>
+</tgroup>
+</table>
</para>
-<sect4>
+<sect3>
<title>Status Flags</title>
<para>
@@ -508,11 +523,11 @@ message is sent to a subscribed mailing list
</variablelist>
</para>
-</sect4>
-
</sect3>
-<sect3>
+</sect2>
+
+<sect2>
<title>The Pager</title>
<para>
@@ -523,19 +538,27 @@ featureful.
<para>
-<screen>
-&lt;Return&gt; go down one line
-&lt;Space&gt; 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 keybindings
-/ search for a regular expression (pattern)
-ESC / search backwards for a regular expression
-\ toggle search pattern coloring
-^ jump to the top of the message
-</screen>
+<table>
+<title>Most common pager keys</title>
+<tgroup cols="2">
+<thead>
+<row><entry>Key</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>&lt;Return&gt;</entry><entry>go down one line</entry></row>
+<row><entry>&lt;Space&gt;</entry><entry>display the next page (or next message if at the end of a message)</entry></row>
+<row><entry>-</entry><entry>go back to the previous page</entry></row>
+<row><entry>n</entry><entry>search for next match</entry></row>
+<row><entry>S</entry><entry>skip beyond quoted text</entry></row>
+<row><entry>T</entry><entry>toggle display of quoted text</entry></row>
+<row><entry>?</entry><entry>show keybindings</entry></row>
+<row><entry>/</entry><entry>search for a regular expression (pattern)</entry></row>
+<row><entry>ESC /</entry><entry>search backwards for a regular expression</entry></row>
+<row><entry>&bsol;</entry><entry>toggle search pattern coloring</entry></row>
+<row><entry>&circ;</entry><entry>jump to the top of the message</entry></row>
+</tbody>
+</tgroup>
+</table>
</para>
@@ -565,8 +588,7 @@ character settings. The sequences Mutt supports are:
<para>
<screen>
-ESC [ Ps;Ps;Ps;...;Ps m
-where Ps =
+ESC [ Ps;Ps;Ps;...;Ps m where Ps =
0 All Attributes Off
1 Bold on
4 Underline on
@@ -596,9 +618,9 @@ display, for example by changing the color associated with color2 for
your xterm, then that color will be used instead of green.
</para>
-</sect3>
+</sect2>
-<sect3 id="threads">
+<sect2 id="threads">
<title>Threaded Mode</title>
<para>
@@ -608,22 +630,30 @@ a few additional functions available in the <emphasis>index</emphasis> and <emph
<para>
-<screen>
-^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
-</screen>
+<table>
+<title>Most common thread mode keys</title>
+<tgroup cols="3">
+<thead>
+<row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>&circ;D</entry><entry>delete-thread</entry><entry>delete all messages in the current thread</entry></row>
+<row><entry>&circ;U</entry><entry>undelete-thread</entry><entry>undelete all messages in the current thread</entry></row>
+<row><entry>&circ;N</entry><entry>next-thread</entry><entry>jump to the start of the next thread</entry></row>
+<row><entry>&circ;P</entry><entry>previous-thread</entry><entry>jump to the start of the previous thread</entry></row>
+<row><entry>&circ;R</entry><entry>read-thread</entry><entry>mark the current thread as read</entry></row>
+<row><entry>ESC d</entry><entry>delete-subthread</entry><entry>delete all messages in the current subthread</entry></row>
+<row><entry>ESC u</entry><entry>undelete-subthread</entry><entry>undelete all messages in the current subthread</entry></row>
+<row><entry>ESC n</entry><entry>next-subthread</entry><entry>jump to the start of the next subthread</entry></row>
+<row><entry>ESC p</entry><entry>previous-subthread</entry><entry>jump to the start of the previous subthread</entry></row>
+<row><entry>ESC r</entry><entry>read-subthread</entry><entry>mark the current subthread as read</entry></row>
+<row><entry>ESC t</entry><entry>tag-thread</entry><entry>toggle the tag on the current thread</entry></row>
+<row><entry>ESC v</entry><entry>collapse-thread</entry><entry>toggle collapse for the current thread</entry></row>
+<row><entry>ESC V</entry><entry>collapse-all</entry><entry>toggle collapse for all threads</entry></row>
+<row><entry>P</entry><entry>parent-message</entry><entry>jump to parent message in thread</entry></row>
+</tbody>
+</tgroup>
+</table>
</para>
@@ -640,9 +670,9 @@ display the number of hidden messages if the thread is collapsed.
See also: <link linkend="strict-threads">&dollar;strict&lowbar;threads</link>.
</para>
-</sect3>
+</sect2>
-<sect3>
+<sect2>
<title>Miscellaneous Functions</title>
<para>
@@ -831,11 +861,11 @@ This function will go to the next line of non-quoted text which come
after a line of quoted text in the internal pager.
</para>
-</sect3>
-
</sect2>
-<sect2>
+</sect1>
+
+<sect1 id="sending">
<title>Sending Mail</title>
<para>
@@ -845,15 +875,23 @@ messages.
<para>
-<screen>
-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
-</screen>
+<table>
+<title>Most commom mail sending keys</title>
+<tgroup cols="3">
+<thead>
+<row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>m</entry><entry>compose</entry><entry>compose a new message</entry></row>
+<row><entry>r</entry><entry>reply</entry><entry>reply to sender</entry></row>
+<row><entry>g</entry><entry>group-reply</entry><entry>reply to all recipients</entry></row>
+<row><entry>L</entry><entry>list-reply</entry><entry>reply to mailing list address</entry></row>
+<row><entry>f</entry><entry>forward</entry><entry>forward message</entry></row>
+<row><entry>b</entry><entry>bounce</entry><entry>bounce (remail) message</entry></row>
+<row><entry>ESC k</entry><entry>mail-key</entry><entry>mail a PGP public key to someone</entry></row>
+</tbody>
+</tgroup>
+</table>
</para>
@@ -891,33 +929,41 @@ will be appended to the message.
<para>
Once you have finished editing the body of your mail message, you are
-returned to the <emphasis>compose</emphasis> menu. The following options are available:
-</para>
-
-<para>
-
-<screen>
-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
-</screen>
+returned to the <emphasis>compose</emphasis> menu. The following functions are available:
+</para>
+
+<para>
+
+<table>
+<title>Most common compose menu keys</title>
+<tgroup cols="3">
+<thead>
+<row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>a</entry><entry>attach-file</entry><entry>attach a file</entry></row>
+<row><entry>A</entry><entry>attach-message</entry><entry>attach message(s) to the message</entry></row>
+<row><entry>ESC k</entry><entry>attach-key</entry><entry>attach a PGP public key</entry></row>
+<row><entry>d</entry><entry>edit-description</entry><entry>edit description on attachment</entry></row>
+<row><entry>D</entry><entry>detach-file</entry><entry>detach a file</entry></row>
+<row><entry>t</entry><entry>edit-to</entry><entry>edit the To field</entry></row>
+<row><entry>ESC f</entry><entry>edit-from</entry><entry>edit the From field</entry></row>
+<row><entry>r</entry><entry>edit-reply-to</entry><entry>edit the Reply-To field</entry></row>
+<row><entry>c</entry><entry>edit-cc</entry><entry>edit the Cc field</entry></row>
+<row><entry>b</entry><entry>edit-bcc</entry><entry>edit the Bcc field</entry></row>
+<row><entry>y</entry><entry>send-message</entry><entry>send the message</entry></row>
+<row><entry>s</entry><entry>edit-subject</entry><entry>edit the Subject</entry></row>
+<row><entry>S</entry><entry>smime-menu</entry><entry>select S/MIME options</entry></row>
+<row><entry>f</entry><entry>edit-fcc</entry><entry>specify an ``Fcc'' mailbox</entry></row>
+<row><entry>p</entry><entry>pgp-menu</entry><entry>select PGP options</entry></row>
+<row><entry>P</entry><entry>postpone-message</entry><entry>postpone this message until later</entry></row>
+<row><entry>q</entry><entry>quit</entry><entry>quit (abort) sending the message</entry></row>
+<row><entry>w</entry><entry>write-fcc</entry><entry>write the message to a folder</entry></row>
+<row><entry>i</entry><entry>ispell</entry><entry>check spelling (if available on your system)</entry></row>
+<row><entry>&circ;F</entry><entry>forget-passphrase</entry><entry>wipe passphrase(s) from memory</entry></row>
+</tbody>
+</tgroup>
+</table>
</para>
@@ -930,7 +976,7 @@ not permitted when you are in that folder. The &percnt;r in <link linkend="statu
a 'A' to indicate that you are in attach-message mode.
</para>
-<sect3>
+<sect2>
<title>Editing the message header</title>
<para>
@@ -966,9 +1012,9 @@ allows you to create a new message thread.
Also see <link linkend="edit-headers">&dollar;edit&lowbar;headers</link>.
</para>
-</sect3>
+</sect2>
-<sect3>
+<sect2>
<title>Using Mutt with PGP</title>
<para>
@@ -1017,13 +1063,20 @@ and validity fields are in order.
<para>
The flags sequence (&percnt;f) will expand to one of the following flags:
-<screen>
-R The key has been revoked and can't be used.
-X The key is expired and can't be used.
-d You have marked the key as disabled.
-c There are unknown critical self-signature
- packets.
-</screen>
+<table>
+<title>PGP key menu flags</title>
+<tgroup cols="2">
+<thead>
+<row><entry>Flag</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>R</entry><entry>The key has been revoked and can't be used.</entry></row>
+<row><entry>X</entry><entry>The key is expired and can't be used.</entry></row>
+<row><entry>d</entry><entry>You have marked the key as disabled.</entry></row>
+<row><entry>c</entry><entry>There are unknown critical self-signature packets.</entry></row>
+</tbody>
+</tgroup>
+</table>
</para>
@@ -1052,9 +1105,9 @@ means a partially trusted association, and a plus character (<emphasis role="bol
indicates complete validity.
</para>
-</sect3>
+</sect2>
-<sect3>
+<sect2>
<title>Sending anonymous messages via mixmaster.</title>
<para>
@@ -1102,11 +1155,11 @@ mixmaster remailers. For details on the other capabilities, please
have a look at the mixmaster documentation.
</para>
-</sect3>
-
</sect2>
-<sect2 id="forwarding-mail">
+</sect1>
+
+<sect1 id="forwarding-mail">
<title>Forwarding and Bouncing Mail</title>
<para>
@@ -1123,10 +1176,18 @@ The following keys are bound by default:
<para>
-<screen>
-f forward forward message
-b bounce bounce (remail) message
-</screen>
+<table>
+<title>Message forwarding/bouncing keys</title>
+<tgroup cols="3">
+<thead>
+<row><entry>Key</entry><entry>Function</entry><entry>Description</entry></row>
+</thead>
+<tbody>
+<row><entry>f</entry><entry>forward</entry><entry>forward message</entry></row>
+<row><entry>b</entry><entry>bounce</entry><entry>bounce (remail) message</entry></row>
+</tbody>
+</tgroup>
+</table>
</para>
@@ -1150,9 +1211,9 @@ Editing the message to forward follows the same procedure as sending or
replying to a message does.
</para>
-</sect2>
+</sect1>
-<sect2 id="postponing-mail">
+<sect1 id="postponing-mail">
<title>Postponing Mail</title>
<para>
@@ -1183,11 +1244,11 @@ replied to for the status of the message to be updated.
See also the <link linkend="postpone">&dollar;postpone</link> quad-option.
</para>
-</sect2>
-
</sect1>
-<sect1 id="configuration">
+</chapter>
+
+<chapter id="configuration">
<title>Configuration</title>
<para>
@@ -1220,7 +1281,7 @@ same which is visible using the ``-v'' <link linkend="commandline">command line<
V) from the index menu.
</para>
-<sect2 id="muttrc-syntax" xreflabel="Syntax of Initialization Files">
+<sect1 id="muttrc-syntax" xreflabel="Syntax of Initialization Files">
<title>Syntax of Initialization Files</title>
<para>
@@ -1310,9 +1371,9 @@ The commands understood by mutt are explained in the next paragraphs.
For a complete list, see the <link linkend="commands">command reference</link>.
</para>
-</sect2>
+</sect1>
-<sect2 id="alias">
+<sect1 id="alias">
<title>Defining/Using aliases</title>
<para>
@@ -1398,9 +1459,9 @@ In the alias menu, you can select as many aliases as you want with the
(default: q) to return to the address prompt.
</para>
-</sect2>
+</sect1>
-<sect2 id="bind">
+<sect1 id="bind">
<title>Changing the default key bindings</title>
<para>
@@ -1532,31 +1593,39 @@ In addition, <emphasis>key</emphasis> may consist of:
<para>
-<screen>
-\t tab
-&lt;tab&gt; tab
-&lt;backtab&gt; backtab / shift-tab
-\r carriage return
-\n newline
-\e escape
-&lt;esc&gt; escape
-&lt;up&gt; up arrow
-&lt;down&gt; down arrow
-&lt;left&gt; left arrow
-&lt;right&gt; right arrow
-&lt;pageup&gt; Page Up
-&lt;pagedown&gt; Page Down
-&lt;backspace&gt; Backspace
-&lt;delete&gt; Delete
-&lt;insert&gt; Insert
-&lt;enter&gt; Enter
-&lt;return&gt; Return
-&lt;home&gt; Home
-&lt;end&gt; End
-&lt;space&gt; Space bar
-&lt;f1&gt; function key 1
-&lt;f10&gt; function key 10
-</screen>
+<table>
+<title>Symbolic key names</title>
+<tgroup cols="2">
+<thead>
+<row><entry>Symbolic name</entry><entry>Meaning</entry></row>
+</thead>
+<tbody>
+<row><entry>&bsol;t</entry><entry>tab</entry></row>
+<row><entry>&lt;tab&gt;</entry><entry>tab</entry></row>
+<row><entry>&lt;backtab&gt;</entry><entry>backtab / shift-tab</entry></row>
+<row><entry>&bsol;r</entry><entry>carriage return</entry></row>
+<row><entry>&bsol;n</entry><entry>newline</entry></row>
+<row><entry>&bsol;e</entry><entry>escape</entry></row>
+<row><entry>&lt;esc&gt;</entry><entry>escape</entry></row>
+<row><entry>&lt;up&gt;</entry><entry>up arrow</entry></row>
+<row><entry>&lt;down&gt;</entry><entry>down arrow</entry></row>
+<row><entry>&lt;left&gt;</entry><entry>left arrow</entry></row>
+<row><entry>&lt;right&gt;</entry><entry>right arrow</entry>