X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/2db38a6f98c2abb42b746064ce97417cccc27e68..38276e01dbc7519f1c79423c909c2703f8415ca8:/doc/misc/mairix-el.texi

diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index b08d5d8e31..73a1294d28 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -3,10 +3,10 @@
 @setfilename ../../info/mairix-el
 @settitle Emacs Interface for Mairix
 
-@documentencoding ISO-8859-1
+@documentencoding UTF-8
 
 @copying
-Copyright @copyright{} 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 2008--2013 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -17,18 +17,17 @@ and with the Back-Cover Texts as in (a) below.  A copy of the license
 is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
-modify this GNU manual.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
+modify this GNU manual.''
 @end quotation
 @end copying
 
-@dircategory Emacs
+@dircategory Emacs network features
 @direntry
-* Mairix: (mairix-el).  Emacs interface to the Mairix mail indexer.
+* Mairix: (mairix-el).          Emacs interface to the Mairix mail indexer.
 @end direntry
 
 @titlepage
-@title mairix.el - Mairix interface for Emacs
+@title mairix.el---Mairix interface for Emacs
 
 @author David Engster
 @page
@@ -39,7 +38,7 @@ developing GNU and promoting software freedom.''
 @contents
 
 @node Top
-@top mairix.el - Mairix interface for Emacs
+@top mairix.el---Mairix interface for Emacs
 
 Mairix is a tool for indexing and searching words in locally stored
 mail.  It was written by Richard Curnow and is licensed under the
@@ -61,6 +60,7 @@ database.
 * Setting up mairix.el::        Set up mairix.el
 * Using mairix.el::             List of interactive functions
 * Extending mairix.el::         Support your favorite mail reader!
+* GNU Free Documentation License::  The license for this documentation.
 @end menu
 
 @node About mairix and mairix.el
@@ -68,7 +68,7 @@ database.
 
 Mairix is a tool for indexing and searching words in locally stored
 mail.  It was written by Richard Curnow and is licensed under the
-GPL.  Mairix comes with most popular GNU/Linux distributions, but it also
+GPL@.  Mairix comes with most popular GNU/Linux distributions, but it also
 runs under Windows (with cygwin), Mac OS X and Solaris.  The homepage can
 be found at
 @uref{http://www.rpcurnow.force9.co.uk/mairix/index.html}
@@ -246,7 +246,7 @@ modifying `mairix-widget-fields-list'.
 @kindex M-x mairix-widget-search-based-on-article
 @findex mairix-widget-search-based-on-article
 Create a mairix query using graphical widgets, but based on the
-currently displayed article, i.e. the available fields will be filled
+currently displayed article, i.e., the available fields will be filled
 with the current header values.
 
 @item mairix-search-from-this-article
@@ -346,10 +346,8 @@ Then add the functions to @code{mairix-display-functions} and
 
 And that's it!
 
-
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
 
 @bye
-
-@ignore
-   arch-tag: cb81470f-e080-489d-bb67-0d11516b63b9
-@end ignore