Merged from [email protected]

Patches applied:

 * [email protected]/emacs--devo--0--patch-619
   Update from CVS

 * [email protected]/emacs--devo--0--patch-620
   Update from CVS

 * [email protected]/emacs--devo--0--patch-621
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-622
   Update from CVS

 * [email protected]/emacs--devo--0--patch-623
   Remove RCS keywords

 * [email protected]/emacs--devo--0--patch-624
   Update from CVS

 * [email protected]/emacs--devo--0--patch-625
   Update from CVS

 * [email protected]/emacs--devo--0--patch-626
   Update from CVS

 * [email protected]/emacs--devo--0--patch-627
   Update from CVS

 * [email protected]/emacs--devo--0--patch-628
   Update from CVS

 * [email protected]/emacs--devo--0--patch-629
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-630
   Update from CVS

 * [email protected]/emacs--devo--0--patch-631
   Update from CVS

 * [email protected]/emacs--devo--0--patch-632
   Update from CVS

 * [email protected]/emacs--devo--0--patch-633
   Update from CVS

 * [email protected]/emacs--devo--0--patch-634
   Update from CVS

 * [email protected]/emacs--devo--0--patch-635
   Update from CVS

 * [email protected]/emacs--devo--0--patch-636
   Update from CVS

 * [email protected]/emacs--devo--0--patch-637
   Remove RCS keywords

 * [email protected]/emacs--devo--0--patch-638
   Update from CVS

 * [email protected]/emacs--devo--0--patch-639
   Update from CVS

 * [email protected]/emacs--devo--0--patch-640
   Update from CVS

 * [email protected]/emacs--devo--0--patch-641
   Update from CVS

 * [email protected]/emacs--devo--0--patch-642
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-643
   Update from CVS

 * [email protected]/emacs--devo--0--patch-644
   Update from CVS

 * [email protected]/emacs--devo--0--patch-645
   Update from CVS

 * [email protected]/emacs--devo--0--patch-646
   Update from CVS

 * [email protected]/emacs--devo--0--patch-647
   Update from CVS

 * [email protected]/emacs--devo--0--patch-648
   Update from CVS

 * [email protected]/emacs--devo--0--patch-649
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-197
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-198
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-199
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-200
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-201
   Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.

 * [email protected]/gnus--rel--5.10--patch-202
   Update from CVS

git-archimport-id: [email protected]/emacs--multi-tty--0--patch-596

1 files changed, 18 insertions, 11 deletions

diff --git a/etc/TODO b/etc/TODO
index 1ebc759294..49c3e0a048 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -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 [email protected] so we can be
@@ -555,16 +556,22 @@ not be noticed if it appears within a word.
 ** 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