auth.texi, epa.texi, gnus-coding.texi, sasl.texi: May as well just include doclicense...

auth.texi, emacs-mime.texi, epa.texi, gnus-coding.texi, gnus.texi, message.texi, sasl.texi, sieve.texi: Do not mention buying copies from the FSF, which does not publish these manuals.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 2c215f8..45dccc1 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,12 @@
+2012-12-21  Glenn Morris  <rgm@gnu.org>
+
+       * auth.texi, epa.texi, gnus-coding.texi, sasl.texi:
+       May as well just include doclicense.texi in everything.
+
+       * auth.texi, emacs-mime.texi, epa.texi, gnus-coding.texi, gnus.texi,
+       message.texi, sasl.texi, sieve.texi: Do not mention buying copies from
+       the FSF, which does not publish these manuals.
+
 2012-12-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * doclicense.texi: Update to latest version from FSF.

diff --git a/texi/auth.texi b/texi/auth.texi
index ebf9aa8..00ef2b1 100644 (file)
--- a/texi/auth.texi
+++ b/texi/auth.texi
@@ -18,17 +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.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
-
-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.
+modify this GNU manual.''
 @end quotation
 @end copying
 
@@ -68,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::
@@ -522,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/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 3d59970..e936baf 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -22,8 +22,7 @@ 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.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
+modify this GNU manual.''
 @end quotation
 @end copying
 

diff --git a/texi/epa.texi b/texi/epa.texi
index 86e15a8..74c966f 100644 (file)
--- a/texi/epa.texi
+++ b/texi/epa.texi
@@ -17,17 +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.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
-
-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.
+modify this GNU manual.''
 @end quotation
 @end copying
 
@@ -68,6 +61,7 @@ called EasyPG Library.
 * Commands::
 * Caching Passphrases::
 * Bug Reports::
+* GNU Free Documentation License::  The license for this documentation.
 @end menu
 
 @node  Overview
@@ -493,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/texi/gnus-coding.texi b/texi/gnus-coding.texi
index 2bc0640..35ec212 100644 (file)
--- a/texi/gnus-coding.texi
+++ b/texi/gnus-coding.texi
@@ -7,26 +7,19 @@
 @syncodeindex pg cp
 
 @copying
-Copyright @copyright{} 2004-2005, 2007-2012  Free Software
+Copyright @copyright{} 2004-2005, 2007-2012 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.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.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
-
-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.
+modify this GNU manual.''
 @end quotation
 @end copying
 
@@ -54,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}
@@ -387,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/texi/gnus.texi b/texi/gnus.texi
index 2db21e8..e3411ca 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -22,8 +22,7 @@ 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.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
+modify this GNU manual.''
 @end quotation
 @end copying
 

diff --git a/texi/message.texi b/texi/message.texi
index eadacf7..e686f39 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -21,8 +21,7 @@ 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.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
+modify this GNU manual.''
 @end quotation
 @end copying
 

diff --git a/texi/sasl.texi b/texi/sasl.texi
index 4ee8de5..e4b89de 100644 (file)
--- a/texi/sasl.texi
+++ b/texi/sasl.texi
@@ -10,8 +10,7 @@
 @copying
 This file describes the Emacs SASL library, version @value{VERSION}.
 
-Copyright @copyright{} 2000, 2004-2012
-Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2004-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -19,17 +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.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
-
-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.
+modify this GNU manual.''
 @end quotation
 @end copying
 
@@ -70,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::              
@@ -258,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

diff --git a/texi/sieve.texi b/texi/sieve.texi
index 2faca67..63c8df3 100644 (file)
--- a/texi/sieve.texi
+++ b/texi/sieve.texi
@@ -11,7 +11,7 @@
 @copying
 This file documents the Emacs Sieve package, for server-side mail filtering.
 
-Copyright @copyright{} 2001-2012  Free Software Foundation, Inc.
+Copyright @copyright{} 2001-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -22,8 +22,7 @@ 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.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
+modify this GNU manual.''
 @end quotation
 @end copying