Merge from emacs-24; up to 2014-07-27T09:41:59Z!ttn@gnu.org

1 files changed, 24 insertions, 0 deletions

diff --git a/etc/NXML-NEWS b/etc/NXML-NEWS
index ab0d351096d..8a284e2617b 100644
--- a/etc/NXML-NEWS
+++ b/etc/NXML-NEWS
@@ -1,3 +1,10 @@
+Copyright (C) 2007-2014 Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+
+For more recent changes, see the main Emacs NEWS file.
+
+
 20041004
 --------
 
@@ -197,3 +204,20 @@ Bug fixes.
 --------
 
 Initial release.
+
+
+
+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.
+
+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.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.