diff options
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/ert.texi | 17 |
2 files changed, 18 insertions, 3 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 24efb00e552..c1fca8ad889 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2011-01-18 Glenn Morris <rgm@gnu.org> + + * ert.texi: Relicense under GFDL 1.3+, and standardize license notice. + 2011-01-14 Eduard Wiebe <usenet@pusto.de> * nxml-mode.texi (Introduction): Fix file name typos. diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index e1a8cdc319c..fea0b935810 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -14,10 +14,21 @@ Copyright @copyright{} 2008, 2010, 2011 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.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 |