May as well just include doclicense.texi in all doc/misc manuals

9 files changed, 74 insertions, 71 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 06ca74d3498..f4e6f47a111 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,12 @@
 2012-12-21  Glenn Morris  <rgm@gnu.org>
 
+        * auth.texi, emacs-gnutls.texi, epa.texi, ert.texi:
+        * gnus-coding.texi, info.texi, nxml-mode.texi, sasl.texi:
+        May as well just include doclicense.texi in everything.
+
+        * ede.texi, eieio.texi, mairix-el.texi: Include a copy of GFDL,
+        which @copying says is included.
+
         * ada-mode.texi, auth.texi, autotype.texi, bovine.texi, calc.texi:
         * cc-mode.texi, cl.texi, dbus.texi, dired-x.texi, ebrowse.texi:
         * ede.texi, ediff.texi, edt.texi, eieio.texi, emacs-gnutls.texi:
diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi
index b5d014ba580..bf8b180f71a 100644
--- a/doc/misc/auth.texi
+++ b/doc/misc/auth.texi
@@ -18,16 +18,10 @@ under the terms of the GNU Free Documentation License, Version 1.3 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.
+is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
 modify this GNU 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.
 @end quotation
 @end copying
 
@@ -67,6 +61,7 @@ It is a way for multiple applications to share a single configuration
 * Secret Service API::
 * Help for developers::
 * GnuPG and EasyPG Assistant Configuration::
+* GNU Free Documentation License::  The license for this documentation.
 * Index::
 * Function Index::
 * Variable Index::
@@ -521,16 +516,20 @@ To set up gpg-agent, follow the instruction in GnuPG manual
 To set up elisp passphrase cache, set
 @code{epa-file-cache-passphrase-for-symmetric-encryption}.
 
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @node Index
-@chapter Index
+@unnumbered Index
 @printindex cp
 
 @node Function Index
-@chapter Function Index
+@unnumbered Function Index
 @printindex fn
 
 @node Variable Index
-@chapter Variable Index
+@unnumbered Variable Index
 @printindex vr
 
 @bye
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index eb6771da349..a98b182b0b9 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -16,16 +16,10 @@ under the terms of the GNU Free Documentation License, Version 1.3 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.
+is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
 modify this GNU 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.
 @end quotation
 @end copying
 
@@ -60,6 +54,7 @@ Emacs Lisp library.
 * Overview::                    Overview of the GnuTLS integration.
 * Help For Users::
 * Help For Developers::
+* GNU Free Documentation License::  The license for this documentation.
 * Function Index::
 * Variable Index::
 @end menu
@@ -184,12 +179,16 @@ Please see @file{gnutls.el} for the @var{spec} details and for usage,
 but do not rely on this function's interface if possible.
 @end defun
 
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @node Function Index
-@chapter Function Index
+@unnumbered Function Index
 @printindex fn
 
 @node Variable Index
-@chapter Variable Index
+@unnumbered Variable Index
 @printindex vr
 
 @bye
diff --git a/doc/misc/epa.texi b/doc/misc/epa.texi
index 027d7c21616..c265f92bed7 100644
--- a/doc/misc/epa.texi
+++ b/doc/misc/epa.texi
@@ -17,16 +17,10 @@ under the terms of the GNU Free Documentation License, Version 1.3 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.
+is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
 modify this GNU 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.
 @end quotation
 @end copying
 
@@ -67,6 +61,7 @@ called EasyPG Library.
 * Commands::
 * Caching Passphrases::
 * Bug Reports::
+* GNU Free Documentation License::  The license for this documentation.
 @end menu
 
 @node  Overview
@@ -492,6 +487,10 @@ Before reporting the bug, you should set @code{epg-debug} in the
 of the @samp{ *epg-debug*} buffer.  Note that the first letter of the
 buffer name is a whitespace.
 
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @bye
 
 @c End:
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index 6e8b4435338..2cd51d5aec9 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -18,16 +18,10 @@ under the terms of the GNU Free Documentation License, Version 1.3 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.
+is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
 modify this GNU 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.
 @end quotation
 @end copying
 
@@ -52,6 +46,7 @@ traditional software development methods.
 * How to Debug Tests::          What to do if a test fails.
 * Extending ERT::               ERT is extensible in several ways.
 * Other Testing Concepts::      Features not in ERT.
+* GNU Free Documentation License::  The license for this documentation.
 
 @detailmenu
  --- The Detailed Node Listing ---
@@ -84,6 +79,10 @@ Other Testing Concepts
 * Mocks and Stubs::           Stubbing out code that is irrelevant to the test.
 * Fixtures and Test Suites::  How ERT differs from tools for other languages.
 
+Appendix
+
+* GNU Free Documentation License:: The license for this documentation.
+
 @end detailmenu
 @end menu
 
@@ -758,7 +757,7 @@ meant to be usable by other code.  But there is no mature API yet.
 Contributions to ERT are welcome.
 
 
-@node Other Testing Concepts,  , Extending ERT, Top
+@node Other Testing Concepts, GNU Free Documentation License , Extending ERT, Top
 @chapter Other Testing Concepts
 
 For information on mocks, stubs, fixtures, or test suites, see below.
@@ -841,6 +840,10 @@ e.g., to run quick tests during interactive development and slow tests less
 often.  This can be achieved with the @code{:tag} argument to
 @code{ert-deftest} and @code{tag} test selectors.
 
+@node GNU Free Documentation License, , Other Testing Concepts, Top
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @bye
 
 @c  LocalWords:  ERT JUnit namespace docstring ERT's
diff --git a/doc/misc/gnus-coding.texi b/doc/misc/gnus-coding.texi
index 8998ce8bd61..35ec2120955 100644
--- a/doc/misc/gnus-coding.texi
+++ b/doc/misc/gnus-coding.texi
@@ -14,18 +14,12 @@ Foundation, Inc.
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 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 Gnus manual.
+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''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
 modify this GNU 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.
 @end quotation
 @end copying
 
@@ -53,6 +47,7 @@ This manual describes @dots{}
 @menu
 * Gnus Coding Style:: Gnus Coding Style
 * Gnus Maintenance Guide:: Gnus Maintenance Guide
+* GNU Free Documentation License::  The license for this documentation.
 @end menu
 
 @c @ref{Gnus Reference Guide, ,Gnus Reference Guide, gnus, The Gnus Newsreader}
@@ -386,6 +381,10 @@ If the variable is new in No Gnus use @code{:version "23.1" ;; No Gnus}.
 The same applies for customizable variables when its default value was
 changed.
 
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @c Local Variables:
 @c mode: texinfo
 @c coding: iso-8859-1
diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 2c1331df33c..aec80522772 100644
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -20,18 +20,12 @@ Copyright @copyright{} 1989, 1992, 1996-2012 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.3 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.
+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''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
 modify this GNU 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.
 @end quotation
 @end copying
 
@@ -83,6 +77,7 @@ Started' chapter.
 * Getting Started::             Getting started using an Info reader.
 * Advanced::                    Advanced Info commands.
 * Expert Info::                 Info commands for experts.
+* GNU Free Documentation License::  The license for this documentation.
 * Index::                       An index of topics, commands, and variables.
 @end menu
 
@@ -1503,6 +1498,10 @@ usually few.
 To check an Info file, do @kbd{M-x Info-validate} while looking at any
 node of the file with Emacs Info mode.
 
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @node Index
 @unnumbered Index
 
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index 8721bce6f9b..0bac8d3ad31 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -14,18 +14,12 @@ Copyright @copyright{} 2007-2012 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.3 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.
+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''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
 modify this GNU 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.
 @end quotation
 @end copying
 
@@ -50,6 +44,7 @@ This manual is not yet complete.
 * Locating a schema::
 * DTDs::
 * Limitations::
+* GNU Free Documentation License::  The license for this documentation.
 @end menu
 
 @node Introduction
@@ -898,4 +893,8 @@ The restrictions on RELAX NG schemas in section 7 of the RELAX NG
 specification are not enforced.
 @end itemize
 
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @bye
diff --git a/doc/misc/sasl.texi b/doc/misc/sasl.texi
index a2096783316..1d65186c9a5 100644
--- a/doc/misc/sasl.texi
+++ b/doc/misc/sasl.texi
@@ -18,16 +18,10 @@ under the terms of the GNU Free Documentation License, Version 1.3 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.
+is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
 modify this GNU 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.
 @end quotation
 @end copying
 
@@ -68,6 +62,7 @@ applications using different protocols.
 * How to use::                  Adding authentication support to your applications.
 * Data types::                  
 * Back end drivers::             Writing your own drivers.
+* GNU Free Documentation License::  The license for this documentation.
 * Index::                       
 * Function Index::              
 * Variable Index::              
@@ -256,16 +251,20 @@ At the first time @var{step} should be set to @code{nil}.
 
 (Not yet written).
 
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @node Index
-@chapter Index
+@unnumbered Index
 @printindex cp
 
 @node Function Index
-@chapter Function Index
+@unnumbered Function Index
 @printindex fn
 
 @node Variable Index
-@chapter Variable Index
+@unnumbered Variable Index
 @printindex vr
 
 @summarycontents