1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 21:00:10 +01:00

46 Commits

Author SHA1 Message Date
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
2c063f2a94 sync README.md with _data/rules.yml, remove non-open forbiddens
should have been removed as part of
https://github.com/github/choosealicense.com/pull/345
correct that oversight
2016-02-28 12:12:57 -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
d5828d5318 Merge pull request #348 from github/tab-slug-bye
Remove need for tab-slug
2016-02-13 18:15:34 -08:00
Ben Balter
9aae9cad12 a few minor markdown formatting fixes 2016-02-13 15:23:17 -05:00
Mike Linksvayer
c04ea11e17 Remove need for tab-slug 2016-02-12 15:51:44 -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
b7204165de Merge pull request #311 from mlinksva/tm-accuracy
Increase accuracy re trademark clauses
2016-01-18 14:27:52 -08:00
Ben Balter
7a32aad01b add link to contributing from README 2016-01-18 15:35:06 -05:00
Ben Balter
42e559a962 bullet point contributing instructions 2016-01-18 15:28:22 -05:00
Ben Balter
790109f099 add criteria for proposing new licenses 2016-01-05 14:48:06 -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
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
Niels Dequeker
fc001d6327 Update README.md
Make link clickable
2015-02-05 12:10:45 +01:00
Stuart P. Bentley
bd12b56b07 Update README.md with new location of rules 2015-01-07 05:05:49 -08:00
sampablokuper
6e2de93780 Remove untenable assertion from goals
Whether in civil rights, human rights, land rights, "intellectual
property" rights (as in this case) or any other rights, the act of
deciding who ought to be granted which rights in which circumstances is
not only inherently political, it is the very essence of politics.
Therefore, it is preposterous for choosealicense.com, if it is to be
meaningful, to aim to be "Politics Free".

This edit takes into account feedback from @tekkub on my initial pull
request.
2014-09-10 13:48:59 +01:00
sampablokuper
206a356934 Remove false assertion from goals
Whether in civil rights, human rights, land rights, "intellectual property" rights (as in this case) or any other rights, the act of deciding who ought to be granted which rights in which circumstances is not only inherently political, it is the very essence of politics. Therefore, it is preposterous for choosealicense.com, if it is to be meaningful, to aim to be "Politics Free".
2014-09-09 23:00:14 +01:00
XhmikosR
fcf2d4090c README.md: no need to make the localhost a clickable link. 2013-12-16 11:34:19 +02:00
XhmikosR
3182a8390b README.md: Break long lines. 2013-12-16 10:47:09 +02:00
Joshua Tauberer
1a8461cc19 Correct mistakes/omissions in the README.
The README says the license files are Markdown but they are not.
The text of the license should be wrapped to a 78 character width.
2013-12-16 10:47:09 +02:00
Soon Van
8c269c57ba Missing question mark on question in intro
- Sentence for "list of licenses common for specific communities"
  reads a little easier as:

   "list of licenses common to specific communities"

- Markdown with uppercase first letter, as a type
- Removed "I counted" as the repo voice otherwise
  doesn't come from a single person
2013-12-14 17:24:56 -05:00
XhmikosR
1bd16afe77 Update README.md.
* use a code block instead of individual code commands
* remove a ul since it only has one list item
2013-12-14 21:45:03 +02:00
XhmikosR
d1ae44f146 Remove trailing spaces. 2013-10-30 20:34:52 +02:00
Aidan Feldman
d967bf06a7 display build status in readme 2013-10-23 00:37:21 -07:00
Ben Lavender
67287e8b61 Document license interpolation 2013-07-18 10:43:08 -05:00
Coby Chapple
35cbf4ad61 license choosers are a thing now 2013-07-16 11:15:53 +01:00
Stefano Costa
5291123ad4 It's about licenses: let's het them right!
"Creative Commons 3.0 license" is unclear. The link is correct though.
2013-07-15 21:51:08 +02:00
James Dennes
9dbb60c5c6 Use Absolute Permalinks
This removes the deprecation warning about absolute permalinks. Absolute Permalinks will be the default as of Jekyll v1.1: http://jekyllrb.com/docs/upgrading/
2013-07-14 15:32:06 +02:00
Ben Balter
d7ca8a2c19 readme cleanup 2013-06-16 10:57:21 -04:00
Benjamin J. Balter
a88cd6646b add project license to readme, fixes #50 2013-05-21 15:17:11 -07:00
Haacked
71a4c87882 Add CONTRIBUTING file.
Fixes #35
2013-05-21 15:17:10 -07:00
Benjamin J. Balter
dedeb49739 update readme with new script/ action and how to add licenses and rules 2013-05-21 15:17:07 -07:00
Benjamin J. Balter
a21098309e add gemfile and script/ folder for easier bootstaping and less friction goodness; 2013-05-21 15:17:07 -07:00
Haacked
fe13fefb57 Added a note about how to view the site locally 2013-05-21 15:16:01 -07:00
Phil Haack
5dac78ac96 Added a goal of _not_ being comprehensive. 2012-04-18 13:41:21 -07:00
Haacked
ae04ee01a7 Adding a readme with a brief project description. 2012-04-18 13:30:13 -07:00