Show
Ignore:
Timestamp:
2006年09月18日 20時48分14秒 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lispref/gpl.texi

    r4131 r4166  
    2424Foundation's software and to any other program whose authors commit to 
    2525using it.  (Some other Free Software Foundation software is covered by 
    26 the GNU Library General Public License instead.)  You can apply it to 
     26the GNU Lesser General Public License instead.)  You can apply it to 
    2727your programs, too. 
    2828 
    …… 
    7676This License applies to any program or other work which contains 
    7777a notice placed by the copyright holder saying it may be distributed 
    78 under the terms of this General Public License.  The ``Program,'' below, 
     78under the terms of this General Public License.  The ``Program'', below, 
    7979refers to any such program or work, and a ``work based on the Program'' 
    8080means either the Program or any derivative work under copyright law: 
    …… 
    8282either verbatim or with modifications and/or translated into another 
    8383language.  (Hereinafter, translation is included without limitation in 
    84 the term ``modification.'')  Each licensee is addressed as ``you.'' 
     84the term ``modification''.)  Each licensee is addressed as ``you''. 
    8585 
    8686Activities other than copying, distribution and modification are not 
    …… 
    275275Each version is given a distinguishing version number.  If the Program 
    276276specifies a version number of this License which applies to it and ``any 
    277 later version,'' you have the option of following the terms and conditions 
     277later version'', you have the option of following the terms and conditions 
    278278either of that version or of any later version published by the Free 
    279279Software Foundation.  If the Program does not specify a version number of 
    …… 
    340340 
    341341@smallexample 
    342 @var{one line to give the program's name and an idea of what it does.} 
    343 Copyright (C) @var{year}  @var{name of author} 
     342@var{one line to give the program's name and a brief idea of what it does.} 
     343Copyright (C) @var{yyyy}  @var{name of author} 
    344344 
    345345This program is free software; you can redistribute it and/or 
    …… 
    365365 
    366366@smallexample 
    367 Gnomovision version 69, Copyright (C) @var{year} @var{name of author} 
    368 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details 
    369 type `show w'.  This is free software, and you are welcome 
    370 to redistribute it under certain conditions; type `show c' 
    371 for details. 
     367Gnomovision version 69, Copyright (C) @var{yyyy} @var{name of author} 
     368Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. 
     369This is free software, and you are welcome to redistribute it  
     370under certain conditions; type `show c' for details. 
    372371@end smallexample 
    373372