[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/man/doclicense.texi,v
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/man/doclicense.texi,v |
Date: |
Mon, 24 Jul 2006 17:43:31 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Richard M. Stallman <rms> 06/07/24 17:43:31
Index: doclicense.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/man/doclicense.texi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- doclicense.texi 16 Sep 2005 22:11:02 -0000 1.9
+++ doclicense.texi 24 Jul 2006 17:43:30 -0000 1.10
@@ -23,7 +23,7 @@
to get credit for their work, while not being considered responsible
for modifications made by others.
-This License is a kind of ``copyleft'', which means that derivative
+This License is a kind of ``copyleft,'' which means that derivative
works of the document must themselves be free in the same sense. It
complements the GNU General Public License, which is a copyleft
license designed for free software.
@@ -44,9 +44,9 @@
contains a notice placed by the copyright holder saying it can be
distributed under the terms of this License. Such a notice grants a
world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein. The ``Document'', below,
+work under the conditions stated herein. The ``Document,'' below,
refers to any such manual or work. Any member of the public is a
-licensee, and is addressed as ``you''. You accept the license if you
+licensee, and is addressed as ``you.'' You accept the license if you
copy, modify or distribute the work in a way requiring permission
under copyright law.
@@ -113,8 +113,8 @@
A section ``Entitled XYZ'' means a named subunit of the Document whose
title either is precisely XYZ or contains XYZ in parentheses following
text that translates XYZ in another language. (Here XYZ stands for a
-specific section name mentioned below, such as ``Acknowledgements'',
-``Dedications'', ``Endorsements'', or ``History''.) To ``Preserve the Title''
+specific section name mentioned below, such as ``Acknowledgements,''
+``Dedications,'' ``Endorsements,'' or ``History.'') To ``Preserve the Title''
of such a section when you modify the Document means that it remains a
section ``Entitled XYZ'' according to this definition.
@@ -210,7 +210,7 @@
G. Preserve in that license notice the full lists of Invariant Sections
and required Cover Texts given in the Document's license address@hidden
H. Include an unaltered copy of this address@hidden
-I. Preserve the section Entitled ``History'', Preserve its Title, and add
+I. Preserve the section Entitled ``History,'' Preserve its Title, and add
to it an item stating at least the title, year, new authors, and
publisher of the Modified Version as given on the Title Page. If
there is no section Entitled ``History'' in the Document, create one
@@ -224,7 +224,7 @@
You may omit a network location for a work that was published at
least four years before the Document itself, or if the original
publisher of the version it refers to gives address@hidden
-K. For any section Entitled ``Acknowledgements'' or ``Dedications'',
+K. For any section Entitled ``Acknowledgements'' or ``Dedications,''
Preserve the Title of the section, and preserve in the section all
the substance and tone of each of the contributor acknowledgements
and/or dedications given address@hidden
@@ -244,7 +244,7 @@
list of Invariant Sections in the Modified Version's license notice.
These titles must be distinct from any other section titles.
-You may add a section Entitled ``Endorsements'', provided it contains
+You may add a section Entitled ``Endorsements,'' provided it contains
nothing but endorsements of your Modified Version by various
parties--for example, statements of peer review or that the text has
been approved by an organization as the authoritative definition of a
@@ -285,7 +285,7 @@
In the combination, you must combine any sections Entitled ``History''
in the various original documents, forming one section Entitled
-``History''; likewise combine any sections Entitled ``Acknowledgements'',
+``History''; likewise combine any sections Entitled ``Acknowledgements,''
and any sections Entitled ``Dedications.'' You must delete all sections
Entitled ``Endorsements.''
@sp 1
@@ -339,8 +339,8 @@
the translation and the original version of this License or a notice
or disclaimer, the original version will prevail.
-If a section in the Document is Entitled ``Acknowledgements'',
-``Dedications'', or ``History'', the requirement (section 4) to Preserve
+If a section in the Document is Entitled ``Acknowledgements,''
+``Dedications,'' or ``History,'' the requirement (section 4) to Preserve
its Title (section 1) will typically require changing the actual
title.
@sp 1
@@ -389,7 +389,7 @@
or any later version published by the Free Software Foundation;
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
+Free Documentation License.''
@end group
@end smallexample
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/man/doclicense.texi,v,
Richard M. Stallman <=