From 83c39a345d4a2bd9adc805b2b095804327a7483f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 6 Jun 2016 10:15:22 -0700 Subject: [PATCH 1/2] small link to appendix & improve for linking, guiding back to home page Based on feeedback from people looking for BSD licenses and wanting to use site as a reference. I'm not thrilled with any distraction from flow of choices that work for most on home page through spectrum covering range of open source licenses without redundant ones, but obviously some people prefer seeing everything in a table, so let them find it, accommodate use as reference and people whose learning style involes poring over a reference rather than being guided. --- appendix.md | 10 ++++++---- licenses.html | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/appendix.md b/appendix.md index f144b75..b961268 100644 --- a/appendix.md +++ b/appendix.md @@ -5,7 +5,9 @@ title: Appendix class: license-types --- -All licenses described in the choosealicense.com [repository](https://github.com/github/choosealicense.com), in a table. +For reference, all licenses described in the choosealicense.com [repository](https://github.com/github/choosealicense.com), in a table. + +If you're here to choose a license, **[start from the home page](/)** to see a few licenses that will work for most cases. {% assign types = "permissions|conditions|limitations" | split: "|" %} @@ -56,11 +58,11 @@ All licenses described in the choosealicense.com [repository](https://github.com ## Legend -

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

+

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' grants of permissions are subject to compliance with conditions.

-

Most open source licenses also have limitations () that usually disclaim warranty and liability and sometimes expressly exclude 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 = '' %} diff --git a/licenses.html b/licenses.html index db4010c..585fae9 100644 --- a/licenses.html +++ b/licenses.html @@ -5,7 +5,8 @@ class: license-types title: Licenses --- -

Open source licenses grant permission to everyone to use, modify, and share licensed software for any purpose, subject to conditions preserving the provenance and openness of the software. The following licenses are arranged from one with the strongest of these conditions (GNU AGPLv3) to one with no conditions (Unlicense). Notice that the popular licenses featured on the home page (GNU GPLv3, Apache License 2.0, and MIT License) fall within this spectrum.

+

Open source licenses grant permission to everyone to use, modify, and share licensed software for any purpose, subject to conditions preserving the provenance and openness of the software. The following licenses are arranged from one with the strongest of these conditions (GNU AGPLv3) to one with no conditions (Unlicense). Notice that the popular licenses featured on the home page (GNU GPLv3, Apache License 2.0, and MIT License) fall within this spectrum.

+

If you were looking for a reference table of all of the licenses on choosealicense.com, see the appendix.

{% include license-overview.html license-id="agpl-3.0" %} {% include license-overview.html license-id="gpl-3.0" %} From 827d62cc28a964115e6f94a2c6f4c4916a4680e8 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 6 Jun 2016 10:25:18 -0700 Subject: [PATCH 2/2] vertical spacing --- assets/css/application.scss | 2 +- licenses.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/application.scss b/assets/css/application.scss index b6370ba..8ced3ad 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -150,7 +150,7 @@ strong { .license-overview { clear: both; - margin-bottom: 50px; + margin-bottom: 40px; } .license-overview-heading { diff --git a/licenses.html b/licenses.html index 585fae9..dcd3655 100644 --- a/licenses.html +++ b/licenses.html @@ -6,7 +6,7 @@ title: Licenses ---

Open source licenses grant permission to everyone to use, modify, and share licensed software for any purpose, subject to conditions preserving the provenance and openness of the software. The following licenses are arranged from one with the strongest of these conditions (GNU AGPLv3) to one with no conditions (Unlicense). Notice that the popular licenses featured on the home page (GNU GPLv3, Apache License 2.0, and MIT License) fall within this spectrum.

-

If you were looking for a reference table of all of the licenses on choosealicense.com, see the appendix.

+

If you were looking for a reference table of all of the licenses on choosealicense.com, see the appendix.

{% include license-overview.html license-id="agpl-3.0" %} {% include license-overview.html license-id="gpl-3.0" %}