Standardize/fix some Org header comments.

* org-freemind.el: Remove duplicate, incorrect license notice.

* ob-lisp.el: Convert consecutive copyright years to ranges.

* ob-js.el, ob-scheme.el: Standardize license text.

* ob-R.el, ob-clojure.el, ob-exp.el, ob-lisp.el, ob-lob.el, ob-perl.el:
* ob-python.el, ob-ref.el, ob.el:
Put multiple authors on separate lines.

diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index c2896e57cbd895b97b2063feaf40d97908187b07..2b0e6d5e16a5f7a2cb6419162cf73dd49b8c7cad 100644 (file)
--- a/lisp/org/ob-R.el
+++ b/lisp/org/ob-R.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;     Dan Davison
 ;; Keywords: literate programming, reproducible research, R, statistics
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7

diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el
index c7bae6c0ef09b7c7d9c669968539cf27f16f707c..090b60662f8fbacbf2466baffd060edf02b1de88 100644 (file)
--- a/lisp/org/ob-clojure.el
+++ b/lisp/org/ob-clojure.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Joel Boehland, Eric Schulte
+;; Author: Joel Boehland
+;;     Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7

diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index b3d0e6ed08a7e06df74c47c20a9662b6992aea06..0fceb184c5e72df840a8bd9dbf6b000345df6d01 100644 (file)
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;     Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7

diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el
index 0d6cc739c8fdedc234b3cfd9513b7a23a84642a7..9e6751c9525c002ca629c3d72eb0aa4e133fdca6 100644 (file)
--- a/lisp/org/ob-js.el
+++ b/lisp/org/ob-js.el
@@ -7,22 +7,20 @@
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; 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 3, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; 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; 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:
 
@@ -35,7 +33,7 @@
 
 ;; - a non-browser javascript engine such as node.js http://nodejs.org/
 ;;   or mozrepl http://wiki.github.com/bard/mozrepl/
-;; 
+;;
 ;; - for session based evaluation mozrepl and moz.el are required see
 ;;   http://wiki.github.com/bard/mozrepl/emacs-integration for
 ;;   configuration instructions

diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index 271099e2ee2ccfce7a9c93db28705f6e66f164d6..4ff9c4076ecd8abbe191918241ac5eda99d14d36 100644 (file)
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -1,8 +1,10 @@
 ;;; ob-lisp.el --- org-babel functions for common lisp evaluation
 
-;; Copyright (C) 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Joel Boehland, Eric Schulte, David T. O'Toole <dto@gnu.org>
+;; Author: Joel Boehland
+;;     Eric Schulte
+;;     David T. O'Toole <dto@gnu.org>
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7

diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index 51653fc211144c3316b7b553e387d59987018aab..5cb40a057f3e37b0840207de9ae656f092b129c3 100644 (file)
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;     Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7

diff --git a/lisp/org/ob-perl.el b/lisp/org/ob-perl.el
index a4853890b96b9b3c561b9b33a948fb243346462d..13d7141373187bae312310f11fba270cbba2c2b9 100644 (file)
--- a/lisp/org/ob-perl.el
+++ b/lisp/org/ob-perl.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 2009-2011  Free Software Foundation
 
-;; Author: Dan Davison, Eric Schulte
+;; Author: Dan Davison
+;;     Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7

diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index a871cbe4126213ab74bd8d65abb4340f7d68631d..5234d83eceec6e4f330c459ecd32d6fb3a0ba53d 100644 (file)
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 2009-2011  Free Software Foundation
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;     Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7

diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index cde2d3579dfad3b008aeee3504b82fdcf5046f7a..b27bd20db405917a5839a2f26b7f5ce23e754416 100644 (file)
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;     Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7

diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el
index 474207b51069c048ad86408599585d7bee62fda0..3e93a3a74f778bfce9f0e9971ce1a56ec7da132b 100644 (file)
--- a/lisp/org/ob-scheme.el
+++ b/lisp/org/ob-scheme.el
@@ -7,22 +7,20 @@
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; 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 3, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; 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; 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:
 
@@ -35,7 +33,7 @@
 
 ;; - a working scheme implementation
 ;;   (e.g. guile http://www.gnu.org/software/guile/guile.html)
-;;   
+;;
 ;; - for session based evaluation cmuscheme.el is required which is
 ;;   included in Emacs
 

diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 7a76c4e3784610f92bf0fe9fe5a25edf6dbcafcf..728c6c5cb5e1b7e1239eada975b5c11d4bc47eaa 100644 (file)
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -2,7 +2,8 @@
 
 ;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;     Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7

diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index 4f72f7ddeee289f65d902c1e9be6c0310cbb07a6..91a1e5e59cb57d0e7d300356977c3e50756a30ec 100644 (file)
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -57,26 +57,6 @@
 ;;             Added y/n question before showing in FreeMind.
 ;; 2009-11-04: Added support for #+BEGIN_HTML.
 ;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; 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 2, 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
-;; 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 this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
 ;;; Code:
 
 (require 'xml)