Merge from emacs--devo--0

[gnu-emacs] / etc / NEWS.19

diff --git a/etc/NEWS.19 b/etc/NEWS.19
index ce06d2a8bfaddc88353c7589bc9eea1884afeb5d..08573703c04f5644a86b8ac8f736ddfb9c2485ee 100644 (file)
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -1,6 +1,8 @@
 GNU Emacs NEWS -- history of user-visible changes.  1992.
-Copyright (C) 1993, 1994, 1995, 2001, 2006 Free Software Foundation, Inc.
-See the end for copying conditions.
+
+Copyright (C) 1993, 1994, 1995, 2001, 2006, 2007 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
 
 This file is about changes in emacs versions 19.
 
@@ -1039,7 +1041,7 @@ your working file with the latest version from the master.
 *** RCS customization.
 
 There is a new variable vc-consult-headers.  If it is t (the default),
-VC searches for RCS headers in working files (like `$Id: NEWS.19,v 1.1 2006/06/04 01:01:51 kfstorm Exp $') and
+VC searches for RCS headers in working files (like `$Id$') and
 determines the state of the file from them, not from the master file.
 This is fast and more reliable when you use branches.  (The variable
 was already present in Emacs 19.29, but didn't get mentioned in the
@@ -4555,7 +4557,7 @@ C-c C-d is now another way to send an end-of-file to the subshell.
 ** Changes to calendar/diary.
 
 Time zone data is now determined automatically, including the
-start/stop days and times of daylight savings time.  The code now
+start/stop days and times of daylight saving time.  The code now
 works correctly almost anywhere in the world.
 
 The format of the holiday specifications has changed and IS NO LONGER
@@ -5131,8 +5133,8 @@ using X).
 ** It is now simpler to tell Emacs to display accented characters under
 X windows.  M-x standard-display-european toggles the display of
 buffer text according to the ISO Latin-1 standard.  With a prefix
-argument, this command enables European character display iff the
-argument is positive.
+argument, this command enables European character display if and only
+if the argument is positive.
 
 ** The `-i' command-line argument tells Emacs to use a picture of the
 GNU gnu as its icon, instead of letting the window manager choose an
@@ -6518,19 +6520,23 @@ the tar file.
 
 \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) 1993, 1994, 1995, 2001, 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; 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: outline