summaryrefslogtreecommitdiff
path: root/doc/misc/ert.texi
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-01-18 00:16:08 -0800
committerGlenn Morris <rgm@gnu.org>2011-01-18 00:16:08 -0800
commit6872a814ef00511ac66a2ac470f1e43ad557bc3b (patch)
tree8b1ee43721bca9bdff67be8e38ab21e6c57909fe /doc/misc/ert.texi
parent53911e8f4ea67606560debaa1590be06458d283f (diff)
downloademacs-6872a814ef00511ac66a2ac470f1e43ad557bc3b.tar.gz
emacs-6872a814ef00511ac66a2ac470f1e43ad557bc3b.tar.bz2
emacs-6872a814ef00511ac66a2ac470f1e43ad557bc3b.zip
* doc/misc/ert.texi: Relicense under GFDL 1.3+, and standardize license notice.
Diffstat (limited to 'doc/misc/ert.texi')
-rw-r--r--doc/misc/ert.texi17
1 files changed, 14 insertions, 3 deletions
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