1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

Merge branch 'gh-pages' into gh-pages

This commit is contained in:
Philippe Loctaux 2016-05-23 21:30:22 +02:00
commit 78f4c90012
2 changed files with 32 additions and 1 deletions

View File

@ -20,6 +20,7 @@ See our [appendix](/appendix) for a table of all of the licenses cataloged in th
* 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 [licenses 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

View File

@ -19,7 +19,7 @@ All licenses described in the choosealicense.com [repository](https://github.com
{% continue %}
{% endif %}
{% capture seen_tags %}{{ seen_tags | append:rule_obj.tag }}{% endcapture %}
<th style="text-align: center; width:7%">{{ rule_obj.label }}</th>
<th style="text-align: center; width:7%"><a href="#{{ rule_obj.tag }}">{{ rule_obj.label }}</a></th>
{% endfor %}
{% endfor %}
</tr>
@ -53,3 +53,33 @@ All licenses described in the choosealicense.com [repository](https://github.com
</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>