1
0
mirror of https://github.com/github/choosealicense.com synced 2024-06-17 00:19:51 +02:00
Commit Graph

91 Commits

Author SHA1 Message Date
Jake Jarvis
67a6eb3066
Some wordiness reduction and grammar fixes 2019-08-26 16:43:35 -04:00
Wolfgang Faust
68ebcac180
Change phrasing of no-license text. 2018-08-18 21:55:26 -04:00
Mike Linksvayer
d82306959b
consistent single quote 2018-08-06 15:26:51 -07:00
Mike Linksvayer
c68566f178
consistent trailing / 2018-07-19 19:44:22 -07:00
Mike Linksvayer
265ffa83e0
avoid redirect 2018-07-19 19:42:40 -07:00
Mike Linksvayer
ff616fbbf0 fiddling with the words, emphasize "community" over "existing" 2018-07-18 12:00:39 -07:00
Mike Linksvayer
e62b3be5eb rename no-license link 2018-06-18 00:15:05 -07:00
Mike Linksvayer
9e9f9b6166
Merge branch 'gh-pages' into home-reform 2018-06-18 07:10:43 +00:00
Mike Linksvayer
64a35c9298 lightbulb/patents->community/existing 2018-06-18 00:04:36 -07:00
Mike Linksvayer
f91ccef2fb tweak existing/community language 2018-06-18 00:01:34 -07:00
Mike Linksvayer
b9bbbe078c rollback permissive, copyleft language; community icon 2018-06-17 23:47:38 -07:00
Mike Linksvayer
c3f9bea852 change no-license internal links 2017-12-30 15:46:13 -08:00
Mike Linksvayer
4aa540f154 Add existing project situation, leave 1 permissive, 1 copyleft choice
This is a **draft**, probably will be controversial, definitely needs
wordsmithing.

Fixes #380 "No clear message on why to choose an open source license"
-- added line under heading

Fixes #335 "Feedback from John Sullivan talk on license choosers"
-- remaining items were (roughly) to not surface patents at this
level, and to surface choice between allowing proprirary/closed
source or not

Fixes #239 "Consider discussing ecosystems with an already predominant
license" (well, it doesn't *discuss* but there's a page for that,
unlinked til now) and makes the default recommendation of just about
everyone -- use exisitng project/community's license if applicable
-- prominent on the site

Closes #48 "Proposed modified workflow: make permissive/copyleft
and patents orthogonal" though probably not in way submitter would
favor. I could be convinced that Apache-2.0 should be featured
rather than MIT because of the former's express patent grant, but
as it stands I'm not sure the complexity of Apache-2.0 (and for a
weak grant, relative to GPLv3) is worth it relative to MIT. There's
some value in the first license a user looks at being really easy
to understand. The continued popularity of MIT and simialar ISC and
BSD-2/3 seems to indicate people want that simplicity. And where
are the holdups based on patents supposedly infringed by open source
projects under licenses without an express patent grant that could
not have happened had those projects been under Apache-2.0? Please
educate me! :)

Any and all feedback most welcome.
2016-06-06 18:31:14 -07:00
Mike Linksvayer
001d3dea74 Choose an open source license
"[D]oesn't have to be scary" is hardly non-judgmental nor inviting
for anyone whose first encounter with open source licensing is this
site. I've also never heard anyone other than this site claim that
choosing an open source license can be scary. Confusing or extremely
boring, yes. Choosing to go open source, yes that can be scary.
Choosing among open source licenses, no.
2016-03-14 00:04:32 -07: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
29538e1dcf Merge pull request #359 from github/food-licenses
non-software licenses page
2016-02-28 08:43:09 -08:00
Eduardo Garcia
779e19fb3b Add project links 2016-02-26 16:52:25 -06:00
Mike Linksvayer
2d4c4a63bd non-software licenses page
building on https://github.com/github/choosealicense.com/pull/307

non-software rather than non-code because software is eating the
world, the main topic is open source software, and I find
software/non-software slighly less trying than code/non-code if
only because it isn't a
[thing](http://www.adamhyde.net/perhaps-stop-using-non-code-whatayarekin/).

tweak text of page, also addressing #261 and #313
2016-02-26 12:34:20 -08:00
Mike Linksvayer
6df14f2d42 Merge branch 'content-B' of https://github.com/afeld/choosealicense.com into food-licenses 2016-02-25 18:18:41 -08:00
Mike Linksvayer
db18b5dfe6 apache version, GNU *gpl naming, in part via #335 2016-02-16 09:29:18 -08:00
Brandon Keepers
6da34f0825 Use Android instead of Docker
Reasoning: it is a mass consumer brand that is likely to be better known than Apache
2016-02-01 19:48:02 +01:00
Brandon Keepers
3227e22d89 Revert changes to GPL text
This should be iterated on in another PR
2016-02-01 19:45:01 +01:00
Brandon Keepers
abe74941dc Update examples
- add a 3rd example (.NET Core) for MIT
- replace SVN & NuGet with more more modern and well-known examples
(Swift, Docker) for Apache:
- Add a GPLv3 project to examples.
2016-01-31 19:54:59 +01:00
Brandon Keepers
ba251b175a Revert "Update examples"
This reverts commit 49cf1471f7.
2016-01-31 19:54:01 +01:00
Brandon Keepers
49cf1471f7 Update examples
- add a 3rd example (.NET Core) for MIT
- replace SVN & NuGet with more more modern and well-known examples
(Swift, Docker) for Apache:
- Add a GPLv3 project to examples.
2016-01-31 19:53:09 +01: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
Aidan Feldman
b24913bb5e Merge remote-tracking branch 'origin/gh-pages' into content-B 2015-11-02 12:35:14 -05:00
Ben Balter
34368e5c32 add fallback description 2015-10-23 17:58:46 -04:00
Ben Balter
4f54fc5c07 add seo include 2015-10-23 17:50:25 -04:00
Anatol Broder
deb2301f48 Use curly apostrophes 2015-01-10 14:20:22 +01:00
Ben Balter
0f652f971e link directly to apache and gpl from homepage, fixes #212 2014-09-05 11:47:43 -04:00
Phil Haack
24e9effec1 Merge pull request #182 from XhmikosR/sitemap
Generate sitemap.xml and add robots.txt.
2014-01-24 09:16:26 -08:00
XhmikosR
6211c56b68 index.html: specify permalink.
This way we don't get `http://choosealicense.com/index.html` in sitemap.
2014-01-24 08:25:40 +02:00
XhmikosR
d40409be96 Revert 26bb900113.
Jekyll already takes care of those.
2014-01-23 22:27:31 +02:00
XhmikosR
280d578703 Revert "Work around issues with old IE."
This reverts commit e6df569ad0.

Conflicts:
	index.html
2014-01-23 11:08:47 +02:00
Aidan Feldman
a73e18bcd3 rename 'content' page to 'non-code' 2014-01-12 23:11:18 -05:00
Aidan Feldman
b1275252c5 add page around licensing content 2014-01-12 23:05:58 -05:00
Anatol Broder
26bb900113 Fix apostrophes 2013-12-28 14:01:22 +01:00
XhmikosR
e6df569ad0 Work around issues with old IE. 2013-12-16 18:45:28 +02:00
XhmikosR
d86fc76265 Use a CSS sprite for the homepage images.
-2 http requests, -1KB.
2013-12-15 10:11:52 +02:00
XhmikosR
2732cf40c0 Rename folders to the shorter and more standard "img" and "js". 2013-12-14 12:44:29 +02:00
XhmikosR
dc4309bd02 Rename clearfix class. 2013-12-10 09:04:20 +02:00
XhmikosR
c1c291b379 Use double quotes consistently. 2013-10-30 20:39:55 +02:00
Aidan Feldman
b5ff5db785 tweaks to make html-proofing pass 2013-10-23 00:20:44 -07:00
Ben Balter
b2892098a0 tighten up index part deux copy 2013-09-16 15:47:27 -04:00
Aidan Feldman
f03c77d9fa separate first and second row of homepage questions 2013-09-16 15:42:21 -04:00
Aidan Feldman
6e91d6b529 change text of second row homepage questions to be consistent with the first 2013-09-16 15:39:10 -04:00
Aidan Feldman
0177da529a reorder homepage questions 2013-09-16 15:17:53 -04:00
Aidan Feldman
837cb3e1d2 reduce text in the homepage FAQ 2013-09-16 15:17:02 -04:00