Change to GFDL 1.2. Refer to license in Emacs manual.

diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 43401ee870a49f5fb07b999849eb4d57f0eb53ec..7ec70e9caa2ece59afbcfba20ddbd43311ee0a0f 100644 (file)
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -39,16 +39,21 @@ Copyright @copyright{} 2004, 2005, 2006, 2007, 2008 Free Software Foundation
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
+under the terms of the GNU Free Documentation License, Version 1.2 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.''
+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