From 5ba84b2865662a3ad79af0b647d6276aeabebd11 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 14 May 2016 13:11:28 -0700 Subject: [PATCH 1/5] add a legend --- appendix.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/appendix.md b/appendix.md index 0860d12..4e686e5 100644 --- a/appendix.md +++ b/appendix.md @@ -53,3 +53,33 @@ All licenses described in the choosealicense.com [repository](https://github.com {% endfor %} + +## Legend + +

Open source licenses grant to the public permissions () to do things with licensed works copyright or other "intellectual property" laws might otherwise disallow.

+ +

Most open source licenses' grants of permissions are subject to compliance with conditions ().

+ +

Most open source licenses also have limitations (), including liability and warranties disclaimed by licensors and sometimes expressly excluding patent or trademark from licenses' grants.

+ +
+{% 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 %} +
{{ rule_obj.label }}
+ {% 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 %} +
{{ r.description }}
+ {% endif %} + {% endfor %} + {% endfor %} + {% endfor %} +{% endfor %} +
From 825ea4edd358c5c92d058d4d898f3cb7a1c2b04b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 14 May 2016 13:15:56 -0700 Subject: [PATCH 2/5] link from table headers to legend terms --- appendix.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appendix.md b/appendix.md index 4e686e5..7257ed1 100644 --- a/appendix.md +++ b/appendix.md @@ -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 %} - {{ rule_obj.label }} + {{ rule_obj.label }} {% endfor %} {% endfor %} @@ -71,7 +71,7 @@ All licenses described in the choosealicense.com [repository](https://github.com {% if seen_tags contains req %} {% continue %} {% endif %} -
{{ rule_obj.label }}
+
{{ rule_obj.label }}
{% capture seen_tags %}{{ seen_tags | append:req }}{% endcapture %} {% for t in types %} {% for r in site.data.rules[t] | sort: "label" %} From ea641ba352779e2adfbae4b042e39634c62c9227 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sat, 14 May 2016 13:20:20 -0700 Subject: [PATCH 3/5] slightly less tortured wording --- appendix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appendix.md b/appendix.md index 7257ed1..824b902 100644 --- a/appendix.md +++ b/appendix.md @@ -60,7 +60,7 @@ All licenses described in the choosealicense.com [repository](https://github.com

Most open source licenses' grants of permissions are subject to compliance with conditions ().

-

Most open source licenses also have limitations (), including liability and warranties disclaimed by licensors and sometimes expressly excluding patent or trademark from licenses' grants.

+

Most open source licenses also have limitations () that usually disclaim warranty and liability and sometimes expressly exclude patent or trademark from licenses' grants.

{% assign seen_tags = '' %} From ce5b42e5102b3377911ad49ea1693292d3d69d70 Mon Sep 17 00:00:00 2001 From: Philippe Ombredanne Date: Sun, 22 May 2016 18:49:10 +0200 Subject: [PATCH 4/5] Add SPDX license list reference It may be relevant to add a link to SPDX as even though SPDX is referenced is many other places in the repo, it does not show up in the about.md. That would a nice addition! (disclaimer: I am on of the SPDX co-founders) --- about.md | 1 + 1 file changed, 1 insertion(+) diff --git a/about.md b/about.md index 55a32a0..cb04886 100644 --- a/about.md +++ b/about.md @@ -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] (http://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 From 76326f87b099da915480d6347d8a156691ab5304 Mon Sep 17 00:00:00 2001 From: Philippe Ombredanne Date: Sun, 22 May 2016 21:03:42 +0200 Subject: [PATCH 5/5] Fix markdown syntax for SPDX link. --- about.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about.md b/about.md index cb04886..f907655 100644 --- a/about.md +++ b/about.md @@ -20,7 +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] (http://spdx.org/licenses)/ +* 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