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

358 Commits

Author SHA1 Message Date
Mike Linksvayer
0b83d3d44e drop "dedication" from family name, fix #289; drop double empty condition properties 2016-03-07 15:43:39 -08:00
Mike Linksvayer
1e7e054a26 Merge remote-tracking branch 'origin/gh-pages' into gplv3-home 2016-03-05 10:08:16 -08:00
Mike Linksvayer
9a56c327d7 opportunistic https to kick CI 2016-03-02 18:27:44 -08:00
Mike Linksvayer
ab3ee0061b take projects listed on homepage from license using property 2016-03-02 18:23:31 -08:00
Mike Linksvayer
9ec2de1a50 rm gplv2 from homepage
- remove descrption of v2 v3 difference
- add to description v3 express patent grant
- update example projects to only include v3 ones
- move v2 projects to gplv2 license using property

partially addresses feedback in #335
2016-03-02 10:19:33 -08:00
Mike Linksvayer
aca74d3aa3 another https opportunistic to kick CI
https://travis-ci.org/github/choosealicense.com/builds/112981705
2016-03-01 14:43:23 -08: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
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
W. Trevor King
39154843df cc-by-sa-4.0: Weaken "same license" to mention compatibility
The human-readable summary uses "same license" [1], but also links to
a page listing other compatible licenses [2], and the license text
includes a compatible-license alternative [3,4].  This commit links to
that same set of compatible licenses using Mike's wording [5].

[1]: https://creativecommons.org/licenses/by-sa/4.0/
[2]: https://creativecommons.org/compatiblelicenses/
[3]: https://creativecommons.org/licenses/by-sa/4.0/legalcode#s3b1
[4]: https://creativecommons.org/licenses/by-sa/4.0/legalcode#s1c
[5]: https://github.com/github/choosealicense.com/pull/353/files#r53963602
2016-02-24 14:18:35 -08:00
W. Trevor King
a97a5bde53 cc-by-sa-4.0: Fix link to CC BY 4.0 (was self-reference)
Correct a typo from c81c90ba (conform to SPDX title to make tests
work, #353).
2016-02-24 14:07:49 -08:00
Mike Linksvayer
814bf9ac58 Merge pull request #353 from github/cc
Add qualifying CC licenses
2016-02-23 17:14:45 -08:00
Waldir Pimenta
926ead535e remove spaces at EOL per discussion in #351 2016-02-21 22:10:43 +00:00
Mike Linksvayer
8e3f62f1e0 cleanup desc/how 2016-02-21 09:36:10 -08:00
Mike Linksvayer
c81c90baa1 conform to SPDX title to make tests work 2016-02-21 09:21:23 -08:00
Mike Linksvayer
3d1334c478 replace failing linka for abantecart 2016-02-20 09:27:21 -08:00
Mike Linksvayer
8e720907da recover indentation from source URL, note patent permission 2016-02-18 20:21:16 -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
0375c35382 *gpl nicknames reflect GNU usage 2016-02-17 15:19:24 -08:00
Mike Linksvayer
db18b5dfe6 apache version, GNU *gpl naming, in part via #335 2016-02-16 09:29:18 -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
2a01884f6f make same-license requirement, add to all copyleft licenses 2016-02-05 10:25:19 -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
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
17fa055cf6 Merge pull request #334 from github/gplv3-no-sublicense
Remove confusing and inaccurate [no-]sublicensing property
2016-02-01 09:45:34 -08:00
Mike Linksvayer
440b44b5f4 remove all attempt to describe sublicensing permission/prohibitions 2016-01-31 14:56:40 -08:00
Mike Linksvayer
8522819681 GPLv3 doesn't allow sublicensing, just as AGPLv3 and GPLv2 don't
LGPLv3 doesn't allow sublicensing, justg as LGPLv2 doesn't as
former is additional permissions for GPLv3 and these don't include
sublicensing
2016-01-30 10:16:23 -08:00
Mike Linksvayer
8ed37bc56a Artistic License 2.0 (c) is for license text, not a template
fix #310 introduced in 0161a3d75d
2016-01-30 10:06:05 -08:00
Mike Linksvayer
72cd65abea Merge pull request #326 from github/no-license
consolidate no license info in /no-license, remove from /licenses
2016-01-28 14:01:51 -08:00
sieversMartin
53324d96cd Merge branch 'gh-pages' into gh-pages 2016-01-28 21:56:33 +01:00
Mike Linksvayer
7959b9aca4 remove BOM from eupl-1.1.txt which caused it to not render 2016-01-28 09:23:53 -08:00
emidiostani
aa28e590b6 Merge branch 'gh-pages' of https://github.com/EmidioStani/choosealicense.com into gh-pages 2016-01-28 09:11:30 +01:00
emidiostani
c27b9cd238 fixed comment https://github.com/github/choosealicense.com/pull/320 2016-01-28 09:10:03 +01:00
Emidio
ec929eb17d Merge branch 'gh-pages' into gh-pages 2016-01-27 09:55:26 +01:00
emidiostani
354ff80904 fixed errors described in https://github.com/github/choosealicense.com/pull/320 2016-01-27 09:53:04 +01:00
Mike Linksvayer
e98ec06a7d consolidate no license info in /no-license, remove from /licenses
fixes #196
2016-01-26 13:42:29 -08:00
martinsievers
749ea304e9 Removed "sub-license" and "patent-use" as suggested in comments on Github 2016-01-21 17:03:37 +01:00
sieversMartin
47a7dc9ffb Merge branch 'gh-pages' into gh-pages 2016-01-21 17:00:17 +01:00
Ben Balter
ed908356e7 make licenses hidden by default 2016-01-20 10:37:44 -05:00
martinsievers
53ff2a8686 Added a note and removed redirect again 2016-01-20 14:37:49 +01:00
martinsievers
57aa0e3764 Removed redirect attribute 2016-01-20 09:38:07 +01:00
martinsievers
e6f445f12b Renamed to pass cibuild 2016-01-20 09:36:02 +01:00
martinsievers
91e45575f0 Added fields 2016-01-19 17:54:36 +01:00
martinsievers
1dbf74ffc7 Added a nickname
Removed redirect
2016-01-19 17:51:08 +01:00
martinsievers
232235df26 Changed line breaks in order to pass the cibuild test 2016-01-19 17:23:01 +01:00
emidiostani
00df51e4a0 added eupl-1.1.txt licence 2016-01-19 14:58:28 +01:00
martinsievers
5362128137 Added license lppl-1-3c.txt. This is the standard license for developing LaTeX packages and classes 2016-01-19 13:54:30 +01: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
7d4c11e390 Merge branch 'mina86-gh-pages' into gh-pages
* mina86-gh-pages:
  Fix GPL 3 link
  Prefer (L)GPL 3.0 to 2.x.
2015-11-22 14:10:15 -05:00
Brandon Keepers
c2c8a67d28 Fix GPL 3 link 2015-11-22 14:04:27 -05:00
Michal Nazarewicz
1422ea3386 Prefer (L)GPL 3.0 to 2.x.
The GPL v3 is an improvement over v2 fixing several issues and
increasing compatibility with other free software licenses.  As such
there is no reason to feature v2 prominently rather than v3.  See
http://www.gnu.org/licenses/rms-why-gplv3.en.html for more rationale.
2015-11-17 16:00:02 +01:00
Waldir Pimenta
cd0c12225d format 'using' property as a bulleted list (fixes #292) 2015-11-02 16:36:55 +00: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
Ben Balter
cb0bc5f40e Merge pull request #303 from github/remove-gpl-no-sublicense
Remove sublicense warning for GPL-3.0
2015-11-02 09:26:03 -05:00
Ben Balter
4e9d7bca05 Merge pull request #293 from waldyrious/rename-category-family
rename category --> family (fix #288)
2015-11-02 09:19:36 -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
Brandon Keepers
eb56474487 Remove sublicense warning for GPL-3.0
From Section 10:

> Each time you convey a covered work, the recipient automatically
> receives a license from the original licensors, to run, modify and
> propagate that work, subject to this License.

Sublicensing is technically forbidden, but the copyleft makes the ability to sublicense irrelevant.
2015-11-01 21:41:21 -05:00
Ben Balter
37c1d947cc update source text to canonical url 2015-10-31 13:17:56 -04:00
Ben Balter
eda9fa97ec Use Mozilla's plaint text version of the MPL 2015-10-31 12:45:06 -04:00
Waldir Pimenta
6cbb454cb6 Merge branch 'gh-pages' into rename-category-family 2015-09-25 18:13:19 +01:00
Ben Balter
99fd693545 add description 2015-09-25 11:34:21 -04:00
Ben Balter
76eebea56e add AFL 2015-09-25 11:29:03 -04:00
Ben Balter
4518291ad7 Merge pull request #286 from christianbundy/patch-1
Remove recommendation to add email address to ISC
2015-09-20 12:34:18 -04:00
Waldir Pimenta
ba91c766d6 rename category --> family (fix #288) 2015-09-09 00:04:34 +01:00
Ben Balter
de0dfaf146 hard wrap 2015-09-08 12:54:14 -04:00
Ben Balter
c94abf0f84 Merge branch 'gh-pages' into matt40k-gh-pages 2015-09-08 12:46:14 -04:00
Ben Balter
1ddb0dc978 Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into clear-bsd 2015-09-08 12:43:38 -04: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
Christian Bundy
7cb14ab9e0 Remove recommendation to add email address to ISC
Remove non-canonical license and usage text from f89201c
2015-09-01 16:28:18 -07:00
Matt Smith
b96a48f34e Add how, removed layout and permalink
Appears the spec has been updated - lets hope this sorts it
2015-09-01 23:29:59 +01:00
Matt Smith
7e5f27a9ef Merge remote-tracking branch 'github/gh-pages' into gh-pages 2015-09-01 23:17:10 +01:00
Matt Smith
d147b88cf1 Update ms-rl.txt 2015-09-01 23:14:42 +01:00
Matt Smith
54d48f0352 Update ms-pl.txt 2015-09-01 23:14:00 +01:00
Matt Smith
7258872c05 Update ms-rl.txt 2015-09-01 23:04:09 +01:00
Matt Smith
c2ebe9bfe7 Update ms-pl.txt 2015-09-01 23:03:20 +01:00
Ben Balter
38704df34c normalize metadata 2015-08-22 16:44:23 -04:00
Ben Balter
3c8ca513cd Merge branch 'gh-pages' into clear-bsd 2015-08-22 16:41:05 -04:00
Ben Balter
16ae83ada5 Merge branch 'gh-pages' into clear-bsd 2015-08-22 16:40:07 -04:00
Ben Balter
df0fd9213f add rules spec 2015-08-22 15:42:12 -04:00
Ben Balter
915c08b821 move meta and fields to yaml 2015-08-22 15:25:16 -04:00
Ben Balter
5c47718e72 fix up wtfpl; 2015-08-19 16:46:40 -04:00
Ben Balter
ca7c100e2a fix ofl title 2015-08-19 16:23:55 -04:00
Ben Balter
c9bf0edc20 rename ofl so tests pass 2015-08-19 16:23:48 -04:00
Ben Balter
a6110b62e4 fix ofl title 2015-08-19 16:19:59 -04:00
Ben Balter
d37cb1e96b rename ofl so tests pass 2015-08-19 16:19:37 -04:00
Ben Balter
5b224fbf9a add clear BSD 2015-08-19 16:14:26 -04:00
Matt Smith
39eed4dccb Merge remote-tracking branch 'upstream/gh-pages' into gh-pages 2015-08-14 14:39:17 +01:00
Matt Smith
12adf39a19 Update ms-rl.txt 2015-08-14 14:33:08 +01:00
Matt Smith
9c7b036fcd Update ms-pl.txt 2015-08-14 14:32:07 +01:00
Ben Balter
3ed0867bb1 normalize license instructions 2015-08-07 11:35:27 -04:00
Ben Balter
f560cc5188 fix new license paths 2015-08-07 11:33:28 -04:00
Ben Balter
4ba1ca5dac implement hidden licenses 2015-08-06 11:56:18 -04:00
Matt Smith
e2dc70b74f bugfix
Missed 'License' from name - SPDX compliance
2015-05-29 01:27:48 +01:00
Matt Smith
2f17a6af22 MS Open Source licenses
Add the the Microsoft Open Source licenses which are heavily used on
Codeplex
2015-05-29 01:10:58 +01:00
Ben Balter
c0ca64aae4 Merge pull request #247 from real-or-random/patch-1
Applying the LGPL v3 correctly
2015-04-28 12:05:46 -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
Brandon Keepers
869573e054 Fix GPL v3.0 alias 2015-03-08 16:50:56 -07: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
e32971e277 Merge branch 'gh-pages' into tests 2015-03-07 12:55:39 -05:00
Ben Balter
dc1cc773a1 add tests 2015-03-07 12:47:24 -05:00
Ben Balter
79368c3197 its all about familiy 2015-03-05 20:30:15 -05:00
Ben Balter
54254c3f69 add descriptions to bsd-3 and agpl 2015-02-26 14:10:55 -05:00
Tim Ruffing
b20cc6035c Applying the LGPL v3 correctly
The LGPL v3 does not include the boilerplate notice. One should use a modified variant of the boilerplate notice at the end of GPL v3, see https://www.gnu.org/licenses/gpl-howto.en.html

> When using the Lesser GPL, insert the word “Lesser” before “General” in all three places. When using the GNU AGPL, insert the word “Affero” before “General” in all three places.
2015-01-17 14:24:45 +01:00
Ben Balter
4fcffe2c6b downcase all licenses 2014-09-17 11:34:25 -04:00
Ben Balter
0a6cf4f5b2 give no-license a txt extension 2014-09-17 11:02:10 -04:00
Ben Balter
22cc77f12b first pass at jekyll2ification 2014-07-31 12:36:56 -04:00