Add 2012 to FSF copyright years for Emacs files

[bpt/emacs.git] / etc / NEWS.20

diff --git a/etc/NEWS.20 b/etc/NEWS.20
index 44d5600..7a76bdd 100644 (file)
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -1,7 +1,8 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
-Copyright (C) 1999, 2000, 2001, 2006
-          Free Software Foundation, Inc.
-See the end for copying conditions.
+
+Copyright (C) 1999-2001, 2006-2012  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
 
 Please send Emacs bug reports to bug-gnu-emacs@gnu.org.
 If possible, use M-x report-emacs-bug.
@@ -695,7 +696,7 @@ pasting operations.
 ** You can specify the printer to use for commands that do printing by
 setting the variable `printer-name'.  Just what a printer name looks
 like depends on your operating system.  You can specify a different
-printer for the Postscript printing commands by setting
+printer for the PostScript printing commands by setting
 `ps-printer-name'.
 
 ** Emacs now supports on-the-fly spell checking by the means of a
@@ -2046,7 +2047,7 @@ standard fontset are created automatically.
 
 If you specify a default ASCII font with the `Font' resource or `-fn'
 argument, a fontset is generated from it.  This works by replacing the
-FOUNDARY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name
+FOUNDRY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name
 with `*' then using this to specify a fontset.  This fontset's short
 name is `fontset-startup'.
 
@@ -3493,9 +3494,9 @@ not by default.  Use --members to turn this feature on.
 *** Java is tagged like C++.  In addition, "extends" and "implements"
 constructs are tagged.  Files are recognized by the extension .java.
 
-*** Etags can now handle programs written in Postscript.  Files are
-recognized by the extensions .ps and .pdb (Postscript with C syntax).
-In Postscript, tags are lines that start with a slash.
+*** Etags can now handle programs written in PostScript.  Files are
+recognized by the extensions .ps and .pdb (PostScript with C syntax).
+In PostScript, tags are lines that start with a slash.
 
 *** Etags now handles Objective C and Objective C++ code.  The usual C and
 C++ tags are recognized in these languages; in addition, etags
@@ -4492,20 +4493,21 @@ select one of those items.
 
 \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 of the License, or
+(at your option) any later version.
 
-Copyright (C) 1999, 2000, 2006
-         Free Software Foundation, Inc.
+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.  If not, see <http://www.gnu.org/licenses/>.
 
-   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: outline