Switch to Texinfo 5.0

* doc/texinfo/Config: Rewrite.
* doc/texinfo/Makefile.am: Use Makeinfo 5 instead of texi2htm
* doc/texinfo/gendocs_template: Remove ps
* doc/imprimatur: Upgrade.
* doc/texinfo/gendocs.sh: New file.
* doc/texinfo/rendition.texi: Remove.
* doc/texinfo/programs.texi: Bugfixes

-Subproject commit 04255b6d5551952b4e0c94da15988f573e3e9fc4
+Subproject commit 6ddf5a88dbe7e919f9b40427718bf73798611079

@@ -52,7 +52,7 @@ final: imprimatur-final
 #EXTRA_DIST = \
 #EXTRA_DIST = \
 # gendocs_template
 # gendocs_template
 
 
-GENDOCS=gendocs.sh
+GENDOCS=$(srcdir)/gendocs.sh
 TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
 TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
 
 
 .PHONY: manual
 .PHONY: manual
@@ -60,8 +60,7 @@ manual:
 	TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
 	TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
 	 MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS) $(AM_MAKEINFOFLAGS)" \
 	 MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS) $(AM_MAKEINFOFLAGS)" \
 	 TEXI2DVI="$(TEXI2DVI)" \
 	 TEXI2DVI="$(TEXI2DVI)" \
-         TEXI2HTML="texi2html $(AM_MAKEINFOFLAGS)" \
-	$(GENDOCS) --texi2html $(PACKAGE) '$(PACKAGE_NAME) manual'
+	$(GENDOCS) --no-copy-images $(PACKAGE) '$(PACKAGE_NAME) manual'
 
 
 manual.tar.bz2: manual
 manual.tar.bz2: manual
 	tar cfj manual.tar.bz2 manual
 	tar cfj manual.tar.bz2 manual

@@ -58,8 +58,6 @@
       (%%ASCII_GZ_SIZE%%K gzipped characters)</a>.</li>
       (%%ASCII_GZ_SIZE%%K gzipped characters)</a>.</li>
   <li><a href="manual/%%PACKAGE%%.dvi.gz">TeX dvi file
   <li><a href="manual/%%PACKAGE%%.dvi.gz">TeX dvi file
       (%%DVI_GZ_SIZE%%K characters gzipped)</a>.</li>
       (%%DVI_GZ_SIZE%%K characters gzipped)</a>.</li>
-  <li><a href="manual/%%PACKAGE%%.ps.gz">PostScript file
-      (%%PS_GZ_SIZE%%K characters gzipped)</a>.</li>
   <li><a href="manual/%%PACKAGE%%.pdf">PDF file
   <li><a href="manual/%%PACKAGE%%.pdf">PDF file
       (%%PDF_SIZE%%K characters)</a>.</li>
       (%%PDF_SIZE%%K characters)</a>.</li>
   <li><a href="manual/%%PACKAGE%%.texi.tar.gz">Texinfo source
   <li><a href="manual/%%PACKAGE%%.texi.tar.gz">Texinfo source

@@ -307,14 +307,14 @@ be described later in this chapter):
 
 
 @example
 @example
 imap4d: Info: parsing file `/etc/mailutils.rc'
 imap4d: Info: parsing file `/etc/mailutils.rc'
-# 1 "/etc/mailutils.rc"
+@hashchar{} 1 "/etc/mailutils.rc"
 mailbox @{
 mailbox @{
-# 2 "/etc/mailutils.rc"
+@hashchar{} 2 "/etc/mailutils.rc"
   mailbox-pattern maildir:/var/spool/mail;type=index;param=2;user=$@{user@};
   mailbox-pattern maildir:/var/spool/mail;type=index;param=2;user=$@{user@};
-# 3 "/etc/mailutils.rc"
+@hashchar{} 3 "/etc/mailutils.rc"
   mailbox-type maildir;
   mailbox-type maildir;
 @};
 @};
-# 6 "/etc/mailutils.rc"
+@hashchar{} 6 "/etc/mailutils.rc"
 include /etc/mailutils.d;
 include /etc/mailutils.d;
 imap4d: Info: parsing file `/etc/mailutils.d/imap4d'
 imap4d: Info: parsing file `/etc/mailutils.d/imap4d'
 ...
 ...
@@ -2524,7 +2524,7 @@ with @var{spool_path} being the full path to your mailspool directory
 @item -?
 @item -?
 @itemx --help
 @itemx --help
 Display a help message.
 Display a help message.
-@itemx --usage
+@item --usage
 Display a short usage summary.
 Display a short usage summary.
 @item -V
 @item -V
 @itemx --version
 @itemx --version
@@ -2860,8 +2860,8 @@ from that user's @file{mbox}.
 @item mail -f @var{path_to_mailbox}
 @item mail -f @var{path_to_mailbox}
 @itemx mail --file @var{path_to_mailbox}
 @itemx mail --file @var{path_to_mailbox}
 To read messages from the specified mailbox.
 To read messages from the specified mailbox.
-@itemx mail -u @var{user}
-@item mail --user=@var{user}
+@item mail -u @var{user}
+@itemx mail --user=@var{user}
 To read messages from the system mailbox belonging to @var{user}.
 To read messages from the system mailbox belonging to @var{user}.
 @end table
 @end table
 
 
@@ -7867,7 +7867,7 @@ use UNIX globbing or extended regular expression matching,
 correspondingly.  These were described in detail above. 
 correspondingly.  These were described in detail above. 
 
 
 @node Dump the Database
 @node Dump the Database
-@subsubsection
+@subsubsection Dump the Database
 
 
 The @option{dump} subcommand dumps the database to the standard output
 The @option{dump} subcommand dumps the database to the standard output
 in a format suitable for backup or sending over the network (a
 in a format suitable for backup or sending over the network (a

-@c This file is part of GNU Mailutils.
-@c Copyright (C) 2001-2004, 2006-2007, 2009-2012, 2014-2015 Free
-@c Software Foundation, Inc.
-@c
-@c GNU Mailutils is free software; you can redistribute it and/or
-@c modify it under the terms of the GNU General Public License as
-@c published by the Free Software Foundation; either version 3, or (at
-@c your option) any later version.
-@c
-@c GNU Mailutils is distributed in the hope that it will be useful, but
-@c WITHOUT ANY WARRANTY; without even the implied warranty of
-@c MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-@c General Public License for more details.
-@c
-@c You should have received a copy of the GNU General Public License
-@c along with GNU Mailutils.  If not, see
-@c <http://www.gnu.org/licenses/>.
-
-@c This file implements Fra@,{c}ois Pinard's concept of 'renditions'.
-
-@c ======================================================================
-@c This document has three levels of rendition: PUBLISH, DISTRIB or PROOF,
-@c as decided by @set symbols. The PUBLISH rendition does not show
-@c notes or marks asking for revision. Most users will prefer having more
-@c information, even if this information is not fully revised for adequacy,
-@c so DISTRIB is the default for distributions. The PROOF rendition
-@c show all marks to the point of ugliness, but is nevertheless useful to
-@c those working on the manual itself.
-@c ======================================================================
-
-@c Set this symbol if you wish FIXMEs to appear in footnotes, instead
-@c of being inserted into the text.
-@c @set PROOF_FOOTNOTED
-
-@ifclear PUBLISH
-@ifclear DISTRIB
-@ifclear PROOF
-@set DISTRIB
-@end ifclear
-@end ifclear
-@end ifclear
-
-@ifset PUBLISH
-@set RENDITION The book, version
-@end ifset
-
-@ifset DISTRIB
-@set RENDITION FTP release, version
-@end ifset
-
-@ifset PROOF
-@set RENDITION Proof reading version
-@end ifset
-
-@macro WRITEME
-@ifclear PUBLISH
-@cartouche
-@center @emph{@strong{Editor's note:} This node is to be written.}
-@end cartouche
-@end ifclear
-@end macro
-
-@c Output marks for nodes needing revision, but not in PUBLISH rendition.
-
-@macro UNREVISED
-@ifclear PUBLISH
-@cartouche
-@emph{Editor's note:} The information in this node may be obsolete or
-otherwise inaccurate.  This message will disappear, once this node revised.
-@end cartouche
-@end ifclear
-@end macro
-
-@c Output various FIXME information only in PROOF rendition.
-
-@macro FIXME{string}
-@ifset PROOF
-@sp 1
-@cartouche
-@strong{Editor's note:} \string\
-@end cartouche
-@end ifset
-@w{}
-@end macro
-
-@macro deadlink{}
-(@strong{Editor's note: dangling link})
-@end macro
-
-@macro FIXMEREF{text,string}
-@ifset PROOF
-@html
-\text\ <span class="deadlink">\string\</span> 
-@end html
-@ifnothtml
-\text\ @i{\string\}
-@end ifnothtml
-@deadlink{}
-@end ifset
-@w{}
-@end macro
-
-@macro FIXME-ref{string}
-@FIXMEREF{,\string\}
-@end macro
-
-@macro FIXME-pxref{string}
-@FIXMEREF{see,\string\}
-@end macro
-
-@macro FIXME-xref{string}
-@FIXMEREF{See,\string\}
-@end macro