From efccdd5700ecb9ed158702ea4f52338dac8c97d7 Mon Sep 17 00:00:00 2001
From: Kevin Israel <pleasestand@live.com>
Date: Sat, 31 Jan 2015 18:49:49 -0500
Subject: [PATCH] composer.json: Correct license identifier

According to <https://spdx.org/licenses/>, "GPL-2.0" means "GNU General
Public License v2.0 only", not "GNU General Public License v2.0 or later",
which has the identifier "GPL-2.0+".

Also made the same change in the documentation for $wgExtensionCredits.

Change-Id: If25c15d03a71d7c50c9c85a04c2a589a3d978ad0
---
 composer.json                | 2 +-
 includes/DefaultSettings.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 2b7a40a514..a54719cd43 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
 			"homepage": "https://www.mediawiki.org/wiki/Special:Version/Credits"
 		}
 	],
-	"license": "GPL-2.0",
+	"license": "GPL-2.0+",
 	"support": {
 		"issues": "https://bugs.mediawiki.org/",
 		"irc": "irc://irc.freenode.net/mediawiki",
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0b37b972bb..7bd80c41da 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6321,7 +6321,7 @@ $wgAutoloadAttemptLowercase = true;
  *     'version' => '1.9.0',
  *     'url' => 'http://example.org/example-extension/',
  *     'descriptionmsg' => 'exampleextension-desc',
- *     'license-name' => 'GPL-2.0',
+ *     'license-name' => 'GPL-2.0+',
  * );
  * @endcode
  *
@@ -6355,7 +6355,7 @@ $wgAutoloadAttemptLowercase = true;
  *    localizable message (omit in favour of 'descriptionmsg').
  *
  * - license-name: Short name of the license (used as label for the link), such
- *   as "GPL-2.0" or "MIT" (https://spdx.org/licenses/ for a list of identifiers).
+ *   as "GPL-2.0+" or "MIT" (https://spdx.org/licenses/ for a list of identifiers).
  */
 $wgExtensionCredits = array();
 
-- 
2.20.1