Fixes for a number of issues which were previously warnings but are now
errors with texinfo5.  Many of these are non-ideal and need to be
revisited.

Author: Mark Brown <broonie@debian.org>
Origin: vendor
Bug-Debian: http://bugs.debian.org/712316
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/cc-mode/cc-mode.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/cc-mode/cc-mode.texi	2013-11-17 13:40:27.131965719 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/cc-mode/cc-mode.texi	2013-11-17 13:42:17.299561610 +0000
@@ -82,7 +82,7 @@
 
 @center @titlefont{CC Mode 5.30}
 @sp 2
-@center @subtitlefont{A GNU Emacs mode for editing C and C-like languages}
+@center @titlefont{A GNU Emacs mode for editing C and C-like languages}
 @sp 2
 @center Barry A. Warsaw, Martin Stjernholm, Alan Mackenzie (AWK support)
 
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/efs/efs.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/efs/efs.texi	2013-11-17 13:40:27.507964299 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/efs/efs.texi	2013-11-17 13:42:17.299561610 +0000
@@ -42,13 +42,13 @@
 @end ifinfo
 
 @titlepage
-@sp5
+@sp 5
 @center @titlefont{EFS}
 @center version 1.20
-@sp2
+@sp 2
 @center A transparent remote file system, by Sandy Rutherford, Andy
 Norman, and Mike Sperber
-@sp7
+@sp 7
 @center This documentation based on ange-ftp documentation by David Smith
 @center and on documentation in the EFS source code
 @center It was put together by Mike Sperber.
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/elib/elib.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/elib/elib.texi	2013-11-17 13:40:27.787963242 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/elib/elib.texi	2013-11-17 13:42:17.299561610 +0000
@@ -39,9 +39,9 @@
 @sp 4
 @comment The title is printed in a large font.
 @center @titlefont{User's Guide}
-@sp
+@sp 1
 @center @titlefont{to}
-@sp
+@sp 1
 @center @titlefont{Elib - The Emacs Lisp Library}
 @sp 2
 @center version 1.0
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/eshell/eshell.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/eshell/eshell.texi	2013-11-17 13:40:28.035962305 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/eshell/eshell.texi	2013-11-17 13:42:17.299561610 +0000
@@ -66,9 +66,9 @@
 @sp 4
 @c The title is printed in a large font.
 @center @titlefont{User's Guide}
-@sp
+@sp 1
 @center @titlefont{to}
-@sp
+@sp 1
 @center @titlefont{Eshell: The Emacs Shell}
 @ignore
 @sp 2
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/eudc/eudc.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/eudc/eudc.texi	2013-11-17 13:40:28.295961324 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/eudc/eudc.texi	2013-11-17 13:42:17.299561610 +0000
@@ -52,8 +52,8 @@
 @end ifinfo
 
 @titlepage
-@title{EUDC Manual}
-@subtitle{The Emacs Unified Directory Client}
+@title EUDC Manual 
+@subtitle The Emacs Unified Directory Client 
 @author by Oscar Figueiredo
 @code{1.32}
 
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/general-docs/texi/xemacs/xemacs-devguide.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/general-docs/texi/xemacs/xemacs-devguide.texi	2013-11-17 13:40:28.555960344 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/general-docs/texi/xemacs/xemacs-devguide.texi	2013-11-17 13:42:17.299561610 +0000
@@ -102,7 +102,7 @@
 * Nodes borrowed from other projects not adapted to XEmacs::
 * Index::                       
 
-@detailmenu
+@c @detailmenu
  --- The Detailed Node Listing ---
 
 People and the Project
@@ -186,13 +186,17 @@
 
 Bugs
 
+* Bugs::
 * Category::                    
 * Status::                      
 * Group::                       
 * Resolution::                  
+* Support Requests::
+* Feature Requests::
 
 File Releases
 
+* File Releases::
 * Release Schedule::            
 * Release Prerequisites::       
 * Updating NEWS::               
@@ -211,7 +215,11 @@
 * Updating the Free Software Directories::  
 * After the Release::           
 
-@end detailmenu
+Misc
+
+* Copying::
+
+@c @end detailmenu
 @end menu
 
 @node Acknowledgments, Introduction, Top, Top
@@ -2180,7 +2188,6 @@
 @strong{Write this node!  Get mailing list and newsgroup information
 from the @uref{http://www.xemacs.org/Lists/, mailing list page},
 available as the module @emph{xemacsweb} @ref{CVS Repository}.
-
 There should also be a node for the Emacs Wiki.}
 
 @cindex XEmacs Resources on the Internet
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/hm--html-menus/hm--html-mode.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/hm--html-menus/hm--html-mode.texi	2013-11-17 13:40:29.467956902 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/hm--html-menus/hm--html-mode.texi	2013-11-17 13:42:17.303561596 +0000
@@ -44,7 +44,7 @@
 @end iftex
 @titlepage
 @sp 10
-@center @titlefont{The Elisp Package hm{-}{-}html{-}menus}
+@center @titlefont{The Elisp Package hm--html-menus}
 
 @sp 4
 @center by Heiko Mnkel
@@ -205,54 +205,54 @@
 @table @file
 @item README 
 Please, read this first.
-@itemx README-EMACS-19
+@item README-EMACS-19
 Some special hints only for GNU Emacs 19 users.
-@itemx ANNOUNCEMENT
+@item ANNOUNCEMENT
 Text of the announcement of this package.
-@itemx LSM
+@item LSM
 Entry for the Linux Software Map.
-@itemx NEWS
+@item NEWS
 The NEWS and Change log file.
-@itemx adapt.el
+@item adapt.el
 Provides (emulates XEmacs) functions for the use of this package with
 GNU Emacs 19.
-@itemx drop
+@item drop
 An xbm file with the drag and drop mouse pointer in the XEmacs.
-@itemx dropmsk
+@item dropmsk
 An xbm file with the mask for the drag and drop mouse pointer in the XEmacs.
-@itemx hm--html.el
+@item hm--html.el
 Provides functions to write html pages. It defines all commands which
 insert html elements and entities.
-@itemx hm--html-indentation.el
+@item hm--html-indentation.el
 Provides the lisp code for the indentation.
-@itemx hm--html-keys.el
+@item hm--html-keys.el
 Defines the key bindings.
-@itemx hm--html-menu.el
+@item hm--html-menu.el
 Provides the menus.
-@itemx hm--html-mode.el
+@item hm--html-mode.el
 Provides the functions for the definition of the hm--html-mode and the
 hm--html-minor-mode. This is the main file of the package.
-@itemx hm--html-not-standard.el
+@item hm--html-not-standard.el
 Provides functions to insert some non standard html elements. This file
 is not evaluated by default and it may be a bad idea to use it.
-@itemx hm--html-configuration.el
+@item hm--html-configuration.el
 Configuration file for the html mode. All the user variables are defined
 in this file. 
-@itemx hm--html-drag-and-drop.el
+@item hm--html-drag-and-drop.el
 Defines the HTML-specific functions for the drag and drop interface.
-@itemx hm--date.el
+@item hm--date.el
 Defines the function hm--date, which returns the date in the format
 "day-month-year" like "30-Jun-1993".
-@itemx html-view.el
+@item html-view.el
 Ron Tapia's html-view.el to view html pages in Mosaic. It is
 patched for use with XEmacs.
-@itemx internal-drag-and-drop.el
+@item internal-drag-and-drop.el
 Provides the general (html-mode independent) functions of the drag and
 drop interface.
-@itemx templates.doc
+@item templates.doc
 Describes the syntax of the templates provided in the file
 @file{tmpl-minor-mode.el}
-@itemx tmpl-minor-mode.el
+@item tmpl-minor-mode.el
 Provides functions for the tmpl-minor-mode. With this mode you can
 expand templates, which are described in the file
 @file{templates-syntax.doc} (look at the files
@@ -260,13 +260,13 @@
 examples).  Templates can be expanded automatically, if you include a
 file with templates via the html pulldown menu item "Templates ..." or
 with the item "Templates (fixed dirs)...".
-@itemx command-description.html.tmpl
+@item command-description.html.tmpl
 Template file for the use with the tmpl-minor-mode.
-@itemx frame.html.tmpl
+@item frame.html.tmpl
 Template file, provides a simple frame.
-@itemx doc/hm--html-mode.texinfo 
+@item doc/hm--html-mode.texinfo 
 Package documentation in the Texinfo format.
-@itemx doc/umlaute.texinfo
+@item doc/umlaute.texinfo
 Texinfo include file for German vowel mutation (deutsche Umlaute).
 @end table
 
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/oo-browser/man/oo-browser.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/oo-browser/man/oo-browser.texi	2013-11-17 13:40:29.819955575 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/oo-browser/man/oo-browser.texi	2013-11-17 13:42:17.303561596 +0000
@@ -33,7 +33,7 @@
 @title The OO-Browser
 @subtitle The Multi-language Object-Oriented Code Browser
 @sp 2
-@centerline{@psfig{figure=im/oobr-menu-cv.ps,width=5in}}
+@c @centerline{@psfig{figure=im/oobr-menu-cv.ps,width=5in}}
 @sp 2
 @author Bob Weiner
 
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/pcl-cvs/pcl-cvs.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/pcl-cvs/pcl-cvs.texi	2013-11-17 13:40:30.099954518 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/pcl-cvs/pcl-cvs.texi	2013-11-17 13:42:17.303561596 +0000
@@ -61,9 +61,9 @@
 @sp 4
 @c The title is printed in a large font.
 @center @titlefont{User's Guide}
-@sp
+@sp 1
 @center @titlefont{to}
-@sp
+@sp 1
 @center @titlefont{pcl-cvs - the Emacs Front-End to CVS}
 @sp 2
 @center release 2.9
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/semantic/doc/glossary.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/semantic/doc/glossary.texi	2013-11-17 13:40:30.403953373 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/semantic/doc/glossary.texi	2013-11-17 13:42:17.303561596 +0000
@@ -5,7 +5,7 @@
 @c proper menus for this chapter.
 @end ignore
 
-@table @keyword
+@table @code
 @item BNF
 In semantic 1.4, a BNF file represented ``Bovine Normal Form'', the
 grammar file used for the 1.4 parser generator.  This was a play on
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/semantic/doc/lang-support-guide.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/semantic/doc/lang-support-guide.texi	2013-11-17 13:40:30.683952317 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/semantic/doc/lang-support-guide.texi	2013-11-17 13:42:17.303561596 +0000
@@ -1101,6 +1101,10 @@
 stream is requested.
 @end deffn
 
+@menu
+* Parser Backend Support:: Parser backend support.
+@end menu
+
 @node Parser Backend Support
 @section Parser Backend Support
 
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/semantic/doc/minor-modes.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/semantic/doc/minor-modes.texi	2013-11-17 13:40:31.095950764 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/semantic/doc/minor-modes.texi	2013-11-17 13:42:17.303561596 +0000
@@ -36,6 +36,9 @@
 * Highlight Edits Mode::
 * Parser State::
 * Unmatched Syntax Highlighting::
+* Sticky Function Mode::
+* Tag Decoration Mode::
+* MRU Bookmarks Mode::
 @end menu
 
 @node Sticky Function Mode
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/sml-mode/sml-mode.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/sml-mode/sml-mode.texi	2013-11-17 13:40:31.495949257 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/sml-mode/sml-mode.texi	2013-11-17 13:42:17.303561596 +0000
@@ -34,8 +34,8 @@
 @center @titlefont{Editing and Running Standard ML}
 @center @titlefont{under GNU Emacs}
 @sp 5
-@center {SML mode, Version $Name:  $}
-@center {August 1999}
+@center SML mode, Version $Name:  $
+@center August 1999
 @sp 2
 @author Authors: Matthew J.@: Morley and Stefan Monnier
 
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/zenirc/doc/zenirc.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/zenirc/doc/zenirc.texi	2013-11-17 13:40:32.759944496 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/zenirc/doc/zenirc.texi	2013-11-17 13:42:17.303561596 +0000
@@ -1,5 +1,5 @@
-\def\line{\hbox to\hsize}
-\def\centerline#1{\line{\hss#1\hss}}
+\def\line \hbox to\hsize
+\def\centerline#1 \line \hss#1\hss
 \input psfig
 \input texinfo   @c -*-texinfo-*-
 @c ----------------------------------------------------------------------
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/auctex/doc/auctex.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/auctex/doc/auctex.texi	2013-11-17 13:49:22.000000000 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/auctex/doc/auctex.texi	2013-11-17 13:53:45.944643089 +0000
@@ -413,7 +413,7 @@
 @item C-c C-f C-f
 @kindex C-c C-f C-f
 @cindex @code{\textsf}
-Insert @sans{sans serif} @samp{\textsf@{@point{}@}} text.
+@c Insert @sans{sans serif} @samp{\textsf@{@point{}@}} text.
 
 @item C-c C-f C-t
 @kindex C-c C-f C-t
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/auctex/doc/preview-latex.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/auctex/doc/preview-latex.texi	2013-11-17 13:49:22.000000000 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/auctex/doc/preview-latex.texi	2013-11-17 13:53:45.944643089 +0000
@@ -699,7 +699,9 @@
 group @code{Preview Gs} for this.
 
 Another noteworthy setting of @code{preview-image-type} is
-@samp{dvipng}: in this case, the @samp{dvipng}@pindex{dvipng} program
+@samp{dvipng}: in this case, the @samp{dvipng}
+@pindex dvipng
+program
 will get run on @acronym{DVI} output (see below for @acronym{PDF}).
 This is in general much faster than Dvips and Ghostscript.  In that
 case, the option
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/auctex/doc/quickstart.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/auctex/doc/quickstart.texi	2013-11-17 13:49:22.000000000 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/auctex/doc/quickstart.texi	2013-11-17 13:53:45.944643089 +0000
@@ -163,7 +163,7 @@
 @item C-c C-f C-f
 @kindex C-c C-f C-f
 @cindex @code{\textsf}
-Insert  @sans{sans serif} @samp{\textsf@{@point{}@}} text.
+@c Insert  @sans{sans serif} @samp{\textsf@{@point{}@}} text.
 
 @item C-c C-f C-t
 @kindex C-c C-f C-t
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/w3/texi/w3.txi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/w3/texi/w3.txi	2013-11-17 13:49:22.000000000 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/w3/texi/w3.txi	2013-11-17 13:53:45.944643089 +0000
@@ -1423,8 +1423,6 @@
 Emacs/W3 will ignore attempts by stylesheets or font tags to change
 certain fonts if this is non-@code{nil}.
 
-@subsection Asynchronous behaviour
-
 @item url-be-asynchronous
 @vindex url-be-asynchronous
 If this is non-@code{nil} then document retrievals over @sc{http} will
Index: xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/xslt-process/doc/xslt-process.texi
===================================================================
--- xemacs21-packages-2009.02.17.dfsg.2.orig/xemacs-packages/xslt-process/doc/xslt-process.texi	2013-11-17 13:49:22.000000000 +0000
+++ xemacs21-packages-2009.02.17.dfsg.2/xemacs-packages/xslt-process/doc/xslt-process.texi	2013-11-17 13:53:45.944643089 +0000
@@ -35,7 +35,8 @@
 @page
 @vskip 0pt plus 1filll
 Copyright @copyright{} 2000, 2001 Ovidiu Predescu.
-@par All rights reserved.
+
+All rights reserved.
 
 @sp 1