docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00
Code Issues Releases Wiki Activity
1,675 Commits 3 Branches 0 Tags 5.1 MiB
Commit Graph

375 Commits

Author SHA1 Message Date
Mike Linksvayer
29a3b153e3 wrapped AFL-3.0, MS-PL, MS-RL taken from 8332159157 2017-11-19 14:21:19 -08:00
Mike Linksvayer
2d5a7244b4 update apache-2.0 using examples 
- Apache HTTPD URL giving timeouts in CI
- Android license file isn't a simple example to copy from
+ Kubernetes, Elasticsearch are very high profile, with simple verbatim license files
 2017-11-13 16:51:43 -08:00
Mike Linksvayer
d43130dc55 make wtfpl source: field point to url with license text 2017-11-13 16:01:45 -08:00
Josh Soref
ce1ee044a9 spelling: prohibition 2017-11-06 03:45:19 +00:00
Mike Linksvayer
efbd4a5ac8
Merge branch 'gh-pages' into patch-1 2017-11-04 10:53:21 -07:00
Mike Linksvayer
99378268a1 Merge https://github.com/github/choosealicense.com into patch-1 2017-11-04 10:51:27 -07:00
Mike Linksvayer
38a3be4898 restore square brackets from canonical versions 2017-10-24 14:48:49 -07:00
Mike Linksvayer
17d1196b31 replace 404 link 2017-10-24 11:22:07 -07:00
Mike Linksvayer
64ba25a22f remove link not found in canonical version 2017-10-18 17:16:11 -07:00
Mike Linksvayer
e90b7c383a wording changes for <> fields to match canonical versions 2017-10-18 17:14:38 -07:00
Mike Linksvayer
d7dd72fdec {} -> <> in license trailer to more closely match canonical texts 2017-10-18 17:04:09 -07:00
Mike Linksvayer
b6e4d57db5 Merge branch 'gh-pages' into patch-1 2017-10-17 18:30:24 -07:00
Mike Linksvayer
c02073ebdb Merge branch 'gh-pages' into patch-1 2017-10-08 18:50:34 -07:00
Mike Linksvayer
dd9a24fb78 Fix EUPL link that changed once again without redirect! 2017-10-04 14:03:08 -07:00
games647
ad0dc7d8c6
Use HTTPS if available 2017-10-01 21:04:07 +02:00
Mike Linksvayer
6709fa7d18 Merge branch 'gh-pages' into patch-1 2017-09-19 14:55:17 -07:00
Mike Linksvayer
9a8bd27017 swap example failing tests 
Seems to be a very minor configuration problem with TLS for cgit.freedesktop.org, swapping out example so tests pass.
 2017-09-19 14:45:18 -07:00
Mike Linksvayer
d70d1c18ac update broken link 2017-09-19 14:00:03 -07:00
Mike Linksvayer
d8310f8b81 Update EPL-1.0 examples 
Each can be detected by licensee and is a non-legacy repo.
 2017-09-19 13:31:33 -07:00
Mike Linksvayer
84ac214d7f Merge branch 'gh-pages' into cc0-source-text 2017-09-18 18:11:14 -07:00
Mike Linksvayer
69232e6fc3 Merge branch 'gh-pages' into patch-1 2017-07-28 09:08:26 -07:00
Laurent Joubert
a792218c0f Update cecill-2.1.txt 
- Corrected link to TXT version
- Corrected text to right column width
- Updated "using" projects
 2017-07-06 11:25:29 +02:00
Mike Linksvayer
65828e1d0f rm fields that should be defaulted to 2017-07-04 12:26:14 -07:00
Laurent Joubert
d9cbe3830c Added CeCILL Licenses v2.1 2017-07-04 18:26:48 +02:00
Damien Lecan
4df304625c Update according to https://fedoraproject.org/wiki/Licensing/PostgreSQL_License 2017-06-26 11:20:18 +02:00
Damien Lecan
8d7d579c3a Add missing [fullname] field 2017-06-26 11:13:01 +02:00
Mike Linksvayer
b8006f70d1 rm fields with default values 2017-06-25 13:56:27 -07:00
Damien Lecan
2e6e50f00f Provide examples compatible with license template 2017-06-24 23:02:26 +02:00
Damien Lecan
82e4edbb60 Use allowed fileds 2017-06-23 18:36:26 +02:00
Damien Lecan
8625394f3b Fix license name 2017-06-23 18:30:16 +02:00
Damien Lecan
25ecb23a40 Merge branch 'gh-pages' into gh-pages 2017-06-23 18:27:13 +02:00
Damien Lecan
fda503385d Initial revision 2017-06-23 18:24:51 +02:00
Matti Schneider
0b57486e2c Line wrap at 78 characters 
As per CONTRIBUTING rules
 2017-06-23 17:01:59 +02:00
Matti Schneider
bcbf76b178 Add EUPL v1.2 2017-06-22 09:55:18 +02:00
Haralan Dobrev
22a9b2bc80 Link to unlicense.org on HTTPS 2017-06-20 22:30:04 +03:00
Waldir Pimenta
22dc2dbe36 fix typo: soley --> solely 2017-06-18 23:40:11 +01:00
Waldir Pimenta
d7e5529839 fix typo: soley --> solely 2017-06-18 23:39:22 +01:00
John Jago
edf588b327 Replace dual-licensed example with RDF.rb 2017-06-10 12:45:38 -05:00
Jan
435252f5c0 Use docopt.rs as example for the Unlicense 2017-06-09 10:49:50 +02:00
Jan
03bf491cd4 Remove stacktrace.js as Unlicense example 2017-06-09 09:59:16 +02:00
Mike Linksvayer
1726b836bb make using required for new licenses 2017-05-30 14:17:13 -07:00
Mike Linksvayer
b3f003eba0 fix uncool EUPL link 2017-05-27 12:31:01 -07:00
Evan Ogas
3215952d39 Fix .NET Core license.txt url 2017-05-17 16:34:04 -04:00
Mike Linksvayer
b225f1f94b Example project moved its license file, update 2017-04-21 18:20:47 -07:00
Naren Dasan
d818ba67fa update developed by 2017-03-25 13:15:30 -07:00
Naren Dasan
7eb2639152 Update ncsa.txt 2017-03-24 12:51:02 -07:00
Naren Dasan
19544b0112 Matching SPDX over OSI 2017-03-24 12:45:18 -07:00
Naren Dasan
27570c5e3f Added different projects and typo 2017-03-24 12:39:36 -07:00
Mike Linksvayer
8e08db2e27 rm trademark-use limitation; this just has a non-endorsement clause 2017-03-24 11:47:47 -07:00
Mike Linksvayer
abff65e95d rm fields with default values 2017-03-24 11:40:33 -07:00
Naren Dasan
da0e011c66 Change hidden to true 2017-03-23 23:19:04 -07:00
Naren Dasan
c8ac779574 fix links 2017-03-23 22:50:03 -07:00
Naren Dasan
2247a46e7c distibute -> distribution 2017-03-23 21:49:33 -07:00
Naren Dasan
cae5457dfa Update ncsa.txt 2017-03-23 21:47:46 -07:00
Naren Dasan
d0af1481b0 links 2017-03-23 18:51:32 -07:00
Naren Dasan
e29f5d16d9 Update ncsa.txt 2017-03-23 18:45:40 -07:00
Naren Dasan
713b9b6020 Adding NCSA License 2017-03-23 18:41:20 -07:00
Mike Linksvayer
69ad10f6c9 []->{} consistency in ECL-2.0 appendix 
See https://github.com/github/choosealicense.com/pull/494#issuecomment-287436948 and Apache-2.0 treatment here.
 2017-03-20 10:13:37 -07:00
Matthew Buckett
388396f933 Dropped duplicate heading on ECL license. 2017-03-17 18:03:29 +00:00
Mike Linksvayer
52a73b8286 rm fields with default values 2017-03-17 10:42:31 -07:00
Matthew Buckett
2f005b33f9 Add ECL-2.0 License 
The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license.
 2017-03-17 11:20:57 +00:00
Mike Linksvayer
6b554b769f Use license text from source 
The existing license text was introduced in https://github.com/github/choosealicense.com/pull/126 presumably by copying and pasting from https://creativecommons.org/publicdomain/zero/1.0/legalcode though I'm not sure how to explain the link at the end. Probably should be updated with https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt or https://spdx.org/licenses/CC0-1.0.html ... latter marks disclaimer as optional and doesn't have first line "Creative Commons Legal Code". This commit uses former.

Making due to https://github.com/benbalter/licensee/issues/172 but holding off on merge pending more discussion there.
 2017-03-04 10:26:17 -08:00
Mike Linksvayer
556c006266 Fix copyright line, which pertains to the license itself 
See http://www.wtfpl.net/faq/
 2017-03-02 17:37:03 -08:00
Jacob Mischka
092ad597e3
Change copyright date 2004 -> [year] in wtfpl 2017-03-02 19:18:44 -06: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
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
Mike Linksvayer
8de49ac800 alignment with other records 
* same-license is not a limitation and doesn't apply in any way to BSL-1.0
* other licenses with a per-file notice recommendation get that added to the note field
* have the description mention the reason for this license existing, binary distribution without notices (IIUC)
* remove using: pending an example that can be followed by others and detected eg on GitHub, see https://github.com/github/choosealicense.com/blob/gh-pages/README.md#optional-fields and see #358 #372 #377
 2016-09-16 15:40:36 -07:00
Jochen Topf
6a74345a6d Add Boost Software License 1.0. 2016-09-16 10:12:43 +02:00
Mike Linksvayer
e800e1c845 Remove variation in instructions for applying LGPLv3 
Leaving only the option described in https://www.gnu.org/licenses/gpl-howto.html

Following from discussion at https://github.com/benbalter/licensee/pull/113#r78846987
 2016-09-14 14:45:04 -07:00
Waldir Pimenta
e0b2b9294d unlicense: fix typo "kakokune" -->"kakoune" 2016-08-22 20:03:52 +01:00
Waldir Pimenta
9e6528c68f sort license properties in the order permissions > conditions > limitations (fixes #387) 2016-08-22 19:42:42 +01:00
Waldir Pimenta
e81e63e696 unlicense: add 3 popular projects using it 2016-08-22 18:24:02 +01:00
Sam Gluck
f44e11237b Fix source URL for ms-rl license 2016-07-24 09:47:39 +01:00
Mike Linksvayer
28c245adec small wording fix, see https://github.com/github/choosealicense.com/pull/440#issuecomment-230809370 2016-07-06 11:20:27 -07:00
Waldir Pimenta
cfa7104f85 Fix instructions for Artistic 2.0 (follow-up #333) 
cf. #103, #310 and #333
cc @mlinksva, @benbalter, @bkeepers and @Haacked
 2016-07-06 15:02:20 +01:00
Paul Chaignon
28f55954bf zlib license 2016-07-01 20:52:01 +02:00
Emil Gedda
bed6d31cc7 Correct the spelling of "license" in wtfpl 
Just a minor correction i found while browsing.
 2016-06-15 21:44:52 +02: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
7cefe4c92d rm unncessary 'additionally' 2016-06-03 10:25:30 -07:00
Mike Linksvayer
6d8339765e remove somewhat redundant words 2016-06-03 10:10:08 -07:00
Mike Linksvayer
d6f7e196ca Merge branch 'gh-pages' into functional-descriptions 2016-06-01 09:01:10 -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
Philippe Loctaux
4c4f200344 Update bsd-3-clause.txt 2016-05-23 23:28:53 +02:00
Philippe Loctaux
4636330a4c Update bsd-3-clause-clear.txt 2016-05-23 23:28:32 +02:00
Philippe Loctaux
edbb88820a Update bsd-3-clause-clear.txt 
fixed spelling
 2016-05-23 08:27:44 +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
Philippe Loctaux
88eab45508 Update bsd-3-clause-clear.txt 2016-05-20 00:36:21 +02:00
Mike Linksvayer
76970d1170 Merge branch 'gh-pages' into functional-descriptions 2016-05-03 14:44:18 -07:00
Théo Zimmermann
1f667089c7 Highlight projects with simpler licensing practices 2016-05-03 22:53:25 +02:00
Théo Zimmermann
a84fc73166 Update the link to LibreOffice license file 2016-05-03 17:52:42 +02:00
Théo Zimmermann
f915264bc8 Add examples of software under MPL 
No better links found for Mozilla Firefox and Thunderbird.
 2016-05-03 12:27:55 +02:00
Théo Zimmermann
7eeef34696 Add a note on the recommended boilerplate 
See the recommendation of the Mozilla Foundation here: https://www.mozilla.org/en-US/MPL/2.0/FAQ/#license-use
 2016-05-03 11:53:33 +02:00
Mike Linksvayer
f92e91a72d improved wording suggested by @Zimmi48 2016-05-02 10:31:59 -07: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
c208a53107 Include 'copyleft', 'permissive', and 'public domain' in descriptions 
Feedback from @waldyrious at
https://github.com/github/choosealicense.com/pull/396#issuecomment-213912884
 2016-04-24 10:06:46 -07:00
Mike Linksvayer
7b4160681c Rework descriptions of 7 listed on /licenses 
- primarily functional
- drop self-naming
- minimize requiring significant understanding of other licenses or
  copyright
- should be excruciatingly bland for anyone who already knows the licenses
  well; newcomers shouldn't have to deal with baggage immediately

Probably a few more words should be added to the xGPLv3s about their
stronger patent terms.

Licenses not listed on /licenses could be described in similar style.
 2016-04-23 21:15:06 -07:00
Mike Linksvayer
8be0e5f8c2 rm patent-use permission field from GPLv2 and LGPLv2.1 metadata 
There's a strong argument they have implied patent licenses, but
this site doesn't annotate any other implied patent licenses, as
one would expect given the description of the patent-use field "This
license provides an express grant of patent rights from the contributor
to the recipient."
 2016-04-12 20:09:48 -07: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
9a5192cb21 AFL and OSL corrections 2016-04-02 17:54:21 -07:00
Waldir Pimenta
7c2763b747 Add list of projects using ISC (closes #377) 2016-03-28 19:06:40 +01:00
Mike Linksvayer
ca3a574513 Merge branch 'gh-pages' into adius-patch-1 2016-03-16 11:56:27 -07:00
Mike Linksvayer
7c4ebdbb7c Merge remote-tracking branch 'origin/gh-pages' into using-LICENSE 2016-03-16 11:27:14 -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
9bdf2b2d36 cut down on and make using: links direct to licenses 
following pattern from #358
 2016-03-15 14:25:16 -07:00
Adrian Sieber
0bd80e1bff Add name of license to ISC license text 2016-03-15 19:13:39 +01:00
Mike Linksvayer
7a68ceb7cf opportunistic https to kick CI 2016-03-14 01:01:05 -07:00
Mike Linksvayer
e0299c5521 markdownify filter on fields for which markdown is OK 
as suggested by @benbalter in / fixes #367

also use markdown to make EUPL boilerplate linked
 2016-03-10 09:36:33 -08:00
Mike Linksvayer
a4f990fe54 don't use markdown in note: field 2016-03-09 20:24:25 -08:00
Mike Linksvayer
068fe71365 Merge branch 'gh-pages' into pd-deduplication 2016-03-09 20:19:08 -08:00
Mark McKinstry
4d147ca4df add note to CC0 about boilerplate 
https://blog.creativecommons.org/2011/04/15/using-cc0-for-public-domain-software/
 2016-03-09 22:39:01 -05:00
Mike Linksvayer
e6ed3ecb2f Merge branch 'gh-pages' into CoC 2016-03-07 17:18:47 -08:00
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 48c6e3e88785106d0a9357df8385f11891e85565.
 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 0161a3d75d5f72fe842886b79c07db6ceb773ae2
 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