From 28e4765dfe434537a3f0fc93f219b39d36fa4342 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 24 May 2016 16:21:13 -0500 Subject: [PATCH] spdx-id required, nickname only for licenses with customary short names --- README.md | 3 ++- _data/meta.yml | 8 ++++++-- _licenses/afl-3.0.txt | 2 +- _licenses/agpl-3.0.txt | 1 + _licenses/apache-2.0.txt | 2 +- _licenses/artistic-2.0.txt | 2 +- _licenses/bsd-2-clause.txt | 2 +- _licenses/bsd-3-clause-clear.txt | 2 +- _licenses/bsd-3-clause.txt | 2 +- _licenses/cc-by-4.0.txt | 2 +- _licenses/cc-by-sa-4.0.txt | 2 +- _licenses/cc0-1.0.txt | 2 +- _licenses/epl-1.0.txt | 2 +- _licenses/eupl-1.1.txt | 2 +- _licenses/gpl-2.0.txt | 1 + _licenses/gpl-3.0.txt | 1 + _licenses/isc.txt | 2 +- _licenses/lgpl-2.1.txt | 1 + _licenses/lgpl-3.0.txt | 1 + _licenses/lppl-1.3c.txt | 2 +- _licenses/mit.txt | 2 +- _licenses/mpl-2.0.txt | 2 +- _licenses/ms-pl.txt | 2 +- _licenses/ms-rl.txt | 2 +- _licenses/ofl-1.1.txt | 2 +- _licenses/osl-3.0.txt | 2 +- _licenses/unlicense.txt | 2 +- _licenses/wtfpl.txt | 2 +- 28 files changed, 34 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 188dd4d..2425709 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc #### Required fields * `title` - The license full name specified by http://spdx.org/licenses/ -* `nickname` - A shorter license name; customary if applicable (e.g., GPLv3) or the SPDX ID (e.g., MPL-2.0) +* `spdx-id` - Short identifier specified by http://spdx.org/licenses/ * `source` - The URL to the license source text * `description` - A human-readable description of the license * `how` - Instructions on how to implement the license @@ -51,6 +51,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc #### Optional fields * `featured` - Whether the license should be featured on the main page (defaults to false) +* `nickname` - Customary short name if applicable (e.g, GPLv3) * `note` - Additional information about the licenses * `using` - A list of notable projects using the license in the form of `project_name: "url"` * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs diff --git a/_data/meta.yml b/_data/meta.yml index bb5428c..cc07cf8 100644 --- a/_data/meta.yml +++ b/_data/meta.yml @@ -5,8 +5,8 @@ description: The license full name specified by http://spdx.org/licenses/ required: true -- name: nickname - description: A shorter license name; customary if applicable (e.g., GPLv3) or the SPDX ID (e.g., MPL-2.0) +- name: spdx-id + description: Short identifier specified by http://spdx.org/licenses/ required: required - name: source @@ -39,6 +39,10 @@ description: Whether the license should be featured on the main page (defaults to false) required: false +- name: nickname + description: Customary short name if applicable (e.g, GPLv3) + required: false + - name: note description: Additional information about the licenses required: false diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index e1888b4..abb76e3 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -1,6 +1,6 @@ --- title: Academic Free License v3.0 -nickname: AFL-3.0 +spdx-id: AFL-3.0 source: http://opensource.org/licenses/afl-3.0 description: The Academic Free License is a variant of the Open Software License that does not require that the source code of derivative works be disclosed. It contains explicit copyright and patent grants and reserves trademark rights in the author. diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index 00f3fb8..a2f23b8 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -1,5 +1,6 @@ --- title: GNU Affero General Public License v3.0 +spdx-id: AGPL-3.0 nickname: GNU AGPLv3 redirect_from: /licenses/agpl/ source: http://www.gnu.org/licenses/agpl-3.0.txt diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index af6db3f..757f841 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -1,6 +1,6 @@ --- title: Apache License 2.0 -nickname: Apache-2.0 +spdx-id: Apache-2.0 redirect_from: /licenses/apache/ source: http://www.apache.org/licenses/LICENSE-2.0.html featured: true diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt index 61aab77..649fc10 100644 --- a/_licenses/artistic-2.0.txt +++ b/_licenses/artistic-2.0.txt @@ -1,6 +1,6 @@ --- title: Artistic License 2.0 -nickname: Artistic-2.0 +spdx-id: Artistic-2.0 redirect_from: /licenses/artistic/ source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index c878be9..42eb9af 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -1,6 +1,6 @@ --- title: BSD 2-clause "Simplified" License -nickname: BSD 2-Clause +spdx-id: BSD-2-Clause redirect_from: /licenses/bsd/ source: http://opensource.org/licenses/BSD-2-Clause diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt index fce0aa8..443fe39 100644 --- a/_licenses/bsd-3-clause-clear.txt +++ b/_licenses/bsd-3-clause-clear.txt @@ -1,6 +1,6 @@ --- title: BSD 3-clause Clear License -nickname: BSD-3-Clause-Clear +spdx-id: BSD-3-Clause-Clear description: A variant of the BSD 3-Clause License that explicitly does not grant any patent rights. diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index fa1ccb4..caf6a7c 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -1,6 +1,6 @@ --- title: BSD 3-clause "New" or "Revised" License -nickname: BSD 3-Clause +spdx-id: BSD-3-Clause source: http://opensource.org/licenses/BSD-3-Clause description: A permissive license similar to the BSD 2-Clause License, but with a 3rd clause that prohibits others from using the name of the project or its contributors to promote derived products without written consent. diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index 5d347ac..845f085 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -1,6 +1,6 @@ --- title: Creative Commons Attribution 4.0 -nickname: CC-BY-4.0 +spdx-id: CC-BY-4.0 source: https://creativecommons.org/licenses/by/4.0/legalcode.txt description: Permits almost any use subject to providing credit and license notice. Frequently used for media assets and educational materials. The most common license for Open Access scientific publications. Not recommended for software. diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index 5a053b6..f743bb1 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -1,6 +1,6 @@ --- title: Creative Commons Attribution Share Alike 4.0 -nickname: CC-BY-SA-4.0 +spdx-id: CC-BY-SA-4.0 source: https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt description: Similar to CC-BY-4.0 but requires derivatives be distributed under the same or a similar, compatible license. Frequently used for media assets and educational materials. A previous version is the default license for Wikipedia and other Wikimedia projects. Not recommended for software. diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.txt index d335384..fbc6c58 100644 --- a/_licenses/cc0-1.0.txt +++ b/_licenses/cc0-1.0.txt @@ -1,6 +1,6 @@ --- title: Creative Commons Zero v1.0 Universal -nickname: CC0-1.0 +spdx-id: CC0-1.0 redirect_from: /licenses/cc0/ source: http://creativecommons.org/publicdomain/zero/1.0/ diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 594f3a7..3cf4c23 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -1,6 +1,6 @@ --- title: Eclipse Public License 1.0 -nickname: EPL-1.0 +spdx-id: EPL-1.0 redirect_from: /licenses/eclipse/ source: https://www.eclipse.org/legal/epl-v10.html diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt index e9f26a1..849dca7 100644 --- a/_licenses/eupl-1.1.txt +++ b/_licenses/eupl-1.1.txt @@ -1,6 +1,6 @@ --- title: European Union Public License 1.1 -nickname: EUPL-1.1 +spdx-id: EUPL-1.1 redirect_from: /licenses/eupl-v1.1/ source: https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11 diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 3a55bc5..f1feec5 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -1,5 +1,6 @@ --- title: GNU General Public License v2.0 +spdx-id: GPL-2.0 nickname: GNU GPLv2 redirect_from: /licenses/gpl-v2/ source: http://www.gnu.org/licenses/gpl-2.0.txt diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt index 1b4c051..7d4e2d5 100644 --- a/_licenses/gpl-3.0.txt +++ b/_licenses/gpl-3.0.txt @@ -1,5 +1,6 @@ --- title: GNU General Public License v3.0 +spdx-id: GPL-3.0 nickname: GNU GPLv3 redirect_from: /licenses/gpl-v3/ source: http://www.gnu.org/licenses/gpl-3.0.txt diff --git a/_licenses/isc.txt b/_licenses/isc.txt index 07bfd85..fecd3c6 100644 --- a/_licenses/isc.txt +++ b/_licenses/isc.txt @@ -1,6 +1,6 @@ --- title: ISC License -nickname: ISC +spdx-id: ISC source: http://opensource.org/licenses/isc-license description: A permissive license lets people do anything with your code with proper attribution and without warranty. The ISC license is functionally equivalent to the BSD 2-Clause and MIT licenses, removing some language that is no longer necessary. diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index 7056384..41c3efa 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -1,5 +1,6 @@ --- title: GNU Lesser General Public License v2.1 +spdx-id: LGPL-2.1 nickname: GNU LGPLv2.1 redirect_from: /licenses/lgpl-v2.1/ source: http://www.gnu.org/licenses/lgpl-2.1.txt diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index e327788..e70c4d4 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -1,5 +1,6 @@ --- title: GNU Lesser General Public License v3.0 +spdx-id: LGPL-3.0 nickname: GNU LGPLv3 redirect_from: /licenses/lgpl-v3/ source: http://www.gnu.org/licenses/lgpl-3.0.txt diff --git a/_licenses/lppl-1.3c.txt b/_licenses/lppl-1.3c.txt index 80961c0..98b945a 100644 --- a/_licenses/lppl-1.3c.txt +++ b/_licenses/lppl-1.3c.txt @@ -1,6 +1,6 @@ --- title: LaTeX Project Public License v1.3c -nickname: LPPL-1.3c +spdx-id: LPPL-1.3c source: https://latex-project.org/lppl/lppl-1-3c.html description: The LaTeX Project Public License (LPPL) is the primary license under which the LaTeX kernel and the base LaTeX packages are distributed. diff --git a/_licenses/mit.txt b/_licenses/mit.txt index 6188e58..e2cdde7 100644 --- a/_licenses/mit.txt +++ b/_licenses/mit.txt @@ -1,6 +1,6 @@ --- title: MIT License -nickname: MIT +spdx-id: MIT source: https://opensource.org/licenses/MIT featured: true diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index 1f98183..6ef718e 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -1,6 +1,6 @@ --- title: Mozilla Public License 2.0 -nickname: MPL-2.0 +spdx-id: MPL-2.0 redirect_from: /licenses/mozilla/ source: https://www.mozilla.org/media/MPL/2.0/index.txt diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt index 538d389..6111486 100644 --- a/_licenses/ms-pl.txt +++ b/_licenses/ms-pl.txt @@ -1,6 +1,6 @@ --- title: Microsoft Public License -nickname: MS-PL +spdx-id: MS-PL source: http://opensource.org/licenses/ms-pl diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index a96c0b5..953fd5b 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -1,6 +1,6 @@ --- title: Microsoft Reciprocal License -nickname: MS-RL +spdx-id: MS-RL source: http://opensource.org/licenses/ms-pl diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt index 0cc7e89..1ab2d8d 100644 --- a/_licenses/ofl-1.1.txt +++ b/_licenses/ofl-1.1.txt @@ -1,6 +1,6 @@ --- title: SIL Open Font License 1.1 -nickname: OFL-1.1 +spdx-id: OFL-1.1 redirect_from: /licenses/ofl/ source: http://scripts.sil.org/OFL_web diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index a0707b5..5393101 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -1,6 +1,6 @@ --- title: Open Software License 3.0 -nickname: OSL-3.0 +spdx-id: OSL-3.0 source: http://opensource.org/licenses/OSL-3.0 description: OSL 3.0 is a copyleft license that does not require reciprocal licensing on linked works. It also provides an express grant of patent rights from contributors to users, with a termination clause triggered if a user files a patent infringement lawsuit. diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 9006650..a0d5145 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -1,6 +1,6 @@ --- title: The Unlicense -nickname: Unlicense +spdx-id: Unlicense source: http://unlicense.org/UNLICENSE description: Because copyright is automatic in most countries, the Unlicense is a template to waive copyright interest in software you've written and dedicate it to the public domain. Use the Unlicense to opt out of copyright entirely. It also includes the no-warranty statement from the MIT/X11 license. diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt index 218b4e2..768bba9 100644 --- a/_licenses/wtfpl.txt +++ b/_licenses/wtfpl.txt @@ -1,6 +1,6 @@ --- title: "Do What The F*ck You Want To Public License" -nickname: WTFPL +spdx-id: WTFPL source: http://www.wtfpl.net/ description: The easiest licence out there. It gives the user permissions to do whatever they want with your code.