From 810eeb561824cb5bdcfff4e57e18d1063b582c35 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Tue, 1 Mar 2016 13:33:15 -0800 Subject: [PATCH 1/3] rename/order license properties better reflect how licenses work and are structured grant (permissions) conditioned on (conditions) with limitations Permissions coming first combats mistaken but apparently widespread impression that licenses impose conditions, even such that without a license, there would be no conditions/work would be in the public domain. Requirements->Conditions emphasizes that they are pertinent if one wants to take advantage of permissions. Forbiddens->Limitations is more accurate: in most cases licenses don't give permission to hold licensors liable, in some cases to use licensors' trademarks or patents, but a licensee does not lose the permissions granted by the license if the licensee holds licensor liable, etc. Also emphasizes that there are limitatations on the license grant, not that the license imposes prohibitions. The most concise place to see both the rename and reorder is in _includes/license-overview.html I did not reorder the appearance of the groups of properties in license source files (.txt files in _licenses) as those orderings are not used to render anything on the webiste. Might do so later. --- README.md | 26 +++++++++++++------------- _data/meta.yml | 8 ++++---- _data/rules.yml | 6 +++--- _includes/css/responsive.css | 6 +++--- _includes/license-overview.html | 4 ++-- _includes/sidebar.html | 2 +- _licenses/afl-3.0.txt | 6 +++--- _licenses/agpl-3.0.txt | 6 +++--- _licenses/apache-2.0.txt | 6 +++--- _licenses/artistic-2.0.txt | 6 +++--- _licenses/bsd-2-clause.txt | 6 +++--- _licenses/bsd-3-clause-clear.txt | 6 +++--- _licenses/bsd-3-clause.txt | 6 +++--- _licenses/cc-by-4.0.txt | 6 +++--- _licenses/cc-by-sa-4.0.txt | 6 +++--- _licenses/cc0-1.0.txt | 8 ++++---- _licenses/epl-1.0.txt | 6 +++--- _licenses/eupl-1.1.txt | 6 +++--- _licenses/gpl-2.0.txt | 6 +++--- _licenses/gpl-3.0.txt | 6 +++--- _licenses/isc.txt | 6 +++--- _licenses/lgpl-2.1.txt | 6 +++--- _licenses/lgpl-3.0.txt | 6 +++--- _licenses/lppl-1.3c.txt | 6 +++--- _licenses/mit.txt | 6 +++--- _licenses/mpl-2.0.txt | 6 +++--- _licenses/ms-pl.txt | 6 +++--- _licenses/ms-rl.txt | 6 +++--- _licenses/ofl-1.1.txt | 6 +++--- _licenses/osl-3.0.txt | 6 +++--- _licenses/unlicense.txt | 8 ++++---- _licenses/wtfpl.txt | 6 +++--- assets/css/application.scss | 22 +++++++++++----------- spec/license_spec.rb | 2 +- 34 files changed, 118 insertions(+), 118 deletions(-) diff --git a/README.md b/README.md index fa1d318..3387efe 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,9 @@ 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 -* `required` - Bulleted list of required rules -* `permitted` - Bulleted list of permitted rules -* `forbidden` - Bulleted list of forbidden rules +* `permissions` - Bulleted list of permission rules +* `conditions` - Bulleted list of condition rules +* `limitations` - Bulleted list of limitation rules #### Optional fields @@ -77,7 +77,15 @@ The license properties (rules) are stored as a bulleted list within the licenses ### Rules -#### Required +#### Permissions + +* `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. + +#### Conditions * `include-copyright` - Include a copy of the license and copyright notice with the code. * `document-changes` - Indicate significant changes made to the code. @@ -86,15 +94,7 @@ The license properties (rules) are stored as a bulleted list within the licenses * `rename` - You must change the name of the software if you modify it. * `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. -#### Permitted - -* `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. - -#### Forbidden +#### 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. * `no-liability` - Software is provided without warranty and the software author/license owner cannot be held liable for damages. diff --git a/_data/meta.yml b/_data/meta.yml index 8fe3d75..0b361e1 100644 --- a/_data/meta.yml +++ b/_data/meta.yml @@ -17,16 +17,16 @@ description: Instructions on how to implement the license required: true -- name: required +- name: conditions description: Bulleted list of required rules required: true -- name: permitted +- name: permissions description: Bulleted list of permitted rules required: true -- name: forbidden - description: Bulleted list of forbidden rules +- name: limitations + description: Bulleted list of limited rules required: true # Optional fields diff --git a/_data/rules.yml b/_data/rules.yml index c731405..9eea295 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -1,4 +1,4 @@ -required: +conditions: - description: Include a copy of the license and copyright notice with the code. label: License and copyright notice tag: include-copyright @@ -18,7 +18,7 @@ required: label: Same License tag: same-license -permitted: +permissions: - description: This software and derivatives may be used for commercial purposes. label: Commercial Use tag: commercial-use @@ -35,7 +35,7 @@ permitted: label: Patent Use tag: patent-use -forbidden: +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. label: Trademark Use tag: trademark-use diff --git a/_includes/css/responsive.css b/_includes/css/responsive.css index 3383e34..0d0120f 100644 --- a/_includes/css/responsive.css +++ b/_includes/css/responsive.css @@ -160,13 +160,13 @@ top: 1px; position: relative; } - .license-rules:not(.license-rules-sidebar) .license-required span { + .license-rules:not(.license-rules-sidebar) .license-conditions span { background-position: -34px 0; } - .license-rules:not(.license-rules-sidebar) .license-permitted span { + .license-rules:not(.license-rules-sidebar) .license-permissions span { background-position: -24px 0px; } - .license-rules:not(.license-rules-sidebar) .license-forbidden span { + .license-rules:not(.license-rules-sidebar) .license-limitations span { background-position: -14px 0; } } diff --git a/_includes/license-overview.html b/_includes/license-overview.html index 83256fc..d504c20 100644 --- a/_includes/license-overview.html +++ b/_includes/license-overview.html @@ -35,7 +35,7 @@ {% endif %} - + {% if license.family %} {% assign variations = site.licenses | where:"hidden",false | where:"family",license.family %} {% else %} @@ -46,7 +46,7 @@
- {% assign types = "required|permitted|forbidden" | split: "|" %} + {% assign types = "permissions|conditions|limitations" | split: "|" %} {% for type in types %} {% endfor %} diff --git a/_includes/sidebar.html b/_includes/sidebar.html index f4d2ba9..f2b9b9b 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -23,7 +23,7 @@
- {% assign types = "required|permitted|forbidden" | split: "|" %} + {% assign types = "permissions|conditions|limitations" | split: "|" %} {% for type in types %}

{{ type | capitalize }}

{{ type | capitalize }}