X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/44d5226a2cedb7e585fd6ab5290902c69154238a..ce57c2fe307e2d866ff0a3c8e3cb4dcd722c4da1:/etc/NEWS.21 diff --git a/etc/NEWS.21 b/etc/NEWS.21 index 476853746f..47f61a13e3 100644 --- a/etc/NEWS.21 +++ b/etc/NEWS.21 @@ -1,7 +1,6 @@ GNU Emacs NEWS -- history of user-visible changes. 2006-05-31 -Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 - Free Software Foundation, Inc. +Copyright (C) 2000-2011 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -2502,7 +2501,7 @@ value is returned. If no window satisfies PREDICATE, DEFAULT is returned. Optional second arg MINIBUF t means count the minibuffer window even -if not active. MINIBUF nil or omitted means count the minibuffer iff +if not active. MINIBUF nil or omitted means count the minibuffer if it is active. MINIBUF neither t nor nil means not to count the minibuffer even if it is active. @@ -4883,10 +4882,10 @@ support a vertical-bar cursor). ---------------------------------------------------------------------- This file is part of GNU Emacs. -GNU Emacs is free software; you can redistribute it and/or modify +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. +the Free Software Foundation, either version 3 of the License, 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 @@ -4894,9 +4893,7 @@ 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. +along with GNU Emacs. If not, see . Local variables: