Add GnuTLS support for W32 and certificate and hostname verification in GnuTLS.

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

diff --git a/etc/NEWS.18 b/etc/NEWS.18
index d7722f9..6bf854d 100644 (file)
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -1,6 +1,6 @@
 GNU Emacs NEWS -- history of user-visible changes.  17-Aug-1988
 
-Copyright (C) 1988, 2006, 2007  Free Software Foundation, Inc.
+Copyright (C) 1988, 2006-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
@@ -1603,10 +1603,10 @@ C_SWITCH_MACHINE can be defined by the m- file to specify extra `cc' switches.
 ----------------------------------------------------------------------
 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
@@ -1614,13 +1614,10 @@ 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 <http://www.gnu.org/licenses/>.
 
 \f
 Local variables:
 mode: text
 end:
 
-arch-tag: 8fed393b-c9c5-47d1-afbb-c0e7a135094a