emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111036: Include GFDL in org.texi


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/emacs-24 r111036: Include GFDL in org.texi
Date: Fri, 14 Dec 2012 09:14:49 -0800
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111036
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-12-14 09:14:49 -0800
message:
  Include GFDL in org.texi
  
  * org.texi (copying): Include a copy of the GFDL.
  The old text said that it contained one (which was untrue), and
  that one should be added if the manual was distributed separately,
  which was logically inconsistent.
  (GNU Free Documentation License): New section.
modified:
  doc/misc/ChangeLog
  doc/misc/org.texi
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-12-13 11:02:41 +0000
+++ b/doc/misc/ChangeLog        2012-12-14 17:14:49 +0000
@@ -1,3 +1,8 @@
+2012-12-14  Glenn Morris  <address@hidden>
+
+       * org.texi (copying): Include a copy of the GFDL.
+       (GNU Free Documentation License): New section.
+
 2012-12-13  Bastien Guerry  <address@hidden>
 
        * org.texi: Fix typos.

=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2012-12-13 11:02:41 +0000
+++ b/doc/misc/org.texi 2012-12-14 17:14:49 +0000
@@ -262,7 +262,7 @@
 @copying
 This manual is for Org version @value{VERSION}.
 
-Copyright @copyright{} 2004-2012  Free Software Foundation, Inc.
+Copyright @copyright{} 2004-2012 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -275,11 +275,6 @@
 (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
 
@@ -305,6 +300,9 @@
 @contents
 
 @ifnottex
address@hidden FIXME These hand-written next,prev,up node pointers make editing 
a lot
address@hidden harder.  There should be no need for them, makeinfo can do it
address@hidden automatically for any document with a normal structure.
 @node Top, Introduction, (dir), (dir)
 @top Org Mode Manual
 
@@ -330,6 +328,7 @@
 * Hacking::                     How to hack your way around
 * MobileOrg::                   Viewing and capture on a mobile device
 * History and Acknowledgments::  How Org came into being
+* GNU Free Documentation License::  The license for this documentation.
 * Main Index::                  An index of Org's concepts and features
 * Key Index::                   Key bindings and where they are described
 * Command and Function Index::  Command names and some internal functions
@@ -16606,7 +16605,7 @@
 agenda files.  If you later use @kbd{C-c a ?} to regenerate the view, only
 the current agenda files will be searched.} using @kbd{C-c a ?}.
 
address@hidden History and Acknowledgments, Main Index, MobileOrg, Top
address@hidden History and Acknowledgments, GNU Free Documentation License, 
MobileOrg, Top
 @appendix History and acknowledgments
 @cindex acknowledgments
 @cindex history
@@ -16949,7 +16948,12 @@
 @end itemize
 
 
address@hidden Main Index, Key Index, History and Acknowledgments, Top
address@hidden GNU Free Documentation License, Main Index, History and 
Acknowledgments, Top
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
+
address@hidden Main Index, Key Index, GNU Free Documentation License, Top
 @unnumbered Concept index
 
 @printindex cp


reply via email to

[Prev in Thread] Current Thread [Next in Thread]