diff options
author | Glenn Morris <rgm@gnu.org> | 2017-07-05 14:08:35 -0400 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2017-07-09 11:27:12 -0400 |
commit | 4abe19740392d259ab55d4dae5cf76c2719f2e7f (patch) | |
tree | ec54e2b5f549f4550134568386196c6df99415fc | |
parent | ef742df8b596489dcf9f03c0a1d8af36f8aef714 (diff) | |
download | org-mode-4abe19740392d259ab55d4dae5cf76c2719f2e7f.tar.gz |
Backport commit 0fda6d53e from Emacs
; Standardize some copyright and license notices
0fda6d53e38cc7073186fed0bd862221d21500ab
Glenn Morris
Wed Jul 5 14:08:35 2017 -0400
-rw-r--r-- | lisp/ob-abc.el | 18 | ||||
-rw-r--r-- | lisp/ob-ebnf.el | 18 | ||||
-rw-r--r-- | lisp/ob-lua.el | 2 | ||||
-rw-r--r-- | lisp/ob-sed.el | 16 | ||||
-rw-r--r-- | lisp/org-eww.el | 8 | ||||
-rw-r--r-- | lisp/org-lint.el | 10 |
6 files changed, 34 insertions, 38 deletions
diff --git a/lisp/ob-abc.el b/lisp/ob-abc.el index 0ce503d..9fbe35b 100644 --- a/lisp/ob-abc.el +++ b/lisp/ob-abc.el @@ -7,22 +7,20 @@ ;; Homepage: http://www.tardis.ed.ac.uk/wwaites ;; Version: 0.01 -;;; 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: diff --git a/lisp/ob-ebnf.el b/lisp/ob-ebnf.el index 410570b..ec5001c 100644 --- a/lisp/ob-ebnf.el +++ b/lisp/ob-ebnf.el @@ -7,22 +7,20 @@ ;; Homepage: http://orgmode.org ;; Version: 1.00 -;;; 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: diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el index fa60b0e..686d41a 100644 --- a/lisp/ob-lua.el +++ b/lisp/ob-lua.el @@ -1,6 +1,6 @@ ;;; ob-lua.el --- Org Babel functions for Lua evaluation -*- lexical-binding: t; -*- -;; Copyright (C) 2014, 2016, 2017 Free Software Foundation, Inc. +;; Copyright (C) 2014, 2016-2017 Free Software Foundation, Inc. ;; Authors: Dieter Schoen ;; Keywords: literate programming, reproducible research diff --git a/lisp/ob-sed.el b/lisp/ob-sed.el index 733c7e1..f249d32 100644 --- a/lisp/ob-sed.el +++ b/lisp/ob-sed.el @@ -8,20 +8,18 @@ ;; This file is part of GNU Emacs. -;;; License: - -;; 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. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: diff --git a/lisp/org-eww.el b/lisp/org-eww.el index 7bc248d..c14ae11 100644 --- a/lisp/org-eww.el +++ b/lisp/org-eww.el @@ -5,15 +5,15 @@ ;; Author: Marco Wahl <marcowahlsoft>a<gmailcom> ;; Keywords: link, eww ;; Homepage: http://orgmode.org -;; + ;; 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 of the License, or ;; (at your option) any later version. -;; This program is distributed in the hope that it will be useful, +;; 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. diff --git a/lisp/org-lint.el b/lisp/org-lint.el index 89aed4b..5abda7c 100644 --- a/lisp/org-lint.el +++ b/lisp/org-lint.el @@ -1,22 +1,24 @@ ;;; org-lint.el --- Linting for Org documents -*- lexical-binding: t; -*- -;; Copyright (C) 2015-2017 Free Software Foundation +;; Copyright (C) 2015-2017 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr> ;; Keywords: outlines, hypermedia, calendar, wp -;; This program is free software; you can redistribute it and/or modify +;; 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. -;; This program is distributed in the hope that it will be useful, +;; 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 this program. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: |