[nongnu] elpa/tuareg 2bc92bc3c2 2/2: Merge commit 'refs/pull/290/head' of github.com:/ocaml/tuareg into elpa/tuareg

[ELPA Syncer]

branch: elpa/tuareg
commit 2bc92bc3c203f3123c33f2ca8a0662b7247900e0
Merge: 3b217685c5 0ef51cb8b3
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    Merge commit 'refs/pull/290/head' of github.com:/ocaml/tuareg into 
elpa/tuareg
    
    * tuareg.el: Move license blurb out of `Commentary:`.
    * README.md: Clarify GPL version.
---
 README.md |  7 ++++++-
 tuareg.el | 31 +++++++++++++++----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 98ed7ad2ec..48e74eb6ac 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![NonGNU 
ELPA](https://elpa.nongnu.org/nongnu/tuareg.svg)](https://elpa.nongnu.org/nongnu/tuareg.html)
 
[![MELPA](https://melpa.org/packages/tuareg-badge.svg)](https://melpa.org/#/tuareg)
 
[![DebianBadge](https://badges.debian.net/badges/debian/stable/elpa-tuareg/version.svg)](https://packages.debian.org/stable/elpa-tuareg)
-[![LGPL v2](https://img.shields.io/badge/licence-lgpl2-blue.svg)](COPYING)
+[![License GPL 
3](https://img.shields.io/badge/license-GPL_3-green.svg)](COPYING)
 [![Build 
Status](https://github.com/ocaml/tuareg/workflows/test/badge.svg)](https://github.com/ocaml/tuareg/actions?query=workflow%3Atest)
 
 Tuareg: an Emacs OCaml mode
@@ -294,3 +294,8 @@ Tuareg mode have been maintained by Albert Cohen until 
version 1.45.
 
 Jane Street took over maintenance based on Albert Cohen's version 1.46
 (later retracted by him), and released its first version as 2.0.
+
+License
+-------
+
+Tuareg is distributed under the GNU General Public License, version 3 or later.
diff --git a/tuareg.el b/tuareg.el
index a0c78353ce..d667cc776f 100644
--- a/tuareg.el
+++ b/tuareg.el
@@ -3,7 +3,6 @@
 ;; Copyright (C) 1997-2006 Albert Cohen, all rights reserved.
 ;; Copyright (C) 2011-2022 Free Software Foundation, Inc.
 ;; Copyright (C) 2009-2010 Jane Street Holding, LLC.
-;; Licensed under the GNU General Public License.
 
 ;; Author: Albert Cohen <Albert.Cohen@inria.fr>
 ;;      Sam Steingold <sds@gnu.org>
@@ -20,6 +19,21 @@
 ;; Homepage: https://github.com/ocaml/tuareg
 ;; EmacsWiki: TuaregMode
 
+;; This file is *NOT* part of GNU Emacs.
+
+;; 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 of the License, 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.  If not, see <https://www.gnu.org/licenses/>.
+
 ;;; Commentary:
 ;;
 ;; Tuareg helps editing OCaml code, to highlight important parts of
@@ -63,21 +77,6 @@
 ;; changes to support XEmacs, Tuareg and OCaml. Furthermore, package
 ;; `thingatpt' is not required any more.
 
-;; This file is *NOT* part of GNU Emacs.
-
-;; 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 of the License, 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.  If not, see <https://www.gnu.org/licenses/>.
-
 ;;; Code:
 
 (require 'cl-lib)