[Emacs-diffs] /srv/bzr/emacs/trunk r102890: * doc/misc/ert.texi: Relicense under GFDL 1.3+, and standardize license notice.

[Glenn Morris]

------------------------------------------------------------
revno: 102890
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-01-18 00:16:08 -0800
message:
  * doc/misc/ert.texi: Relicense under GFDL 1.3+, and standardize license 
notice.
modified:
  doc/misc/ChangeLog
  doc/misc/ert.texi

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-01-14 17:42:40 +0000
+++ b/doc/misc/ChangeLog        2011-01-18 08:16:08 +0000
@@ -1,3 +1,7 @@
+2011-01-18  Glenn Morris  <address@hidden>
+
+       * ert.texi: Relicense under GFDL 1.3+, and standardize license notice.
+
 2011-01-14  Eduard Wiebe  <address@hidden>
 
        * nxml-mode.texi (Introduction): Fix file name typos.

=== modified file 'doc/misc/ert.texi'
--- a/doc/misc/ert.texi 2011-01-12 16:08:24 +0000
+++ b/doc/misc/ert.texi 2011-01-18 08:16:08 +0000
@@ -14,10 +14,21 @@
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+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 no Front-Cover Texts, and with no Back-Cover
-Texts.
+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 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.
 @end quotation
 @end copying