Fix header and footer format.

Switch to recommended form of GPLv3 permissions notice.

1 files changed, 20 insertions, 29 deletions

diff --git a/lisp/ns-grabenv.el b/lisp/ns-grabenv.el
index 12fab4478f7..643daba2ca2 100644
--- a/lisp/ns-grabenv.el
+++ b/lisp/ns-grabenv.el
@@ -1,26 +1,25 @@
 ;;; ns-grabenv.el --- functions to set environment variables by running a subshell
-;;; Copyright (C) 1993, 1994, 2005, 2006, 2008 Free Software Foundation, Inc.
 
-;;; Author: Carl Edman, Christian Limpach, Scott Bender, Christophe de Dinechin,
-;;;         Adrian Robert
-;;; Keywords: terminals
+;; Copyright (C) 1993, 1994, 2005, 2006, 2008 Free Software Foundation, Inc.
+
+;; Author: Carl Edman, Christian Limpach, Scott Bender, Christophe de Dinechin, Adrian Robert
+;; Keywords: terminals
+
+;; 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/>.
 
-;;; 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, 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; see the file COPYING.  If not, write to
-;;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;;; Boston, MA 02110-1301, USA.
 
 ;;; Idea based on NS 4.2 distribution, this version of code based on
 ;;; mac-read-environment-vars-from-shell () by David Reitter in Aquamacs dist..
@@ -57,13 +56,5 @@ commands for it to execute (defaults to \"printenv\")."
 
 (provide 'ns-grabenv)
 
-;;; ns-grabenv.el ends here
-
-; (autoload (quote ns-grabenv) "ns-grabenv" "\
-;  Run a shell subprocess, and interpret its output as a series of environment
-; variables to insert into the emacs environment.  The first optional argument
-; gives the path to the shell (defaults to the current setting of
-; shell-file-name).  The remaining arguments are interpreted as a list of
-; commands for it to execute (defaults to \"printenv\")." nil nil)
-
 ;; arch-tag: e65e1dd8-1566-460c-ad66-07948588be56
+;;; ns-grabenv.el ends here