diff etc/TODO @ 90751:52a7f3f50b89

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 624-636) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 200-201) - Merge from emacs--devo--0 - Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser. Revision: [e-mail]/emacs--unicode--0--patch-171

--- a/etc/TODO	Mon Feb 12 02:58:27 2007 +0000
+++ b/etc/TODO	Tue Feb 13 12:14:16 2007 +0000
@@ -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 [e-mail] 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:
+
+This file is part of GNU Emacs.
+
+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.
 
-    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:
+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.
 
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the file.
+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