Re-add Todo item about merging.

[bpt/emacs.git] / etc / NEWS.1-17

diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index 4b0a210..21f4c34 100644 (file)
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1,6 +1,8 @@
 GNU Emacs NEWS -- history of user-visible changes.  26-Mar-1986
-Copyright (C) 1985, 1986, 2006, 2007  Richard M. Stallman.
-See the end for copying conditions.
+
+Copyright (C) 1985, 1986, 2006, 2007, 2008  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
 
 This file is about changes in emacs versions 1 through 17.
 
@@ -1206,7 +1208,7 @@ whether and where a line has a comment.
 
 * New function `auto-save-file-name-p'
 
-Should return non-`nil' iff given a string which is the name of an
+Should return non-`nil' if given a string which is the name of an
 auto-save file (sans directory name).  If you redefine
 `make-auto-save-file-name', you should redefine this accordingly.  By
 default, this function returns `t' for filenames beginning with
@@ -2509,19 +2511,23 @@ Lisp programming changes
 
 \f
 ----------------------------------------------------------------------
-Copyright information:
+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 3, or (at your option)
+any later version.
 
-Copyright (C) 1985, 1986, 2006, 2007  Richard M. Stallman
+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.
 
-   Permission is granted to anyone to make or distribute verbatim copies
-   of this document as received, in any medium, provided that the
-   copyright notice and this permission notice are preserved,
-   thus giving the recipient permission to redistribute in turn.
+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.
 
-   Permission is granted to distribute modified versions
-   of this document, or of portions of it,
-   under the above conditions, provided also that they
-   carry prominent notices stating who last changed them.
 \f
 Local variables:
 mode: text