diff --git a/README.md b/README.md index d915b65..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,20 +94,11 @@ 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. -* `modifications` - This software may not be modified. -* `distribution` - You may not distribute this software. +* `patent-use` - This license explicitly states that it does NOT grant you any rights in the patents of contributors. ## License 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 2970878..bf15b75 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -1,6 +1,6 @@ -required: +conditions: - description: Include a copy of the license and copyright notice with the code. - label: License and copyright notice + label: License and Copyright Notice tag: include-copyright - description: Indicate significant changes made to the code. label: State Changes @@ -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,10 +35,13 @@ 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: Use Trademark + label: Trademark Use tag: trademark-use - description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. label: Hold Liable tag: no-liability +- description: This license explicitly states that it does NOT grant you any rights in the patents of contributors. + label: Patent Use + tag: patent-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/footer.html b/_includes/footer.html index ffb31ef..74cef19 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,11 +5,11 @@

If you have questions or issues, it is always best to consult a legal professional.
- This site is licensed under the + The content of this site is licensed under the Creative Commons Attribution 3.0 Unported License.

- Demystified with <3 by GitHub, Inc. + Demystified with <3 by GitHub, Inc.
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 }}

@@ -56,9 +56,9 @@ permalink: /
{{ type | capitalize }}