emacs: lispref/doclicense.texi comparison

comparison lispref/doclicense.texi @ 90228:fa0da9b57058

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 542-553) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 116-121) - Merge from emacs--cvs-trunk--0 - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Mon, 19 Sep 2005 10:20:33 +0000
parents	f9a65d7ebd29 cb3a28e6571d
children	8a8e69664178

comparison

equal deleted inserted replaced

-:10fe5fadaf89
+:fa0da9b57058
 @c -*-texinfo-*-
 @node GNU Free Documentation License, GPL, Antinews, Top
 @appendix GNU Free Documentation License
-@center Version 1.1, March 2000
+@center Version 1.2, November 2002
 @display
-Copyright (C) 2000  Free Software Foundation, Inc.
+Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
 @end display
 @enumerate 0
 @item
 PREAMBLE
 The purpose of this License is to make a manual, textbook, or other
-written document ``free'' in the sense of freedom: to assure everyone
+functional and useful document ``free'' in the sense of freedom: to
-the effective freedom to copy and redistribute it, with or without
+assure everyone the effective freedom to copy and redistribute it,
-modifying it, either commercially or noncommercially.  Secondarily,
+with or without modifying it, either commercially or noncommercially.
-this License preserves for the author and publisher a way to get
+Secondarily, this License preserves for the author and publisher a way
-credit for their work, while not being considered responsible for
+to get credit for their work, while not being considered responsible
-modifications made by others.
+for modifications made by others.
 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.
 @sp 1
 @item
 APPLICABILITY AND DEFINITIONS
-This License applies to any manual or other work that contains a
+This License applies to any manual or other work, in any medium, that
-notice placed by the copyright holder saying it can be distributed
+contains a notice placed by the copyright holder saying it can be
-under the terms of this License.  The ``Document'', below, refers to any
+distributed under the terms of this License.  Such a notice grants a
-such manual or work.  Any member of the public is a licensee, and is
+world-wide, royalty-free license, unlimited in duration, to use that
-addressed as ``you''.
+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
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
 A ``Modified Version'' of the Document means any work containing the
 Document or a portion of it, either copied verbatim, or with
 modifications and/or translated into another language.
 A ``Secondary Section'' is a named appendix or a front-matter section of
 the Document that deals exclusively with the relationship of the
 publishers or authors of the Document to the Document's overall subject
 (or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
+within that overall subject.  (Thus, if the Document is in part a
 textbook of mathematics, a Secondary Section may not explain any
 mathematics.)  The relationship could be a matter of historical
 connection with the subject or with related matters, or of legal,
 commercial, philosophical, ethical or political position regarding
 them.
 The ``Invariant Sections'' are certain Secondary Sections whose titles
 are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
 The ``Cover Texts'' are certain short passages of text that are listed,
 as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
 A ``Transparent'' copy of the Document means a machine-readable copy,
 represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
+general public, that is suitable for revising the document
 straightforwardly with generic text editors or (for images composed of
 pixels) generic paint programs or (for drawings) some widely available
 drawing editor, and that is suitable for input to text formatters or
 for automatic translation to a variety of formats suitable for input
 to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
+format whose markup, or absence of markup, has been arranged to thwart
-subsequent modification by readers is not Transparent.  A copy that is
+or discourage subsequent modification by readers is not Transparent.
-not ``Transparent'' is called ``Opaque''.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not ``Transparent'' is called ``Opaque.''
 Examples of suitable formats for Transparent copies include plain
 ASCII without markup, Texinfo input format, LaTeX input format, SGML
 or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
+HTML, PostScript or PDF designed for human modification.  Examples of
-PostScript, PDF, proprietary formats that can be read and edited only
+transparent image formats include PNG, XCF and JPG.  Opaque formats
-by proprietary word processors, SGML or XML for which the DTD and/or
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
 processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
+machine-generated HTML, PostScript or PDF produced by some word
-purposes only.
+processors for output purposes only.
 The ``Title Page'' means, for a printed book, the title page itself,
 plus such following pages as are needed to hold, legibly, the material
 this License requires to appear in the title page.  For works in
 formats which do not have any title page as such, ``Title Page'' means
 the text near the most prominent appearance of the work's title,
 preceding the beginning of the body of the text.
+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''
+of such a section when you modify the Document means that it remains a
+section ``Entitled XYZ'' according to this definition.
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
 @sp 1
 @item
 VERBATIM COPYING
 You may copy and distribute the Document in any medium, either
 you may publicly display copies.
 @sp 1
 @item
 COPYING IN QUANTITY
-If you publish printed copies of the Document numbering more than 100,
+If you publish printed copies (or copies in media that commonly have
-and the Document's license notice requires Cover Texts, you must enclose
+printed covers) of the Document, numbering more than 100, and the
-the copies in covers that carry, clearly and legibly, all these Cover
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
 Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
 the back cover.  Both covers must also clearly and legibly identify
 you as the publisher of these copies.  The front cover must present
 the full title with all words of the title equally prominent and
 visible.  You may add other material on the covers in addition.
 pages.
 If you publish or distribute Opaque copies of the Document numbering
 more than 100, you must either include a machine-readable Transparent
 copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
+a computer-network location from which the general network-using
-Transparent copy of the Document, free of added material, which the
+public has access to download using public-standard network protocols
-general network-using public has access to download anonymously at no
+a complete Transparent copy of the Document, free of added material.
-charge using public-standard network protocols.  If you use the latter
+If you use the latter option, you must take reasonably prudent steps,
-option, you must take reasonably prudent steps, when you begin
+when you begin distribution of Opaque copies in quantity, to ensure
-distribution of Opaque copies in quantity, to ensure that this
+that this Transparent copy will remain thus accessible at the stated
-Transparent copy will remain thus accessible at the stated location
+location until at least one year after the last time you distribute an
-until at least one year after the last time you distribute an Opaque
+Opaque copy (directly or through your agents or retailers) of that
-copy (directly or through your agents or retailers) of that edition to
+edition to the public.
-the public.
 It is requested, but not required, that you contact the authors of the
 Document well before redistributing any large number of copies, to give
 them a chance to provide you with an updated version of the Document.
 @sp 1
 of the Document).  You may use the same title as a previous version
 if the original publisher of that version gives permission.@*
 B. List on the Title Page, as authors, one or more persons or entities
 responsible for authorship of the modifications in the Modified
 Version, together with at least five of the principal authors of the
-Document (all of its principal authors, if it has less than five).@*
+Document (all of its principal authors, if it has fewer than five),
+unless they release you from this requirement.@*
 C. State on the Title page the name of the publisher of the
 Modified Version, as the publisher.@*
 D. Preserve all the copyright notices of the Document.@*
 E. Add an appropriate copyright notice for your modifications
 adjacent to the other copyright notices.@*
 giving the public permission to use the Modified Version under the
 terms of this License, in the form shown in the Addendum below.@*
 G. Preserve in that license notice the full lists of Invariant Sections
 and required Cover Texts given in the Document's license notice.@*
 H. Include an unaltered copy of this License.@*
-I. Preserve the section entitled ``History'', and its title, and add to
+I. Preserve the section Entitled ``History'', Preserve its Title, and add
-it an item stating at least the title, year, new authors, and
+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
+there is no section Entitled ``History'' in the Document, create one
 stating the title, year, authors, and publisher of the Document as
 given on its Title Page, then add an item describing the Modified
 Version as stated in the previous sentence.@*
 J. Preserve the network location, if any, given in the Document for
 public access to a Transparent copy of the Document, and likewise
 the network locations given in the Document for previous versions
 it was based on.  These may be placed in the ``History'' section.
 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 permission.@*
-K. In any section entitled ``Acknowledgements'' or ``Dedications'',
+K. For any section Entitled ``Acknowledgements'' or ``Dedications'',
-preserve the section's title, and preserve in the section all the
+Preserve the Title of the section, and preserve in the section all
-substance and tone of each of the contributor acknowledgements
+the substance and tone of each of the contributor acknowledgements
 and/or dedications given therein.@*
 L. Preserve all the Invariant Sections of the Document,
 unaltered in their text and in their titles.  Section numbers
 or the equivalent are not considered part of the section titles.@*
-M. Delete any section entitled ``Endorsements''.  Such a section
+M. Delete any section Entitled ``Endorsements.''  Such a section
 may not be included in the Modified Version.@*
-N. Do not retitle any existing section as ``Endorsements''
+N. Do not retitle any existing section to be Entitled ``Endorsements''
 or to conflict in title with any Invariant Section.@*
+O. Preserve any Warranty Disclaimers.@*
 @sp 1
 If the Modified Version includes new front-matter sections or
 appendices that qualify as Secondary Sections and contain no material
 copied from the Document, you may at your option designate some or all
 of these sections as invariant.  To do this, add their titles to the
 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
 standard.
 You may combine the Document with other documents released under this
 License, under the terms defined in section 4 above for modified
 versions, provided that you include in the combination all of the
 Invariant Sections of all of the original documents, unmodified, and
 list them all as Invariant Sections of your combined work in its
-license notice.
+license notice, and that you preserve all their Warranty Disclaimers.
 The combined work need only contain one copy of this License, and
 multiple identical Invariant Sections may be replaced with a single
 copy.  If there are multiple Invariant Sections with the same name but
 different contents, make the title of each such section unique by
 adding at the end of it, in parentheses, the name of the original
 author or publisher of that section if known, or else a unique number.
 Make the same adjustment to the section titles in the list of
 Invariant Sections in the license notice of the combined work.
-In the combination, you must combine any sections entitled ``History''
+In the combination, you must combine any sections Entitled ``History''
-in the various original documents, forming one section entitled
+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
+and any sections Entitled ``Dedications.''  You must delete all sections
-entitled ``Endorsements.''
+Entitled ``Endorsements.''
 @sp 1
 @item
 COLLECTIONS OF DOCUMENTS
 You may make a collection consisting of the Document and other documents
 @item
 AGGREGATION WITH INDEPENDENT WORKS
 A compilation of the Document or its derivatives with other separate
 and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
+distribution medium, is called an ``aggregate'' if the copyright
-of the Document, provided no compilation copyright is claimed for the
+resulting from the compilation is not used to limit the legal rights
-compilation.  Such a compilation is called an ``aggregate'', and this
+of the compilation's users beyond what the individual works permit.
-License does not apply to the other self-contained works thus compiled
+When the Document is included in an aggregate, this License does not
-with the Document, on account of their being thus compiled, if they
+apply to the other works in the aggregate which are not themselves
-are not themselves derivative works of the Document.
+derivative works of the Document.
 If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
+copies of the Document, then if the Document is less than one half of
-of the entire aggregate, the Document's Cover Texts may be placed on
+the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
+covers that bracket the Document within the aggregate, or the
-Otherwise they must appear on covers around the whole aggregate.
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
 @sp 1
 @item
 TRANSLATION
 Translation is considered a kind of modification, so you may
 distribute translations of the Document under the terms of section 4.
 Replacing Invariant Sections with translations requires special
 permission from their copyright holders, but you may include
 translations of some or all Invariant Sections in addition to the
 original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
+translation of this License, and all the license notices in the
-original English version of this License.  In case of a disagreement
+Document, and any Warranty Disclaimers, provided that you also include
-between the translation and the original English version of this
+the original English version of this License and the original versions
-License, the original English version will prevail.
+of those notices and disclaimers.  In case of a disagreement between
+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
+its Title (section 1) will typically require changing the actual
+title.
 @sp 1
 @item
 TERMINATION
 You may not copy, modify, sublicense, or distribute the Document except
 the License in the document and put the following copyright and
 license notices just after the title page:
 @smallexample
 @group
+Copyright (C)  @var{year}  @var{your name}.
-Copyright (C)  @var{year}  @var{your name}.
+Permission is granted to copy, distribute and/or modify this document
-Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2
-under the terms of the GNU Free Documentation License, Version 1.1
+or any later version published by the Free Software Foundation;
-or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-with the Invariant Sections being @var{list their titles}, with the
+A copy of the license is included in the section entitled ``GNU
-Front-Cover Texts being @var{list}, and with the Back-Cover Texts being @var{list}.
+Free Documentation License''.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
 @end group
 @end smallexample
-If you have no Invariant Sections, write ``with no Invariant Sections''
-instead of saying which ones are invariant.  If you have no
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-Front-Cover Texts, write ``no Front-Cover Texts'' instead of
+replace the ``with...Texts.'' line with this:
-``Front-Cover Texts being @var{list}''; likewise for Back-Cover Texts.
+@smallexample
+@group
+with the Invariant Sections being @var{list their titles}, with the
+Front-Cover Texts being @var{list}, and with the Back-Cover Texts being
+@var{list}.
+@end group
+@end smallexample
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
 If your document contains nontrivial examples of program code, we
 recommend releasing these examples in parallel under your choice of
 free software license, such as the GNU General Public License,
 to permit their use in free software.

Mercurial > emacs

comparison lispref/doclicense.texi @ 90228:fa0da9b57058