changeset 47737:0a70200bde27

use @copying instead of @ifinfo.
author Karl Berry <karl@gnu.org>
date Wed, 02 Oct 2002 23:24:31 +0000
parents ca02563d5270
children f75902c4cbb5
files man/ChangeLog man/ada-mode.texi man/autotype.texi man/calc.texi man/cc-mode.texi man/cl.texi man/dired-x.texi man/ebrowse.texi man/ediff.texi man/emacs-mime.texi man/emacs.texi man/eshell.texi man/eudc.texi man/faq.texi man/forms.texi man/idlwave.texi man/info.texi man/message.texi man/mh-e.texi man/pcl-cvs.texi man/reftex.texi man/sc.texi man/ses.texi man/speedbar.texi man/vip.texi man/viper.texi man/widget.texi man/woman.texi
diffstat 28 files changed, 444 insertions(+), 911 deletions(-) [+]
line wrap: on
line diff
--- a/man/ChangeLog	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/ChangeLog	Wed Oct 02 23:24:31 2002 +0000
@@ -1,3 +1,17 @@
+2002-10-02  Karl Berry  <karl@gnu.org>
+
+	* (ada-mode.texi autotype.texi calc.texi cc-mode.texi cl.texi
+	dired-x.texi ebrowse.texi ediff.texi emacs-mime.texi emacs.texi
+	eshell.texi eudc.texi faq.texi forms.texi idlwave.texi info.texi
+	message.texi mh-e.texi pcl-cvs.texi reftex.texi sc.texi ses.texi
+	speedbar.texi vip.texi viper.texi widget.texi woman.texi):
+	Per rms, update all manuals to use @copying instead of @ifinfo.
+	Also use @ifnottex instead of @ifinfo around the top node, where
+	needed for the sake of the HTML output.
+	(The gnus manual is not fixed since it's not clear to me how it
+	 works; and the tramp manual already uses @copying, although in an
+	 unusual way.  All others were changed.)
+
 2002-09-10  Jonathan Yavner  <jyavner@engineer.com>
 
 	* Makefile.in (INFO_TARGETS, DVI_TARGETS): Add SES.
--- a/man/ada-mode.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/ada-mode.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -1,19 +1,16 @@
 \input texinfo  @c -*-texinfo-*-
 @setfilename ../info/ada-mode
 @settitle Ada Mode
-@dircategory Emacs
-@direntry
-* Ada mode: (ada-mode). Emacs mode for editing Ada code.
-@end direntry
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 @comment The following lines inserts the copyright notice
 @comment into the Info file.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-@ifnottex
-Copyright @copyright{} 1999, 2000, 2001 Free Software Foundation, Inc.
+@copying
+Copyright @copyright{} 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with the
@@ -31,11 +28,13 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifnottex
+@end quotation
+@end copying
 
-@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@comment TeX title page
-@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+@dircategory Emacs
+@direntry
+* Ada mode: (ada-mode). Emacs mode for editing Ada code.
+@end direntry
 
 @titlepage
 @sp 10
@@ -44,28 +43,9 @@
 @subtitle An Emacs major mode for programming Ada 95 with GNAT
 @subtitle July 1998 for Ada Mode Version 3.0
 @sp 2
-
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1999, 2000, 2001 Free Software Foundation, Inc.
-@sp 1
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
-``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 
 
--- a/man/autotype.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/autotype.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -1,6 +1,6 @@
 \input texinfo
 @c This is an annex of the Emacs manual.
-@c Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+@c Copyright (C) 1994, 1995, 2002 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
@@ -10,15 +10,10 @@
 @c  @cindex selfinserting text
 @c  @cindex autotypist
 
-@dircategory Emacs
-@direntry
-* Autotype: (autotype). Convenient features for text that you enter frequently
-                          in Emacs.
-@end direntry
-
-@ifnottex
+@copying
 Copyright @copyright{} 1994, 1995, 1999 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with the
@@ -36,7 +31,14 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifnottex
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* Autotype: (autotype). Convenient features for text that you enter frequently
+                          in Emacs.
+@end direntry
 
 @titlepage
 @sp 10
@@ -51,25 +53,7 @@
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1994, 1995, 1999 Free Software Foundation, Inc.
-@sp 1
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
-``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 
 @node Top
--- a/man/calc.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/calc.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -5,10 +5,6 @@
 @c [title]
 @settitle GNU Emacs Calc 2.02g Manual
 @setchapternewpage odd
-@dircategory Emacs
-@direntry
-* Calc: (calc). 	Advanced desk calculator and mathematical tool.
-@end direntry
 @comment %**end of header (This is for running Texinfo on a region.)
 
 @tex
@@ -67,11 +63,12 @@
 @end ignore
 @end iftex
 
-@ifnottex
+@copying
 This file documents Calc, the GNU Emacs calculator.
 
 Copyright (C) 1990, 1991, 2001, 2002 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with the
@@ -82,7 +79,13 @@
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
 this GNU Manual, like GNU software.  Copies published by the Free
 Software Foundation raise funds for GNU development.''
-@end ifnottex
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* Calc: (calc). 	Advanced desk calculator and mathematical tool.
+@end direntry
 
 @titlepage
 @sp 6
@@ -99,17 +102,7 @@
 
 @vskip 0pt plus 1filll
 Copyright @copyright{} 1990, 1991, 2001, 2002 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being just ``GNU GENERAL PUBLIC LICENSE'', with the
-Front-Cover texts being ``A GNU Manual,'' and with the Back-Cover
-Texts as in (a) below.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+@insertcopying
 @end titlepage
 
 @c [begin]
--- a/man/cc-mode.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/cc-mode.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -31,26 +31,13 @@
 @comment 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-@macro copyrightblurb
-Copyright @copyright{} 1995, 96, 97, 98, 99, 2000, 01 Free Software Foundation, Inc.
-@end macro
-
-@comment Info directory entry for use by install-info. The indentation
-@comment here is by request from the FSF folks.
-@dircategory Emacs
-@direntry
-* CC Mode: (ccmode).   Emacs mode for editing C, C++, Objective-C,
-                          Java, Pike, and IDL code.
-@end direntry
-
-@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@comment The following lines inserts the copyright notice
-@comment into the Info file.
-@comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-@ifnottex
-Copyright @copyright{} 1995, 96, 97, 98, 99, 2000, 2001 Free Software Foundation, Inc.
-
+@copying
+This manual is for CC Mode in Emacs.
+
+Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free
+Software Foundation, Inc.
+
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with the
@@ -68,7 +55,17 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifnottex
+@end quotation
+@end copying
+
+
+@comment Info directory entry for use by install-info. The indentation
+@comment here is by request from the FSF folks.
+@dircategory Emacs
+@direntry
+* CC Mode: (ccmode).   Emacs mode for editing C, C++, Objective-C,
+                          Java, Pike, and IDL code.
+@end direntry
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 @comment TeX title page
@@ -85,25 +82,7 @@
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1995, 96, 97, 98, 99, 2000, 2001 Free Software Foundation, Inc.
-@sp 1
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
-``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--- a/man/cl.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/cl.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -2,21 +2,12 @@
 @setfilename ../info/cl
 @settitle Common Lisp Extensions
 
-@dircategory Emacs
-@direntry
-* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
-@end direntry
-
-@iftex
-@finalout
-@end iftex
-
-@ifinfo
+@copying
 This file documents the GNU Emacs Common Lisp emulation package.
 
-Copyright (C) 1993 Free Software Foundation, Inc.
-
-
+Copyright (C) 1993, 2002 Free Software Foundation, Inc.
+
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -33,7 +24,15 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
+@end direntry
+
+@finalout
 
 @titlepage
 @sp 6
@@ -46,26 +45,8 @@
 @center Dave Gillespie
 @center daveg@@synaptics.com
 @page
-
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1993 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 
 @node Top, Overview, (dir), (dir)
--- a/man/dired-x.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/dired-x.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -18,31 +18,19 @@
 @setfilename ../info/dired-x
 @c dired-x.el REVISION NUMBER
 @settitle Dired Extra Version 2 User's Manual
-
-@dircategory Emacs
-@direntry
-* Dired-X: (dired-x).   Dired Extra Features.
-@end direntry
-
 @iftex
 @finalout
 @end iftex
 @c @setchapternewpage odd		% For book style double sided manual.
 @comment %**end of header (This is for running Texinfo on a region.)
-@c      @smallbook
-@tex
-\overfullrule=0pt
-%\global\baselineskip 30pt      % For printing in double spaces
-@end tex
 
-@ifinfo
-@node Copyright, Top, (dir), (dir)
-@comment  node-name,  next,  previous,  up
+@copying
 This documents the ``extra'' features for Dired Mode for GNU Emacs found in
 the file @file{dired-x.el}.
 
-Copyright @copyright{} 1993, 1994, 2001 Free Software Foundation, Inc.
+Copyright @copyright{} 1993, 1994, 2001, 2002 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
 preserved on all copies.
@@ -68,9 +56,20 @@
 (this paragraph not being relevant to the printed manual).
 
 @end ignore
-@end ifinfo
+@end quotation
+@end copying
 
-@c
+@dircategory Emacs
+@direntry
+* Dired-X: (dired-x).   Dired Extra Features.
+@end direntry
+
+@c      @smallbook
+@tex
+\overfullrule=0pt
+%\global\baselineskip 30pt      % For printing in double spaces
+@end tex
+
 @titlepage
 @sp 6
 @c dired-x.el REVISION NUMBER
@@ -89,33 +88,14 @@
 @center (Based on @file{dired.texi} by Sebastian Kremer <sk@@thp.uni-koeln.de>)
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1993, 1994, 2001 Free Software Foundation
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of
-this manual under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of
-a permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this
-manual into another language, under the above conditions for
-modified versions, except that this permission notice may be stated
-in a translation approved by the Free Software Foundation.
-
-The file used to create this is called @file{dired-x.texi}, but the
-original work that was altered to make that file was called
-@file{dired.texi} written by Sebastian Kremer.
-
+@insertcopying
 @end titlepage
 
 @page
 
 @ifinfo
 
-@node Top, Introduction, Copyright, (dir)
+@node Top
 @comment  node-name,  next,  previous,  up
 
 @noindent
--- a/man/ebrowse.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/ebrowse.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -7,16 +7,12 @@
 @syncodeindex fn cp
 @comment %**end of header
 
-@ifinfo
-@dircategory Emacs
-@direntry 
-* Ebrowse: (ebrowse).   A C++ class browser for Emacs.
-@end direntry
-
+@copying
 This file documents Ebrowse, a C++ class browser for GNU Emacs.
 
-Copyright @copyright{} 2000 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2002 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -33,9 +29,14 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
+@end quotation
+@end copying
 
-@iftex
+@dircategory Emacs
+@direntry 
+* Ebrowse: (ebrowse).   A C++ class browser for Emacs.
+@end direntry
+
 @titlepage
 @title Ebrowse User's Manual
 @sp 4
@@ -45,31 +46,9 @@
 @sp 5
 @author Gerd Moellmann
 @page
-
 @vskip 0pt plus 1filll
-@noindent
-Copyright @copyright{} 2000 Free Software Foundation, Inc.
-
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
-@page
-@end iftex
 
 @node Top, Overview, (dir), (dir)
 
--- a/man/ediff.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/ediff.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -15,23 +15,20 @@
 @synindex pg cp
 @synindex ky cp
 
-@dircategory Emacs
-@direntry
-* Ediff: (ediff).       A visual interface for comparing and merging programs.
-@end direntry
-
 @iftex
 @finalout
 @end iftex
 @c      @smallbook
 @comment %**end of header (This is for running Texinfo on a region.)
 
-@ifinfo
+@copying
 This file documents Ediff, a comprehensive visual interface to Unix diff
 and patch utilities.
 
-Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -48,9 +45,14 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
+@end quotation
+@end copying
 
-@iftex
+@dircategory Emacs
+@direntry
+* Ediff: (ediff).       A visual interface for comparing and merging programs.
+@end direntry
+
 @titlepage
 @title Ediff User's Manual
 @sp 4
@@ -62,28 +64,9 @@
 @page
 
 @vskip 0pt plus 1filll
-@noindent
-Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
+@insertcopying
+@end titlepage
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
-@end titlepage
-@page
-@end iftex
 
 @node Top, Introduction, (dir), (dir)
 
--- a/man/emacs-mime.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/emacs-mime.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -5,21 +5,13 @@
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
-@dircategory Emacs
-@direntry
-* MIME: (emacs-mime).   Emacs MIME de/composition library.
-@end direntry
-@iftex
-@finalout
-@end iftex
-@setchapternewpage odd
 
-@ifnottex
-
+@copying
 This file documents the Emacs MIME interface functionality.
 
-Copyright (C) 1998,99,2000, 2002 Free Software Foundation, Inc.
+Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -36,39 +28,27 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifnottex
+@end quotation
+@end copying
 
-@tex
+@dircategory Emacs
+@direntry
+* MIME: (emacs-mime).   Emacs MIME de/composition library.
+@end direntry
+@iftex
+@finalout
+@end iftex
+@setchapternewpage odd
 
 @titlepage
 @title Emacs MIME Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
-
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1998,99,2000, 2002 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being none, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
+@insertcopying
+@end titlepage
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
-@end titlepage
-@page
-
-@end tex
 
 @node Top
 @top Emacs MIME
--- a/man/emacs.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/emacs.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -1,31 +1,20 @@
 \input texinfo
 
-@setchapternewpage odd
+@setfilename ../info/emacs
 @settitle GNU Emacs Manual
-@setfilename ../info/emacs
-@defcodeindex op
-@synindex pg cp
 
 @c The edition number appears in several places in this file
 @set EDITION   Fourteenth
 @set EMACSVER  21.3.50
 
-@ifnottex
+@copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
 updated for Emacs version @value{EMACSVER}.
 
-@dircategory Emacs
-@direntry
-* Emacs: (emacs).	The extensible self-documenting text editor.
-@end direntry
+Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998,
+1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
-Published by the Free Software Foundation
-59 Temple Place, Suite 330
-Boston, MA  02111-1307 USA
-
-Copyright (C) 1985, 1986,1987,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002
-   Free Software Foundation, Inc.
-
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with the
@@ -38,7 +27,13 @@
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
 this GNU Manual, like GNU software.  Copies published by the Free
 Software Foundation raise funds for GNU development.''
-@end ifnottex
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* Emacs: (emacs).	The extensible self-documenting text editor.
+@end direntry
 
 @c in general, keep the following line commented out, unless doing a
 @c copy of this manual that will be published.  the manual should go
@@ -46,11 +41,16 @@
 
 @c @smallbook
 
+@setchapternewpage odd
+@defcodeindex op
+@synindex pg cp
+
 @iftex
 @kbdinputstyle code
 
 @shorttitlepage GNU Emacs Manual
 @end iftex
+
 @titlepage
 @sp 6
 @center @titlefont{GNU Emacs Manual}
@@ -60,31 +60,13 @@
 @center Richard Stallman
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+@insertcopying
+
 @sp 2
-@value{EDITION} Edition @*
-Updated for Emacs Version @value{EMACSVER}, @*
-August 2000
-
-ISBN 1-882114-06-X
-@sp 1
+ISBN 1-882114-06-X @*
 Published by the Free Software Foundation @*
 59 Temple Place, Suite 330 @*
 Boston, MA  02111-1307 USA
-@sp 1
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
-``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
-Manual,'' 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 freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
 
 @sp 2
 Cover art by Etienne Suvasa.
--- a/man/eshell.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/eshell.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -1,40 +1,17 @@
 \input texinfo  @c -*-texinfo-*-
-
-@c "@(#)$Name:  $:$Id: eshell.texi,v 1.14 2002/06/17 15:55:51 kai Exp $"
-
-@c Documentation for Eshell: The Emacs Shell.
-@c Copyright (C) 1999, 2000  Free Software Foundation, Inc.
-
-@c This file is part of GNU Emacs
-
-@c GNU Emacs is free software; you can redistribute it and/or modify it
-@c under the terms of the GNU General Public License as published by the
-@c Free Software Foundation; either version 2 of the License, or (at
-@c your option) any later version.
-
-@c GNU Emacs 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 You should have received a copy of the GNU General Public License
-@c along with Eshell; see the file COPYING.  If not, write to the Free
-@c Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
+@c "@(#)$Name:  $:$Id: eshell.texi,v 1.15 2002/08/16 06:29:39 eggert Exp $"
 @c %**start of header
 @setfilename ../info/eshell
 @settitle Eshell: The Emacs Shell
+@synindex vr fn
 @c %**end of header
 
-@dircategory Emacs
-@direntry
-* Eshell: (eshell).     A command shell implemented in Emacs Lisp.
-@end direntry
-@setchapternewpage on
-     
-@ifinfo
-Copyright @copyright{} 1999, 2000, 2001  Free Software Foundation, Inc.
+@copying
+This manual is for Eshell, the Emacs shell.
 
+Copyright @copyright{} 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -51,10 +28,16 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
+@end quotation
+@end copying
 
-@synindex vr fn
-@c The titlepage section does not appear in the Info file.
+@dircategory Emacs
+@direntry
+* 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.
@@ -72,28 +55,9 @@
 @center John Wiegley
 @c -date-
 
-@c  The following two commands start the copyright page for the printed
-@c  manual.  This will not appear in the Info file.
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1999, 2000, 2001  Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 
 @contents
@@ -102,7 +66,7 @@
 @c                   The real text starts here
 @c ================================================================
 
-@ifinfo
+@ifnottex
 @node Top, What is Eshell?, (dir), (dir)
 @top Eshell
 
@@ -113,7 +77,7 @@
 @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.
-@end ifinfo
+@end ifnottex
 
 @menu
 * What is Eshell?::             A brief introduction to the Emacs Shell.
--- a/man/eudc.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/eudc.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -2,29 +2,19 @@
 @c %**start of header
 @setfilename ../info/eudc
 @settitle Emacs Unified Directory Client (EUDC) Manual
-@iftex
 @afourpaper
-@end iftex
 @c %**end of header
 
-@footnotestyle end
-
-@ifinfo
-@dircategory Emacs
-@direntry
-* EUDC: (eudc).   An Emacs client for directory servers (LDAP, PH).
-@end direntry
-
-This file documents EUDC v1.30b
-
-EUDC is part of Emacs.
+@copying
+This file documents EUDC v1.30b.
 
 EUDC is 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)
 
-Copyright 1998, 2000, 2001 Free Software Foundation, Inc.
+Copyright 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -41,7 +31,15 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* EUDC: (eudc).   An Emacs client for directory servers (LDAP, PH).
+@end direntry
+
+@footnotestyle end
 
 @titlepage
 @title{EUDC Manual}
@@ -51,27 +49,10 @@
 
 @page
 @vskip 0pt plus 1fill
-Copyright @copyright{} 1998, 2000, 2001 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 
-@ifinfo
+@ifnottex
 @node     Top, Overview, (dir), (dir)
 @comment  node-name,  next,         previous, up
 
@@ -81,7 +62,7 @@
 A common interface to directory servers using various protocols such as
 LDAP or the CCSO white pages directory system (PH/QI)
 
-@end ifinfo
+@end ifnottex
 
 @menu
 * Overview::                    Summary of EUDC features
--- a/man/faq.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/faq.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -9,18 +9,13 @@
 @c This is used in many places
 @set VER 21.3
 
-@c The @ifinfo stuff only appears in the Info version
-@ifinfo
-@dircategory Emacs
-@direntry
-* Emacs FAQ: (efaq).	Frequently Asked Questions about Emacs.
-@end direntry
-
+@copying
 Copyright 2001, 2002 Free Software Foundation, Inc.
 Copyright 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner@*
 Copyright 1992,1993 Steven Byrnes@*
 Copyright 1990,1991,1992 Joseph Brian Wells@*
 
+@quotation
 This list of frequently asked questions about GNU Emacs with answers
 ("FAQ") may be translated into other languages, transformed into other
 formats (e.g. Texinfo, Info, WWW, WAIS), and updated with new information.
@@ -37,8 +32,13 @@
 
 [This version has been somewhat edited from the last-posted version
 (as of August 1999) for inclusion in the Emacs distribution.]
-
-@end ifinfo
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* Emacs FAQ: (efaq).	Frequently Asked Questions about Emacs.
+@end direntry
 
 @c The @titlepage stuff only appears in the printed version
 @titlepage
@@ -48,27 +48,7 @@
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 2001,2002 Free Software Foundation, inc.@*
-Copyright @copyright{} 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner@*
-Copyright @copyright{} 1992,1993 Steven Byrnes@*
-Copyright @copyright{} 1990,1991,1992 Joseph Brian Wells@*
-
-This list of frequently asked questions about GNU Emacs with answers
-("FAQ") may be translated into other languages, transformed into other
-formats (e.g. Texinfo, Info, WWW, WAIS), and updated with new information.
-
-The same conditions apply to any derivative of the FAQ as apply to the FAQ
-itself.  Every copy of the FAQ must include this notice or an approved
-translation, information on who is currently maintaining the FAQ and how to
-contact them (including their e-mail address), and information on where the
-latest version of the FAQ is archived (including FTP information).
-
-The FAQ may be copied and redistributed under these conditions, except that
-the FAQ may not be embedded in a larger literary work unless that work
-itself allows free copying and redistribution.
-
-[This version has been somewhat edited from the last-posted version
-(as of August 1999) for inclusion in the Emacs distribution.]
+@insertcopying
 @end titlepage
 
 @node    Top, FAQ notation, (dir), (dir)
--- a/man/forms.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/forms.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -15,17 +15,12 @@
 @c      @smallbook
 @comment %**end of header (This is for running Texinfo on a region.)
 
-@dircategory Emacs
-@direntry
-* Forms: (forms).	Emacs package for editing data bases
-			  by filling in forms.
-@end direntry
-
-@ifinfo
+@copying
 This file documents Forms mode, a form-editing major mode for GNU Emacs.
 
-Copyright 1989, 1997, 2001 Free Software Foundation, Inc.
+Copyright 1989, 1997, 2001, 2002 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -42,9 +37,15 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
+@end quotation
+@end copying
 
-@iftex
+@dircategory Emacs
+@direntry
+* Forms: (forms).	Emacs package for editing data bases
+			  by filling in forms.
+@end direntry
+
 @titlepage
 @sp 6
 @center @titlefont{Forms Mode User's Manual}
@@ -58,31 +59,11 @@
 @center Johan Vromans
 @center @i{jvromans@@squirrel.nl}
 @page
-
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1989, 1997, 2001 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
+@insertcopying
+@end titlepage
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
-@page
-@end titlepage
-@end iftex
-
-@ifinfo
+@ifnottex
 @node Top
 @top Forms Mode
 
@@ -112,7 +93,7 @@
 * Credits::                     Thanks everyone.
 * Index::                       Index to this manual.
 @end menu
-@end ifinfo
+@end ifnottex
 
 @node Forms Example
 @chapter Forms Example
--- a/man/idlwave.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/idlwave.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -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
@@ -21,9 +17,8 @@
 @set MAINTAINER-EMAIL jdsmith@@as.arizona.edu
 @set IDLWAVE-HOMEPAGE http://idlwave.org/
 @c %**end of header
-@finalout
-
-@ifinfo 
+
+@copying
 This file documents IDLWAVE, a major mode for editing IDL files with
 Emacs, and interacting with an IDL shell run as a subprocess.
 
@@ -33,6 +28,7 @@
 Copyright @copyright{} 1999, 2000, 2001, 2002 Free Software Foundation,
 Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -49,7 +45,15 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* IDLWAVE: (idlwave).	Major mode and shell for IDL files.
+@end direntry
+
+@finalout
 
 @titlepage
 @title IDLWAVE User Manual
@@ -60,26 +64,8 @@
 @page
 This is edition @value{EDITION} of the @cite{IDLWAVE User Manual} for
 IDLWAVE version @value{VERSION}, @value{DATE}.
-@sp 2
-Copyright @copyright{} 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-@sp 2
 @cindex Copyright, of IDLWAVE
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 @contents
 
--- a/man/info.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/info.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -6,21 +6,16 @@
 @syncodeindex vr cp
 @syncodeindex ky cp
 @comment %**end of header
-@comment $Id: info.texi,v 1.24 2002/07/07 11:31:31 rms Exp $
+@comment $Id: info.texi,v 1.25 2002/08/14 20:25:10 karl Exp $
 
-@dircategory Texinfo documentation system
-@direntry
-* Info: (info).         How to use the documentation browsing system.
-@end direntry
-
-@ifinfo
+@copying
 This file describes how to use Info, the on-line, menu-driven GNU
 documentation system.
 
 Copyright (C) 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
 
-
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -37,7 +32,13 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
+@end quotation
+@end copying
+
+@dircategory Texinfo documentation system
+@direntry
+* Info: (info).         How to use the documentation browsing system.
+@end direntry
 
 @titlepage
 @title Info
@@ -46,29 +47,7 @@
 @author and the GNU Texinfo community
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1989, 1992, 1993, 1996, 1997, 1998, 1999, 2000,
-2001, 2002 Free Software Foundation, Inc.
-@sp 2
-Published by the Free Software Foundation @*
-59 Temple Place - Suite 330 @*
-Boston, MA 02111-1307, USA.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 
 @ifnottex
--- a/man/message.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/message.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -5,21 +5,13 @@
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
-@dircategory Emacs
-@direntry
-* Message: (message).   Mail and news composition mode that goes with Gnus.
-@end direntry
-@iftex
-@finalout
-@end iftex
-@setchapternewpage odd
-
-@ifnottex
-
+@copying
 This file documents Message, the Emacs message composition mode.
 
-Copyright (C) 1996,97,98,99,2000,2001 Free Software Foundation, Inc.
+Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -36,40 +28,29 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifnottex
+@end quotation
+@end copying
 
-@tex
+@dircategory Emacs
+@direntry
+* Message: (message).   Mail and news composition mode that goes with Gnus.
+@end direntry
+@iftex
+@finalout
+@end iftex
+@setchapternewpage odd
+
 
 @titlepage
 @title Message 5.9.0 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
-
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1996,97,98,99,2000,2001 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being none, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 @page
 
-@end tex
-
 @node Top
 @top Message
 
--- a/man/mh-e.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/mh-e.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -1,30 +1,24 @@
 \input texinfo   @c -*-texinfo-*-
-@c $Id: mh-e.texi,v 1.11 2001/05/19 09:21:27 eliz Exp $
+@c $Id: mh-e.texi,v 1.12 2001/09/12 20:59:49 rms Exp $
 @c %**start of header
 @setfilename ../info/mh-e
 @settitle mh-e
 @c %**end of header
 
-@setchapternewpage odd
-
-@dircategory Emacs
-@direntry
-* MH-E: (mh-e).		Emacs interface to the MH mail system.
-@end direntry
-
 @c Version variables.
 @set EDITION 1.3
 @set VERSION 5.0.2
 @set UPDATED 18 February 2001
 @set UPDATE-MONTH February 2001
 
-@ifinfo
+@copying
 This is Edition @value{EDITION}, last updated @value{UPDATED}, of
 @cite{mh-e, The Emacs Interface to MH}, for mh-e, Version
 @value{VERSION}.
 
-Copyright 1995, 2001 Free Software Foundation, Inc.
-
+Copyright 1995, 2001, 2002 Free Software Foundation, Inc.
+
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -41,7 +35,15 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
+@end quotation
+@end copying
+
+@setchapternewpage odd
+
+@dircategory Emacs
+@direntry
+* MH-E: (mh-e).		Emacs interface to the MH mail system.
+@end direntry
 
 @titlepage
 @sp 10
@@ -57,27 +59,11 @@
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1995, 2001 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+Copyright @copyright{} 1995, 2001, 2002 Free Software Foundation, Inc.
+@insertcopying
 @end titlepage
 
-@ifinfo
+@ifnottex
 @node Top, Preface, (dir), (dir)
 @top MH and Emacs
 This is Edition @value{EDITION} of @cite{mh-e, The Emacs Interface to
@@ -96,7 +82,7 @@
 * Variable Index::              
 * Concept Index::               
 @end menu
-@end ifinfo
+@end ifnottex
 
 @node Preface, Tour Through mh-e, Top, Top
 @unnumbered Preface
--- a/man/pcl-cvs.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/pcl-cvs.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -1,42 +1,16 @@
 \input texinfo  @c -*-texinfo-*-
-
-@c "@(#)$Name:  $:$Id: pcl-cvs.texi,v 1.15 2002/04/09 18:41:56 monnier Exp $"
-
-@c Documentation for the GNU Emacs CVS mode.
-@c Copyright (C) 1991,92,93,94,95,96,97,98,99,2000, 2001  Free Software Foundation, Inc.
-
-@c This file is part of GNU Emacs
-
-@c GNU Emacs is free software; you can redistribute it and/or modify
-@c it under the terms of the GNU General Public License as published by
-@c the Free Software Foundation; either version 2 of the License,
-@c or (at your option) any later version.
-
-@c GNU Emacs is distributed in the hope that it will be useful,
-@c but WITHOUT ANY WARRANTY; without even the implied warranty of
-@c MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-@c GNU General Public License for more details.
-
-@c You should have received a copy of the GNU General Public License
-@c along with pcl-cvs; see the file COPYING.  If not, write to
-@c the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
+@c "@(#)$Name:  $:$Id: pcl-cvs.texi,v 1.16 2002/08/16 06:29:40 eggert Exp $"
 @c %**start of header
 @setfilename ../info/pcl-cvs
 @settitle PCL-CVS --- Emacs Front-End to CVS
+@syncodeindex vr fn
 @c %**end of header
 
-@c 
+@copying
+Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+1999, 2000, 2002 Free Software Foundation, Inc.
 
-@dircategory Emacs
-@direntry
-* PCL-CVS: (pcl-cvs).	Emacs front-end to CVS.
-@end direntry
-@setchapternewpage on
-
-@ifinfo
-Copyright @copyright{} 1991,92,93,94,95,96,97,98,99,2000  Free Software Foundation, Inc.
-
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with the
@@ -54,9 +28,14 @@
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
 this GNU Manual, like GNU software.  Copies published by the Free
 Software Foundation raise funds for GNU development.''
-@end ifinfo
+@end quotation
+@end copying
 
-@syncodeindex vr fn
+@dircategory Emacs
+@direntry
+* PCL-CVS: (pcl-cvs).	Emacs front-end to CVS.
+@end direntry
+
 @c The titlepage section does not appear in the Info file.
 @titlepage
 @sp 4
@@ -80,25 +59,7 @@
 @c  for the printed manual.  This will not appear in the Info file.
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1991,92,93,94,95,96,97,98,99,2000  Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
-``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
+@insertcopying
 @end titlepage
 
 @c ================================================================
@@ -106,7 +67,7 @@
 @c ================================================================
 
 @node Top, About PCL-CVS, (dir), (dir)
-@ifinfo
+@ifnottex
 @top PCL-CVS
 
 This manual describes PCL-CVS, the GNU Emacs front-end to CVS.  It
@@ -114,7 +75,7 @@
 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.
-@end ifinfo
+@end ifnottex
 
 @menu
 * About PCL-CVS::               Installation, credits, history, @dots{}
--- a/man/reftex.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/reftex.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -2,10 +2,6 @@
 @c %**start of header
 @setfilename ../info/reftex
 @settitle RefTeX User Manual
-@dircategory Emacs
-@direntry
-* RefTeX: (reftex).	Emacs support for LaTeX cross-references and citations.
-@end direntry
 @synindex ky cp
 @syncodeindex vr cp
 @syncodeindex fn cp
@@ -13,29 +9,17 @@
 @set EDITION 4.19
 @set DATE August 2002
 @c %**end of header
-@finalout
-
-@c Macro definitions
-
-@c Subheadings inside a table.  Need a difference between info and the rest.
-@macro tablesubheading{text}
-@ifinfo
-@subsubheading \text\
-@end ifinfo
-@ifnotinfo
-@item @b{\text\}
-@end ifnotinfo
-@end macro
-
-@ifinfo
+
+@copying
 This file documents @b{Ref@TeX{}}, a package to do labels, references,
-citations and indices for LaTeX documents with Emacs.@refill
+citations and indices for LaTeX documents with Emacs.
 
 This is edition @value{EDITION} of the @b{Ref@TeX{}} User Manual for
-@b{Ref@TeX{}} @value{VERSION}@refill
+@b{Ref@TeX{}} @value{VERSION}.
 
 Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -52,7 +36,27 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* RefTeX: (reftex).	Emacs support for LaTeX cross-references and citations.
+@end direntry
+
+@finalout
+
+@c Macro definitions
+
+@c Subheadings inside a table.  Need a difference between info and the rest.
+@macro tablesubheading{text}
+@ifinfo
+@subsubheading \text\
 @end ifinfo
+@ifnotinfo
+@item @b{\text\}
+@end ifnotinfo
+@end macro
 
 @titlepage
 @title Ref@TeX{} User Manual
@@ -61,32 +65,9 @@
 
 @author by Carsten Dominik
 @page
-Copyright @copyright{} 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-@sp 2
-This is edition @value{EDITION} of the @cite{Ref@TeX{} User Manual} for
-@b{Ref@TeX{}} version @value{VERSION}, @value{DATE}.@refill
-
-@sp 2
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@vskip 0pt plus 1filll
+@insertcopying
 @end titlepage
-@page
 
 @ifnottex
 @node Top,,,(dir)
--- a/man/sc.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/sc.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -7,26 +7,17 @@
 @finalout
 @end iftex
 
-@dircategory Emacs
-@direntry
-* SC: (sc).		Supercite lets you cite parts of messages you're 
-			  replying to, in flexible ways.
-@end direntry
-
 @c @setchapternewpage odd		% For book style double sided manual.
 @comment %**end of header (This is for running Texinfo on a region.)
-@c      @smallbook
-@tex
-\overfullrule=0pt
-%\global\baselineskip 30pt      % For printing in double spaces
-@end tex
-@ifinfo
+
+@copying
 This document describes the Supercite Version 3.1 package for citing and
 attributing the replies for various GNU Emacs mail and news reading
 subsystems.
 
-Copyright @copyright{} 1993, 2001 Free Software Foundation, Inc.
+Copyright @copyright{} 1993, 2001, 2002 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -43,8 +34,17 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
-@c
+@end quotation
+@end copying
+
+@c      @smallbook
+
+@dircategory Emacs
+@direntry
+* SC: (sc).		Supercite lets you cite parts of messages you're 
+			  replying to, in flexible ways.
+@end direntry
+
 @titlepage
 @sp 6
 @center @titlefont{Supercite User's Manual}
@@ -59,27 +59,10 @@
 @center @t{@dots{}!uunet!cen.com!bwarsaw}
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1993 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
+@insertcopying
+@end titlepage
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
-@end titlepage
-@page
-@ifinfo
+@ifnottex
 @node Top, Introduction, (dir), (dir)
 @comment  node-name,  next,  previous,  up
 
@@ -107,7 +90,8 @@
 * Key Index::
 * Variable Index::
 @end menu
-@end ifinfo
+@end ifnottex
+
 
 @node  Introduction, Usage Overview, Top, Top
 @comment  node-name,  next,  previous,  up
--- a/man/ses.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/ses.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -5,16 +5,12 @@
 @setchapternewpage off
 @c %**end of header
 
-@dircategory Emacs
-@direntry
-* SES: (ses).       Simple Emacs Spreadsheet
-@end direntry
-
-@ifinfo
+@copying
 This file documents SES: the Simple Emacs Spreadsheet.
 
 Copyright @copyright{} 2002  Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -31,7 +27,13 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* SES: (ses).       Simple Emacs Spreadsheet
+@end direntry
 
 @finalout
 
@@ -41,28 +43,9 @@
 @author Jonathan A. Yavner
 @author @email{jyavner@@engineer.com}
 
-@comment  The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
-@noindent
-Copyright @copyright{} 2002 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 
 @contents
--- a/man/speedbar.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/speedbar.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -1,34 +1,14 @@
 \input texinfo   @c -*-texinfo-*-
-@c
-@c $Id: speedbar.texi,v 1.9 2001/09/12 20:58:22 rms Exp $
-@c
-
-@c This file is part of GNU Emacs
-
-@c GNU Emacs is free software; you can redistribute it and/or modify it
-@c under the terms of the GNU General Public License as published by the
-@c Free Software Foundation; either version 2 of the License, or (at
-@c your option) any later version.
-
-@c GNU Emacs 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 You should have received a copy of the GNU General Public License
-@c along with Emacs; see the file COPYING.  If not, write to the Free
-@c Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+@c $Id: speedbar.texi,v 1.10 2002/03/16 19:33:21 eliz Exp $
 
 @setfilename ../info/speedbar
 @settitle Speedbar: File/Tag summarizing utility
+@syncodeindex fn cp
 
-@dircategory Emacs
-@direntry
-* Speedbar: (speedbar). File/Tag summarizing utility.
-@end direntry
-@ifnottex
-Copyright @copyright{} 1999, 2000 Free Software Foundation, Inc.
+@copying
+Copyright @copyright{} 1999, 2000, 2002 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with the
@@ -46,7 +26,13 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifnottex
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* Speedbar: (speedbar). File/Tag summarizing utility.
+@end direntry
 
 @titlepage
 @sp 10
@@ -56,29 +42,9 @@
 @vskip 0pt plus 1 fill
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1999, 2000 Free Software Foundation, Inc.
-@sp 1
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and
-``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 
-@syncodeindex fn cp
-
 @node Top, , , (dir)Top
 @comment  node-name,  next,  previous,  up
 
--- a/man/vip.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/vip.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -3,30 +3,10 @@
 @setfilename ../info/vip
 @settitle VIP
 
-@dircategory Emacs
-@direntry
-* VIP: (vip).		An older VI-emulation for Emacs.
-@end direntry
-
-@iftex
-@finalout
-@end iftex
+@copying
+Copyright @copyright{} 1987, 2001, 2002 Free Software Foundation, Inc.
 
-@titlepage
-@sp 10
-@center @titlefont{VIP}
-@sp 1
-@center A Vi Package for GNU Emacs
-@center (Version 3.5, September 15, 1987)
-@sp 2
-@center Masahiko Sato
-@sp 2
-@end titlepage
-
-@unnumbered Distribution
-
-Copyright @copyright{} 1987, 2001 Free Software Foundation, Inc.
-
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -43,8 +23,30 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
+@end quotation
+@end copying
 
-@ifinfo
+@titlepage
+@sp 10
+@center @titlefont{VIP}
+@sp 1
+@center A Vi Package for GNU Emacs
+@center (Version 3.5, September 15, 1987)
+@sp 2
+@center Masahiko Sato
+@page
+@vskip 0pt plus1filll
+@insertcopying
+@end titlepage
+
+@dircategory Emacs
+@direntry
+* VIP: (vip).		An older VI-emulation for Emacs.
+@end direntry
+
+@finalout
+
+@ifnottex
 @node Top, Survey,, (DIR)
 @top VIP
 
@@ -63,7 +65,7 @@
 @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
 
-@end ifinfo
+@end ifnottex
 
 @menu
 * Survey::		A survey of VIP.
--- a/man/viper.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/viper.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -6,35 +6,11 @@
 @comment @setfilename viper.info
 @setfilename ../info/viper
 
-@dircategory Emacs
-@direntry
-* VIPER: (viper).       The newest Emacs VI-emulation mode.
-                          (also, A VI Plan for Emacs Rescue
-                           or the VI PERil.)
-@end direntry
-
-@iftex
-@finalout
-@end iftex
-
-@titlepage
-@title Viper Is a Package for Emacs Rebels
-@subtitle a Vi emulator for Emacs
-@subtitle January 2002, Viper Version 3.11.2
-
-@author Michael Kifer (Viper)
-@author Aamod Sane (VIP 4.4)
-@author Masahiko Sato (VIP 3.5)
-
-@page
-@vskip 0pt plus 1fill
-@end titlepage
-
-@unnumbered Distribution
-
-@noindent
-Copyright @copyright{} 1995, 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
-
+@copying
+Copyright @copyright{} 1995, 1996, 1997, 2001, 2002 Free Software
+Foundation, Inc.
+
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -51,8 +27,33 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-
-@ifinfo
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* VIPER: (viper).       The newest Emacs VI-emulation mode.
+                          (also, A VI Plan for Emacs Rescue
+                           or the VI PERil.)
+@end direntry
+
+@finalout
+
+@titlepage
+@title Viper Is a Package for Emacs Rebels
+@subtitle a Vi emulator for Emacs
+@subtitle January 2002, Viper Version 3.11.2
+
+@author Michael Kifer (Viper)
+@author Aamod Sane (VIP 4.4)
+@author Masahiko Sato (VIP 3.5)
+
+@page
+@vskip 0pt plus 1filll
+@insertcopying
+@end titlepage
+
+@ifnottex
 @node Top, Overview,, (DIR)
 
 @unnumbered Viper
@@ -98,7 +99,7 @@
 @code{kifer@@cs.stonybrook.edu} is the current address for Viper bug reports.
 Please use the Ex command @kbd{:submitReport} for this purpose.@refill
 
-@end ifinfo
+@end ifnottex
 
 @menu
 * Overview::                    Read for a smoother start
--- a/man/widget.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/widget.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -3,9 +3,16 @@
 @c %**start of header
 @setfilename ../info/widget
 @settitle The Emacs Widget Library
-@ifnottex
-Copyright @copyright{} 2000 Free Software Foundation, Inc.
+@syncodeindex fn cp
+@syncodeindex vr cp
+@syncodeindex ky cp
+@afourpaper
+@c %**end of header
 
+@copying
+Copyright @copyright{} 2000, 2002 Free Software Foundation, Inc.
+
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with the
@@ -23,17 +30,8 @@
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
 this GNU Manual, like GNU software.  Copies published by the Free
 Software Foundation raise funds for GNU development.''
-@end ifnottex
-
-@iftex
-@afourpaper
-@headings double
-@end iftex
-@c %**end of header
-
-@syncodeindex fn cp
-@syncodeindex vr cp
-@syncodeindex ky cp
+@end quotation
+@end copying
 
 @dircategory Emacs
 @direntry
--- a/man/woman.texi	Wed Oct 02 22:04:53 2002 +0000
+++ b/man/woman.texi	Wed Oct 02 23:24:31 2002 +0000
@@ -1,10 +1,10 @@
 \input texinfo   @c -*-texinfo-*-
-@c $Id: woman.texi,v 1.10 2002/07/01 08:06:37 rms Exp $
+@c $Id: woman.texi,v 1.11 2002/08/16 06:29:40 eggert Exp $
 @c %**start of header
 @setfilename ../info/woman
 @settitle WoMan: Browse Unix Manual Pages ``W.O. (without) Man''
 @c Manual last updated:
-@set UPDATED Time-stamp: <2001-03-05 17:10:30 eliz>
+@set UPDATED Time-stamp: <2002-10-02 16:01:26 karl>
 @c Software version:
 @set VERSION 0.54 (beta)
 @afourpaper
@@ -14,17 +14,13 @@
 @paragraphindent 0
 @c %**end of header
 
-@dircategory Emacs
-@direntry
-* WoMan: (woman).       Browse UN*X Manual Pages "W.O. (without) Man".
-@end direntry
-
-@ifinfo
+@copying
 This file documents WoMan: A program to browse Unix manual pages `W.O.
 (without) man'.
 
-Copyright @copyright{} 2001  Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002 Free Software Foundation, Inc.
 
+@quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with no
@@ -41,7 +37,13 @@
 Documentation License.  If you want to distribute this document
 separately from the collection, you can do so by adding a copy of the
 license to the document, as described in section 6 of the license.
-@end ifinfo
+@end quotation
+@end copying
+
+@dircategory Emacs
+@direntry
+* WoMan: (woman).       Browse UN*X Manual Pages "W.O. (without) Man".
+@end direntry
 
 @finalout
 
@@ -63,25 +65,7 @@
 @comment  The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
-@noindent
-Copyright @copyright{} 2001 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', 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'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+@insertcopying
 @end titlepage
 
 @contents