Skip to content

Commit 810eeb5

Browse files
mlinksvamlinksva
committed
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.
1 parent 7b2790b commit 810eeb5

34 files changed

Lines changed: 118 additions & 118 deletions

‎README.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
4343
* `source` - The URL to the license source text
4444
* `description` - A human-readable description of the license
4545
* `how` - Instructions on how to implement the license
46-
* `required` - Bulleted list of required rules
47-
* `permitted` - Bulleted list of permitted rules
48-
* `forbidden` - Bulleted list of forbidden rules
46+
* `permissions` - Bulleted list of permission rules
47+
* `conditions` - Bulleted list of condition rules
48+
* `limitations` - Bulleted list of limitation rules
4949

5050
#### Optional fields
5151

@@ -77,7 +77,15 @@ The license properties (rules) are stored as a bulleted list within the licenses
7777

7878
### Rules
7979

80-
#### Required
80+
#### Permissions
81+
82+
* `commercial-use` - This software and derivatives may be used for commercial purposes.
83+
* `modifications` - This software may be modified.
84+
* `distribution` - You may distribute this software.
85+
* `private-use` - You may use and modify the software without distributing it.
86+
* `patent-use` - This license provides an express grant of patent rights from the contributor to the recipient.
87+
88+
#### Conditions
8189

8290
* `include-copyright` - Include a copy of the license and copyright notice with the code.
8391
* `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
8694
* `rename` - You must change the name of the software if you modify it.
8795
* `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.
8896

89-
#### Permitted
90-
91-
* `commercial-use` - This software and derivatives may be used for commercial purposes.
92-
* `modifications` - This software may be modified.
93-
* `distribution` - You may distribute this software.
94-
* `private-use` - You may use and modify the software without distributing it.
95-
* `patent-use` - This license provides an express grant of patent rights from the contributor to the recipient.
96-
97-
#### Forbidden
97+
#### Limitations
9898

9999
* `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.
100100
* `no-liability` - Software is provided without warranty and the software author/license owner cannot be held liable for damages.

‎_data/meta.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
description: Instructions on how to implement the license
1818
required: true
1919

20-
- name: required
20+
- name: conditions
2121
description: Bulleted list of required rules
2222
required: true
2323

24-
- name: permitted
24+
- name: permissions
2525
description: Bulleted list of permitted rules
2626
required: true
2727

28-
- name: forbidden
29-
description: Bulleted list of forbidden rules
28+
- name: limitations
29+
description: Bulleted list of limited rules
3030
required: true
3131

3232
# Optional fields

‎_data/rules.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
required:
1+
conditions:
22
- description: Include a copy of the license and copyright notice with the code.
33
label: License and copyright notice
44
tag: include-copyright
@@ -18,7 +18,7 @@ required:
1818
label: Same License
1919
tag: same-license
2020

21-
permitted:
21+
permissions:
2222
- description: This software and derivatives may be used for commercial purposes.
2323
label: Commercial Use
2424
tag: commercial-use
@@ -35,7 +35,7 @@ permitted:
3535
label: Patent Use
3636
tag: patent-use
3737

38-
forbidden:
38+
limitations:
3939
- 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.
4040
label: Trademark Use
4141
tag: trademark-use

‎_includes/css/responsive.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,13 @@
160160
top: 1px;
161161
position: relative;
162162
}
163-
.license-rules:not(.license-rules-sidebar) .license-required span {
163+
.license-rules:not(.license-rules-sidebar) .license-conditions span {
164164
background-position: -34px 0;
165165
}
166-
.license-rules:not(.license-rules-sidebar) .license-permitted span {
166+
.license-rules:not(.license-rules-sidebar) .license-permissions span {
167167
background-position: -24px 0px;
168168
}
169-
.license-rules:not(.license-rules-sidebar) .license-forbidden span {
169+
.license-rules:not(.license-rules-sidebar) .license-limitations span {
170170
background-position: -14px 0;
171171
}
172172
}

‎_includes/license-overview.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h3 class="license-family-name">
3535
</ul>
3636
{% endif %}
3737
</div>
38-
38+
3939
{% if license.family %}
4040
{% assign variations = site.licenses | where:"hidden",false | where:"family",license.family %}
4141
{% else %}
@@ -46,7 +46,7 @@ <h3 class="license-family-name">
4646
<div {% if variation.id %}id="{{ variation.id | remove: '/licenses/' | slugify }}" {% endif %}class="variation-tab {% if variation.id %}variation-{{ variation.id | remove: '/licenses/' | slugify }}{% endif %} js-variation-tab{% if license.id == variation.id %} active{% endif %}">
4747
<table class="license-rules">
4848
<tr>
49-
{% assign types = "required|permitted|forbidden" | split: "|" %}
49+
{% assign types = "permissions|conditions|limitations" | split: "|" %}
5050
{% for type in types %}
5151
<th class="label">{{ type | capitalize }}</th>
5252
{% endfor %}

‎_includes/sidebar.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h5>How to apply this license</h5>
2323

2424
<div class="license-rules license-rules-sidebar">
2525

26-
{% assign types = "required|permitted|forbidden" | split: "|" %}
26+
{% assign types = "permissions|conditions|limitations" | split: "|" %}
2727
{% for type in types %}
2828
<h3>{{ type | capitalize }}</h3>
2929
<ul class="license-{{ type }}">

‎_licenses/afl-3.0.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ description: The Academic Free License is a variant of the Open Source License t
66

77
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Files licensed under OSL 3.0 must also include the notice "Licensed under the Academic Free License version 3.0" adjacent to the copyright notice.
88

9-
required:
9+
conditions:
1010
- include-copyright
1111

12-
permitted:
12+
permissions:
1313
- commercial-use
1414
- modifications
1515
- distribution
1616
- private-use
1717
- patent-use
1818

19-
forbidden:
19+
limitations:
2020
- trademark-use
2121
- no-liability
2222

‎_licenses/agpl-3.0.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
1212

1313
note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license.
1414

15-
required:
15+
conditions:
1616
- include-copyright
1717
- document-changes
1818
- disclose-source
1919
- network-use-disclose
2020
- same-license
2121

22-
permitted:
22+
permissions:
2323
- commercial-use
2424
- modifications
2525
- distribution
2626
- patent-use
2727
- private-use
2828

29-
forbidden:
29+
limitations:
3030
- no-liability
3131

3232
hidden: false

‎_licenses/apache-2.0.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
1010

1111
note: The Apache Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice at the very end of the license in the appendix.
1212

13-
required:
13+
conditions:
1414
- include-copyright
1515
- document-changes
1616

17-
permitted:
17+
permissions:
1818
- commercial-use
1919
- modifications
2020
- distribution
2121
- patent-use
2222
- private-use
2323

24-
forbidden:
24+
limitations:
2525
- trademark-use
2626
- no-liability
2727

‎_licenses/artistic-2.0.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ description: Heavily favored by the Perl community, the Artistic license require
77

88
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders.
99

10-
required:
10+
conditions:
1111
- include-copyright
1212
- document-changes
1313

14-
permitted:
14+
permissions:
1515
- commercial-use
1616
- modifications
1717
- distribution
1818
- patent-use
1919
- private-use
2020

21-
forbidden:
21+
limitations:
2222
- no-liability
2323
- trademark-use
2424

0 commit comments

Comments
 (0)