Merge branch 'gh-pages' into functional-descriptions

mlinksva · mlinksva · commit d6f7e196cab1 · 2016-06-01T09:01:10.000-07:00
diff --git a/README.md b/README.md
@@ -39,7 +39,8 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
 
 #### Required fields
 
-* `title` - The SPDX-compliant, human-readable license name
+* `title` - The license full name specified by http://spdx.org/licenses/
+* `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
@@ -50,10 +51,10 @@ 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
-* `nickname` - A shorter, human-readable license name where the SPDX license name (`title` above) is long
 
 ### Auto-populated fields
 
@@ -92,7 +93,7 @@ The license properties (rules) are stored as a bulleted list within the licenses
 
 #### Limitations
 
-* `trademark-use` - While this may be implicitly true of all licenses, this license explicitly states that it does NOT grant you any rights in the trademarks or other marks of contributors.
+* `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.
 * `no-liability` - Software is provided without warranty and the software author/license owner cannot be held liable for damages.
 * `patent-use` -  This license explicitly states that it does NOT grant you any rights in the patents of contributors.
 
diff --git a/_data/meta.yml b/_data/meta.yml
@@ -2,9 +2,13 @@
 # The available fields are:
 
 - name: title
-  description: The SPDX-compliant, human-readable license name
+  description: The license full name specified by http://spdx.org/licenses/
   required: true
 
+- name: spdx-id
+  description: Short identifier specified by http://spdx.org/licenses/
+  required: required
+
 - name: source
   description: The URL to the license source text
   required: true
@@ -35,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
@@ -46,7 +54,3 @@
 - name: redirect_from
   description: Relative path(s) to redirect to the license from, to prevent breaking old URLs
   required: false
-
-- name: nickname
-  description: A shorter, human-readable license name where the SPDX license name (`title` above) is long
-  required: false
diff --git a/_data/rules.yml b/_data/rules.yml
@@ -33,7 +33,7 @@ permissions:
   tag: patent-use
 
 limitations:
-- description: While this may be implicitly true of all licenses, this license explicitly states that it does NOT grant you any rights in the trademarks or other marks of contributors.
+- 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
   tag: trademark-use
 - description: Software is provided without warranty and the software author/license owner cannot be held liable for damages.
diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt
@@ -1,5 +1,6 @@
 ---
 title: Academic Free License v3.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
@@ -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
@@ -1,5 +1,6 @@
 ---
 title: Apache License 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
@@ -1,5 +1,6 @@
 ---
 title: Artistic License 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
@@ -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
@@ -1,5 +1,6 @@
 ---
 title: BSD 3-clause Clear License
+spdx-id: 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.
 
@@ -37,7 +38,7 @@ below) provided that the following conditions are met:
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 
-* Neither the name of [project] nor the names of its contributors may be used
+* Neither the name of the copyright holder nor the names of its contributors may be used
   to endorse or promote products derived from this software without specific
   prior written permission.
 
diff --git 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 <a href="/licenses/bsd-2-clause/">BSD 2-Clause License</a>, 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.
@@ -35,7 +35,7 @@ modification, are permitted provided that the following conditions are met:
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 
-* Neither the name of [project] nor the names of its
+* Neither the name of the copyright holder nor the names of its
   contributors may be used to endorse or promote products derived from
   this software without specific prior written permission.
 
diff --git 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
@@ -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 <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.
diff --git 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 Universal
+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
@@ -1,5 +1,6 @@
 ---
 title: Eclipse Public License 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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,6 @@
 ---
 title: ISC License
+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 <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.
diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,6 @@
 ---
 title: MIT License
+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
@@ -1,5 +1,6 @@
 ---
 title: Mozilla Public License 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
@@ -1,5 +1,6 @@
 ---
 title: Microsoft Public License
+spdx-id: MS-PL
 
 source: http://opensource.org/licenses/ms-pl
 
diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt
@@ -1,5 +1,6 @@
 ---
 title: Microsoft Reciprocal License
+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
@@ -1,5 +1,6 @@
 ---
 title: SIL Open Font License 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
@@ -1,5 +1,6 @@
 ---
 title: Open Software License 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
@@ -1,5 +1,6 @@
 ---
 title: The Unlicense
+spdx-id: Unlicense
 source: http://unlicense.org/UNLICENSE
 
 description: A license with no conditions whatsoever which dedicates works to the public domain. Unlicensed works, modifications, and larger works may be distributed under different terms and without source code.
diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt
@@ -1,5 +1,6 @@
 ---
 title: "Do What The F*ck You Want To Public License"
+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.
diff --git a/about.md b/about.md
@@ -10,14 +10,17 @@ If you already know what you're doing and have a license you prefer to use, that
 
 ## Not comprehensive
 
-This site is not a comprehensive directory of open source licenses. We think there are too many options, which adds to the confusion. On the homepage, we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/).
+This site is not a comprehensive directory of open source licenses. We think there are too many options, which adds to the confusion. On the [homepage](/), we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/), and have a page about [licenses for non-software projects](/non-software/).
+
+See our [appendix](/appendix) for a table of all of the licenses cataloged in the choosealicense.com repository and the links below for *even more licenses* that you **do not** need to learn about when choosing a license for your project.
 
 ### Additional resources
 
 {: .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)
+* 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
 * [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://home.ccil.org/~cowan/floss/) by John Cowan
diff --git a/appendix.md b/appendix.md
@@ -0,0 +1,85 @@
+---
+layout: default
+permalink: /appendix/
+title: Appendix
+class: license-types
+---
+
+All licenses described in the choosealicense.com [repository](https://github.com/github/choosealicense.com), in a table.
+
+<table border style="font-size: xx-small">
+{% assign types = "permissions|conditions|limitations" | split: "|" %}
+<tr>
+  <th scope="col" style="text-align: center">License</th>
+  {% assign seen_tags = '' %}
+  {% for type in types %}
+    {% assign rules = site.data.rules[type] | sort: "label" %}
+    {% for rule_obj in rules %}
+      {% if seen_tags contains rule_obj.tag %}
+        {% continue %}
+      {% endif %}
+      {% capture seen_tags %}{{ seen_tags | append:rule_obj.tag }}{% endcapture %}
+      <th scope="col" style="text-align: center; width:7%"><a href="#{{ rule_obj.tag }}">{{ rule_obj.label }}</a></th>
+    {% endfor %}
+  {% endfor %}
+</tr>
+{% for license in site.licenses | sort: 'path' %}
+  <tr style="height: 3em"><th scope="row"><a href="{{ license.id }}">{{ license.title }}</a></th>
+  {% assign seen_tags = '' %}
+  {% for type in types %}
+    {% assign rules = site.data.rules[type] | sort: "label" %}
+    {% for rule_obj in rules %}
+      {% assign req = rule_obj.tag %}
+      {% if seen_tags contains req %}
+        {% continue %}
+      {% endif %}
+      {% capture seen_tags %}{{ seen_tags | append:req }}{% endcapture %}
+      {% assign seen_req = false %}
+      {% for t in types %}
+        {% if license[t] contains req %}
+          <td class="license-{{ t }}" style="text-align:center">
+            <span class="{{ req }}">
+              <span class="license-sprite {{ req }}"></span>
+            </span>
+          </td>
+          {% assign seen_req = true %}
+        {% endif %}
+      {% endfor %}
+      {% unless seen_req %}
+        <td></td>
+      {% endunless %}
+    {% endfor %}
+  {% endfor %}
+  </tr>
+{% endfor %}
+</table>
+
+## Legend
+
+<p>Open source licenses grant to the public <b>permissions</b> (<span class="license-permissions"><span class="license-sprite"></span></span>) to do things with licensed works copyright or other "intellectual property" laws might otherwise disallow.</p>
+
+<p>Most open source licenses' grants of permissions are subject to compliance with <b>conditions</b> (<span class="license-conditions"><span class="license-sprite"></span></span>).</p>
+
+<p>Most open source licenses also have <b>limitations</b> (<span class="license-limitations"><span class="license-sprite"></span></span>) that usually disclaim warranty and liability and sometimes expressly exclude patent or trademark from licenses' grants.</p>
+
+<dl>
+{% assign seen_tags = '' %}
+{% for type in types %}
+  {% assign rules = site.data.rules[type] | sort: "label" %}
+  {% for rule_obj in rules %}
+    {% assign req = rule_obj.tag %}
+    {% if seen_tags contains req %}
+      {% continue %}
+    {% endif %}
+    <dt id="{{ req }}">{{ rule_obj.label }}</dt>
+    {% capture seen_tags %}{{ seen_tags | append:req }}{% endcapture %}
+    {% for t in types %}
+      {% for r in site.data.rules[t] | sort: "label" %}
+        {% if r.tag == req %}
+          <dd class="license-{{t}}"><span class="license-sprite"></span> {{ r.description }}</dd>
+        {% endif %}
+      {% endfor %}
+    {% endfor %}
+  {% endfor %}
+{% endfor %}
+</dl>
diff --git a/assets/js/app.coffee b/assets/js/app.coffee
@@ -38,11 +38,11 @@ class Choosealicense
     # Dynamically add annotations as title attribute to rule list items
     for ruletype, rules of window.annotations
       for rule in rules
-        $(".license-rules ul.license-#{ruletype} li.#{rule["tag"]}").attr "title", rule["description"]
+        $(".license-#{ruletype} .#{rule["tag"]}").attr "title", rule["description"]
 
     # Init tooltips on all rule list items
     for ruletype, label of @ruletypes
-      $(".license-#{ruletype} li").qtip
+      $(".license-#{ruletype} li, .license-#{ruletype} .license-sprite").qtip
         content:
           text: false
           title:
diff --git a/no-license.md b/no-license.md
diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb
diff --git a/spec/license_spec.rb b/spec/license_spec.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
