Show
Ignore:
Timestamp:
09/18/06 20:48:14 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/etc/COPYING

    r3801 r4166  
    22                       Version 2, June 1991 
    33 
    4  Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
    5                        51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA 
     4 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 
     5 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 
    66 Everyone is permitted to copy and distribute verbatim copies 
    77 of this license document, but changing it is not allowed. 
    …… 
    1616Foundation's software and to any other program whose authors commit to 
    1717using it.  (Some other Free Software Foundation software is covered by 
    18 the GNU Library General Public License instead.)  You can apply it to 
     18the GNU Lesser General Public License instead.)  You can apply it to 
    1919your programs, too. 
    2020 
    …… 
    5656  The precise terms and conditions for copying, distribution and 
    5757modification follow. 
    58   
     58 
    5959                    GNU GENERAL PUBLIC LICENSE 
    6060   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
    …… 
    111111    does not normally print such an announcement, your work based on 
    112112    the Program is not required to print an announcement.) 
    113   
     113 
    114114These requirements apply to the modified work as a whole.  If 
    115115identifiable sections of that work are not derived from the Program, 
    …… 
    169169distribution of the source code, even though third parties are not 
    170170compelled to copy the source along with the object code. 
    171   
     171 
    172172  4. You may not copy, modify, sublicense, or distribute the Program 
    173173except as expressly provided under this License.  Any attempt 
    …… 
    226226This section is intended to make thoroughly clear what is believed to 
    227227be a consequence of the rest of this License. 
    228   
     228 
    229229  8. If the distribution and/or use of the Program is restricted in 
    230230certain countries either by patents or by copyrighted interfaces, the 
    …… 
    279279 
    280280                     END OF TERMS AND CONDITIONS 
    281   
     281 
    282282            How to Apply These Terms to Your New Programs 
    283283 
    …… 
    304304    GNU General Public License for more details. 
    305305 
    306     You should have received a copy of the GNU General Public License 
    307     along with this program; if not, write to the Free Software 
    308     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
    309  
     306    You should have received a copy of the GNU General Public License along 
     307    with this program; if not, write to the Free Software Foundation, Inc., 
     308    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
    310309 
    311310Also add information on how to contact you by electronic and paper mail. 
    …… 
    337336proprietary programs.  If your program is a subroutine library, you may 
    338337consider it more useful to permit linking proprietary applications with the 
    339 library.  If this is what you want to do, use the GNU Library General 
     338library.  If this is what you want to do, use the GNU Lesser General 
    340339Public License instead of this License.