Mercurial > emacs
changeset 112355:98399365dc54
* doc/misc/ert.texi: Relicense under GFDL 1.3+, and standardize license notice.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 18 Jan 2011 00:16:08 -0800 |
| parents | 34bef019033d |
| children | fa69cea85c66 |
| files | doc/misc/ChangeLog doc/misc/ert.texi |
| diffstat | 2 files changed, 18 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Mon Jan 17 21:23:52 2011 -0800 +++ b/doc/misc/ChangeLog Tue Jan 18 00:16:08 2011 -0800 @@ -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.
--- a/doc/misc/ert.texi Mon Jan 17 21:23:52 2011 -0800 +++ b/doc/misc/ert.texi Tue Jan 18 00:16:08 2011 -0800 @@ -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