1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 04:40:09 +01:00

Make nickname a required meta field

Add missing nicknames
Use SPDX ID if no customary nickname (eg GNU GPLv3) exists

This ensures that a relatively compact name is always available

I may be missing some obvious customary names, e.g., is "Eclipse
1.0" customary? For now I've used the SPDX ID, EPL-1.0.
This commit is contained in:
Mike Linksvayer 2016-05-24 14:21:29 -05:00
parent ce2838f7a0
commit 6fe44f4637
17 changed files with 22 additions and 8 deletions

View File

@ -39,7 +39,8 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
#### Required fields #### Required fields
* `title` - The SPDX-compliant, human-readable license name * `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)
* `source` - The URL to the license source text * `source` - The URL to the license source text
* `description` - A human-readable description of the license * `description` - A human-readable description of the license
* `how` - Instructions on how to implement the license * `how` - Instructions on how to implement the license
@ -53,7 +54,6 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
* `note` - Additional information about the licenses * `note` - Additional information about the licenses
* `using` - A list of notable projects using the license in the form of `project_name: "url"` * `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 * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs
* `nickname` - A shorter, human-readable license name where the SPDX license name (`title` above) is long
### Auto-populated fields ### Auto-populated fields

View File

@ -2,9 +2,13 @@
# The available fields are: # The available fields are:
- name: title - name: title
description: The SPDX-compliant, human-readable license name description: The license full name specified by http://spdx.org/licenses/
required: true required: true
- name: nickname
description: A shorter license name; customary if applicable (e.g., GPLv3) or the SPDX ID (e.g., MPL-2.0)
required: required
- name: source - name: source
description: The URL to the license source text description: The URL to the license source text
required: true required: true
@ -46,7 +50,3 @@
- name: redirect_from - name: redirect_from
description: Relative path(s) to redirect to the license from, to prevent breaking old URLs description: Relative path(s) to redirect to the license from, to prevent breaking old URLs
required: false required: false
- name: nickname
description: A shorter, human-readable license name where the SPDX license name (`title` above) is long
required: false

View File

@ -1,5 +1,6 @@
--- ---
title: Academic Free License v3.0 title: Academic Free License v3.0
nickname: AFL-3.0
source: http://opensource.org/licenses/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. 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.

View File

@ -1,5 +1,6 @@
--- ---
title: Apache License 2.0 title: Apache License 2.0
nickname: Apache-2.0
redirect_from: /licenses/apache/ redirect_from: /licenses/apache/
source: http://www.apache.org/licenses/LICENSE-2.0.html source: http://www.apache.org/licenses/LICENSE-2.0.html
featured: true featured: true

View File

@ -1,5 +1,6 @@
--- ---
title: Artistic License 2.0 title: Artistic License 2.0
nickname: Artistic-2.0
redirect_from: /licenses/artistic/ redirect_from: /licenses/artistic/
source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt

View File

@ -1,5 +1,6 @@
--- ---
title: BSD 3-clause Clear License title: BSD 3-clause Clear License
nickname: BSD-3-Clause-Clear
description: A variant of the <a href="/licenses/bsd-3-clause/">BSD 3-Clause License</a> that explicitly does not grant any patent rights. description: A variant of the <a href="/licenses/bsd-3-clause/">BSD 3-Clause License</a> that explicitly does not grant any patent rights.

View File

@ -1,6 +1,6 @@
--- ---
title: Creative Commons Zero v1.0 Universal title: Creative Commons Zero v1.0 Universal
nickname: CC0 1.0 Universal nickname: CC0-1.0
redirect_from: /licenses/cc0/ redirect_from: /licenses/cc0/
source: http://creativecommons.org/publicdomain/zero/1.0/ source: http://creativecommons.org/publicdomain/zero/1.0/

View File

@ -1,5 +1,6 @@
--- ---
title: Eclipse Public License 1.0 title: Eclipse Public License 1.0
nickname: EPL-1.0
redirect_from: /licenses/eclipse/ redirect_from: /licenses/eclipse/
source: https://www.eclipse.org/legal/epl-v10.html source: https://www.eclipse.org/legal/epl-v10.html

View File

@ -1,5 +1,6 @@
--- ---
title: ISC License title: ISC License
nickname: ISC
source: http://opensource.org/licenses/isc-license 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 <a href="/licenses/bsd-2-clause/">BSD 2-Clause</a> and <a href="/licenses/mit/">MIT</a> licenses, removing some language that is no longer necessary. 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 <a href="/licenses/bsd-2-clause/">BSD 2-Clause</a> and <a href="/licenses/mit/">MIT</a> licenses, removing some language that is no longer necessary.

View File

@ -1,5 +1,6 @@
--- ---
title: MIT License title: MIT License
nickname: MIT
source: https://opensource.org/licenses/MIT source: https://opensource.org/licenses/MIT
featured: true featured: true

View File

@ -1,5 +1,6 @@
--- ---
title: Mozilla Public License 2.0 title: Mozilla Public License 2.0
nickname: MPL-2.0
redirect_from: /licenses/mozilla/ redirect_from: /licenses/mozilla/
source: https://www.mozilla.org/media/MPL/2.0/index.txt source: https://www.mozilla.org/media/MPL/2.0/index.txt

View File

@ -1,5 +1,6 @@
--- ---
title: Microsoft Public License title: Microsoft Public License
nickname: MS-PL
source: http://opensource.org/licenses/ms-pl source: http://opensource.org/licenses/ms-pl

View File

@ -1,5 +1,6 @@
--- ---
title: Microsoft Reciprocal License title: Microsoft Reciprocal License
nickname: MS-RL
source: http://opensource.org/licenses/ms-pl source: http://opensource.org/licenses/ms-pl

View File

@ -1,5 +1,6 @@
--- ---
title: SIL Open Font License 1.1 title: SIL Open Font License 1.1
nickname: OFL-1.1
redirect_from: /licenses/ofl/ redirect_from: /licenses/ofl/
source: http://scripts.sil.org/OFL_web source: http://scripts.sil.org/OFL_web

View File

@ -1,5 +1,6 @@
--- ---
title: Open Software License 3.0 title: Open Software License 3.0
nickname: OSL-3.0
source: http://opensource.org/licenses/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. 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.

View File

@ -1,5 +1,6 @@
--- ---
title: The Unlicense title: The Unlicense
nickname: Unlicense
source: http://unlicense.org/UNLICENSE source: http://unlicense.org/UNLICENSE
description: Because copyright is automatic in most countries, <a href="http://unlicense.org">the Unlicense</a> 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. description: Because copyright is automatic in most countries, <a href="http://unlicense.org">the Unlicense</a> 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.

View File

@ -1,5 +1,6 @@
--- ---
title: "Do What The F*ck You Want To Public License" title: "Do What The F*ck You Want To Public License"
nickname: WTFPL
source: http://www.wtfpl.net/ source: http://www.wtfpl.net/
description: The easiest licence out there. It gives the user permissions to do whatever they want with your code. description: The easiest licence out there. It gives the user permissions to do whatever they want with your code.