X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/b17f53abc28496125965f36147b76ea5f6a2b4fb..0b22a5e17ba44f559664af2d59c4828bfe56baaa:/lisp/autoinsert.el

diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 4ed1942ee8..c01999a7b8 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -1,7 +1,7 @@
 ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files
 
 ;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Charlie Martin <crm@cs.duke.edu>
 ;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org>
@@ -10,10 +10,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
@@ -21,9 +21,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:
 
@@ -55,7 +53,8 @@
   "Automatic mode-dependent insertion of text into new files."
   :prefix "auto-insert-"
   :group 'files
-  :group 'convenience)
+  :group 'convenience
+  :link '(custom-manual "(autotype) Autoinserting"))
 
 
 (defcustom auto-insert 'not-modified
@@ -186,20 +185,18 @@ If this contains a %s, that will be replaced by the matching rule."
     (completing-read "Keyword, C-h: " v1 nil t))
     str ", ") & -2 "
 
-\;; This file is free software; you can redistribute it and/or modify
+\;; This program 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.
 
-\;; This file is distributed in the hope that it will be useful,
+\;; This program 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; 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 this program.  If not, see <http://www.gnu.org/licenses/>.
 
 \;;; Commentary:
 
@@ -230,10 +227,11 @@ If this contains a %s, that will be replaced by the matching rule."
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, and no Cover Texts.  A copy of the license is
-included in the section entitled ``GNU Free Documentation License.''
+under the terms of the GNU Free Documentation License, Version 1.2
+or any later version published by the Free Software Foundation;
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+Texts.  A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
 
 A copy of the license is also available from the Free Software
 Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}.