Merge commit 'upstream/1.5.21'

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

diff --git a/doc/manual.xml.tail b/doc/manual.xml.tail
index c2c955fc50905134f1d5a1e88bebf97268463f60..d6da22e5142638753f1b2756382ae26f8074773b 100644 (file)
--- a/doc/manual.xml.tail
+++ b/doc/manual.xml.tail
@@ -16,13 +16,13 @@ __print_map(index)
 __print_map(pager)
 __print_map(alias)
 __print_map(query)
 __print_map(pager)
 __print_map(alias)
 __print_map(query)

-__print_map(attach)
+__print_map(attachment)

 __print_map(compose)
 __print_map(postpone)
 __print_map(browser)
 __print_map(pgp)
 __print_map(smime)
 __print_map(compose)
 __print_map(postpone)
 __print_map(browser)
 __print_map(pgp)
 __print_map(smime)

-__print_map(mix)
+__print_map(mixmaster)

 __print_map(editor)
 
 </sect1>
 __print_map(editor)
 
 </sect1>


@@ -36,8 +36,8 @@ __print_map(editor)
 <title>Acknowledgements</title>
 
 <para>
 <title>Acknowledgements</title>
 
 <para>

-Kari Hurtta <email>kari.hurtta@fmi.fi</email>
-co-developed the original MIME parsing code back in the ELM-ME days.
+Kari Hurtta <email>kari.hurtta@fmi.fi</email> co-developed the original
+MIME parsing code back in the ELM-ME days.

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


@@ -95,8 +95,10 @@ The following people have been very helpful to the development of Mutt:
 <title>About This Document</title>
 
 <para>
 <title>About This Document</title>
 
 <para>

-This document was written in <ulink url="http://docbook.sourceforge.net">DocBook</ulink>,
-and then rendered using the <ulink url="http://xmlsoft.org/XSLT/">Gnome XSLT toolkit</ulink>.
+This document was written in <ulink
+url="http://docbook.sourceforge.net">DocBook</ulink>, and then rendered
+using the <ulink url="http://xmlsoft.org/XSLT/">Gnome XSLT
+toolkit</ulink>.

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


@@ -104,7 +106,3 @@ and then rendered using the <ulink url="http://xmlsoft.org/XSLT/">Gnome XSLT too
 </chapter>
 
 </book>
 </chapter>
 
 </book>

-
-<!--
-vim:ft=xml
--->