emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111055: May as well just include


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/emacs-24 r111055: May as well just include doclicense.texi in all doc/misc manuals
Date: Fri, 21 Dec 2012 11:01:24 -0800
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111055
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-12-21 11:01:24 -0800
message:
  May as well just include doclicense.texi in all doc/misc manuals
modified:
  doc/misc/ChangeLog
  doc/misc/auth.texi
  doc/misc/emacs-gnutls.texi
  doc/misc/epa.texi
  doc/misc/ert.texi
  doc/misc/gnus-coding.texi
  doc/misc/info.texi
  doc/misc/nxml-mode.texi
  doc/misc/sasl.texi
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-12-21 18:36:41 +0000
+++ b/doc/misc/ChangeLog        2012-12-21 19:01:24 +0000
@@ -1,5 +1,12 @@
 2012-12-21  Glenn Morris  <address@hidden>
 
+       * 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:

=== modified file 'doc/misc/auth.texi'
--- a/doc/misc/auth.texi        2012-12-21 18:36:41 +0000
+++ b/doc/misc/auth.texi        2012-12-21 19:01:24 +0000
@@ -18,16 +18,10 @@
 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 @@
 * 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 elisp passphrase cache, set
 @code{epa-file-cache-passphrase-for-symmetric-encryption}.
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
 @node Index
address@hidden Index
address@hidden Index
 @printindex cp
 
 @node Function Index
address@hidden Function Index
address@hidden Function Index
 @printindex fn
 
 @node Variable Index
address@hidden Variable Index
address@hidden Variable Index
 @printindex vr
 
 @bye

=== modified file 'doc/misc/emacs-gnutls.texi'
--- a/doc/misc/emacs-gnutls.texi        2012-12-21 18:36:41 +0000
+++ b/doc/misc/emacs-gnutls.texi        2012-12-21 19:01:24 +0000
@@ -16,16 +16,10 @@
 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 @@
 * 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 @@
 but do not rely on this function's interface if possible.
 @end defun
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
 @node Function Index
address@hidden Function Index
address@hidden Function Index
 @printindex fn
 
 @node Variable Index
address@hidden Variable Index
address@hidden Variable Index
 @printindex vr
 
 @bye

=== modified file 'doc/misc/epa.texi'
--- a/doc/misc/epa.texi 2012-12-21 18:36:41 +0000
+++ b/doc/misc/epa.texi 2012-12-21 19:01:24 +0000
@@ -17,16 +17,10 @@
 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 @@
 * Commands::
 * Caching Passphrases::
 * Bug Reports::
+* GNU Free Documentation License::  The license for this documentation.
 @end menu
 
 @node  Overview
@@ -492,6 +487,10 @@
 of the @samp{ *epg-debug*} buffer.  Note that the first letter of the
 buffer name is a whitespace.
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
 @bye
 
 @c End:

=== modified file 'doc/misc/ert.texi'
--- a/doc/misc/ert.texi 2012-12-21 18:36:41 +0000
+++ b/doc/misc/ert.texi 2012-12-21 19:01:24 +0000
@@ -18,16 +18,10 @@
 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 @@
 * 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 @@
 * 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 @@
 Contributions to ERT are welcome.
 
 
address@hidden Other Testing Concepts,  , Extending ERT, Top
address@hidden 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 @@
 often.  This can be achieved with the @code{:tag} argument to
 @code{ert-deftest} and @code{tag} test selectors.
 
address@hidden GNU Free Documentation License, , Other Testing Concepts, Top
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
 @bye
 
 @c  LocalWords:  ERT JUnit namespace docstring ERT's

=== modified file 'doc/misc/gnus-coding.texi'
--- a/doc/misc/gnus-coding.texi 2012-12-21 18:36:41 +0000
+++ b/doc/misc/gnus-coding.texi 2012-12-21 19:01:24 +0000
@@ -14,18 +14,12 @@
 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 @@
 @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 @@
 The same applies for customizable variables when its default value was
 changed.
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
 @c Local Variables:
 @c mode: texinfo
 @c coding: iso-8859-1

=== modified file 'doc/misc/info.texi'
--- a/doc/misc/info.texi        2012-12-21 18:36:41 +0000
+++ b/doc/misc/info.texi        2012-12-21 19:01:24 +0000
@@ -20,18 +20,12 @@
 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 @@
 * 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 @@
 To check an Info file, do @kbd{M-x Info-validate} while looking at any
 node of the file with Emacs Info mode.
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
 @node Index
 @unnumbered Index
 

=== modified file 'doc/misc/nxml-mode.texi'
--- a/doc/misc/nxml-mode.texi   2012-12-21 18:36:41 +0000
+++ b/doc/misc/nxml-mode.texi   2012-12-21 19:01:24 +0000
@@ -14,18 +14,12 @@
 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 @@
 * Locating a schema::
 * DTDs::
 * Limitations::
+* GNU Free Documentation License::  The license for this documentation.
 @end menu
 
 @node Introduction
@@ -898,4 +893,8 @@
 specification are not enforced.
 @end itemize
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
 @bye

=== modified file 'doc/misc/sasl.texi'
--- a/doc/misc/sasl.texi        2012-12-21 18:36:41 +0000
+++ b/doc/misc/sasl.texi        2012-12-21 19:01:24 +0000
@@ -18,16 +18,10 @@
 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 @@
 * 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 @@
 
 (Not yet written).
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
 @node Index
address@hidden Index
address@hidden Index
 @printindex cp
 
 @node Function Index
address@hidden Function Index
address@hidden Function Index
 @printindex fn
 
 @node Variable Index
address@hidden Variable Index
address@hidden Variable Index
 @printindex vr
 
 @summarycontents


reply via email to

[Prev in Thread] Current Thread [Next in Thread]