[Emacs-diffs] Changes to emacs/etc/TODO,v

[Glenn Morris]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/02/11 01:11:40

Index: TODO
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/TODO,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- TODO        21 Jan 2007 00:17:30 -0000      1.140
+++ TODO        11 Feb 2007 01:11:40 -0000      1.141
@@ -1,8 +1,9 @@
 Emacs TODO List                                                   -*-outline-*-
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-Free Software Foundation, Inc.
-See the end of the file for copying permissions.
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
 
 If you are ready to start working on any of these TODO items, we
 appreciate your help; please write to address@hidden so we can be
@@ -555,16 +556,22 @@
 ** Fix unexelf.c to handle the .data.rel and .data.rel.local
    sections made by GCC 3.4 on IRIX.
 
-COPYING PERMISSIONS:
 
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this file, to deal in the file without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the file, and to
-    permit persons to whom the file is furnished to do so, subject to
-    the following condition:
+This file is part of GNU Emacs.
 
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the file.
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
 
 ;;; arch-tag: b0a3e40b-726a-457d-9999-ba848321b036