Switch to recommended form of GPLv3 permissions notice.

[bpt/emacs.git] / lisp / help.el

diff --git a/lisp/help.el b/lisp/help.el
index 3073475..5ed6756 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -8,10 +8,10 @@
 
 ;; 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 3, 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
@@ -19,9 +19,7 @@
 ;; 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/>.
 
 ;;; Commentary:
 
@@ -309,12 +307,13 @@ If that doesn't give a function, return nil."
   (interactive)
   (view-help-file "COPYING"))
 
-(defalias 'describe-project 'describe-gnu-project)
 (defun describe-gnu-project ()
   "Display info on the GNU project."
   (interactive)
   (view-help-file "THE-GNU-PROJECT"))
 
+(define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2")
+
 (defun describe-no-warranty ()
   "Display info on all the kinds of warranty Emacs does NOT have."
   (interactive)
@@ -412,12 +411,14 @@ With argument, display info only for the selected version."
           (beginning-of-line)
           (point)))))))
 
-(defalias 'view-todo 'view-emacs-todo)
 (defun view-emacs-todo (&optional arg)
   "Display the Emacs TODO list."
   (interactive "P")
   (view-help-file "TODO"))
 
+(define-obsolete-function-alias 'view-todo 'view-emacs-todo "22.2")
+
+
 (defun view-echo-area-messages ()
   "View the log of recent echo-area messages: the `*Messages*' buffer.
 The number of messages retained in that buffer