1
0
mirror of https://github.com/github/choosealicense.com synced 2024-06-16 16:09:50 +02:00
Commit Graph

40 Commits

Author SHA1 Message Date
Mike Linksvayer
b62ee46b31
Add "Modified" nickname to BSD-3-Clause
Note it has a number of nicknames https://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_(%22BSD_License_2.0%22,_%22Revised_BSD_License%22,_%22New_BSD_License%22,_or_%22Modified_BSD_License%22) the first two of which are captured in the current title.

This change will facilitate matching a semi-common markup version, see https://github.com/licensee/licensee/pull/578
2022-12-27 15:03:56 -08:00
Mike Linksvayer
164971616d
Reflect 44691632d2 2022-01-22 13:49:06 -08:00
Mike Linksvayer
4037f7168e
Update BSD-3-Clause examples because d3 is now ISC licensed 2021-07-05 21:31:41 -07:00
Mike Linksvayer
55d5160d84
BSD-3-Clause description: copyright holder rather than project 2021-03-23 13:53:07 -07:00
ObserverOfTime
a5e495914c
Convert license using array to map 2020-10-03 11:34:50 +03:00
Mike Linksvayer
40031df9e2 Remove superfluous instruction from bsd-3-clause* 'how' field 2019-02-15 12:51:55 -08:00
Mike Linksvayer
63220fb382 use example without hardcoded party in text 2018-08-20 12:29:29 -07:00
Mike Linksvayer
10222a9eb6
Merge branch 'gh-pages' into numbered-bsd 2018-08-20 19:13:01 +00:00
Mike Linksvayer
719b9bd02e BSD-2/3-Clause numbered list, uses
SPDX and OSI have numbered lists for these licenses
2018-08-18 16:17:46 -07:00
Mike Linksvayer
325806b42a rm source metadata, defer to SPDX record 2018-08-04 14:07:24 -07:00
Mike Linksvayer
102887fbeb use SPDX license list 3.0 2017-12-29 14:30:08 -08:00
games647
ad0dc7d8c6
Use HTTPS if available 2017-10-01 21:04:07 +02:00
Mike Linksvayer
1726b836bb make using required for new licenses 2017-05-30 14:17:13 -07: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
28e4765dfe spdx-id required, nickname only for licenses with customary short names 2016-05-24 16:21:13 -05:00
Philippe Loctaux
4c4f200344 Update bsd-3-clause.txt 2016-05-23 23:28:53 +02:00
Philippe Loctaux
f58d55c699 Update bsd-3-clause.txt
fixed spelling
2016-05-23 08:27:24 +02:00
Philippe Loctaux
a84497089b Update bsd-3-clause.txt 2016-05-20 00:36:36 +02:00
Mike Linksvayer
b4cf070a82 rm no longer pertinent fields and tests 2016-04-07 18:48:15 -07:00
Mike Linksvayer
922d4d3f79 add missing descriptions, missing property, slight desc tweaks 2016-04-04 10:56:29 -07:00
Mike Linksvayer
4e1109c92b consistent self-id of bsd-2/3, mit following isc in #371 2016-03-15 14:51:19 -07: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
6e36568139 Make BSD nicknames self-descriptive and conform to OSI site use
- don't require knowledge of 'new' or 'simplified' relative to *what*
- rm nickname for BSD 3-clause Clear License which is hidden and
  deserves to remain little known
2016-02-18 08:05:17 -08:00
Mike Linksvayer
c04ea11e17 Remove need for tab-slug 2016-02-12 15:51:44 -08:00
Ben Balter
8d24208088 Revert "upgrade to jekyll 3 due to"
This reverts commit 48c6e3e887.
2016-02-09 12:21:11 -05:00
Mike Linksvayer
48c6e3e887 upgrade to jekyll 3 due to
https://github.com/blog/2100-github-pages-now-faster-and-simpler-with-jekyll-3-0
2016-02-02 16:02:01 -08:00
Mike Linksvayer
440b44b5f4 remove all attempt to describe sublicensing permission/prohibitions 2016-01-31 14:56:40 -08:00
Ben Balter
ed908356e7 make licenses hidden by default 2016-01-20 10:37:44 -05: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
Waldir Pimenta
ba91c766d6 rename category --> family (fix #288) 2015-09-09 00:04:34 +01:00
Waldir Pimenta
f76e99330f Normalize sorting of license properties
Properties are now consistently sorted across all license files,
appearing in the following order:

**title**
nickname
tab-slug
redirect_from
category
variant
featured
hidden
**source**

**description**
**how**
note

using

**required**
**permitted**
**forbidden**
2015-09-06 18:59:27 +01:00
Ben Balter
915c08b821 move meta and fields to yaml 2015-08-22 15:25:16 -04:00
Ben Balter
4ba1ca5dac implement hidden licenses 2015-08-06 11:56:18 -04:00
lord63
4908ddf1c1 Update bsd-3-clause.txt
Replace the not exist {organizetion} option with [project].
2015-04-06 11:30:45 +08:00
Ben Balter
0ca328b53a add nicknames for license list 2015-03-07 14:11:34 -05:00
Ben Balter
530e15d771 validate SPDX compliance 2015-03-07 13:38:52 -05:00
Ben Balter
54254c3f69 add descriptions to bsd-3 and agpl 2015-02-26 14:10:55 -05:00
Ben Balter
4fcffe2c6b downcase all licenses 2014-09-17 11:34:25 -04:00