Show
Ignore:
Timestamp:
07/29/06 07:48:34 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lispref/doclicense.texi

    r3894 r4131  
    2525for modifications made by others. 
    2626 
    27 This License is a kind of ``copyleft'', which means that derivative 
     27This License is a kind of ``copyleft,'' which means that derivative 
    2828works of the document must themselves be free in the same sense.  It 
    2929complements the GNU General Public License, which is a copyleft 
     
    4646distributed under the terms of this License.  Such a notice grants a 
    4747world-wide, royalty-free license, unlimited in duration, to use that 
    48 work under the conditions stated herein.  The ``Document'', below, 
     48work under the conditions stated herein.  The ``Document,'' below, 
    4949refers to any such manual or work.  Any member of the public is a 
    50 licensee, and is addressed as ``you''.  You accept the license if you 
     50licensee, and is addressed as ``you.''  You accept the license if you 
    5151copy, modify or distribute the work in a way requiring permission 
    5252under copyright law. 
     
    115115title either is precisely XYZ or contains XYZ in parentheses following 
    116116text that translates XYZ in another language.  (Here XYZ stands for a 
    117 specific section name mentioned below, such as ``Acknowledgements'', 
    118 ``Dedications'', ``Endorsements'', or ``History''.)  To ``Preserve the Title'' 
     117specific section name mentioned below, such as ``Acknowledgements,'' 
     118``Dedications,'' ``Endorsements,'' or ``History.'')  To ``Preserve the Title'' 
    119119of such a section when you modify the Document means that it remains a 
    120120section ``Entitled XYZ'' according to this definition. 
     
    212212   and required Cover Texts given in the Document's license notice.@* 
    213213H. Include an unaltered copy of this License.@* 
    214 I. Preserve the section Entitled ``History'', Preserve its Title, and add 
     214I. Preserve the section Entitled ``History,'' Preserve its Title, and add 
    215215   to it an item stating at least the title, year, new authors, and 
    216216   publisher of the Modified Version as given on the Title Page.  If 
     
    226226   least four years before the Document itself, or if the original 
    227227   publisher of the version it refers to gives permission.@* 
    228 K. For any section Entitled ``Acknowledgements'' or ``Dedications'', 
     228K. For any section Entitled ``Acknowledgements'' or ``Dedications,'' 
    229229   Preserve the Title of the section, and preserve in the section all 
    230230   the substance and tone of each of the contributor acknowledgements 
     
    246246These titles must be distinct from any other section titles. 
    247247 
    248 You may add a section Entitled ``Endorsements'', provided it contains 
     248You may add a section Entitled ``Endorsements,'' provided it contains 
    249249nothing but endorsements of your Modified Version by various 
    250250parties--for example, statements of peer review or that the text has 
     
    287287In the combination, you must combine any sections Entitled ``History'' 
    288288in the various original documents, forming one section Entitled 
    289 ``History''; likewise combine any sections Entitled ``Acknowledgements'', 
     289``History''; likewise combine any sections Entitled ``Acknowledgements,'' 
    290290and any sections Entitled ``Dedications.''  You must delete all sections 
    291291Entitled ``Endorsements.'' 
     
    341341or disclaimer, the original version will prevail. 
    342342 
    343 If a section in the Document is Entitled ``Acknowledgements'', 
    344 ``Dedications'', or ``History'', the requirement (section 4) to Preserve 
     343If a section in the Document is Entitled ``Acknowledgements,'' 
     344``Dedications,'' or ``History,'' the requirement (section 4) to Preserve 
    345345its Title (section 1) will typically require changing the actual 
    346346title. 
     
    391391with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. 
    392392A copy of the license is included in the section entitled ``GNU 
    393 Free Documentation License''. 
     393Free Documentation License.'' 
    394394@end group 
    395395@end smallexample