consistently use @insertcopying, @direntry, @contents

doc/misc/ChangeLog

+2009-02-16  Karl Berry  <karl@gnu.org>
+
+	* ada-mode.texi,
+	* auth.texi,
+	* autotype.texi,
+	* calc.texi,
+	* cc-mode.texi,
+	* cl.texi,
+	* dbus.texi,
+	* dired-x.texi,
+	* ebrowse.texi,
+	* ediff.texi,
+	* emacs-mime.texi,
+	* epa.texi,
+	* erc.texi,
+	* eshell.texi,
+	* eudc.texi,
+	* faq.texi,
+	* flymake.texi,
+	* forms.texi,
+	* gnus-coding.texi,
+	* gnus.texi,
+	* idlwave.texi,
+	* info.texi,
+	* mairix-el.texi,
+	* message.texi,
+	* mh-e.texi,
+	* newsticker.texi,
+	* nxml-mode.texi,
+	* org.texi,
+	* pcl-cvs.texi,
+	* pgg.texi,
+	* rcirc.texi,
+	* reftex.texi,
+	* remember.texi,
+	* sasl.texi,
+	* sc.texi,
+	* ses.texi,
+	* sieve.texi,
+	* smtpmail.texi,
+	* speedbar.texi,
+	* tramp.texi,
+	* url.texi,
+	* vip.texi,
+	* viper.texi,
+	* widget.texi,
+	* woman.texi: Consistently use @insertcopying in the Top node,
+	@contents at the front (after @end titlepage),
+	and @direntry after @copying.
+	(Bug#1988)
+
 2009-02-13  Teodor Zlatanov  <tzz@lifelogs.com>
 
 	* auth.texi: New file documenting auth-source.

doc/misc/ada-mode.texi

@@ -37,11 +37,14 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
-@c fixme; title page doesn't show up in ada-mode.info; why bother with
-@c it?
+@contents
 
 @node Top, Overview, (dir), (dir)
 
+@ifnottex
+@insertcopying
+@end ifnottex
+
 @menu
 * Overview::
 * Installation::                Installing Ada mode on your system
@@ -1520,7 +1523,6 @@ autofill the current comment.
 
 @printindex fn
 
-@contents
 @bye
 
 @ignore

doc/misc/auth.texi

 \input texinfo                  @c -*-texinfo-*-
-
 @setfilename auth.info
+@settitle Emacs auth-source Library @value{VERSION}
 
 @set VERSION 0.1
 
-@dircategory Emacs
-@direntry
-* auth-source: (auth).   The Emacs auth-source library.
-@end direntry
-
-@settitle Emacs auth-source Library @value{VERSION}
-
 @copying
 This file describes the Emacs auth-source library.
 
-Copyright @copyright{} 2008, 2009
-Free Software Foundation, Inc.
+Copyright @copyright{} 2008, 2009 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -37,21 +29,22 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@tex
+@dircategory Emacs
+@direntry
+* auth-source: (auth).   The Emacs auth-source library.
+@end direntry
 
 @titlepage
 @title Emacs auth-source Library
-
 @author by Ted Zlatanov
 @page
-
 @vskip 0pt plus 1filll
 @insertcopying
 @end titlepage
-@page
 
-@end tex
+@contents
 
+@ifnottex
 @node Top
 @top Emacs auth-source
 This manual describes the Emacs auth-source library.
@@ -59,6 +52,8 @@ This manual describes the Emacs auth-source library.
 It is a way for multiple applications to share a single configuration
 (in Emacs and in files) for user convenience.
 
+@insertcopying
+
 @menu
 * Overview::                    Overview of the auth-source library.
 * Help for users::              
@@ -67,6 +62,7 @@ It is a way for multiple applications to share a single configuration
 * Function Index::              
 * Variable Index::              
 @end menu
+@end ifnottex
 
 @node Overview
 @chapter Overview
@@ -192,8 +188,6 @@ users' netrc files.
 @chapter Variable Index
 @printindex vr
 
-@summarycontents
-@contents
 @bye
 
 @c End:

doc/misc/autotype.texi

 \input texinfo
 @c This is an annex of the Emacs manual.
-@c Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004,
-@c   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 @c Author: Daniel.Pfeiffer@Informatik.START.dbp.de, fax (+49 69) 7588-2389
 @setfilename ../../info/autotype
 @c @node Autotypist, Picture, Abbrevs, Top
@@ -51,6 +49,8 @@ frequently in Emacs}
 @insertcopying
 @end titlepage
 
+@contents
+
 @node Top
 @top Autotyping
 
@@ -79,6 +79,10 @@ be defined for inserting and navigating between text more generally.  A
 sort of meta-expansion facility can be used to try a set of alternative
 completions and expansions of text at point.
 
+@ifnottex
+@insertcopying
+@end ifnottex
+
 @menu
 * Using Skeletons::        How to insert a skeleton into your text.
 * Wrapping Skeletons::     Putting existing text within a skeleton.
@@ -101,7 +105,6 @@ completions and expansions of text at point.
 @end menu
 
 
-
 @node Using Skeletons
 @chapter Using Skeletons
 @cindex skeletons
@@ -660,8 +663,6 @@ of the expansion possibilities.
 @unnumbered Variable Index
 @printindex vr
 
-@setchapternewpage odd
-@contents
 @bye
 
 @ignore

doc/misc/calc.texi

@@ -127,8 +127,6 @@ developing GNU and promoting software freedom.''
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1990, 1991, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 @insertcopying
 @end titlepage
 
@@ -161,6 +159,8 @@ file), type @kbd{?}.  (You can also type @kbd{h} to run through a
 longer Info tutorial.)
 @end ifinfo
 
+@insertcopying
+
 @menu
 * Getting Started::       General description and overview.
 @ifinfo

doc/misc/cc-mode.texi

@@ -211,10 +211,13 @@ from
 @comment This appears only in the Info file, not the printed manual.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+@summarycontents
+@contents
+
 @node    Top, Introduction, (dir), (dir)
 @comment node-name, next, previous, up
 
-@ifinfo
+@ifnottex
 @top @ccmode{}
 
 @ccmode{} is a GNU Emacs mode for editing files containing C, C++,
@@ -223,7 +226,9 @@ and AWK code.  It provides syntax-based indentation, font locking, and
 has several handy commands and some minor modes to make the editing
 easier.  It does not provide tools to look up and navigate between
 functions, classes etc - there are other packages for that.
-@end ifinfo
+
+@insertcopying
+@end ifnottex
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -6986,12 +6991,6 @@ Since most @ccmode{} variables are prepended with the string
 @comment Epilogue.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-@iftex
-@page
-@summarycontents
-@contents
-@end iftex
-
 @bye
 
 @ignore

doc/misc/cl.texi

@@ -44,6 +44,8 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@contents
+
 @node Top, Overview, (dir), (dir)
 @chapter Introduction
 
@@ -53,6 +55,10 @@ Common Lisp.  All the facilities are described here in detail.  While
 this document does not assume any prior knowledge of Common Lisp, it
 does assume a basic familiarity with Emacs Lisp.
 
+@ifnottex
+@insertcopying
+@end ifnottex
+
 @menu
 * Overview::             Installation, usage, etc.
 * Program Structure::    Arglists, `eval-when', `defalias'
@@ -5329,8 +5335,6 @@ recursion.
 
 @printindex vr
 
-@setchapternewpage odd
-@contents
 @bye
 
 @ignore

doc/misc/dbus.texi

@@ -27,6 +27,7 @@ developing GNU and promoting software freedom.''
 * D-Bus: (dbus).                Using D-Bus in Emacs.
 @end direntry
 
+@contents
 
 @node Top, Overview, (dir), (dir)
 @top D-Bus integration in Emacs
@@ -38,7 +39,9 @@ before you compile Emacs.}  D-Bus is a message bus system, a simple
 way for applications to talk to one another.  An overview of D-Bus can
 be found at @uref{http://dbus.freedesktop.org/}.
 
+@ifnottex
 @insertcopying
+@end ifnottex
 
 @menu
 * Overview::                    An overview of D-Bus.
@@ -1567,8 +1570,6 @@ whether a given D-Bus error is related to them.
 @appendix GNU Free Documentation License
 @include doclicense.texi
 
-@contents
-@c End of dbus.texi
 @bye
 
 @ignore

doc/misc/dired-x.texi

@@ -64,7 +64,8 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
-@page
+@contents
+
 
 @ifnottex
 
@@ -97,6 +98,8 @@ For @file{dired-x.el} revision 2
 
 @end itemize
 
+@insertcopying
+
 @menu
 * Introduction::
 * Installation::
@@ -1256,12 +1259,7 @@ Lawrence R. Dodd
 @unnumbered Variable Index
 @printindex vr
 
-@setchapternewpage odd
-@c @summarycontents
-@contents
-
 @bye
-@c dired-x.texi ends here.
 
 @ignore
    arch-tag: 201727aa-9318-4c74-a0d7-4f51c550c4de

doc/misc/ebrowse.texi

@@ -43,11 +43,15 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
-@node Top, Overview, (dir), (dir)
+@contents
 
 @ifnottex
+@node Top, Overview, (dir), (dir)
+
 You can browse C++ class hierarchies from within Emacs by using
 Ebrowse.
+
+@insertcopying
 @end ifnottex
 
 @menu
@@ -1448,7 +1452,6 @@ in on with the command @kbd{C-c C-m m}.
 @unnumbered Concept Index
 @printindex cp
 
-@contents
 @bye
 
 @ignore

doc/misc/ediff.texi

@@ -25,7 +25,7 @@
 This file documents Ediff, a comprehensive visual interface to Unix diff
 and patch utilities.
 
-Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 @quotation
@@ -61,9 +61,11 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@contents
 
 @node Top, Introduction, (dir), (dir)
 
+@insertcopying
 
 @menu
 * Introduction::                About Ediff.
@@ -2532,8 +2534,6 @@ Eli Zaretskii (eliz@@is.elta.co.il)
 @unnumbered Index
 @printindex cp
 
-@setchapternewpage odd
-@contents
 @bye
 
 @ignore

doc/misc/emacs-mime.texi

@@ -47,6 +47,8 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@contents
+
 @node Top
 @top Emacs MIME
 
@@ -66,6 +68,10 @@ Procedures), RFC2049 (Conformance Criteria and Examples).  It is highly
 recommended that anyone who intends writing @acronym{MIME}-compliant software
 read at least RFC2045 and RFC2047.
 
+@ifnottex
+@insertcopying
+@end ifnottex
+
 @menu
 * Decoding and Viewing::  A framework for decoding and viewing.
 * Composing::             @acronym{MML}; a language for describing @acronym{MIME} parts.
@@ -1873,8 +1879,6 @@ Documentation of the text/plain format parameter for flowed text.
 @chapter Index
 @printindex cp
 
-@summarycontents
-@contents
 @bye
 
 

doc/misc/epa.texi

@@ -7,7 +7,7 @@
 @set VERSION 1.0.0
 
 @copying
-This file describes EasyPG Assistant.
+This file describes EasyPG Assistant @value{VERSION}.
 
 Copyright @copyright{} 2007, 2008, 2009 Free Software Foundation, Inc.
 
@@ -36,7 +36,6 @@ license to the document, as described in section 6 of the license.
 * EasyPG Assistant: (epa).   An Emacs user interface to GNU Privacy Guard.
 @end direntry
 
-
 @titlepage
 @title EasyPG Assistant
 
@@ -46,10 +45,8 @@ license to the document, as described in section 6 of the license.
 @vskip 0pt plus 1filll
 @insertcopying
 @end titlepage
-@page
 
-@c @summarycontents
-@c @contents
+@contents
 
 @node Top
 @top EasyPG Assistant user's manual
@@ -61,8 +58,9 @@ EasyPG Assistant is a part of the package called EasyPG, an all-in-one
 GnuPG interface for Emacs.  EasyPG also contains the library interface
 called EasyPG Library.
 
-@noindent
-This manual covers EasyPG version @value{VERSION}.
+@ifnottex
+@insertcopying
+@end ifnottex
 
 @menu
 * Overview::                    

doc/misc/erc.texi

@@ -2,14 +2,8 @@
 @c %**start of header
 @setfilename ../../info/erc
 @settitle ERC Manual
-@c %**end of header
-
-@dircategory Emacs
-@direntry
-* ERC: (erc).           Powerful, modular, and extensible IRC client for Emacs.
-@end direntry
-
 @syncodeindex fn cp
+@c %**end of header
 
 @copying
 This manual is for ERC version 5.3.
@@ -33,6 +27,11 @@ and modified without restriction.
 @end quotation
 @end copying
 
+@dircategory Emacs
+@direntry
+* ERC: (erc).           Powerful, modular, and extensible IRC client for Emacs.
+@end direntry
+
 @titlepage
 @title ERC manual
 @subtitle a full-featured IRC client
@@ -45,7 +44,6 @@ and modified without restriction.
 @insertcopying
 @end titlepage
 
-@c So the toc is printed at the start
 @contents
 
 @ifnottex

doc/misc/eshell.texi

@@ -30,8 +30,6 @@ developing GNU and promoting software freedom.''
 * Eshell: (eshell).     A command shell implemented in Emacs Lisp.
 @end direntry
 
-@setchapternewpage on
-
 @titlepage
 @sp 4
 @c The title is printed in a large font.
@@ -64,13 +62,15 @@ developing GNU and promoting software freedom.''
 @node Top, What is Eshell?, (dir), (dir)
 @top Eshell
 
-This manual documents Eshell, a shell-like command interpretor
+Eshell is a shell-like command interpretor
 implemented in Emacs Lisp.  It invokes no external processes except for
 those requested by the user.  It is intended to be a functional
 replacement for command shells such as @command{bash}, @command{zsh},
 @command{rc}, or @command{4dos}; since Emacs itself is capable of
 handling the sort of tasks accomplished by those tools.
 @c This manual is updated to release 2.4 of Eshell.
+
+@insertcopying
 @end ifnottex
 
 @menu

doc/misc/eudc.texi

@@ -47,16 +47,13 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@contents
+
 @ifnottex
 @node     Top, Overview, (dir), (dir)
 @comment  node-name,  next,         previous, up
 
-
-This manual documents EUDC v1.30b, the Emacs Unified Directory Client.
-
-A common interface to directory servers using various protocols such as
-LDAP or the CCSO white pages directory system (PH/QI)
-
+@insertcopying
 @end ifnottex
 
 @menu
@@ -970,8 +967,6 @@ in testing and proofreading the code and docs of @file{ph.el}.
 
 @printindex vr
 
-@setchapternewpage odd
-@contents
 @bye
 
 @ignore

doc/misc/faq.texi

@@ -4,8 +4,6 @@
 @settitle GNU Emacs FAQ
 @c %**end of header
 
-@setchapternewpage odd
-
 @c This is used in many places
 @set VER 23.0.90
 
@@ -56,6 +54,8 @@ distribution.]
 @insertcopying
 @end titlepage
 
+@contents
+
 @node    Top, FAQ notation, (dir), (dir)
 
 This is the GNU Emacs FAQ, last updated on @today{}.
@@ -64,6 +64,10 @@ This FAQ is maintained as a part of GNU Emacs.  If you find any errors,
 or have any suggestions, please use @kbd{M-x report-emacs-bug} to report
 them.
 
+@ifnottex
+@insertcopying
+@end ifnottex 
+
 @menu
 * FAQ notation::
 * General questions::
@@ -5492,7 +5496,6 @@ part of the Gnus distribution.
 @unnumbered Concept Index
 @printindex cp
 
-@contents
 @bye
 
 @ignore

doc/misc/flymake.texi

@@ -47,6 +47,7 @@ developing GNU and promoting software freedom.''
 @ifnottex
 @node Top
 @top GNU Flymake
+@insertcopying 
 @end ifnottex
 
 @menu

doc/misc/forms.texi

@@ -58,6 +58,8 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@contents
+
 @ifnottex
 @node Top
 @top Forms Mode
@@ -73,6 +75,8 @@ job: a control file and a data file.  The data file holds the
 actual data to be presented.  The control file describes
 how to present it.
 
+@insertcopying 
+
 @menu
 * Forms Example::               An example: editing the password data base.
 * Entering and Exiting Forms Mode::
@@ -971,7 +975,6 @@ Software Foundation.  Thanks, Richard!
 @unnumbered Index
 @printindex cp
 
-@contents
 @bye
 
 @ignore

doc/misc/gnus-coding.texi

@@ -7,7 +7,8 @@
 @syncodeindex pg cp
 
 @copying
-Copyright (C) 2004, 2005, 2007, 2008, 2009  Free Software Foundation, Inc.
+Copyright @copyright{} 2004, 2005, 2007, 2008, 2009  Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -42,9 +43,14 @@ license to the document, as described in section 6 of the license.
 @c anyway hoping that it might annoy someone enough to fix it.  ;-)
 @c Fixing only a paragraph also is appreciated.
 
+@ifnottex
 @node Top
 @top Gnus Coding Style and Maintainance Guide
 This manual describes @dots{}
+
+@insertcopying 
+@end ifnottex
+
 @menu
 * Gnus Coding Style:: Gnus Coding Style
 * Gnus Maintainance Guide:: Gnus Maintainance Guide

doc/misc/gnus.texi

@@ -320,10 +320,6 @@ developing GNU and promoting software freedom.''
 @end iflatex
 @end iftex
 
-@ifnottex
-@insertcopying
-@end ifnottex
-
 @dircategory Emacs
 @direntry
 * Gnus: (gnus).         The newsreader Gnus.
@@ -331,8 +327,6 @@ developing GNU and promoting software freedom.''
 @iftex
 @finalout
 @end iftex
-@setchapternewpage odd
-
 
 
 @titlepage
@@ -344,6 +338,8 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@summarycontents
+@contents
 
 @node Top