1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-13 06:58:53 +01:00
Commit Graph

47 Commits

Author SHA1 Message Date
Ben Balter
fe965f16f6 s/required/true 2017-07-25 11:22:05 -04:00
Mike Linksvayer
1726b836bb make using required for new licenses 2017-05-30 14:17:13 -07:00
floatingatoll
d171cf3c22 De-capitalize one mistakenly-capitalized 'License'
The surround text (and following items) use the phrase "Same license" and no evidence is present of capitalization of License as a proper noun in this text.
2017-04-08 21:23:05 -07:00
Mike Linksvayer
ec57a36433 spel 2017-03-27 08:35:39 -07:00
Mike Linksvayer
aeca75a53b Don't inlcude 'you' in any rule descriptions
Descriptions should make sense whether reader is licensor or licensee
2017-03-26 16:56:26 -07:00
Ben Balter
401fbf5fc0
convert rule labels to sentance case 2017-03-14 19:44:38 -04:00
Mike Linksvayer
1ce6e03c5e simplify 2017-02-19 17:31:58 -08:00
Mike Linksvayer
6ae1f697d7 same-license--variations 2017-02-19 14:37:32 -08:00
Mike Linksvayer
f7cdfa1e96 Merge branch 'gh-pages' into warranty 2016-12-21 12:11:30 -08:00
Mike Linksvayer
234d416f73 notices with code->software
notice condition of open source licenses usually for any distribution, not only source code form

fixes #272
2016-12-19 10:48:25 -08:00
Mike Linksvayer
57f7891273 no-liability -> liability, warranty
rename and add tag and associated descriptions

fixes #412
2016-12-12 14:29:25 -08:00
Mike Linksvayer
570f69e4ec hidden: false for 'popular' licenses
- document criteria for whether a license is hidden
  - needed for license spectrum on /licenses OR
  - on 'popular' list at https://opensource.org/licenses (some other list could be used in the future)
- adjust license properties and tests accordingly

This gets non-hidden list back close to what it was before #386 and (pending licensee vendoring this change, licensee release, and github.com licensee dependency version bump) some commonly requested licenses (eg #413 #449) will reappear in the github.com license drop-down.
2016-09-26 11:20:44 -07:00
Waldir Pimenta
9e6528c68f sort license properties in the order permissions > conditions > limitations (fixes #387) 2016-08-22 19:42:42 +01:00
Mike Linksvayer
582d2029a0 let's be consistent with _ in "variables" 2016-06-30 09:57:40 -07:00
Mike Linksvayer
1b983bd1e4 rm unneeded quotes 2016-06-30 09:56:15 -07:00
Mike Linksvayer
675309ad24 make explicit in docs what I was about to leave as pull request desc 2016-06-30 09:47:28 -07:00
Mike Linksvayer
69095b6f93 Update docs: using: field value should be a link to LICENSE implementation
Practice since #358 see #372 and #377 for examples.
2016-06-30 09:36:56 -07:00
Mike Linksvayer
cf79b35e06 re-add optional hidden field, default to true
licenses on /licenses have `hidden: false` set

fixes #434
2016-06-14 10:35:44 -07:00
Mike Linksvayer
28e4765dfe spdx-id required, nickname only for licenses with customary short names 2016-05-24 16:21:13 -05:00
Mike Linksvayer
6fe44f4637 Make nickname a required meta field
Add missing nicknames
Use SPDX ID if no customary nickname (eg GNU GPLv3) exists

This ensures that a relatively compact name is always available

I may be missing some obvious customary names, e.g., is "Eclipse
1.0" customary? For now I've used the SPDX ID, EPL-1.0.
2016-05-24 14:21:29 -05:00
Shane Curcuru
4c3818e881 Update with proposed suggestion 2016-05-05 21:38:16 -04:00
Shane Curcuru
d1ad7bd8e3 Better limitations:trademark-use
Existing phrase is likely confusing to new readers; trying to better clarify the fact that copyright licenses don't grant you trademarks anyway, but that these licenses are explicit about letting you know trademarks aren't copyrights.
2016-05-05 15:47:27 -04:00
Mike Linksvayer
213c5400bc re-add 'featured' field
was unused for choosealicense.com display after
https://github.com/github/choosealicense.com/pull/386

but choosealicense.com is vendored into licensee which eventually
is used in GitHub; 'featured' determines what is highlighted in
license drop-down eg at https://github.com/new
2016-04-26 12:22:15 -07:00
Mike Linksvayer
abef7e0bab state changes missing from 4 licenses which have condition
also drop 'significant' from description, does not correspond to
any license
2016-04-25 15:08:39 -07:00
Mike Linksvayer
e5a92ccb50 rm 'rename' field; never used to describe any license
Searched with `git log -Srename`

Arguably *could* be used to describe ofl-1.1 or artistic-2.0, but
renaming is an option for licensors to include in ofl-1.1 and one
of a few ways to comply with artistic-2.0. Doesn't seem straightforward
or common enough to catalog here.
2016-04-11 17:07:11 -07:00
Mike Linksvayer
b4cf070a82 rm no longer pertinent fields and tests 2016-04-07 18:48:15 -07:00
Waldir Pimenta
adc9883240 harmonize capitalization of labels (title case) 2016-03-06 23:13:18 +00:00
Mike Linksvayer
810eeb5618 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.
2016-03-01 13:33:15 -08:00
Mike Linksvayer
78217a096b Use Trademark -> Trademark Use to match otther Use Xs 2016-02-28 12:15:51 -08:00
Mike Linksvayer
ede7a09118 Add "forbidden" property for "patent-use", mirroring "trademark-use",
for the sorry licenses that explicitly do not grant any patent
permissions
2016-02-28 12:10:23 -08:00
Mike Linksvayer
c04ea11e17 Remove need for tab-slug 2016-02-12 15:51:44 -08:00
Mike Linksvayer
ade0beec17 Test that only open licenses are included per
https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-a-license

- check that all licenses have minimum permissions
- remove non-open (and unused) forbiddens
- closes #1 with confidence
2016-02-08 10:25:06 -08:00
Mike Linksvayer
2a01884f6f make same-license requirement, add to all copyleft licenses 2016-02-05 10:25:19 -08:00
Mike Linksvayer
5fb1cde719 remove note about LGPL and OSL, see discussion in #343 2016-02-05 09:15:05 -08:00
W. Trevor King
92b2fa9728 Remove 'library-usage'
The last meaningful change to this tag was c4c48d49 (Change nonstatic
to library usage, 2013-07-10), but I'm not sure where that discussion
happened.  In any case, that commit changed some "must" wording to
"may" wording, which seems like it should move the label from required
to permitted.  However, a library-usage permission would also apply to
many other licenses (e.g. folks are free to link MIT-licensed work
from a proprietary program), and adding library-usage to almost all
the licenses seems like the wrong way to make this distinction [1].

The limitations that the LGPL and OSL place on disclose-source scoping
are already covered in the disclose-source description, so the
library-usage label doesn't seem to be adding anything meaningful.
The OSL gets at this distinction by tightly scoping derivative works
[2], and the LGPL talks about combined works as a special subset of
derivative works [3,4].  The MPL makes a similar distinction between
"Covered Software" and "Larger Work" [5], and the EPL makes a similar
distinction between "derivative works" and "the Program" [6].  Whether
the location of those distinctions, or the requirements placed on
combined works can be neatly summarized in a boolean label remains to
be seen, but we're pretty sure that library-usage is not that label
[7].

Subsequent commits may replace the caveat in the disclose-source
description with wording in the license description themselves or by
adding a new label that summarizes the issue.  Until then, the
disclose-source description more clearly covers the information that
library-usage was intended to convey, so this commit removes the
less-clear label to avoid redundancy.

[1]: https://github.com/github/choosealicense.com/pull/343#issuecomment-179532710
[2]: http://rosenlaw.com/OSL3.0-explained.htm#_Toc187293087
[3]: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
[4]: https://www.gnu.org/licenses/lgpl.html
[5]: https://www.mozilla.org/en-US/MPL/2.0/
[6]: http://www.eclipse.org/legal/epl-v10.html
[7]: https://github.com/github/choosealicense.com/pull/343#issuecomment-179557468
2016-02-04 11:38:05 -08:00
Mike Linksvayer
5c020b61eb Revert "Revert "Update descriptions of fields to reflect hidden default change"" 2016-02-02 16:10:39 -08:00
Mike Linksvayer
8c8698f1f5 Revert "Update descriptions of fields to reflect hidden default change" 2016-02-02 14:45:56 -08:00
Mike Linksvayer
86645a03b3 Update descriptions of fields to reflect hidden default change,
info provided in
https://github.com/github/choosealicense.com/issues/290#issuecomment-138722623
2016-02-02 13:45:39 -08:00
Mike Linksvayer
440b44b5f4 remove all attempt to describe sublicensing permission/prohibitions 2016-01-31 14:56:40 -08:00
Mike Linksvayer
587e104dc8 BSD and OFL licenses have no endorsement clauses, not explicit
non-grant of trademark rights.

Generalize description of trademark a bit to 'or' include other
marks, as some licenses include others, though trademark the only
universal among such licenses.
2015-12-14 11:15:38 -08:00
Mike Linksvayer
54de9d0e86 Slightly increase accuracy of trademark info:
- use not directly forbideen by certain licenses, rather rights not granted
- CC0-1.0 is one of those licenses with explicit non-grant
2015-12-14 11:03:17 -08:00
Brandon Keepers
1a17c9a94c Merge pull request #305 from github/patent-use
Rename "Patent Grant" to "Patent Use"
2015-11-02 10:57:43 -05:00
Brandon Keepers
15ebedb726 Rename "Patent Grant" to "Patent Use"
Per the discussion in #168, the consumers of the softare are granted the right to use patents. So "Patent Use" makes more sense from a consumer perspective than "Patent Grant".
2015-11-01 22:51:13 -05:00
Waldir Pimenta
ba91c766d6 rename category --> family (fix #288) 2015-09-09 00:04:34 +01:00
Ben Balter
915c08b821 move meta and fields to yaml 2015-08-22 15:25:16 -04:00
Derek Jones
c30ff9e20a Merge remote-tracking branch 'github/gh-pages' into osl-3.0
Conflicts:
	_config.yml
2015-08-06 10:22:19 -07:00
Ben Balter
22cc77f12b first pass at jekyll2ification 2014-07-31 12:36:56 -04:00