consistently use @insertcopying, @direntry, @contents

46 files changed, 271 insertions, 191 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6a068799faf..03ff9f70284 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,54 @@
+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.
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi
index 20de8af9f1f..ae9597818c6 100644
--- a/doc/misc/ada-mode.texi
+++ b/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
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index 7a9031a0c1a..31b281f890a 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -1,21 +1,13 @@
 \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:
diff --git a/doc/misc/autotype.texi b/doc/misc/autotype.texi
index edd210c2b5c..0ca6b8105ea 100644
--- a/doc/misc/autotype.texi
+++ b/doc/misc/autotype.texi
@@ -1,7 +1,5 @@
 \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
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index a167a76bbe1..823dccfe136 100644
--- a/doc/misc/calc.texi
+++ b/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
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 399e38ea5be..0d8385ed968 100644
--- a/doc/misc/cc-mode.texi
+++ b/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
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 2e7993a6de5..fb1aace9bc6 100644
--- a/doc/misc/cl.texi
+++ b/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
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index c012647144e..51dabf8028d 100644
--- a/doc/misc/dbus.texi
+++ b/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
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index f8dee506e5c..84ef5205b7a 100644
--- a/doc/misc/dired-x.texi
+++ b/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
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index ce7144feb37..9642c3c1dd6 100644
--- a/doc/misc/ebrowse.texi
+++ b/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
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index a5881945dc7..b13d6b10f5f 100644
--- a/doc/misc/ediff.texi
+++ b/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
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 883a552b135..e9a03595502 100644
--- a/doc/misc/emacs-mime.texi
+++ b/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
 
 
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index bedd370dae3..97a61cd5547 100644
--- a/doc/misc/epa.texi
+++ b/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::                    
diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index 81e1239cec9..09e9479449e 100644
--- a/doc/misc/erc.texi
+++ b/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
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 2e24db33e83..e7d4132c4b8 100644
--- a/doc/misc/eshell.texi
+++ b/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
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index d298012090f..c3adbb44b4a 100644
--- a/doc/misc/eudc.texi
+++ b/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
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 8cebb0028e8..af705ffc017 100644
--- a/doc/misc/faq.texi
+++ b/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
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index e886e7fa099..a713d7ccee4 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -47,6 +47,7 @@ developing GNU and promoting software freedom.''
 @ifnottex
 @node Top
 @top GNU Flymake
+@insertcopying 
 @end ifnottex
 
 @menu
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index cc830972663..4f6280b47ca 100644
--- a/doc/misc/forms.texi
+++ b/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
diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi
index 324cba4aee1..a384e8b1634 100644
--- a/doc/misc/gnus-coding.texi
+++ b/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
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index b4ceb358957..86011fe3a00 100644
--- a/doc/misc/gnus.texi
+++ b/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
 @top The Gnus Newsreader
@@ -358,6 +354,10 @@ luck.
 @c Adjust ../Makefile.in if you change the following line:
 This manual corresponds to Gnus v5.13
 
+@ifnottex
+@insertcopying
+@end ifnottex
+
 @end ifinfo
 
 @iftex
@@ -30505,7 +30505,7 @@ Below is a slightly shortened version of the @code{nndir} back end.
 
 @lisp
 ;;; @r{nndir.el --- single directory newsgroup access for Gnus}
-;; @r{Copyright (C) 1995,96 Free Software Foundation, Inc.}
+;; @r{Copyright (C) 1995,1996 Free Software Foundation, Inc.}
 
 ;;; @r{Code:}
 
@@ -31265,8 +31265,6 @@ former).  The manual is unambiguous, but it can be confusing.
 @chapter Key Index
 @printindex ky
 
-@summarycontents
-@contents
 @bye
 
 @iftex
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 046016608d7..0d241771dcb 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -2,10 +2,6 @@
 @c %**start of header
 @setfilename ../../info/idlwave
 @settitle IDLWAVE User Manual
-@dircategory Emacs
-@direntry
-* IDLWAVE: (idlwave).   Major mode and shell for IDL files.
-@end direntry
 @synindex ky cp
 @syncodeindex vr cp
 @syncodeindex fn cp
@@ -43,6 +39,11 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
+@dircategory Emacs
+@direntry
+* IDLWAVE: (idlwave).   Major mode and shell for IDL files.
+@end direntry
+
 @titlepage
 @title IDLWAVE User Manual
 @subtitle Emacs major mode and shell for IDL
@@ -52,17 +53,16 @@ developing GNU and promoting software freedom.''
 @vskip 0pt plus 1filll
 @insertcopying
 @end titlepage
-@contents
 
-@page
+@contents
 
 @ifnottex
-
 @node Top, Introduction, (dir), (dir)
 
 IDLWAVE is a package which supports editing source code written in the
 Interactive Data Language (IDL), and running IDL as an inferior shell.
 
+@insertcopying 
 @end ifnottex
 
 @menu
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index cb47d3180d9..147e0b7a5ca 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -79,6 +79,8 @@ Started' chapter.
 @end ifinfo
 @end ifnottex
 
+@insertcopying 
+
 @menu
 * Getting Started::             Getting started using an Info reader.
 * Advanced::                    Advanced Info commands.
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index d7370784535..9d0f69f241f 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -36,6 +36,7 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@contents
 
 @node Top
 @top mairix.el - Mairix interface for Emacs
@@ -50,6 +51,10 @@ currently displayed mail, save regularly used searches in your
 @file{.emacs} for future use and lets you call mairix for updating the
 database.
 
+@ifnottex
+@insertcopying
+@end ifnottex
+
 @menu
 * About mairix and mairix.el::  About the mairix search engine and mairix.el
 * Configuring mairix::          How to configure mairix
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index e4a797be177..51e15508e6d 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -32,7 +32,6 @@ developing GNU and promoting software freedom.''
 @iftex
 @finalout
 @end iftex
-@setchapternewpage odd
 
 @titlepage
 @title Message Manual
@@ -43,11 +42,17 @@ developing GNU and promoting software freedom.''
 @vskip 0pt plus 1filll
 @insertcopying
 @end titlepage
-@page
+
+@summarycontents
+@contents
 
 @node Top
 @top Message
 
+@ifnottex
+@insertcopying
+@end ifnottex
+
 All message composition from Gnus (both mail and news) takes place in
 Message mode buffers.
 
@@ -2432,8 +2437,6 @@ basis of the new @code{Cc} header, except if this header is
 @chapter Key Index
 @printindex ky
 
-@summarycontents
-@contents
 @bye
 
 @c End:
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 2cf5b30f3d8..b4a26fa6451 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -62,7 +62,6 @@ Public License.''
 @end direntry
 
 @c Title Page
-@setchapternewpage odd
 @titlepage
 @title The MH-E Manual
 @subtitle Version @value{VERSION}@value{EDITION}
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi
index 38505a666a5..10ac0069eb3 100644
--- a/doc/misc/newsticker.texi
+++ b/doc/misc/newsticker.texi
@@ -51,6 +51,9 @@ developing GNU and promoting software freedom.''
 @ifnottex
 @node Top
 @top Newsticker
+
+@insertcopying 
+
 @end ifnottex
 
 @menu
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index 8e769a2bb1a..1181e743e74 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -5,7 +5,6 @@
 @c %**end of header
 
 @copying
-
 This manual documents nxml-mode, an Emacs major mode for editing
 XML with RELAX NG support. 
 
@@ -39,8 +38,9 @@ license to the document, as described in section 6 of the license.
 @node Top
 @top nXML Mode
 
-This manual documents nxml-mode, an Emacs major mode for editing
-XML with RELAX NG support.  This manual is not yet complete.
+@insertcopying
+
+This manual is not yet complete.
 
 @menu
 * Completion::                  
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 814378ac108..b8f56f123c7 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -6,11 +6,6 @@
 @set VERSION 6.21b
 @set DATE February 2009
 
-@dircategory Emacs
-@direntry
-* Org Mode: (org).      Outline-based notes management and organizer
-@end direntry
-
 @c Version and Contact Info
 @set MAINTAINERSITE @uref{http://orgmode.org,maintainers webpage}
 @set AUTHOR Carsten Dominik
@@ -56,6 +51,11 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
+@dircategory Emacs
+@direntry
+* Org Mode: (org).      Outline-based notes management and organizer
+@end direntry
+
 @titlepage
 @title The Org Manual
 
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 61e37753501..3422f6981c0 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -55,6 +55,8 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@contents
+
 @c ================================================================
 @c                   The real text starts here
 @c ================================================================
@@ -68,6 +70,9 @@ is nowhere near complete, so you are advised to use @kbd{M-x
 customize-group RET pcl-cvs @key{RET}} and to look at the documentation strings
 of the various commands and major modes for further information.
 @c This manual is updated to release 2.5 of PCL-CVS.
+
+@insertcopying 
+
 @end ifnottex
 
 @menu
@@ -1426,9 +1431,6 @@ this manual.
 
 @printindex ky
 
-@setchapternewpage odd
-@summarycontents
-@contents
 @bye
 
 @ignore
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi
index 27775e3e578..11b03924139 100644
--- a/doc/misc/pgg.texi
+++ b/doc/misc/pgg.texi
@@ -1,12 +1,12 @@
 \input texinfo                  @c -*-texinfo-*-
-
 @setfilename ../../info/pgg
+@settitle PGG @value{VERSION}
 
 @set VERSION 0.1
 
-
 @copying
-This file describes PGG, an Emacs interface to various PGP implementations.
+This file describes PGG @value{VERSION}, an Emacs interface to various
+PGP implementations.
 
 Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 Free Software Foundation, Inc.
@@ -30,9 +30,6 @@ developing GNU and promoting software freedom.''
 * PGG: (pgg).   Emacs interface to various PGP implementations.
 @end direntry
 
-@settitle PGG @value{VERSION}
-
-
 @titlepage
 @title PGG
 
@@ -42,14 +39,20 @@ developing GNU and promoting software freedom.''
 @vskip 0pt plus 1filll
 @insertcopying
 @end titlepage
-@page
+
+@contents
 
 @node Top
 @top PGG
-This manual describes PGG.  PGG is an interface library between Emacs
+
+PGG is an interface library between Emacs
 and various tools for secure communication.  PGG also provides a simple
 user interface to encrypt, decrypt, sign, and verify MIME messages.
 
+@ifnottex
+@insertcopying 
+@end ifnottex
+
 @menu
 * Overview::                    What PGG is.
 * Prerequisites::               Complicated stuff you may have to do.
@@ -491,8 +494,6 @@ If non-@code{nil}, don't check the checksum of the packets.
 @unnumbered Variable Index
 @printindex vr
 
-@summarycontents
-@contents
 @bye
 
 @c End:
diff --git a/doc/misc/rcirc.texi b/doc/misc/rcirc.texi
index dce2e03f6d9..6bc7185370b 100644
--- a/doc/misc/rcirc.texi
+++ b/doc/misc/rcirc.texi
@@ -33,10 +33,11 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@contents
+
 @ifnottex
 @node Top, Basics, (dir), (dir)
 @top rcirc Manual
-@end ifnottex
 
 @code{rcirc} is an Emacs IRC client.
 
@@ -45,6 +46,10 @@ communicate with each other in real-time.  Communication occurs both in
 topic channels which are collections of many users, or privately, with
 just one other user.
 
+@insertcopying
+
+@end ifnottex
+
 @menu
 * Basics::
 * Reference::
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index 2b48e78d855..c8876cc9512 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -74,6 +74,9 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@summarycontents
+@contents
+
 @ifnottex
 @node Top,,,(dir)
 
@@ -86,6 +89,8 @@ Don't be discouraged by the size of this manual, which covers
 Nutshell}).  You can go back later to other parts of this document when
 needed.
 
+@insertcopying 
+
 @menu
 * Introduction::                     Quick-Start information.
 
@@ -5883,8 +5888,6 @@ released on 7 Jan 1997.
 @unnumbered Index
 @printindex cp
 
-@summarycontents
-@contents
 @bye
 
 @ignore
diff --git a/doc/misc/remember.texi b/doc/misc/remember.texi
index 0ec59daf09e..ef6bce24f76 100644
--- a/doc/misc/remember.texi
+++ b/doc/misc/remember.texi
@@ -2,14 +2,8 @@
 @c %**start of header
 @setfilename ../../info/remember
 @settitle Remember Manual
-@c %**end of header
-
-@dircategory Emacs
-@direntry
-* Remember: (remember). Simple information manager for Emacs
-@end direntry
-
 @syncodeindex fn cp
+@c %**end of header
 
 @copying
 This manual is for Remember Mode, version 1.9
@@ -31,6 +25,11 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
+@dircategory Emacs
+@direntry
+* Remember: (remember). Simple information manager for Emacs
+@end direntry
+
 @titlepage
 @title Guide to Remember Mode
 @subtitle a simple information manager
@@ -43,7 +42,6 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
-@c So the toc is printed at the start
 @contents
 
 @ifnottex
diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi
index d2f8eb798b6..b7873025318 100644
--- a/doc/misc/sasl.texi
+++ b/doc/misc/sasl.texi
@@ -1,18 +1,11 @@
 \input texinfo                  @c -*-texinfo-*-
-
 @setfilename ../../info/sasl
 
 @set VERSION 0.2
-
-@dircategory Emacs
-@direntry
-* SASL: (sasl).   The Emacs SASL library.
-@end direntry
-
 @settitle Emacs SASL Library @value{VERSION}
 
 @copying
-This file describes the Emacs SASL library.
+This file describes the Emacs SASL library, version @value{VERSION}.
 
 Copyright @copyright{} 2000, 2004, 2005, 2006, 2007, 2008, 2009
 Free Software Foundation, Inc.
@@ -37,10 +30,14 @@ license to the document, as described in section 6 of the license.
 @end quotation
 @end copying
 
-@tex
+@dircategory Emacs
+@direntry
+* SASL: (sasl).   The Emacs SASL library.
+@end direntry
+
 
 @titlepage
-@title Emacs SASL Library
+@title Emacs SASL Library @value{VERSION}
 
 @author by Daiki Ueno
 @page
@@ -48,17 +45,18 @@ license to the document, as described in section 6 of the license.
 @vskip 0pt plus 1filll
 @insertcopying
 @end titlepage
-@page
 
-@end tex
 
 @node Top
 @top Emacs SASL
-This manual describes the Emacs SASL library.
 
-A common interface to share several authentication mechanisms between
+SASL is a common interface to share several authentication mechanisms between
 applications using different protocols.
 
+@ifnottex
+@insertcopying 
+@end ifnottex
+
 @menu
 * Overview::                    What Emacs SASL library is.
 * How to use::                  Adding authentication support to your applications.
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index 46d05a014e6..979cff23ca7 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -49,12 +49,16 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@summarycontents
+@contents
+
 @ifnottex
 @node Top, Introduction, (dir), (dir)
 @comment  node-name,  next,  previous,  up
 
-This document describes Supercite, an Emacs package for citing and
-attributing replies to mail and news messages.  The manual is divided
+@insertcopying 
+
+The manual is divided
 into the following chapters.
 
 @menu
@@ -1935,9 +1939,6 @@ its @var{variable} name.
 @sp 2
 @end iftex
 @printindex vr
-@setchapternewpage odd
-@summarycontents
-@contents
 @bye
 
 @ignore
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index a3081bacc68..89228df57c5 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -64,6 +64,8 @@ by formulas that can refer to the values of other cells.
 
 To report bugs, send email to @email{jyavner@@member.fsf.org}.
 
+@insertcopying
+
 @menu
 * Sales Pitch::                 Why use SES?
 * The Basics::                  Basic spreadsheet commands
diff --git a/doc/misc/sieve.texi b/doc/misc/sieve.texi
index 17a64caa3ff..19848426f0b 100644
--- a/doc/misc/sieve.texi
+++ b/doc/misc/sieve.texi
@@ -1,5 +1,4 @@
 \input texinfo                  @c -*-texinfo-*-
-
 @setfilename ../../info/sieve
 @settitle Emacs Sieve Manual
 @synindex fn cp
@@ -44,13 +43,13 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@summarycontents
+@contents
 
 @node Top
 @top Sieve Support for Emacs
 
-This manual documents the Emacs Sieve package.
-
-It is intended as a users manual for Sieve Mode and Manage Sieve, and
+This is intended as a users manual for Sieve Mode and Manage Sieve, and
 as a reference manual for the @samp{sieve-manage} protocol Emacs Lisp
 API.
 
@@ -58,7 +57,9 @@ Sieve is a language for server-side filtering of mail.  The language
 is documented in RFC 3028.  This manual does not attempt to document
 the language, so keep RFC 3028 around.
 
-A good online Sieve resources is @uref{http://www.cyrusoft.com/sieve/}.
+@ifnottex
+@insertcopying
+@end ifnottex
 
 @menu
 * Installation::          Getting ready to use the package.
@@ -352,8 +353,6 @@ A Protocol for Remotely Managing Sieve Scripts
 @unnumbered Index
 @printindex cp
 
-@summarycontents
-@contents
 @bye
 
 @c End:
diff --git a/doc/misc/smtpmail.texi b/doc/misc/smtpmail.texi
index 4325bd0afa2..848da3ec6ea 100644
--- a/doc/misc/smtpmail.texi
+++ b/doc/misc/smtpmail.texi
@@ -414,7 +414,6 @@ cannot accept mail.
 
 @printindex fn
 
-@contents
 @bye
 
 @ignore
diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi
index 3dcc73f1eca..2e6e27330ec 100644
--- a/doc/misc/speedbar.texi
+++ b/doc/misc/speedbar.texi
@@ -1,5 +1,4 @@
 \input texinfo   @c -*-texinfo-*-
-
 @setfilename ../../info/speedbar
 @settitle Speedbar: File/Tag summarizing utility
 @syncodeindex fn cp
@@ -38,6 +37,8 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@contents
+
 @node Top, , , (dir)Top
 @comment  node-name,  next,  previous,  up
 
@@ -67,6 +68,10 @@ button.  Expanding refers to clicking on an expansion button to display
 an expanded summary of the entry the expansion button is
 on.  @xref{Basic Navigation}.
 
+@ifnottex
+@insertcopying 
+@end ifnottex
+
 @menu
 * Introduction::     Basics of speedbar.
 * Basic Navigation:: Basics of speedbar common between all modes.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 23a974906dc..00b5f4ca909 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2,7 +2,6 @@
 @setfilename ../../info/tramp
 @c %**start of header
 @settitle TRAMP User Manual
-@setchapternewpage odd
 @c %**end of header
 
 @c This is *so* much nicer :)
@@ -62,21 +61,15 @@ supports it in developing GNU and promoting software freedom.''
                                  @value{emacsname} remote file access via rsh and rcp.
 @end direntry
 
-@tex
-
 @titlepage
 @title @value{tramp} version @value{trampver} User Manual
-
 @author by Daniel Pittman
 @author based on documentation by Kai Gro@ss{}johann
-
 @page
 @insertcopying
-
 @end titlepage
-@page
 
-@end tex
+@contents
 
 @ifnottex
 @node Top, Overview, (dir), (dir)
@@ -3490,8 +3483,6 @@ for @value{emacsothername}.
 @unnumbered Concept Index
 @printindex cp
 
-@contents
-@c End of tramp.texi - the TRAMP User Manual
 @bye
 
 @c TODO
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index fe4dd9bca58..f60952a10f7 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -13,13 +13,13 @@
 %\global\baselineskip 30pt      % for printing in double space
 @end tex
 @dircategory World Wide Web
-@dircategory GNU Emacs Lisp
+@dircategory Emacs
 @direntry
 * URL: (url).                 URL loading package.
 @end direntry
 
 @copying
-This file documents the URL loading package.
+This file documents the Emacs Lisp URL loading package.
 
 Copyright @copyright{} 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002,
 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -49,10 +49,14 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
-@page
+@contents
+
 @node Top
 @top URL
 
+@ifnottex
+@insertcopying
+@end ifnottex
 
 @menu
 * Getting Started::             Preparing your program to use URLs.
@@ -1181,8 +1185,6 @@ Connect directly.
 @unnumbered Concept Index
 @printindex cp
 
-@setchapternewpage odd
-@contents
 @bye
 
 @ignore
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index b3c0a7ee930..a1ef6b9717a 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -1,5 +1,4 @@
 \input texinfo
-
 @setfilename ../../info/vip
 @settitle VIP
 
@@ -34,13 +33,14 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@finalout
+@contents
+
 @dircategory Emacs
 @direntry
 * VIP: (vip).           An older VI-emulation for Emacs.
 @end direntry
 
-@finalout
-
 @ifnottex
 @node Top, Survey,, (DIR)
 @top VIP
@@ -60,6 +60,8 @@ Comments and bug reports are welcome.  Please send messages to
 @code{ms@@Sail.Stanford.Edu} if you are outside of Japan and to
 @code{masahiko@@sato.riec.tohoku.junet} if you are in Japan.@refill
 
+@insertcopying 
+
 @end ifnottex
 
 @menu
@@ -1943,8 +1945,6 @@ file.
 @unnumbered Concept Index
 @printindex cp
 
-@setchapternewpage odd
-@contents
 @bye
 
 @ignore
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 5f9da080ca8..11f8f214663 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -47,6 +47,8 @@ developing GNU and promoting software freedom.''
 @insertcopying
 @end titlepage
 
+@contents
+
 @ifnottex
 @node Top, Overview,, (DIR)
 
@@ -93,6 +95,7 @@ Comments and bug reports are welcome.
 @code{kifer@@cs.stonybrook.edu} is the current address for Viper bug reports.
 Please use the Ex command @kbd{:submitReport} for this purpose.@refill
 
+@insertcopying
 @end ifnottex
 
 @menu
@@ -4537,8 +4540,6 @@ zapman@@cc.gatech.edu (Jason Zapman II),
 
 @printindex cp
 
-@setchapternewpage odd
-@contents
 @bye
 
 @ignore
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 0d847debde5..905ead0ec8a 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -1,12 +1,10 @@
 \input texinfo.tex
-
 @c %**start of header
 @setfilename ../../info/widget
 @settitle The Emacs Widget Library
 @syncodeindex fn cp
 @syncodeindex vr cp
 @syncodeindex ky cp
-@afourpaper
 @c %**end of header
 
 @copying
@@ -33,10 +31,14 @@ developing GNU and promoting software freedom.''
                            facility.
 @end direntry
 
+@contents
+
 @node Top, Introduction, (dir), (dir)
 @comment  node-name,  next,  previous,  up
 @top The Emacs Widget Library
 
+@insertcopying
+
 @menu
 * Introduction::
 * User Interface::
@@ -1826,8 +1828,6 @@ This is an alphabetical listing of all concepts, functions, commands,
 variables, and widgets described in this manual.
 @printindex cp
 
-@setchapternewpage odd
-@contents
 @bye
 
 @ignore
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index d53a651c53a..00248d6aa1e 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -4,7 +4,7 @@
 @settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man''
 @c FIXME
 @c Manual last updated:
-@set UPDATED Time-stamp: <Mon 30-Jun-2008 19:59:42 gm on grasmoor>
+@set UPDATED Time-stamp: <2009-02-16 09:25:50 karl>
 @c Software version:
 @set VERSION 0.54 (beta)
 @afourpaper
@@ -82,6 +82,8 @@ Manual Last Updated @value{UPDATED}
 Queen Mary and Westfield College (University of London)
 Mile End Road, London E1 4NS, UK
 @end display
+
+@insertcopying
 @end ifnottex
 
 @menu