Standardize license wording, and switch license to GPLv3 or later.

diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index 32097f57b9aec4b4489cbf4794636e67a43a8961..eb70a2e2d314c63798c06d7c21863205122d78d6 100644 (file)
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -13,10 +13,10 @@
 
 ;; ======================================================================
 
-;; This program 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 of the License, or (at
-;; your option) any later version.
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
 
 ;; This program is distributed in the hope that it will be useful, but
 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,8 +24,9 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software Foundation,
-;; Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+;; 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.
 
 (defconst newsticker-version "1.10" "Version number of newsticker.el.")