Merge branch 'gh-pages' into cc0-source-text

2024-12-22 04:40:09 +01:00 · 2017-09-18 18:11:14 -07:00 · 2017-09-18 18:11:14 -07:00 · 84ac214d7f
commit 84ac214d7f
parent 6b554b769f fe965f16f6
45 changed files with 484 additions and 58 deletions
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
  Exclude:
    - _site/**/*
    - vendor/**/*
--- a/.travis.yml
+++ b/.travis.yml
@ -5,7 +5,7 @@ script: "./script/cibuild"
 #environment
 language: ruby
 rvm:
-  - 2.3.3
+  - 2.4.0

 branches:
  only:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -14,12 +14,13 @@ get. But first, please make sure you understand what

 Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or <http://choosealicense.com/licenses>, and there are several requirements for a license to be [cataloged](http://choosealicense.com/appendix/) on the site:

-1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license-or-exception).
+1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license).
 2. The license must be listed on one of the following approved lists of licenses:
   * [List of OSI approved licenses](https://opensource.org/licenses/alphabetical)
   * [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*)
   * [Open Definition's list of conformant licenses](http://opendefinition.org/licenses/) (non-code)
 3. A [GitHub code search](https://github.com/search?q=MIT+filename%3ALICENSE&type=Code) must reveal at least *1,000* public repositories using the license
+4. Identification of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that could be detected by [licensee](https://github.com/benbalter/licensee) if it knew about the license

 If your proposed license meets the above criteria, here's a few other things to keep in mind as you propose the license's addition:

@ -28,6 +29,7 @@ If your proposed license meets the above criteria, here's a few other things to
 * The license files should be in the format of `_licenses/[lowercased-spdx-id].txt` (e.g., `_licenses/mit.txt`)
 * Each license has both [required and optional metadata](https://github.com/github/choosealicense.com#license-metadata) that should be included.
 * The text of the license should be wrapped to a 78 character width.
+* The text of the license should match the corresponding text found at https://spdx.org/licenses/
 * The body of the file should be the text of the license in plain text.

 ## Making Changes
--- a/1
+++ b/1
@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'

 require 'json'
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
 # Choosealicense.com

-[![Build Status](https://travis-ci.org/github/choosealicense.com.png?branch=gh-pages)](https://travis-ci.org/github/choosealicense.com)
+[![Build Status](https://travis-ci.org/github/choosealicense.com.svg?branch=gh-pages)](https://travis-ci.org/github/choosealicense.com)

 Like a Choose Your Own Adventure site, but only much less interesting.

@ -44,6 +44,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
 * `source` - The URL to the license source text
 * `description` - A human-readable description of the license
 * `how` - Instructions on how to implement the license
+* `using` - A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`
 * `permissions` - Bulleted list of permission rules
 * `conditions` - Bulleted list of condition rules
 * `limitations` - Bulleted list of limitation rules
@ -54,7 +55,6 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
 * `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true)
 * `nickname` - Customary short name if applicable (e.g, GPLv3)
 * `note` - Additional information about the licenses
-* `using` - A list of up to 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`
 * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs

 ### Auto-populated fields
@ -80,25 +80,25 @@ The license properties (rules) are stored as a bulleted list within the licenses

 * `commercial-use` - This software and derivatives may be used for commercial purposes.
 * `modifications` - This software may be modified.
-* `distribution` - You may distribute this software.
-* `private-use` - You may use and modify the software without distributing it.
-* `patent-use` - This license provides an express grant of patent rights from the contributor to the recipient.
+* `distribution` - This software may be distributed.
+* `private-use` - This software may be used and modified in private.
+* `patent-use` - This license provides an express grant of patent rights from contributors.

 #### Conditions

-* `include-copyright` - Include a copy of the license and copyright notice with the software.
-* `document-changes` - Indicate changes made to the code.
-* `disclose-source` - Source code must be made available when distributing the software.
-* `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code.
+* `include-copyright` - A copy of the license and copyright notice must be included with the software.
+* `document-changes` - Changes made to the code must be documented.
+* `disclose-source` - Source code must be made available when the software is distributed.
+* `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the source code.
 * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.
 * `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used.
 * `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library.

 #### Limitations

-* `trademark-use` - This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.
+* `trademark-use` - This license explicitly states that it does NOT grant trademark rights, even though licenses without such a statement probably do not grant any implicit trademark rights.
 * `liability` - This license includes a limitation of liability.
-* `patent-use` -  This license explicitly states that it does NOT grant you any rights in the patents of contributors.
+* `patent-use` - This license explicitly states that it does NOT grant any rights in the patents of contributors.
 * `warranty` - The license explicitly states that it does NOT provide any warranty.

 ## License
--- a/3
+++ b/3
@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'html-proofer'
 require 'rspec/core/rake_task'

@ -26,7 +27,7 @@ task :approved_licenses do
  puts approved.join(', ')
  puts "\n"

-  potential = approved - licenses.map { |l| l['id'] }
+  potential = approved - (licenses.map { |l| l['id'] })
  puts "#{potential.count} potential additions:"
  puts potential.join(', ')
 end
--- a/_data/meta.yml
+++ b/_data/meta.yml
@ -7,7 +7,7 @@

 - name: spdx-id
  description: Short identifier specified by http://spdx.org/licenses/
-  required: required
+  required: true

 - name: source
  description: The URL to the license source text
@ -33,6 +33,10 @@
  description: Bulleted list of limited rules
  required: true

+- name: using
+  description: 'A list of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`'
+  required: true
+
 # Optional fields

 - name: featured
@ -51,10 +55,6 @@
  description: Additional information about the licenses
  required: false

- name: using
-  description: 'A list of up to 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url`'
-  required: false
-
 - name: redirect_from
  description: Relative path(s) to redirect to the license from, to prevent breaking old URLs
  required: false
--- a/_data/rules.yml
+++ b/_data/rules.yml
@ -1,52 +1,52 @@
 permissions:
 - description: This software and derivatives may be used for commercial purposes.
-  label: Commercial Use
+  label: Commercial use
  tag: commercial-use
 - description: This software may be modified.
  label: Modification
  tag: modifications
- description: You may distribute this software.
+- description: This software may be distributed.
  label: Distribution
  tag: distribution
- description: You may use and modify the software without distributing it.
-  label: Private Use
+- description: This software may be used and modified in private.
+  label: Private use
  tag: private-use
- description: This license provides an express grant of patent rights from the contributor to the recipient.
-  label: Patent Use
+- description: This license provides an express grant of patent rights from contributors.
+  label: Patent use
  tag: patent-use

 conditions:
- description: Include a copy of the license and copyright notice with the software.
-  label: License and Copyright Notice
+- description: A copy of the license and copyright notice must be included with the software.
+  label: License and copyright notice
  tag: include-copyright
- description: Indicate changes made to the code.
-  label: State Changes
+- description: Changes made to the code must be documented.
+  label: State changes
  tag: document-changes
- description: Source code must be made available when distributing the software.
-  label: Disclose Source
+- description: Source code must be made available when the software is distributed.
+  label: Disclose source
  tag: disclose-source
- description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code.
-  label: Network Use is Distribution
+- description: Users who interact with the software via network are given the right to receive a copy of the source code.
+  label: Network use is distribution
  tag: network-use-disclose
 - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.
-  label: Same License
+  label: Same license
  tag: same-license
 - description: Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used.
-  label: Same License (File)
+  label: Same license (file)
  tag: same-license--file
 - description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library.
-  label: Same License (Library)
+  label: Same license (library)
  tag: same-license--library

 limitations:
- description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.
-  label: Trademark Use
+- description: This license explicitly states that it does NOT grant trademark rights, even though licenses without such a statement probably do not grant any implicit trademark rights.
+  label: Trademark use
  tag: trademark-use
 - description: This license includes a limitation of liability.
  label: Liability
  tag: liability
- description: This license explicitly states that it does NOT grant you any rights in the patents of contributors.
-  label: Patent Use
+- description: This license explicitly states that it does NOT grant any rights in the patents of contributors.
+  label: Patent use
  tag: patent-use
 - description: The license explicitly states that it does NOT provide any warranty.
  label: Warranty
--- a/_licenses/afl-3.0.txt
+++ b/_licenses/afl-3.0.txt
@ -7,6 +7,8 @@ description: The Academic Free License is a variant of the Open Software License

 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Files licensed under AFL 3.0 must also include the notice "Licensed under the Academic Free License version 3.0" adjacent to the copyright notice.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/agpl-3.0.txt
+++ b/_licenses/agpl-3.0.txt
@ -12,6 +12,8 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of

 note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/artistic-2.0.txt
+++ b/_licenses/artistic-2.0.txt
@ -8,6 +8,8 @@ description: Heavily favored by the Perl community, the Artistic license require

 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code, and copy the text of the license into the file. Do not replace the copyright notice (year, author), which refers to the license itself, not the licensed project.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/bsd-2-clause.txt
+++ b/_licenses/bsd-2-clause.txt
@ -9,6 +9,8 @@ description: A permissive license that comes in two variants, the <a href="/lice

 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/bsd-3-clause-clear.txt
+++ b/_licenses/bsd-3-clause-clear.txt
@ -7,6 +7,8 @@ description: A variant of the <a href="/licenses/bsd-3-clause/">BSD 3-Clause Lic

 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/bsd-3-clause.txt
+++ b/_licenses/bsd-3-clause.txt
@ -8,6 +8,8 @@ description: A permissive license similar to the <a href="/licenses/bsd-2-clause

 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/bsl-1.0.txt
+++ b/_licenses/bsl-1.0.txt
@ -9,6 +9,8 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of

 note: Boost recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the [Boost Software License FAQ](http://www.boost.org/users/license.html#FAQ).

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/cc-by-4.0.txt
+++ b/_licenses/cc-by-4.0.txt
@ -5,7 +5,9 @@ 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.

-how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to soley supply a link to a copy of the license, usually to the <a href='https://creativecommons.org/licenses/by/4.0/'>canonical URL for the license</a>.
+how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to solely supply a link to a copy of the license, usually to the <a href='https://creativecommons.org/licenses/by/4.0/'>canonical URL for the license</a>.
+
+using:

 permissions:
  - commercial-use
--- a/_licenses/cc-by-sa-4.0.txt
+++ b/_licenses/cc-by-sa-4.0.txt
@ -5,7 +5,9 @@ source: https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt

 description: Similar to <a href='/licenses/cc-by-4.0/'>CC-BY-4.0</a> but requires derivatives be distributed under the same or a similar, <a href="https://creativecommons.org/compatiblelicenses/">compatible</a> 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.

-how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to soley supply a link to a copy of the license, usually to the <a href='https://creativecommons.org/licenses/by-sa/4.0/'>canonical URL for the license</a>.
+how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. It is also acceptable to solely supply a link to a copy of the license, usually to the <a href='https://creativecommons.org/licenses/by-sa/4.0/'>canonical URL for the license</a>.
+
+using:

 permissions:
  - commercial-use
--- a/_licenses/cc0-1.0.txt
+++ b/_licenses/cc0-1.0.txt
@ -10,6 +10,8 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of

 note: Creative Commons recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be <a href="https://wiki.creativecommons.org/wiki/CC0_FAQ#May_I_apply_CC0_to_computer_software.3F_If_so.2C_is_there_a_recommended_implementation.3F">found on their website</a>.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/ecl-2.0.txt
+++ b/_licenses/ecl-2.0.txt
@ -0,0 +1,236 @@
+---
+title: Educational Community License v2.0
+spdx-id: ECL-2.0
+source: https://opensource.org/licenses/ECL-2.0
+
+description: The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license.
+
+how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
+
+note: The Apereo Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice at the very end of the license in the appendix.
+
+using:
+  - Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE
+  - OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE
+  - Opencast Matterhorn: https://bitbucket.org/opencast-community/matterhorn/src/e5b1684a822c0bd9bb07f3e53b4e1f22932da5ef/LICENSE?fileviewer=file-view-default
+
+permissions:
+  - commercial-use
+  - modifications
+  - distribution
+  - patent-use
+  - private-use
+
+conditions:
+  - include-copyright
+  - document-changes
+
+limitations:
+  - trademark-use
+  - liability
+  - warranty
+
+---
+Educational Community License
+
+Version 2.0, April 2007
+
+http://opensource.org/licenses/ECL-2.0
+
+The Educational Community License version 2.0 ("ECL") consists of the Apache
+2.0 license, modified to change the scope of the patent grant in section 3 to
+be specific to the needs of the education communities using this license. The
+original Apache 2.0 license can be found at:
+http://www.apache.org/licenses/LICENSE-2.0
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other
+entities that control, are controlled by, or are under common control with
+that entity. For the purposes of this definition, "control" means (i) the
+power, direct or indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (ii) ownership of fifty percent
+(50%) or more of the outstanding shares, or (iii) beneficial ownership of such
+entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation source, and
+configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object
+code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form,
+made available under the License, as indicated by a copyright notice that is
+included in or attached to the work (an example is provided in the Appendix
+below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative
+Works shall not include works that remain separable from, or merely link (or
+bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original
+version of the Work and any modifications or additions to that Work or
+Derivative Works thereof, that is intentionally submitted to Licensor for
+inclusion in the Work by the copyright owner or by an individual or Legal
+Entity authorized to submit on behalf of the copyright owner. For the purposes
+of this definition, "submitted" means any form of electronic, verbal, or
+written communication sent to the Licensor or its representatives, including
+but not limited to communication on electronic mailing lists, source code
+control systems, and issue tracking systems that are managed by, or on behalf
+of, the Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise designated
+in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and
+such Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such
+Contributor that are necessarily infringed by their Contribution(s) alone or
+by combination of their Contribution(s) with the Work to which such
+Contribution(s) was submitted. If You institute patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging that
+the Work or a Contribution incorporated within the Work constitutes direct or
+contributory patent infringement, then any patent licenses granted to You
+under this License for that Work shall terminate as of the date such
+litigation is filed. Any patent license granted hereby with respect to
+contributions by an individual employed by an institution or organization is
+limited to patent claims where the individual that is the author of the Work
+is also the inventor of the patent claims licensed, and where the organization
+or institution has the right to grant such license under applicable grant and
+research funding agreements. No other express or implied licenses are granted.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works
+thereof in any medium, with or without modifications, and in Source or Object
+form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and You must cause any modified files to carry prominent notices
+stating that You changed the files; and You must retain, in the Source form of
+any Derivative Works that You distribute, all copyright, patent, trademark,
+and attribution notices from the Source form of the Work, excluding those
+notices that do not pertain to any part of the Derivative Works; and If the
+Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of
+the following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License. You may add Your own copyright statement to Your
+modifications and may provide additional or different license terms and
+conditions for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use, reproduction, and
+distribution of the Work otherwise complies with the conditions stated in this
+License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally
+submitted for inclusion in the Work by You to the Licensor shall be under the
+terms and conditions of this License, without any additional terms or
+conditions. Notwithstanding the above, nothing herein shall supersede or
+modify the terms of any separate license agreement you may have executed with
+Licensor regarding such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides
+the Work (and each Contributor provides its Contributions) on an "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+are solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a result of
+this License or out of the use or inability to use the Work (including but not
+limited to damages for loss of goodwill, work stoppage, computer failure or
+malfunction, or any and all other commercial damages or losses), even if such
+Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License.
+However, in accepting such obligations, You may act only on Your own behalf
+and on Your sole responsibility, not on behalf of any other Contributor, and
+only if You agree to indemnify, defend, and hold each Contributor harmless for
+any liability incurred by, or claims asserted against, such Contributor by
+reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Educational Community License to your work
+
+To apply the Educational Community License to your work, attach the following
+boilerplate notice, with the fields enclosed by brackets "{}" replaced with
+your own identifying information. (Don't include the brackets!) The text
+should be enclosed in the appropriate comment syntax for the file format. We
+also recommend that a file or class name and description of purpose be
+included on the same "printed page" as the copyright notice for easier
+identification within third-party archives.
+
+Copyright {yyyy} {name of copyright owner} Licensed under the Educational
+Community License, Version 2.0 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of the License at
+
+http://opensource.org/licenses/ECL-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations under
+the License.
--- a/_licenses/eupl-1.1.txt
+++ b/_licenses/eupl-1.1.txt
@ -2,7 +2,7 @@
 title: European Union Public License 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
+source: https://joinup.ec.europa.eu/community/eupl/og_page/eupl-text-11-12

 description: The “European Union Public Licence” (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union.

@ -10,6 +10,8 @@ how: Create a text file (typically named COPYING or LICENCE.txt) in the root of

 note: The European Commission recommends taking the additional step of adding a [boilerplate notice](https://joinup.ec.europa.eu/sites/default/files/ckeditor_files/files/EUPL%201_1%20Guidelines%20EN%20Joinup.pdf#page=17) to the top of each file.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/isc.txt
+++ b/_licenses/isc.txt
@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
 using:
  - documentation.js: https://github.com/documentationjs/documentation/blob/master/LICENSE
  - Node.js semver: https://github.com/npm/node-semver/blob/master/LICENSE
-  - OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/master/LICENSE
+  - OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/master/LICENSE.md

 permissions:
  - commercial-use
--- a/_licenses/lgpl-2.1.txt
+++ b/_licenses/lgpl-2.1.txt
@ -12,6 +12,8 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of

 note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/lgpl-3.0.txt
+++ b/_licenses/lgpl-3.0.txt
@ -12,6 +12,8 @@ how: This license is an additional set of permissions to the <a href="/licenses/

 note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the <a href="/licenses/gpl-3.0">GNU GPLv3 license</a>. Insert the word “Lesser” before “General” in all three places in the boilerplate notice to make sure that you refer to the GNU LGPLv3 and not the GNU GPLv3.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/lppl-1.3c.txt
+++ b/_licenses/lppl-1.3c.txt
@ -9,6 +9,8 @@ how: To use this license, place in each of the components of your work both an e

 note: An example boilerplate and more information about how to use the license can be found at the end of the license.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/mit.txt
+++ b/_licenses/mit.txt
@ -11,7 +11,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of

 using:
  - jQuery: https://github.com/jquery/jquery/blob/master/LICENSE.txt
-  - .NET Core: https://github.com/dotnet/corefx/blob/master/LICENSE
+  - .NET Core: https://github.com/dotnet/corefx/blob/master/LICENSE.TXT
  - Rails: https://github.com/rails/rails/blob/master/activerecord/MIT-LICENSE

 permissions:
--- a/_licenses/ms-pl.txt
+++ b/_licenses/ms-pl.txt
@ -7,6 +7,8 @@ description: An open source license with a patent grant.

 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/ms-rl.txt
+++ b/_licenses/ms-rl.txt
@ -7,6 +7,8 @@ description: An open source license with a patent grant similar to the <a href="

 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/ncsa.txt
+++ b/_licenses/ncsa.txt
@ -0,0 +1,64 @@
+---
+title: University of Illinois/NCSA Open Source License
+spdx-id: NCSA
+nickname: UIUC/NCSA
+source: https://opensource.org/licenses/NCSA
+
+description: The University of Illinois/NCSA Open Source License, or UIUC license, is a permissive free software license, based on the <a href="/licenses/mit/">MIT/X11 license</a>  and the <a href="/licenses/bsd-3-clause/">BSD 3-clause License</a>. Its conditions include requiring the preservation of copyright and license notices both in source and in binary distributions and the prohibtion of using the names of the authors or the project organization to promote or endorse derived products.
+
+how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work.
+
+using: 
+ - LLDB: https://github.com/llvm-mirror/lldb/blob/master/LICENSE.TXT
+ - ROCR-Runtime: https://github.com/RadeonOpenCompute/ROCR-Runtime/blob/master/LICENSE.txt
+ - RLTK: https://github.com/chriswailes/RLTK/blob/master/LICENSE
+
+permissions:
+  - commercial-use
+  - modifications
+  - distribution
+  - private-use
+
+conditions:
+  - include-copyright
+
+limitations:
+  - liability
+  - warranty
+
+---
+
+University of Illinois/NCSA Open Source License 
+
+Copyright (c) [year] [fullname]. All rights reserved. 
+
+Developed by: [fullname] 
+              [project] 
+              [project_url]
+                  
+Permission is hereby granted, free of charge, to any person 
+obtaining a copy of this software and associated documentation files 
+(the "Software"), to deal with the Software without restriction, 
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software, 
+and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+* Redistributions of source code must retain the above copyright notice, 
+  this list of conditions and the following disclaimers.
+
+* Redistributions in binary form must reproduce the above copyright 
+  notice, this list of conditions and the following disclaimers in the 
+  documentation and/or other materials provided with the distribution.
+
+* Neither the names of [fullname], [project] nor the names of its 
+  contributors may be used to endorse or promote products derived from
+  this Software without specific prior written permission.
+  
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH
+THE SOFTWARE.
--- a/_licenses/ofl-1.1.txt
+++ b/_licenses/ofl-1.1.txt
@ -10,6 +10,8 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of

 note: This license doesn't require source provision, but recommends it. All files derived from OFL files must remain licensed under the OFL.

+using:
+
 permissions:
  - private-use
  - commercial-use
--- a/_licenses/postgresql.txt
+++ b/_licenses/postgresql.txt
@ -0,0 +1,48 @@
+---
+title: PostgreSQL License
+spdx-id: PostgreSQL
+source: https://opensource.org/licenses/PostgreSQL
+
+description: A very short, BSD-style license, used specifically for PostgreSQL.  
+
+how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution.
+
+using:
+  - pgBadger: https://github.com/dalibo/pgbadger/blob/master/LICENSE
+  - pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE
+  - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE.txt
+
+permissions:
+  - commercial-use
+  - modifications
+  - distribution
+  - private-use
+
+conditions:
+  - include-copyright
+
+limitations:
+  - liability
+  - warranty
+
+---
+
+PostgreSQL Licence
+
+Copyright (c) [year], [fullname]
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose, without fee, and without a written agreement is
+hereby granted, provided that the above copyright notice and this paragraph
+and the following two paragraphs appear in all copies.
+
+IN NO EVENT SHALL [fullname] BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING
+OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF [fullname]
+HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+[fullname] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
+AND [fullname] HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
+ENHANCEMENTS, OR MODIFICATIONS.
--- a/_licenses/unlicense.txt
+++ b/_licenses/unlicense.txt
@ -10,8 +10,8 @@ how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root

 using:
  - youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE
-  - stacktrace.js: https://github.com/stacktracejs/stacktrace.js/blob/master/LICENSE
  - kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE
+  - RDF.rb: https://github.com/ruby-rdf/rdf/blob/master/UNLICENSE

 permissions:
  - private-use
@ -50,4 +50,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.

-For more information, please refer to <http://unlicense.org>
+For more information, please refer to <https://unlicense.org>
--- a/_licenses/wtfpl.txt
+++ b/_licenses/wtfpl.txt
@ -7,6 +7,8 @@ description: The easiest license out there. It gives the user permissions to do

 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/_licenses/zlib.txt
+++ b/_licenses/zlib.txt
@ -7,6 +7,8 @@ description: A short permissive license, compatible with GPL. Requires altered s

 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders.

+using:
+
 permissions:
  - commercial-use
  - modifications
--- a/about.md
+++ b/about.md
@ -18,10 +18,8 @@ See our [appendix](/appendix) for a table of all of the licenses cataloged in th

 {: .bullets}

-* Open Source Initiative's [list of licenses](https://opensource.org/licenses/) approved as conforming to the [Open Source Definition](https://opensource.org/osd)
-* Free Software Foundation's [comments on various licenses](http://www.gnu.org/licenses/license-list.html) and [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.en.html)
-* Linux Foundation's [SPDX License List](https://spdx.org/licenses/)
-* [Comparison of free and open-source software licenses](https://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on English Wikipedia
+* Open Source Initiative's FAQ on [Which Open Source license should I choose to release my software under?](https://opensource.org/faq#which-license)
+* Free Software Foundation's [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.en.html)
 * [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) ([source](https://github.com/ox-it/licdiff)) from [OSS Watch](http://www.oss-watch.ac.uk/)
 * [Free/Libre/Open Source license selection wizard](http://vrici.lojban.org/~cowan/floss/) by John Cowan
 * [The Legal Side of Open Source](https://opensource.guide/legal/), an Open Source Guide covering licensing and related issues
--- a/non-software.md
+++ b/non-software.md
@ -12,7 +12,7 @@ Open source software licenses can be used for non-software works, and often are

 ### Documentation

-Any open source software license or open Creative Commons license is applicable to software documentation. If you use different licenses for your software and its documentation, you may wish to take care that source code examples in the documentation are also licensed under the software license.
+Any open source software license or open license for media (see [above](#data-media-etc)) is applicable to software documentation. If you use different licenses for your software and its documentation, you may wish to take care that source code examples in the documentation are also licensed under the software license.

 ### Fonts

--- a/script/check-approval
+++ b/script/check-approval
@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 # Checks if a given license meets the approval criteria to be added to choosealicense.com
 # See https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-a-license
 # Usage: script/check-approval [SPDX LICENSE ID]
--- a/script/generate-docs
+++ b/script/generate-docs
@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 # Usage: script/generate-docs
 # Reads in the fields, meta, and rules YAML files and produces markdown output
 # suitable for documenting in the project's README
--- a/spec/ci_ruby_version_spec.rb
+++ b/spec/ci_ruby_version_spec.rb
@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'json'
 require 'open-uri'
 require 'spec_helper'
--- a/spec/license_bom_spec.rb
+++ b/spec/license_bom_spec.rb
@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'

 describe 'byte order marks' do
--- a/spec/license_fields_spec.rb
+++ b/spec/license_fields_spec.rb
@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'

 describe 'license fillable fields' do
@ -6,7 +7,7 @@ describe 'license fillable fields' do
    context "The #{license['title']} license" do
      it 'should only contain supported fillable fields' do
        matches = license['content'].scan(/\[([a-z]+)\]/)
-        extra_fields = matches.flatten - fields.map { |f| f['name'] }
+        extra_fields = matches.flatten - (fields.map { |f| f['name'] })
        expect(extra_fields).to be_empty
      end
    end
--- a/spec/license_meta_spec.rb
+++ b/spec/license_meta_spec.rb
@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'

 describe 'license meta' do
@ -8,7 +9,7 @@ describe 'license meta' do

    context "The #{license['title']} license" do
      it 'should only contain supported meta fields' do
-        extra_fields = raw_fields.keys - meta.map { |m| m['name'] }
+        extra_fields = raw_fields.keys - (meta.map { |m| m['name'] })
        expect(extra_fields).to be_empty
      end

@ -17,6 +18,34 @@ describe 'license meta' do
        missing = required - raw_fields.keys
        expect(missing).to be_empty
      end
+
+      it 'using contains 3 examples' do
+        legacy = [
+          'afl-3.0',
+          'agpl-3.0',
+          'artistic-2.0',
+          'bsd-2-clause',
+          'bsd-3-clause',
+          'bsd-3-clause-clear',
+          'bsl-1.0',
+          'cc0-1.0',
+          'cc-by-4.0',
+          'cc-by-sa-4.0',
+          'eupl-1.1',
+          'gpl-2.0',
+          'lgpl-2.1',
+          'lgpl-3.0',
+          'lppl-1.3c',
+          'ms-pl',
+          'ms-rl',
+          'ofl-1.1',
+          'wtfpl',
+          'zlib'
+        ]
+        skip 'added before 3 using examples required' if legacy.include?(license['slug'])
+        examples = raw_fields['using'] || []
+        expect(examples.length).to eq(3)
+      end
    end
  end
 end
--- a/spec/license_rules_spec.rb
+++ b/spec/license_rules_spec.rb
@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'

 describe 'license rules' do
--- a/spec/license_shown_spec.rb
+++ b/spec/license_shown_spec.rb
@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require 'spec_helper'

 describe 'shown licenses' do
  # Whitelist of popular licenses that are shown (non-hidden)
  # Note: most new licenses that are added should be hidden by default
-  SHOWN_LICENSES = %w(
+  SHOWN_LICENSES = %w[
    agpl-3.0
    apache-2.0
    bsd-2-clause
@ -17,7 +18,7 @@ describe 'shown licenses' do
    mit
    mpl-2.0
    unlicense
-  ).freeze
+  ].freeze

  it 'has the expected number of shown licenses' do
    expect(shown_licenses.count).to eql(12)
--- a/spec/license_spec.rb
+++ b/spec/license_spec.rb
@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'

 describe 'licenses' do
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'jekyll'
 require 'open-uri'
 require 'json'
@ -42,7 +43,7 @@ def licenses
 end

 def shown_licenses
-  licenses.select { |l| !l['hidden'] }
+  licenses.reject { |l| l['hidden'] }
 end

 def site