From 3edf479745e250219579a02e739632f10bfb3de3 Mon Sep 17 00:00:00 2001 From: Roland Hieber Date: Fri, 19 Jul 2013 03:15:18 +0200 Subject: [PATCH 001/157] BSD licenses: bring back the list bullets --- licenses/bsd-3-clause.txt | 6 +++--- licenses/bsd.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/licenses/bsd-3-clause.txt b/licenses/bsd-3-clause.txt index 687d2a1..2b8d334 100644 --- a/licenses/bsd-3-clause.txt +++ b/licenses/bsd-3-clause.txt @@ -28,14 +28,14 @@ All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this +* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - Redistributions in binary form must reproduce the above copyright notice, this +* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - Neither the name of the {organization} nor the names of its +* Neither the name of the {organization} nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/licenses/bsd.txt b/licenses/bsd.txt index bccdf60..e40886b 100644 --- a/licenses/bsd.txt +++ b/licenses/bsd.txt @@ -29,10 +29,10 @@ All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this +* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - Redistributions in binary form must reproduce the above copyright notice, this +* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. From 48261c1c7793720bca8546c55fc407e98e62e642 Mon Sep 17 00:00:00 2001 From: Mark Imbriaco Date: Thu, 25 Jul 2013 12:44:01 -0400 Subject: [PATCH 002/157] Adding choosealicense.org as well as some www. hostnames. --- CNAME | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CNAME b/CNAME index 5ba5ac0..c2e98d8 100644 --- a/CNAME +++ b/CNAME @@ -1 +1,4 @@ -choosealicense.com \ No newline at end of file +choosealicense.com +www.choosealicense.com +choosealicense.org +www.choosealicense.org From f504b88a90963cafcb8299dba280efc3758a5821 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 25 Jul 2013 13:51:32 -0400 Subject: [PATCH 003/157] revert 48261c1c7793720bca8546c55fc407e98e62e642 --- CNAME | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CNAME b/CNAME index c2e98d8..5ba5ac0 100644 --- a/CNAME +++ b/CNAME @@ -1,4 +1 @@ -choosealicense.com -www.choosealicense.com -choosealicense.org -www.choosealicense.org +choosealicense.com \ No newline at end of file From 86f22c87d6b6a97189a125e66860456c6bc9bca8 Mon Sep 17 00:00:00 2001 From: Jakukyo Friel Date: Fri, 26 Jul 2013 17:46:54 +0800 Subject: [PATCH 004/157] make notations of no-license more coherent - make notations of /no-license.md and licenses/no-license.html more coherent - clarify only publishing code on a *public* repo on github grants others the right to view and fork your code in licenses/no-license.html --- licenses/no-license.html | 2 +- no-license.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/licenses/no-license.html b/licenses/no-license.html index 783e374..0bbd43f 100644 --- a/licenses/no-license.html +++ b/licenses/no-license.html @@ -4,7 +4,7 @@ permalink: /licenses/no-license/ class: license-types title: No License -description: You retain all rights and do not permit distribution, reproduction, or derivative works. You may grant some rights in cases where you publish your source code to a site that requires accepting terms of service. For example, publishing to GitHub requires you allow others to view and fork your code. +description: You retain all rights and do not permit distribution, reproduction, or derivative works. You may grant some rights in cases where you publish your source code to a site that requires accepting terms of service. For example, publishing code in a public repository on GitHub requires you allow others to view and fork your code. note: This option may be subject to the Terms Of Use of the site where you publish your source code. diff --git a/no-license.md b/no-license.md index 2ba8c44..38d1ee4 100644 --- a/no-license.md +++ b/no-license.md @@ -8,6 +8,6 @@ You're under no obligation to choose a license and it's your right not to includ You'll have to check with your own legal counsel regarding your particular project, but generally speaking, the absence of a license means that default copyright laws apply. This means that you retain all rights to your source code and that nobody else may reproduce, distribute, or create derivative works from your work. This might not be what you intend. -Even in the absence of a license file, if you publish your source code in a public repository on GitHub, you have accepted the [Terms of Service](https://help.github.com/articles/github-terms-of-service) which do allow other GitHub users some rights. Specifically, you allow others to view and fork your repository. +Even in the absence of a license file, you may grant some rights in cases where you publish your source code to a site that requires accepting terms of service. For example, if you publish your source code in a public repository on GitHub, you have accepted the [Terms of Service](https://help.github.com/articles/github-terms-of-service) which do allow other GitHub users some rights. Specifically, you allow others to view and fork your repository. -If you want to share your work with others, please consider choosing an open source license. \ No newline at end of file +If you want to share your work with others, please consider choosing an open source license. From 952aa2d1969711d20be8fbcbc9e02da809e1608b Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 12 Aug 2013 11:37:32 -0400 Subject: [PATCH 005/157] :dog: food dat github-pages gem --- Gemfile | 4 +--- Gemfile.lock | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index ec75eef..4bc6e3e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,3 @@ source 'https://rubygems.org' -gem "jekyll", '=1.0.3' -gem 'liquid', '=2.5.0' -gem 'redcarpet', '=2.2.2' \ No newline at end of file +gem "github-pages" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index e6b3cc1..6316c83 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,32 +1,43 @@ GEM remote: https://rubygems.org/ specs: + RedCloth (4.2.9) classifier (1.3.3) fast-stemmer (>= 1.0.0) colorator (0.1) - commander (4.1.3) + commander (4.1.5) highline (~> 1.6.11) directory_watcher (1.4.1) fast-stemmer (1.0.2) + github-pages (1) + RedCloth (= 4.2.9) + jekyll (= 1.1.2) + kramdown (= 1.0.2) + liquid (= 2.5.1) + maruku (= 0.6.1) + rdiscount (= 1.6.8) + redcarpet (= 2.2.2) highline (1.6.19) - jekyll (1.0.3) + jekyll (1.1.2) classifier (~> 1.3) colorator (~> 0.1) commander (~> 4.1.3) directory_watcher (~> 1.4.1) kramdown (~> 1.0.2) - liquid (~> 2.3) + liquid (~> 2.5.1) maruku (~> 0.5) pygments.rb (~> 0.5.0) + redcarpet (~> 2.2.2) safe_yaml (~> 0.7.0) kramdown (1.0.2) - liquid (2.5.0) + liquid (2.5.1) maruku (0.6.1) syntax (>= 1.0.0) posix-spawn (0.3.6) - pygments.rb (0.5.1) + pygments.rb (0.5.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) + rdiscount (1.6.8) redcarpet (2.2.2) safe_yaml (0.7.1) syntax (1.0.0) @@ -36,6 +47,4 @@ PLATFORMS ruby DEPENDENCIES - jekyll (= 1.0.3) - liquid (= 2.5.0) - redcarpet (= 2.2.2) + github-pages From 5a3379cb2ac139887595f7cf0bc17c7dba582271 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 12 Aug 2013 13:18:50 -0400 Subject: [PATCH 006/157] Exclude vendor from Jekyll This will tell Jekyll not to look at the `vendor` folder, preventing build errors and allowing CI to pass. --- _config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_config.yml b/_config.yml index ed961da..e69d1e7 100644 --- a/_config.yml +++ b/_config.yml @@ -65,3 +65,4 @@ exclude: - CNAME - Gemfile* - script + - vendor From daa1ada6bc1e40dc157a715b7c9bbcfb5208285a Mon Sep 17 00:00:00 2001 From: enyst Date: Sun, 18 Aug 2013 22:47:53 +0300 Subject: [PATCH 007/157] Rephrase advice to consult a legal professional. Fixes #57 --- _includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/footer.html b/_includes/footer.html index 421dd14..c722363 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -4,7 +4,7 @@ Terms of Service

- Please consult a legal expert before adopting a software license for your project.
+ If you have questions or issues, it is always best to consult a professional.
This site is licensed under the Creative Commons Attribution 3.0 Unported License.

From 7ed07c572f40a14b90408cf30ba47ee38b5624af Mon Sep 17 00:00:00 2001 From: enyst Date: Mon, 19 Aug 2013 04:32:10 +0300 Subject: [PATCH 008/157] Artistic license is not copyleft. Fixes #73 Signed-off-by: enyst --- licenses/artistic.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/licenses/artistic.txt b/licenses/artistic.txt index 11dd18c..15cf31e 100644 --- a/licenses/artistic.txt +++ b/licenses/artistic.txt @@ -12,7 +12,6 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of required: - include-copyright - document-changes - - disclose-source permitted: - commercial-use - modifications From 5a201367c4540b3be35e1219a5c064bbed8d69ed Mon Sep 17 00:00:00 2001 From: enyst Date: Mon, 19 Aug 2013 04:41:05 +0300 Subject: [PATCH 009/157] Add note about the condition on modified versions to the description of Artistic. --- licenses/artistic.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/artistic.txt b/licenses/artistic.txt index 15cf31e..2471e34 100644 --- a/licenses/artistic.txt +++ b/licenses/artistic.txt @@ -5,7 +5,7 @@ permalink: /licenses/artistic/ source: http://opensource.org/licenses/Artistic-2.0 -description: A license that’s heavily favored by the Perl community. +description: A license that’s heavily favored by the Perl community. Provided that modified versions do not prevent the user from running the standard version, this license does not require distributions of modified versions to provide the source code. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. From 1709afacee2fc2d44aff8dd0979433daa0bfecba Mon Sep 17 00:00:00 2001 From: enyst Date: Mon, 19 Aug 2013 05:19:30 +0300 Subject: [PATCH 010/157] Update GPL short presentation to convey the requirement some better. Fixes #66 --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 64cf4cd..9919b6c 100644 --- a/index.html +++ b/index.html @@ -36,7 +36,7 @@ description: A site to provide non-judgmental guidance on choosing a license for

I care about sharing improvements.

- The GPL (V2 or V3) is a copyleft license that requires others who modify your code to disclose their changes if they redistribute it in source or binary form. V3 is similar to V2, but further restricts use in hardware that forbids software alterations. + The GPL (V2 or V3) is a copyleft license that requires anyone distributing the code, modified or not, to make the source available under the same terms to whomever they distribute to. V3 is similar to V2, but further restricts use in hardware that forbids software alterations.

Linux, Git, and WordPress use the GPL. From 717b93a1a7359876d5d119184303c9a38b3db8c6 Mon Sep 17 00:00:00 2001 From: enyst Date: Mon, 19 Aug 2013 05:42:03 +0300 Subject: [PATCH 011/157] Rephrase GPL description to avoid modifications in favor of derivative. Add the qualifier complete to the source code required. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 9919b6c..a6033c2 100644 --- a/index.html +++ b/index.html @@ -36,7 +36,7 @@ description: A site to provide non-judgmental guidance on choosing a license for

I care about sharing improvements.

- The GPL (V2 or V3) is a copyleft license that requires anyone distributing the code, modified or not, to make the source available under the same terms to whomever they distribute to. V3 is similar to V2, but further restricts use in hardware that forbids software alterations. + The GPL (V2 or V3) is a copyleft license that requires anyone distributing the code, or a derivative work of the code, to make the complete source available under the same terms to whomever they distribute to. V3 is similar to V2, but further restricts use in hardware that forbids software alterations.

Linux, Git, and WordPress use the GPL. From 2329a746929bcdc7c57670b0b6d5f915cd90af86 Mon Sep 17 00:00:00 2001 From: enyst Date: Mon, 19 Aug 2013 16:49:48 +0300 Subject: [PATCH 012/157] More concise Artistic license description. --- licenses/artistic.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/artistic.txt b/licenses/artistic.txt index 2471e34..908e0c7 100644 --- a/licenses/artistic.txt +++ b/licenses/artistic.txt @@ -5,7 +5,7 @@ permalink: /licenses/artistic/ source: http://opensource.org/licenses/Artistic-2.0 -description: A license that’s heavily favored by the Perl community. Provided that modified versions do not prevent the user from running the standard version, this license does not require distributions of modified versions to provide the source code. +description: Heavily favored by the Perl community, the Artistic license requires that modified versions of the software do not prevent users from running the standard version. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. From 1487e9af5033592af02b8771d2c641907ec6bca4 Mon Sep 17 00:00:00 2001 From: enyst Date: Mon, 19 Aug 2013 16:56:54 +0300 Subject: [PATCH 013/157] Shorten first part of GPL description as per benbalter's input. Remove 'whomever they distribute to'. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index a6033c2..e2b5891 100644 --- a/index.html +++ b/index.html @@ -36,7 +36,7 @@ description: A site to provide non-judgmental guidance on choosing a license for

I care about sharing improvements.

- The GPL (V2 or V3) is a copyleft license that requires anyone distributing the code, or a derivative work of the code, to make the complete source available under the same terms to whomever they distribute to. V3 is similar to V2, but further restricts use in hardware that forbids software alterations. + The GPL (V2 or V3) is a copyleft license that requires anyone who distributes your code or a derivative work to make the source available under the same terms. V3 is similar to V2, but further restricts use in hardware that forbids software alterations.

Linux, Git, and WordPress use the GPL. From a0e3974eb3a87bba67895b0637455d738fc1a719 Mon Sep 17 00:00:00 2001 From: enyst Date: Mon, 19 Aug 2013 23:55:46 +0300 Subject: [PATCH 014/157] Added "legal" qualifier to clarify a legal professional is advisable. --- _includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/footer.html b/_includes/footer.html index c722363..8b72905 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -4,7 +4,7 @@ Terms of Service

- If you have questions or issues, it is always best to consult a professional.
+ If you have questions or issues, it is always best to consult a legal professional.
This site is licensed under the Creative Commons Attribution 3.0 Unported License.

From d32dc360eab42c1888b0839b290aa6d6de68bc34 Mon Sep 17 00:00:00 2001 From: Pat Hawks Date: Tue, 20 Aug 2013 01:34:27 -0400 Subject: [PATCH 015/157] Compress images Compress images using [ImageOptim](https://github.com/pornel/ImageOptim) version 1.4.3 --- images/bg.jpg | Bin 10909 -> 9597 bytes images/blue-dot@2x.png | Bin 1245 -> 273 bytes images/circular@2x.png | Bin 2322 -> 1220 bytes images/green-dot@2x.png | Bin 1245 -> 276 bytes images/lightbulb@2x.png | Bin 3489 -> 1936 bytes images/red-dot@2x.png | Bin 1251 -> 276 bytes images/source@2x.png | Bin 1311 -> 359 bytes images/three-arrows@2x.png | Bin 2973 -> 1526 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/bg.jpg b/images/bg.jpg index 1506e27ac42846ecb9c90eabbca1e9a140d89521..5452c5126c12fd89c9161ae1ee12fb10dba8acd0 100644 GIT binary patch literal 9597 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 literal 10909 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 literal 1245 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvO-#h|fup&B zlersAuSMv>2~2MaLa!rEy`aR9TL84#CABECEH%ZgC_h&L>}jh^+-@<)X&zK> z3U0Sp;MA)Rbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3b9ejLhB?AMazo(01NX4zB zlo^%1jQkUrA89C*u_Wm#h_ODp@9>AEL!R+tokASzk?#eP2RaTjO*pvLL5B0l8J-^p z?N_Ki4e$bI0(?h= z3x0G(9N;)|_k>-eq#E~;%?r6SSQU)Z7&n@1Vtwmy=Cp(D0p26M2HZ;)OmxYez;L8X zf%{LVkM0tt2{Q#1xN9Uc*ylKiy|{3JNp}LPlF1f_p3cT&3@HbtrDpx-N;zmM6;;5S zaxhLRYC}I~)Rlir8y_kdhd1a{a2(OjOgQMIu#ex{b*jUknO$x5tdFXm9O4TRUdr^b zUQ2?{NLe^)?V>4v7bIvkgf&i)h~qlaU3fKP@`6@*%Y$E8qt1R4S~YpQ!|CNuU6!q@ z54hj_MMrsCXyfXeN_?jmUhw+IaHU|*S+NENW(Kif`-Ti#(^61@vd$@?2>?p9 Bpeg_W diff --git a/images/circular@2x.png b/images/circular@2x.png index 2b9173b3dcd2195ed5d20ec0caf17ebc6f401cec..91393a85b6dd390980219cb7197cc851f566f0ac 100644 GIT binary patch literal 1220 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 diff --git a/images/green-dot@2x.png b/images/green-dot@2x.png index 315376d6954666dd989bb6dc1f64069f34ad9750..f20deb707730434de37c67f68874c59ca8a669c2 100644 GIT binary patch delta 248 zcmV{YP-~nuGL`d$UmFo$_ zVDA;|T@GL(BAR6U2NZ%}#wE|~uz{3`21X#m^gKF9tX$KDxLK#Gu z!g@E*zyaz*0c=yCg9z$NF}kk;O~gUI$Ksfvb4nFOO&;{gQjqpJ`e8N7KdvfkAQ>SpvhZC^@cM!VAZ| yGJT1anPg$|!P1|hY+m~2Ys=+s2M@04+HwQ*_k>m>BU{q|0000TWs4@7rKDT1rU6h(JPdoRh|FeW~p( zX*ag4FQux)%2iB4VwxCCLt{|-Pzhn;!kYuS;a+UgBiZ({lKA+FjaJ!ud;nZhjgD*Q}y|i|5I2`&!~`0L0y^F z1k|`fujxu$3vOlW@0?bhI;!`A3S8O^(f z2K#+(K7?VGr{Y{FUH&n*!WOPo+SV;oJ361hKkn{a#D7=7F}!-RQVw)p#Op^^?b#}C zS+5-eFSq6jw!dn7zkgLbcXnT;W6`!3T(VbbZr4Noz4%KP!!Iu0ob!X9+p9GUjxX*0q>|~mHFp^N22by)+3K;ktf}k6 zXS~B$F1lpB$Gz8`vaEmIzGS^*UuhWu+l^xJME5%0)$<(qq8b#i<(k9s&2j5;t;gY9 zwJm2!hx3OoTb<*7f4inGoq9aj?QgBWG4N6L;m%*?&z?B|?j4MNei@%)HNNfqLh8ib zz)pMHsaHBK9D4ezV@Yaf@Ppt1J87+7Ssh=AU;pgn+qFOO3xy*cH?BT^`u2AkF?us_ z?oMd-&90x$uicpJn!lYaK6)G*AG%i99;{ffXa3m#>w;@$hk4<|qa)mh;q2T$QNW&D diff --git a/images/lightbulb@2x.png b/images/lightbulb@2x.png index 0d7c4a26ea6f35f0d592f46acf62b732e83a29b8..7156683911c07f5379572bc45f784be53398fa45 100644 GIT binary patch delta 1922 zcmV-|2YvXV8;}o>BYy{1Nkl!i> z`X_q+;>?|CUEk;P_1t?8GY@|H9AKYwx%Zqo=W|^!zaANCz<*`95%=Lyyofh3j1M3P zXK)Pr@h5CVA8x=DxVq!Fdg{OmY{T17h5QSf(SxaZ2|E)%#eS$p_MjJ2vljL|EXHoA zj?UpZd=-T>hiyS0jzWRik8h)xrm#iaiT^->JAj+g5Oy|RgHqfa|aeD$xi!sulKfj6fyWi+@hIIx6569Dqu22p3j5>;&wC zJe|Z{D8L1x32REco$WwlCByy(^7IC-fD2S7jzOOKDiyXH^0Wi3aDi*b0Oa8`t|~Wd z3ywe@okkM>Q*qxBUaZG~CsOcV8?S_vF+vf3yt%l3EEgrL? z;&@?~Lk4GY30%fq3mJWRys$eUgY9rRP{4l3V1M05g>AwpWN-^yPOO3q_I*^?PRL*s zEpRz812SqGE9_4ogJsVo*h74A~<;;4>;Gwa?9)%2M!R5>%`x&rASX}IJ ze=Wl0%rwa0zi_2IxL$_KsbR>VEjj30kimMmoO%&5xTcgXnD4=jD?Y$(OAdM*GWZ%? zPJi748LUbUdOpqwKGv;}!G`3Z0m$GYxSW~`89bRBG-UibkIS*kA%mUCL1(OUv>da} z^#_uJWN-*B$36iW97rA`lEDC6&dFdfdAufuwXxhXkAC>!iy(u)#;~S?*CQW(xHVp} z6}@7QB~NS1U@$(seD1Npd&UE|4RAR%4SzD&lN|IWWY7+mQ(ch3_T-@FAcOgEIkf^Z zSeqR53&>yq0|%cxf&gIzw~rTrOXa2joJ8FMvcw9F^$ z6_C+=a2fL}$lw$%u!jY9K?X-N_J0s-^>}DK4(A*8JCM;rxQzHNWORKgVOuZ)8N86g zZz3Kg970JqA~9*qfjn zyu)AvWc0;Kgl)tD$Y2=Fa49nxqdqGwLs*mLzAKTGxfe3JxsqX9Fbo;Im4C7Y!vv3? zZ4gCUSi9Ab(IU7qEJd#eSBB-jZ-%RM*fyMo3|>b8u0#Wn2UnsZ1|fqJ=2y2?`N=sy z1z~T8jMl+fRC})XQs7|=*asP$MZ14kKTknMa{>J_#bLy*A;TI(40 zLX1KNhfu6vSfCd&T3N@it0AL1;p!cB5{`Quq-(B2*cKf3dIf&~VSoLvhT4byK4jDf zSC%?$ZTu6(8isAc5y;>jw1yMb{|v&C8irj88Lfc}C#?S*aR7xHgl)h-JhtyY9bQ;q zGi20NgRotY(MGsX!_M+phxgYYY(Hdh4l_ay>;1!2F|5yS$2Pdo!*)VO>#G=c17vhf z_+f!pJa#@mS%t8Z@PD5FTb#oWdoyIzQ-!e0AfxUyh4tC5-&=*Se}fDL(U_jFz>grK zZP=190(sbyunjWmg-cu5$v6cCY7~>x7Z%tA1?n-lw1(}10(D)Q!#3bB6qv(kNN-r+ z=TKlCf=heYc~D^HWg+Z&coz!92{ffYEYJ@HVh3DS!mfn^@q2KV!ggR`AUeVi8^y3O zYz!NP5Ox992Vy~%!ae{6;(-{}D29z;W7rrrhK*rk*cdj3U5qV(SR6puC?jEG*eHgL zVdr3BndZf?|LDMQ!^W^NYz!O2#;`GL3|pH20Rw5C^I&_UDF6Tf07*qo IM6N<$f_GPaHvj+t literal 3489 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 diff --git a/images/red-dot@2x.png b/images/red-dot@2x.png index 21e1e2fcdf99e88b9d9af3750ae26af168c20460..43acaf71822b96f17b74af4ef9801e44a12bdef4 100644 GIT binary patch delta 248 zcmV87*cmNw45t6%T<$3}! z*n0(gmjjrHh$b2T0fiu#amlmz+W8^Ndy`w$YiTSv@UX=h0oL%~pqh3@+QCDFPzDjE zu-*+caDe(y0NWJkAcFc*jP9#I6EW0}V%X1t5`3tP98pLHMsZLX>puc{gaUyO6&+|p z32}8`E*Mzqz(z2z*MXB@;3^*Y%OhGyzvQ0uXIhs2(X_EZV33?emcXzpN{;K6@WL^# yOkZMUCRvz#u=Hmro0q=%+H$$u!GmkMw%hZD<>19KT$fG@Z$au$3(z*2k+KCTntcX_Gc*Vw&Uu|*{h%RWzsV2;hsgA~w(0!PdfeUf zJb!+_-~W~8Ok(J1>kj)448yFkK{kojJ^E)hp?|&PzmJx^S|qIv%XzKDsSpe1R;3=909*>jmb$dK?H*it3i=@!&anQYt+rzl}z{W!$Z)z^j zB-!YOFLd$~1x-^Jk}Q=<&Qgz4R>w%%>-FjyE|&u#9K|U~0S~w8>>TPgyTg0-??WeZok|-EbZ|#3t-87;3 z(YKp}iw>Kk4<$73DjMw7{GU|}GmOO8V5B3*W7J6a! z?u-xoY_6TOyxX!5JdfAzRJ+Y>jrRVNk?u@uL(08#+wz*Rv63*pj?eAAUP;?mW{!hZ zIKQuMYDC{OCYJ{FSp3>NXS`{-(J}-c(F%pr9gFy*_EGS8ZGguX z>Q?JFFB%u>cB`XmTF8)A$B$pMI*$JH?QLc5!hwMfUu)xy-j6bm*?xKH@}+~|!J)`! zx9|zS%C)_JCVBdPV7I01!Yl1p4?p|msRXrq;DdpK7ShdSwaM}HfccOR*7-d&?hofZ4p>npe|gYA4fFyfO9 P`Zb2dB17zlq0G#`2b!W9 diff --git a/images/source@2x.png b/images/source@2x.png index 9b09b184adb5803cd4e763ccb324352dedeef860..e4afc9b70f8b55c21fd9b3e398a12324502cb99b 100644 GIT binary patch delta 333 zcmV-T0kZy|3g-flBYy!dNkl0{I`qfqAcQh3BO^&WpMu7%Y`-UfzQd`^b_wFKQ=H1 zDTU{o;u&i_3;=L~(cT3BPgu4=s-QV!}4DNl7?yAKs|cLW|@F_yg)rV$0VdEppJWJ zjxO4XCNxI}TL>U!0uG^uCJqo{4pm5sX1Kr<1Sk%eKo^QDETQ5sM4#A31!5DhgKz91 za9qMm%s>FUfJS3%KrAV~u!{jmVjQP70U^Y}HD)1(b+n*10RhCpAjHss0u})tsYO6P fz`uVV&=2?p<<4&Ht8U}fi7AzZCsS=07?@QuLn2Bde0{8v^Kf6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M( zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}+T7#d8#0MoBXEYLU9GXQxBrqI_HztY@Xxa#7Ppj3o=u^L<)Qdy9y zACy|0Us{w5jJPyqkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mMNJ@J&q4%mWE% zf_3=%T6yLbmn7yTr+T{BDgn*V%gju%GBI#8v~YHFF*a~9GcP^Az7H6D#^?{Dj2SqJXRKtXT=?BDwCtM&0p7c}mfa$#mn6N{qUwzHMz&O#<#WAGf z)|+eI8mxg52R_cu)0D29cD!pUZ))nol;ts}np&ssE#DN_74YWH+&$h4b#m5CRptJ4 zBT~a_Q$YB`wi9Q++JE(py=-%?XJzDvtNDh-=jVPtYkuF-_@c)jC82^fi6Z<~&BaOw z-FetExV0HYk479-;yUbcpo33l(a}5y5zn*Twuy|VE4E1nClsz@k-l+oM$B_}ro4#< z#ne7z{8}q_Hp5}9_fG4J9fEIOt9|IQQ`vM*bfLRm#M_S(rz8gVC_kOzz!hsT`Ed-- zBJs-oZ+i1g5-qYmpE(oQT6%@$#)6+KuDoP4eYtLm-HL$UM+EZj3I$Bg+wJpDbMK-@ zu6L&%zG3c@=sN56R?g7HQ_^McdpgTK=KB6D_34H+{TKSB@1{m5`mT5+vN>p%e*e?D z<0jMA{ChpcVfULU#vRhCpC#0bu3xX)_Q)!8N~Qed`h=i3k7G}kZc@$)S4h0oQ1V!Y zd56hf;b&{MWi4mDrEc0>Dqg~!H?TaJEr%vk^Uf}O{f!>iaQ)vsdu&soE5 Z!0?&VS3zaBj}WNH@^tlcS?83{1OU%o+I|24 diff --git a/images/three-arrows@2x.png b/images/three-arrows@2x.png index 383873c35ed68839b8c51e71aff1b63e3ca45b4d..83f650f9ffd289d61ab5dafdf2167e642a226d7f 100644 GIT binary patch delta 1509 zcmVUh7Uju)~l%N#Ks#*m~3 z-H5UX=?(M>${vU)A{8nkQeF@d9mJ$7QK@)0b-a$3%F7%TCjW1uFVP}s*q$@z?6dY> zd;bo64)gHL;X8ZQUTbYuq}Kyp>pEB9V?;58H|ePXD`Efo1btHonTfB%AP$SmE67qRrBPwV-8(;}rhdv4@|M6^u)yaA^Dxmzvvk6vb8wwRsf#TT= z^JHUTA}UBcUw^_p+Z2983aBr(z*4d~+=vuVKWv4i>?`zDK;gx+4VDpG(N6(|p}&hK zW458c0?K|o+hG~CJ$Di1ES?>(jN6f`h;kIqPFNsz<|d+?#Ip+)m|eMuCSe}rTumoMh@&qkWK-o4JmY~Ck3P}MeAO)m=6p#W^Knh3!g+u`?s#dkpglKW2geEDW2=F&;#-xkpi0O;wf@K&Jhe#KoxuXzjzdoa}-Sq zsH|u3J4^xfbPP=j=z;P40aHK^j%c_7>S0#-codLx93vDEfM@Y1OaWEy1V%;*=sDbg zDSsf}5rrSn?2N|a+|F`9&Pj|aU_dWqIUc9lfUbM~Z zLVm;O0t7S%H&eL6x1m(mfLuH&{*OM5F*y$CMchnrjM<7(y#l&|X)(8$J|jAVu{jKA zE^eh5kFyY^qyy^2)C|p2oW-~t1=NDu8Go8*TTpRC6~@z?xtUTIQTPG1peutj{qs?( zHK5CA&hSEC2gU^)(7Y7lX-ekvl@I6=rXX@M9MSjy1DcOg0J|Mp(AC?3E@E;(`&G_i zd_V!cgi=8Jt>VXMb%@8AnLpO8%p6m^%AqpQs;P_87V|GDMJCZ;ZE4k-Ni)Y#tu1ra`GZ3`wA%M z@x<>Ih`D>oOGKA2CB=Xi;V#UR1D@h>X1gDJnuaUhBk~{6%eV*gdY&;6cMRXRHbNev}kpfEISe$|7)YtWkM*%rwavIS-Kk+Ca7tv{0PVDs;j{9r;H~J$|K-n`K z#}$tPsx_ixu#DN2{dg3R(_Vz5u#DIlPCN?88HOVv$D@E0(T;HAQ9#a69EN$eJsK|P000000 LNkvXXu0mjf17NCm literal 2973 zcmaJ@d00~U8V1cJS5PZ8Lj*Hz0t5qq@8xRhBbu9dVfrA?dAjMbE)ZCA_YVpGli<95$;&Tsk7`@Y}z`@Ziv&ncot23wjr zngIX+%g_+=I{my~|L{zW^<(Ey99lm)2m<2-F`QIEHjT#skm#Jv3}`5emd04epwUI! z1{nkZz|fT$8z+dPMBr06EF^6ngA}s3dNu$+_*TfJrEFygpqm+KOg0fVdHx~{%A^xv z-(e}96m9@x3o~Rpj}fyyGB#!V))Zel?Ax_af)KA4U@-(VsF0Px=HrD#*hgKwem!qS z!Jr=@f~`c@-$BJusL%ioj{(IZy$~s$XfzauL!wt>aX9oUD8>_wL3!$L90I)>kHz6J z-q24MOz(|HPsOhz2YvFT-w|P31OhG|h04y(MrL~h!^!xZMd}ug zfWzOy;X(sqa8P#&ErrRRH+XzxP$>9NHeWzvr!YdvM3`O!$z;;;{{DepXtLMpATM$N z8XbuC!Fc+Tu%0*{-@w42Ky2V=E}4^($zretpSkpZxY)09=bM4W)q5s0c+4yYJ&4C) zK|dZE&-{8Un6K)6;?ln!i`Q4VD19)f`O^MZsXv?a{WHJ((zyD~m)2*n_5IG%H+Fx- z>=OXM)H;+*iWS~{eqWSfx8BJ_cZcP1Sh@u2UA{)+pn3#`Ho$6m?g*-DLmW04?dJAj z%z0&>J+{8j9W9ZHy=BoUmxQa2kbV#G_%6)6#VDZz75JVw?oBVaKk@we)ybrboauLl z=kCAF`s0>&|8UiyEgxqVd6!_GX^@UX?NNI?3fzwoQB|b%u5<51$*acQF7JgdmyL!B z>5yI93zt|Ln&pohDdIhH-OGKvbN2ATKR(Dj_-}>*0Q!bH&CkxwJ&SNV&FaHRifhjq88%9;0yYfsR=H!HH+Sm z_HCaW>1?Vv?WFRtoaHTfb8L|z242wK-IuPGZyS;O8!Ls~sXv!UZGIRNElDr#%W>M3 zvx@FFJ62(Wy({k8*VnZe1I^K0-Mtd0Q1yeB4nTeUb?{Xq3#|L2TM&lzp&Jt)^&s&1PWyI(SPsA>tEanIcUpI5=Ca0 zvq^Ciars!MOQ-GDb3qypzG>+tRf6lQi8}D$|)Y-884B3p!roym7`^g!OTq0=voKa zaq7j>hg#x`t1zqy$%a}mM3mhWhC6_EhSvMyp<$j7_)8b{QGCX5tRdbETQMaW3Z`10 z3~I2s4pyE$f{+Zapjsa%ms6#|4~lt4O9y;w7EXHj%M*bD`(Q|)ZPE{Z#9D(gGr#F3 z#`30@11~$Mx{N!L{D2vGEmHG(naEiC0pweorDRzZ%$9=#D_wjHk~Bk+uc-HC&i{BP zXSl=SZC?4RE0UAW_h5vuzd-A2LY%s#JV@`M39~1<^@V3%v|a8L2zSgl__pD*g}?1K zQd?y1R~(!JMSJhoC9deavf;Q+y^sT2G3b_2qmy-eSAe3+0;GzmfvS?Be(GS+k$#P_ z>s0aXy9<6Xeg^R;=hStHpRv)hKfzHZ^>13uCi9f9yQ}to_XDCn1Ms4^54U{oVS=Ja zBAtcSLl$c~NI;0M{c6{_hf&m9XGnH-*CEQ7YE9Zjc)cOnxzii=j0u)41*=5l7p%*# zNB3*ezBT9Mk2fm-GeTUO&e8csZoScU^S4FY6C`qC^p2`+Ik;Axqwkvb)u#0kV#nrY z1Q7qm1U7pRRQ42pgCdnLL(7Q3rC(HJQ|drr_6P@&yZ}SFwE*_LS;E z{QKeQ2O>x6rJtL3vnGQgGZIPI5!*<^aQ+zUDHw5 z#$^W-?`%I=kiBWwuC=w*KGSODzw_!xtag*sQE&pwbV_;Qua3LUMK;njlN)81g#P3t zaP-asp`yk-N~D{9m|bT>MT{9-`<;u4c-*@s+|I?ZNSI*zOK{FCIkj<*`OtgYgdL{f z!Lls?G^As6rE7ZW>_&0R?y1<(h+>5~%rWHpZFeK#oAZip0Eg1n(~AQ*kHuj{ojo z%B#HUaxeZTWq=5)Xoc^uVF{(1qSVQ1{?B-jCjO{7q#7_Ief&p8+oOgn6}G~2f{->5 zZF+}~XfuDwM&A`D1wBXM&Aw@v)jh(S$pgLO z{A0IiWJGem=Qq%m#K)>R}@|$)9H(*#$OV4J)#XVx%S$k^x^A`KEBbNAH zSAv_tfhp97re@R9&f}M3Z|QzCb9cCrWv-K)Ycw+)B7SgceNm{bV6TMS0uKH==5(7w z@p${-H4F<^Qkz{{V^S?05hG From 29c9fe142a210c3f41ee76712769c1feed603944 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sat, 14 Sep 2013 00:35:25 -0400 Subject: [PATCH 016/157] specify required ruby version --- .ruby-version | 1 + Gemfile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..77fee73 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +1.9.3 diff --git a/Gemfile b/Gemfile index 4bc6e3e..98a042b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,4 @@ source 'https://rubygems.org' +ruby File.read('.ruby-version').strip -gem "github-pages" \ No newline at end of file +gem "github-pages" From 319bd3677e9523ee05502539d942e74adaa3632a Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sat, 14 Sep 2013 00:39:58 -0400 Subject: [PATCH 017/157] upgrade to gh-pages 4 --- .ruby-version | 2 +- Gemfile.lock | 2 +- javascripts/app.js | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.ruby-version b/.ruby-version index 77fee73..227cea2 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -1.9.3 +2.0.0 diff --git a/Gemfile.lock b/Gemfile.lock index 6316c83..2ad15af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GEM highline (~> 1.6.11) directory_watcher (1.4.1) fast-stemmer (1.0.2) - github-pages (1) + github-pages (4) RedCloth (= 4.2.9) jekyll (= 1.1.2) kramdown (= 1.0.2) diff --git a/javascripts/app.js b/javascripts/app.js index f140d3c..be3bca0 100644 --- a/javascripts/app.js +++ b/javascripts/app.js @@ -1,9 +1,8 @@ -// Generated by CoffeeScript 1.4.0 +// Generated by CoffeeScript 1.6.3 (function() { var Choosealicense; Choosealicense = (function() { - Choosealicense.prototype.flashAvailable = function() { if (typeof ActiveXObject !== "undefined" && ActiveXObject !== null) { return !!(new ActiveXObject('ShockwaveFlash.ShockwaveFlash')); From 678ae0686f201426d7b5bb5d3e54ef907c12e5f5 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sat, 14 Sep 2013 00:42:13 -0400 Subject: [PATCH 018/157] upgrade ruby version for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f9d70f9..d7d6d73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,4 @@ script: "./script/cibuild" #environment language: ruby rvm: - - 1.9.3 \ No newline at end of file + - 2.0.0 From 5126e72b4a7f001b14ab3c443edc28fd0f2663fc Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sat, 14 Sep 2013 00:57:53 -0400 Subject: [PATCH 019/157] add line re: non-code projects --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index e2b5891..d23de3a 100644 --- a/index.html +++ b/index.html @@ -45,6 +45,6 @@ description: A site to provide non-judgmental guidance on choosing a license for

What if none of these work for me or I want to retain all of my rights? More licenses are available.

- +

What if I need a license for content that isn't source code? Check out Creative Commons.

What if I don't want to choose a license? You don't have to.

From 08c0635e0a7024017ae4c9234dae6ae078ce4e4d Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sat, 14 Sep 2013 02:15:12 -0400 Subject: [PATCH 020/157] include list of resources --- about.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/about.md b/about.md index cf5c142..93042b6 100644 --- a/about.md +++ b/about.md @@ -11,9 +11,14 @@ If you already know what you’re doing and have a license you prefer to use ## Not comprehensive -This site is not a comprehensive directory of open source licenses. If you’re looking for a comprehensive list, we recommend the Open Source Initiative website. +This site is not a comprehensive directory of open source licenses. We think there are too many options, which adds to the confusion. On the homepage, we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/). Additional resources: -We think there are too many options, which adds to the confusion. On the homepage, we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/). + ## Help us improve it From 5cb937aa9d255f05d1967f0352f5ec2fbcdc9d48 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 16 Sep 2013 14:06:50 -0400 Subject: [PATCH 021/157] use kramdown to process markdown --- _config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/_config.yml b/_config.yml index e69d1e7..5662322 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,6 @@ title: ChooseALicense.com relative_permalinks: false -markdown: redcarpet +markdown: kramdown rules: @@ -8,33 +8,33 @@ rules: include-copyright: description: Include a copy of the license and copyright notice with the code. label: License and copyright notice - document-changes: + document-changes: description: Indicate significant changes made to the code. label: State Changes disclose-source: description: Source code must be made available when distributing the software. In the case of LGPL, the source for the library (and not the entire program) must be made available. label: Disclose Source library-usage: - description: The library may be used within a non-open-source application. + description: The library may be used within a non-open-source application. label: Library usage - rename: + rename: description: You must change the name of the software if you modify it. label: Rename permitted: - commercial-use: + commercial-use: description: This software and derivatives may be used for commercial purposes. label: Commercial Use - modifications: + modifications: description: This software may be modified. label: Modification - distribution: + distribution: description: You may distribute this software. label: Distribution - sublicense: + sublicense: description: You may grant a sublicense to modify and distribute this software to third parties not included in the license. label: Sublicensing - private-use: + private-use: description: You may use and modify the software without distributing it. label: Private Use patent-grant: @@ -45,10 +45,10 @@ rules: trademark-use: description: While this may be implicitly true of all licenses, this license explicitly states that you may NOT use the names, logos, or trademarks of contributors. label: Use Trademark - no-liability: + no-liability: description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. label: Hold Liable - no-sublicense: + no-sublicense: description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license. label: Sublicensing modifications: From 97a644642021b954dcba007d0f4641f4cb29653e Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Mon, 16 Sep 2013 14:21:19 -0400 Subject: [PATCH 022/157] convert resource list to kramdown syntax --- about.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/about.md b/about.md index 93042b6..f614b3b 100644 --- a/about.md +++ b/about.md @@ -13,12 +13,11 @@ If you already know what you’re doing and have a license you prefer to use This site is not a comprehensive directory of open source licenses. We think there are too many options, which adds to the confusion. On the homepage, we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/). Additional resources: - +* [Open Source Initiative](http://opensource.org/licenses/) - comprehensive list of open source licenses +* [Comparison of free and open-source software licenses](http://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on Wikipedia +* [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) from [OSS Watch](http://www.oss-watch.ac.uk/) +* [TLDRLegal](http://www.tldrlegal.com/) +{: .bullets} ## Help us improve it From a47bbeea43b5a3b49ffac404c744c1b6f50a7a9f Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Mon, 16 Sep 2013 15:16:10 -0400 Subject: [PATCH 023/157] make the additinal homepage questions side-by-side --- css/application.css | 39 +++++++++++++++------------------------ index.html | 39 +++++++++++++++++++++++++++------------ 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/css/application.css b/css/application.css index f73cecd..67ffa69 100644 --- a/css/application.css +++ b/css/application.css @@ -190,37 +190,38 @@ strong { top: 10px; } -.situations { +.triptych { width: 900px; - margin: 0 auto; + margin: 0 auto 15px; } -.situations li { +.triptych li { width: 280px; float: left; margin-left: 27px; text-align: center; } -.situations .whatever { +.triptych li:first-child { margin-left: 0; - margin-top: 16px; } -.situations .copyleft { - margin-top: 3px; -} -.situations h3 { - margin: 0 auto 20px auto; - width: 220px; -} - -.situations h3 a { +.triptych li > a { text-decoration: none; +} +.triptych h3 { color: #443a33; font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif; font-size: 22px; font-weight: 900; line-height: 1.1; + margin: 0 auto 20px auto; + width: 220px; } +.situations .whatever { + margin-top: 16px; +} +.situations .copyleft { + margin-top: 3px; +} .situations .button { margin-top: 20px; } @@ -236,16 +237,6 @@ strong { color: #5c5855; padding: 16px; } -.see-more { - margin-top: 20px; - display: inline-block; - padding-left: 80px; - padding-right: 80px; - font-weight: bold; -} -.see-more p:last-child { - margin-bottom: 0.3em; -} .license-rules { font-size: 13px; diff --git a/index.html b/index.html index d23de3a..24f6572 100644 --- a/index.html +++ b/index.html @@ -11,10 +11,12 @@ description: A site to provide non-judgmental guidance on choosing a license for Which of the following best describes your situation? } -
    + -
    -

    What if none of these work for me or I want to retain all of my rights? More licenses are available.

    -

    What if I need a license for content that isn't source code? Check out Creative Commons.

    -

    What if I don't want to choose a license? You don't have to.

    -
    + From 837cb3e1d2bccfce233691925c9b0a2ddd0c4cbd Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Mon, 16 Sep 2013 15:17:02 -0400 Subject: [PATCH 024/157] reduce text in the homepage FAQ --- index.html | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 24f6572..f5b10b9 100644 --- a/index.html +++ b/index.html @@ -51,15 +51,21 @@ description: A site to provide non-judgmental guidance on choosing a license for
From 0177da529a89424a2103ce7b2ea9f0549d6b1ce8 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Mon, 16 Sep 2013 15:17:53 -0400 Subject: [PATCH 025/157] reorder homepage questions --- index.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index f5b10b9..26cc1b5 100644 --- a/index.html +++ b/index.html @@ -50,18 +50,18 @@ description: A site to provide non-judgmental guidance on choosing a license for
    -
  • -

    What if none of these work for me?

    -

    - If you want to retain all your rights or have other requirements, more licenses are available. -

    -

  • What if my content isn't code?

    Check out Creative Commons.

    • +
  • +

    What if none of these work for me?

    +

    + If you want to retain all your rights or have other requirements, more licenses are available. +

    +

  • What if I don't want to choose a license?

    From b4e302a73cd23d8e2eecea1e1bfee72c2ff0cf42 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Mon, 16 Sep 2013 15:38:22 -0400 Subject: [PATCH 026/157] increase vertical spacing between homepage questions --- css/application.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/application.css b/css/application.css index 67ffa69..579569a 100644 --- a/css/application.css +++ b/css/application.css @@ -192,7 +192,7 @@ strong { .triptych { width: 900px; - margin: 0 auto 15px; + margin: 0 auto 35px; } .triptych li { width: 280px; From 6e91d6b529ef92a135991badd0a61d66d2b5d904 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Mon, 16 Sep 2013 15:39:10 -0400 Subject: [PATCH 027/157] change text of second row homepage questions to be consistent with the first --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 26cc1b5..a3d7daf 100644 --- a/index.html +++ b/index.html @@ -51,19 +51,19 @@ description: A site to provide non-judgmental guidance on choosing a license for

  • -

    What if my content isn't code?

    +

    My content isn't code.

    Check out Creative Commons.

  • -

    What if none of these work for me?

    +

    None of these work for me.

    If you want to retain all your rights or have other requirements, more licenses are available.

  • -

    What if I don't want to choose a license?

    +

    I don't want to choose a license.

    You don't have to.

    From f03c77d9fa6e94235d63cac65aa483c337db5bd0 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Mon, 16 Sep 2013 15:42:21 -0400 Subject: [PATCH 028/157] separate first and second row of homepage questions --- css/application.css | 2 +- index.html | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/css/application.css b/css/application.css index 579569a..1bdf655 100644 --- a/css/application.css +++ b/css/application.css @@ -192,7 +192,7 @@ strong { .triptych { width: 900px; - margin: 0 auto 35px; + margin: 0 auto 20px; } .triptych li { width: 280px; diff --git a/index.html b/index.html index a3d7daf..3c61d0c 100644 --- a/index.html +++ b/index.html @@ -49,6 +49,11 @@ description: A site to provide non-judgmental guidance on choosing a license for

+

+ { + What if none of these work for me? + } +

  • My content isn't code.

    @@ -57,7 +62,7 @@ description: A site to provide non-judgmental guidance on choosing a license for

  • -

    None of these work for me.

    +

    I want more choices.

    If you want to retain all your rights or have other requirements, more licenses are available.

    From b2892098a00561009efa9e48757f1e34832e35a1 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Mon, 16 Sep 2013 15:47:27 -0400 Subject: [PATCH 029/157] tighten up index part deux copy --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 3c61d0c..ccc3372 100644 --- a/index.html +++ b/index.html @@ -64,7 +64,7 @@ description: A site to provide non-judgmental guidance on choosing a license for

  • I want more choices.

    - If you want to retain all your rights or have other requirements, more licenses are available. + More licenses are available.

  • From 85755edd74f8c0a020df9dff2d1c0998f0228a1c Mon Sep 17 00:00:00 2001 From: Jason Long Date: Wed, 25 Sep 2013 08:58:07 -0400 Subject: [PATCH 030/157] put license text in lighter container for better contrast --- _includes/sidebar.html | 4 ++-- css/application.css | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 1cd0783..854a9f2 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -1,7 +1,7 @@
    Copy license text to clipboard -
    +
    How to apply this license

    {{ page.how }} @@ -42,5 +42,5 @@

{% endif %} - + diff --git a/css/application.css b/css/application.css index 1bdf655..a60c438 100644 --- a/css/application.css +++ b/css/application.css @@ -161,7 +161,7 @@ strong { .container { margin: 40px auto; - width: 900px; + width: 940px; } .home { @@ -232,7 +232,6 @@ strong { -webkit-border-radius: 3px; -moz-border-radius: 3px; -ms-border-radius: 3px; - -o-border-radius: 3px; border-radius: 3px; color: #5c5855; padding: 16px; @@ -316,12 +315,19 @@ strong { .license-body { font-size: 15px; float: left; - width: 660px; + width: 700px; } .license-body pre { font-family: Consolas, Monaco, Courier, monospace; font-size: 14px; + background-color: rgba(255, 255, 255, 0.8); + border: 1px solid #e9e6e1; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + border-radius: 3px; + padding: 20px; } .sidebar { @@ -350,6 +356,7 @@ strong { .sidebar .source { margin-top: 4px; + margin-bottom: 30px; } .sidebar .source a { padding-left: 20px; From 02470e2452875e9c5ea6f9b722313cb5ab5444e6 Mon Sep 17 00:00:00 2001 From: Jason Long Date: Thu, 26 Sep 2013 07:43:15 -0400 Subject: [PATCH 031/157] removed unused callout class --- css/application.css | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/css/application.css b/css/application.css index a60c438..ad074f5 100644 --- a/css/application.css +++ b/css/application.css @@ -226,17 +226,6 @@ strong { margin-top: 20px; } -.callout { - background-color: rgba(255, 255, 255, 0.33); - border: solid 1px #e9e6e1; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - -ms-border-radius: 3px; - border-radius: 3px; - color: #5c5855; - padding: 16px; -} - .license-rules { font-size: 13px; line-height: 1.3; From bee7665b869d8e336376e5275392b7e3c2d9db90 Mon Sep 17 00:00:00 2001 From: Wayne Beaton Date: Thu, 17 Oct 2013 13:59:11 -0400 Subject: [PATCH 032/157] Updated the description and using statements in eclipse.txt --- licenses/eclipse.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/licenses/eclipse.txt b/licenses/eclipse.txt index 0b313f3..a4f0706 100644 --- a/licenses/eclipse.txt +++ b/licenses/eclipse.txt @@ -3,7 +3,15 @@ layout: license title: Eclipse Public License v1.0 permalink: /licenses/eclipse/ -description: Used by the Eclipse foundation for its software, this license includes reciprocal requirements in some cases. +description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones. + +using: + The Eclipse Foundation: "http://www.eclipse.org" + OpenDaylight: "http://www.opendaylight.org/" + Clojure: "http://clojure.org/" + JUnit: "http://junit.org/" + Ruby: "https://github.com/jruby/jruby" + Mondrian: "http://en.wikipedia.org/wiki/Mondrian_OLAP_server" how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. From d2b1145e6d1a89a74caa7a8594a8d671c75828d1 Mon Sep 17 00:00:00 2001 From: "Andreas Renberg (IQAndreas)" Date: Tue, 22 Oct 2013 14:14:30 +0200 Subject: [PATCH 033/157] Switch to use the plaintext formatting for Apache License It's very clear that the site had copied over the HTML version of the Apache License. See [lines 122 to 142](https://github.com/github/choosealicense.com/blob/4e2fd06748ba8cc61c13b604b5bd947242bcbd63/licenses/apache.txt#L122) as an example where the unordered list bullets not copied in along with the rest of the text, throwing off the formatting and bunching together text. Since the site is displaying the plaintext version of the license, it makes more sense to use the nicely formatted [plaintext version provided by Apache](http://www.apache.org/licenses/LICENSE-2.0.txt). --- licenses/apache.txt | 313 +++++++++++++++++++++++--------------------- 1 file changed, 162 insertions(+), 151 deletions(-) diff --git a/licenses/apache.txt b/licenses/apache.txt index d6c8a7f..1d3bb47 100644 --- a/licenses/apache.txt +++ b/licenses/apache.txt @@ -30,194 +30,205 @@ forbidden: --- -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -1. Definitions. + 1. Definitions. -"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -"Licensor" shall mean the copyright owner or entity authorized by the copyright -owner that is granting the License. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. -"Legal Entity" shall mean the union of the acting entity and all other entities -that control, are controlled by, or are under common control with that entity. -For the purposes of this definition, "control" means (i) the power, direct or -indirect, to cause the direction or management of such entity, whether by -contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. -"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License. + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. -"Source" form shall mean the preferred form for making modifications, including -but not limited to software source code, documentation source, and configuration -files. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. -"Object" form shall mean any form resulting from mechanical transformation or -translation of a Source form, including but not limited to compiled object code, -generated documentation, and conversions to other media types. + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. -"Work" shall mean the work of authorship, whether in Source or Object form, made -available under the License, as indicated by a copyright notice that is included -in or attached to the work (an example is provided in the Appendix below). + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). -"Derivative Works" shall mean any work, whether in Source or Object form, that -is based on (or derived from) the Work and for which the editorial revisions, -annotations, elaborations, or other modifications represent, as a whole, an -original work of authorship. For the purposes of this License, Derivative Works -shall not include works that remain separable from, or merely link (or bind by -name) to the interfaces of, the Work and Derivative Works thereof. + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. -"Contribution" shall mean any work of authorship, including the original version -of the Work and any modifications or additions to that Work or Derivative Works -thereof, that is intentionally submitted to Licensor for inclusion in the Work -by the copyright owner or by an individual or Legal Entity authorized to submit -on behalf of the copyright owner. For the purposes of this definition, -"submitted" means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, and -issue tracking systems that are managed by, or on behalf of, the Licensor for -the purpose of discussing and improving the Work, but excluding communication -that is conspicuously marked or otherwise designated in writing by the copyright -owner as "Not a Contribution." + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf -of whom a Contribution has been received by Licensor and subsequently -incorporated within the Work. + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. -2. Grant of Copyright License. + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form. + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. -3. Grant of Patent License. + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable (except as stated in this section) patent license to make, have -made, use, offer to sell, sell, import, and otherwise transfer the Work, where -such license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by combination -of their Contribution(s) with the Work to which such Contribution(s) was -submitted. If You institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work or a -Contribution incorporated within the Work constitutes direct or contributory -patent infringement, then any patent licenses granted to You under this License -for that Work shall terminate as of the date such litigation is filed. + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and -4. Redistribution. + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and -You may reproduce and distribute copies of the Work or Derivative Works thereof -in any medium, with or without modifications, and in Source or Object form, -provided that You meet the following conditions: + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and -You must give any other recipients of the Work or Derivative Works a copy of -this License; and -You must cause any modified files to carry prominent notices stating that You -changed the files; and -You must retain, in the Source form of any Derivative Works that You distribute, -all copyright, patent, trademark, and attribution notices from the Source form -of the Work, excluding those notices that do not pertain to any part of the -Derivative Works; and -If the Work includes a "NOTICE" text file as part of its distribution, then any -Derivative Works that You distribute must include a readable copy of the -attribution notices contained within such NOTICE file, excluding those notices -that do not pertain to any part of the Derivative Works, in at least one of the -following places: within a NOTICE text file distributed as part of the -Derivative Works; within the Source form or documentation, if provided along -with the Derivative Works; or, within a display generated by the Derivative -Works, if and wherever such third-party notices normally appear. The contents of -the NOTICE file are for informational purposes only and do not modify the -License. You may add Your own attribution notices within Derivative Works that -You distribute, alongside or as an addendum to the NOTICE text from the Work, -provided that such additional attribution notices cannot be construed as -modifying the License. -You may add Your own copyright statement to Your modifications and may provide -additional or different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works as a whole, -provided Your use, reproduction, and distribution of the Work otherwise complies -with the conditions stated in this License. + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. -5. Submission of Contributions. + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. -Unless You explicitly state otherwise, any Contribution intentionally submitted -for inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the terms of -any separate license agreement you may have executed with Licensor regarding -such Contributions. + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. -6. Trademarks. + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. -This License does not grant permission to use the trade names, trademarks, -service marks, or product names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and -reproducing the content of the NOTICE file. + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. -7. Disclaimer of Warranty. + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. -Unless required by applicable law or agreed to in writing, Licensor provides the -Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, -including, without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are -solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise of -permissions under this License. + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. -8. Limitation of Liability. + END OF TERMS AND CONDITIONS -In no event and under no legal theory, whether in tort (including negligence), -contract, or otherwise, unless required by applicable law (such as deliberate -and grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, incidental, -or consequential damages of any character arising as a result of this License or -out of the use or inability to use the Work (including but not limited to -damages for loss of goodwill, work stoppage, computer failure or malfunction, or -any and all other commercial damages or losses), even if such Contributor has -been advised of the possibility of such damages. + APPENDIX: How to apply the Apache License to your work. -9. Accepting Warranty or Additional Liability. + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. -While redistributing the Work or Derivative Works thereof, You may choose to -offer, and charge a fee for, acceptance of support, warranty, indemnity, or -other liability obligations and/or rights consistent with this License. However, -in accepting such obligations, You may act only on Your own behalf and on Your -sole responsibility, not on behalf of any other Contributor, and only if You -agree to indemnify, defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason of your -accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work - -To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "{}" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included on -the same "printed page" as the copyright notice for easier identification within -third-party archives. - - Copyright {yyyy} {name of copyright owner} + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + From f07c1f9beba890dcb7bddafed8375aefc05d3c6f Mon Sep 17 00:00:00 2001 From: "Andreas Renberg (IQAndreas)" Date: Tue, 22 Oct 2013 14:21:04 +0200 Subject: [PATCH 034/157] Change braces to match the rest of the site --- licenses/apache.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses/apache.txt b/licenses/apache.txt index 1d3bb47..212737e 100644 --- a/licenses/apache.txt +++ b/licenses/apache.txt @@ -210,7 +210,7 @@ forbidden: APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" + boilerplate notice, with the fields enclosed by brackets "{}" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -218,7 +218,7 @@ forbidden: same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright {yyyy} {name of copyright owner} Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 800d8bbdb87301cb5f4e3426ff717646649a927d Mon Sep 17 00:00:00 2001 From: "Andreas Renberg (IQAndreas)" Date: Wed, 23 Oct 2013 07:37:32 +0200 Subject: [PATCH 035/157] Only include link to source if one has been provided Not all licenses have provided a `source` property, so this check just prevent an empty `href` in such cases. --- _includes/sidebar.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 854a9f2..396c37e 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -12,9 +12,11 @@

{% endif %} + {% if page.source %}
- Source + Source
+ {% endif %}
From dc58abef620554ab98969b3177f4eaa98d1056a4 Mon Sep 17 00:00:00 2001 From: "Andreas Renberg (IQAndreas)" Date: Wed, 23 Oct 2013 08:09:55 +0200 Subject: [PATCH 036/157] Add license sources where missing --- licenses/gpl-v2.txt | 1 + licenses/gpl-v3.txt | 1 + licenses/lgpl-v2.1.txt | 1 + licenses/lgpl-v3.txt | 1 + licenses/mit.txt | 1 + licenses/mozilla.txt | 1 + licenses/public-domain.txt | 2 ++ 7 files changed, 8 insertions(+) diff --git a/licenses/gpl-v2.txt b/licenses/gpl-v2.txt index 751c221..019e09e 100644 --- a/licenses/gpl-v2.txt +++ b/licenses/gpl-v2.txt @@ -2,6 +2,7 @@ title: GPL v2 layout: license permalink: /licenses/gpl-v2/ +source: http://www.gnu.org/licenses/gpl-2.0.txt featured: true diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt index c3c105b..487377f 100644 --- a/licenses/gpl-v3.txt +++ b/licenses/gpl-v3.txt @@ -2,6 +2,7 @@ title: GPL v3 layout: license permalink: /licenses/gpl-v3/ +source: http://www.gnu.org/licenses/gpl-3.0.txt description: GPL is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license. diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt index eacacde..b0976cb 100644 --- a/licenses/lgpl-v2.1.txt +++ b/licenses/lgpl-v2.1.txt @@ -2,6 +2,7 @@ layout: license title: LGPL v2.1 permalink: /licenses/lgpl-v2.1/ +source: http://www.gnu.org/licenses/lgpl-2.1.txt description: Primarily used for software libraries, LGPL requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction. diff --git a/licenses/lgpl-v3.txt b/licenses/lgpl-v3.txt index afab013..f486e4b 100644 --- a/licenses/lgpl-v3.txt +++ b/licenses/lgpl-v3.txt @@ -2,6 +2,7 @@ layout: license title: LGPL v3 permalink: /licenses/lgpl-v3/ +source: http://www.gnu.org/licenses/lgpl-3.0.txt description: Version 3 of the LGPL is an additional set of permissions to the GPL v3 license that requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction. diff --git a/licenses/mit.txt b/licenses/mit.txt index 006d0b9..e9ae8d6 100644 --- a/licenses/mit.txt +++ b/licenses/mit.txt @@ -2,6 +2,7 @@ layout: license title: MIT License permalink: /licenses/mit/ +source: http://opensource.org/licenses/MIT featured: true diff --git a/licenses/mozilla.txt b/licenses/mozilla.txt index eb86f2f..37ec20d 100644 --- a/licenses/mozilla.txt +++ b/licenses/mozilla.txt @@ -2,6 +2,7 @@ layout: license title: Mozilla Public License Version 2.0 permalink: /licenses/mozilla/ +source: http://www.mozilla.org/MPL/2.0/ description: The Mozilla Public License (MPL 2.0) is maintained by the Mozilla foundation. This license attempts to be a compromise between the permissive BSD license and the reciprocal GPL license. diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index 77ca8fb..a870459 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -5,6 +5,8 @@ class: license-types title: Public Domain (Unlicense) filename: UNLICENSE +source: http://unlicense.org/UNLICENSE + description: Because copyright is automatic in most countries, the Unlicense is a template to waive copyright interest in software you've written and dedicate it to the public domain. Use the Unlicense to opt out of copyright entirely. It also includes the no-warranty statement from the MIT/X11 license. how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file. From c3f8ee7c889dbc951f670863e0a630b484c2b751 Mon Sep 17 00:00:00 2001 From: "Andreas Renberg (IQAndreas)" Date: Wed, 23 Oct 2013 08:53:11 +0200 Subject: [PATCH 037/157] Use the plaintext formatting of the Artistic License 2.0 Another case where the license was copied from HTML, but had a nicely formatted plaintext version (this is the last one, I promise). This time the source was taken from --- licenses/artistic.txt | 292 ++++++++++++++++++++++++------------------ 1 file changed, 165 insertions(+), 127 deletions(-) diff --git a/licenses/artistic.txt b/licenses/artistic.txt index 11dd18c..c8236a0 100644 --- a/licenses/artistic.txt +++ b/licenses/artistic.txt @@ -2,8 +2,7 @@ layout: license title: Artistic License 2.0 permalink: /licenses/artistic/ - -source: http://opensource.org/licenses/Artistic-2.0 +source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt description: A license that’s heavily favored by the Perl community. @@ -23,166 +22,205 @@ forbidden: - no-liability - trademark-use --- + The Artistic License 2.0 -Artistic License 2.0 -Copyright (c) [year] [fullname] + Copyright (c) 2000-2006, The Perl Foundation. -Everyone is permitted to copy and distribute verbatim copies of this license -document, but changing it is not allowed. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. Preamble -This license establishes the terms under which a given free software Package may -be copied, modified, distributed, and/or redistributed. The intent is that the -Copyright Holder maintains some artistic control over the development of that -Package while still keeping the Package available as open source and free -software. -You are always permitted to make arrangements wholly outside of this license -directly with the Copyright Holder of a given Package. If the terms of this -license do not permit the full use that you propose to make of the Package, you -should contact the Copyright Holder and seek a different licensing arrangement. +This license establishes the terms under which a given free software +Package may be copied, modified, distributed, and/or redistributed. +The intent is that the Copyright Holder maintains some artistic +control over the development of that Package while still keeping the +Package available as open source and free software. + +You are always permitted to make arrangements wholly outside of this +license directly with the Copyright Holder of a given Package. If the +terms of this license do not permit the full use that you propose to +make of the Package, you should contact the Copyright Holder and seek +a different licensing arrangement. Definitions -"Copyright Holder" means the individual(s) or organization(s) named in the -copyright notice for the entire Package. -"Contributor" means any party that has contributed code or other material to the -Package, in accordance with the Copyright Holder's procedures. + "Copyright Holder" means the individual(s) or organization(s) + named in the copyright notice for the entire Package. -"You" and "your" means any person who would like to copy, distribute, or modify -the Package. + "Contributor" means any party that has contributed code or other + material to the Package, in accordance with the Copyright Holder's + procedures. -"Package" means the collection of files distributed by the Copyright Holder, and -derivatives of that collection and/or of those files. A given Package may -consist of either the Standard Version, or a Modified Version. + "You" and "your" means any person who would like to copy, + distribute, or modify the Package. -"Distribute" means providing a copy of the Package or making it accessible to -anyone else, or in the case of a company or organization, to others outside of -your company or organization. + "Package" means the collection of files distributed by the + Copyright Holder, and derivatives of that collection and/or of + those files. A given Package may consist of either the Standard + Version, or a Modified Version. -"Distributor Fee" means any fee that you charge for Distributing this Package or -providing support for this Package to another party. It does not mean licensing -fees. + "Distribute" means providing a copy of the Package or making it + accessible to anyone else, or in the case of a company or + organization, to others outside of your company or organization. -"Standard Version" refers to the Package if it has not been modified, or has -been modified only in ways explicitly requested by the Copyright Holder. + "Distributor Fee" means any fee that you charge for Distributing + this Package or providing support for this Package to another + party. It does not mean licensing fees. -"Modified Version" means the Package, if it has been changed, and such changes -were not explicitly requested by the Copyright Holder. + "Standard Version" refers to the Package if it has not been + modified, or has been modified only in ways explicitly requested + by the Copyright Holder. -"Original License" means this Artistic License as Distributed with the Standard -Version of the Package, in its current version or as it may be modified by The -Perl Foundation in the future. + "Modified Version" means the Package, if it has been changed, and + such changes were not explicitly requested by the Copyright + Holder. -"Source" form means the source code, documentation source, and configuration -files for the Package. + "Original License" means this Artistic License as Distributed with + the Standard Version of the Package, in its current version or as + it may be modified by The Perl Foundation in the future. + + "Source" form means the source code, documentation source, and + configuration files for the Package. + + "Compiled" form means the compiled bytecode, object code, binary, + or any other form resulting from mechanical transformation or + translation of the Source form. -"Compiled" form means the compiled bytecode, object code, binary, or any other -form resulting from mechanical transformation or translation of the Source form. Permission for Use and Modification Without Distribution -(1) You are permitted to use the Standard Version and create and use Modified -Versions for any purpose without restriction, provided that you do not -Distribute the Modified Version. + +(1) You are permitted to use the Standard Version and create and use +Modified Versions for any purpose without restriction, provided that +you do not Distribute the Modified Version. + Permissions for Redistribution of the Standard Version -(2) You may Distribute verbatim copies of the Source form of the Standard -Version of this Package in any medium without restriction, either gratis or for -a Distributor Fee, provided that you duplicate all of the original copyright -notices and associated disclaimers. At your discretion, such verbatim copies may -or may not include a Compiled form of the Package. -(3) You may apply any bug fixes, portability changes, and other modifications -made available from the Copyright Holder. The resulting Package will still be -considered the Standard Version, and as such will be subject to the Original -License. +(2) You may Distribute verbatim copies of the Source form of the +Standard Version of this Package in any medium without restriction, +either gratis or for a Distributor Fee, provided that you duplicate +all of the original copyright notices and associated disclaimers. At +your discretion, such verbatim copies may or may not include a +Compiled form of the Package. -Distribution of Modified Versions of the Package as Source -(4) You may Distribute your Modified Version as Source (either gratis or for a -Distributor Fee, and with or without a Compiled form of the Modified Version) -provided that you clearly document how it differs from the Standard Version, -including, but not limited to, documenting any non-standard features, -executables, or modules, and provided that you do at least ONE of the following: +(3) You may apply any bug fixes, portability changes, and other +modifications made available from the Copyright Holder. The resulting +Package will still be considered the Standard Version, and as such +will be subject to the Original License. -(a) make the Modified Version available to the Copyright Holder of the Standard -Version, under the Original License, so that the Copyright Holder may include -your modifications in the Standard Version. -(b) ensure that installation of your Modified Version does not prevent the user -installing or running the Standard Version. In addition, the Modified Version -must bear a name that is different from the name of the Standard Version. -(c) allow anyone who receives a copy of the Modified Version to make the Source -form of the Modified Version available to others under -(i) the Original License or -(ii) a license that permits the licensee to freely copy, modify and redistribute -the Modified Version using the same licensing terms that apply to the copy that -the licensee received, and requires that the Source form of the Modified -Version, and of any works derived from it, be made freely available in that -license fees are prohibited but Distributor Fees are allowed. -Distribution of Compiled Forms of the Standard Version or Modified Versions -without the Source -(5) You may Distribute Compiled forms of the Standard Version without the -Source, provided that you include complete instructions on how to get the Source -of the Standard Version. Such instructions must be valid at the time of your -distribution. If these instructions, at any time while you are carrying out such -distribution, become invalid, you must provide new instructions on demand or -cease further distribution. If you provide valid instructions or cease -distribution within thirty days after you become aware that the instructions are -invalid, then you do not forfeit any of your rights under this license. +Distribution of Modified Versions of the Package as Source -(6) You may Distribute a Modified Version in Compiled form without the Source, -provided that you comply with Section 4 with respect to the Source of the -Modified Version. +(4) You may Distribute your Modified Version as Source (either gratis +or for a Distributor Fee, and with or without a Compiled form of the +Modified Version) provided that you clearly document how it differs +from the Standard Version, including, but not limited to, documenting +any non-standard features, executables, or modules, and provided that +you do at least ONE of the following: -Aggregating or Linking the Package -(7) You may aggregate the Package (either the Standard Version or Modified -Version) with other packages and Distribute the resulting aggregation provided -that you do not charge a licensing fee for the Package. Distributor Fees are -permitted, and licensing fees for other components in the aggregation are -permitted. The terms of this license apply to the use and Distribution of the -Standard or Modified Versions as included in the aggregation. + (a) make the Modified Version available to the Copyright Holder + of the Standard Version, under the Original License, so that the + Copyright Holder may include your modifications in the Standard + Version. -(8) You are permitted to link Modified and Standard Versions with other works, -to embed the Package in a larger work of your own, or to build stand-alone -binary or bytecode versions of applications that include the Package, and -Distribute the result without restriction, provided the result does not expose a -direct interface to the Package. + (b) ensure that installation of your Modified Version does not + prevent the user installing or running the Standard Version. In + addition, the Modified Version must bear a name that is different + from the name of the Standard Version. -Items That are Not Considered Part of a Modified Version + (c) allow anyone who receives a copy of the Modified Version to + make the Source form of the Modified Version available to others + under + + (i) the Original License or + + (ii) a license that permits the licensee to freely copy, + modify and redistribute the Modified Version using the same + licensing terms that apply to the copy that the licensee + received, and requires that the Source form of the Modified + Version, and of any works derived from it, be made freely + available in that license fees are prohibited but Distributor + Fees are allowed. + + +Distribution of Compiled Forms of the Standard Version +or Modified Versions without the Source + +(5) You may Distribute Compiled forms of the Standard Version without +the Source, provided that you include complete instructions on how to +get the Source of the Standard Version. Such instructions must be +valid at the time of your distribution. If these instructions, at any +time while you are carrying out such distribution, become invalid, you +must provide new instructions on demand or cease further distribution. +If you provide valid instructions or cease distribution within thirty +days after you become aware that the instructions are invalid, then +you do not forfeit any of your rights under this license. + +(6) You may Distribute a Modified Version in Compiled form without +the Source, provided that you comply with Section 4 with respect to +the Source of the Modified Version. + + +Aggregating or Linking the Package + +(7) You may aggregate the Package (either the Standard Version or +Modified Version) with other packages and Distribute the resulting +aggregation provided that you do not charge a licensing fee for the +Package. Distributor Fees are permitted, and licensing fees for other +components in the aggregation are permitted. The terms of this license +apply to the use and Distribution of the Standard or Modified Versions +as included in the aggregation. + +(8) You are permitted to link Modified and Standard Versions with +other works, to embed the Package in a larger work of your own, or to +build stand-alone binary or bytecode versions of applications that +include the Package, and Distribute the result without restriction, +provided the result does not expose a direct interface to the Package. + + +Items That are Not Considered Part of a Modified Version + +(9) Works (including, but not limited to, modules and scripts) that +merely extend or make use of the Package, do not, by themselves, cause +the Package to be a Modified Version. In addition, such works are not +considered parts of the Package itself, and are not subject to the +terms of this license. -(9) Works (including, but not limited to, modules and scripts) that merely -extend or make use of the Package, do not, by themselves, cause the Package to -be a Modified Version. In addition, such works are not considered parts of the -Package itself, and are not subject to the terms of this license. General Provisions -(10) Any use, modification, and distribution of the Standard or Modified -Versions is governed by this Artistic License. By using, modifying or -distributing the Package, you accept this license. Do not use, modify, or -distribute the Package, if you do not accept this license. +(10) Any use, modification, and distribution of the Standard or +Modified Versions is governed by this Artistic License. By using, +modifying or distributing the Package, you accept this license. Do not +use, modify, or distribute the Package, if you do not accept this +license. -(11) If your Modified Version has been derived from a Modified Version made by -someone other than you, you are nevertheless required to ensure that your -Modified Version complies with the requirements of this license. +(11) If your Modified Version has been derived from a Modified +Version made by someone other than you, you are nevertheless required +to ensure that your Modified Version complies with the requirements of +this license. -(12) This license does not grant you the right to use any trademark, service -mark, tradename, or logo of the Copyright Holder. +(12) This license does not grant you the right to use any trademark, +service mark, tradename, or logo of the Copyright Holder. -(13) This license includes the non-exclusive, worldwide, free-of-charge patent -license to make, have made, use, offer to sell, sell, import and otherwise -transfer the Package with respect to any patent claims licensable by the -Copyright Holder that are necessarily infringed by the Package. If you institute -patent litigation (including a cross-claim or counterclaim) against any party -alleging that the Package constitutes direct or contributory patent -infringement, then this Artistic License to you shall terminate on the date that -such litigation is filed. +(13) This license includes the non-exclusive, worldwide, +free-of-charge patent license to make, have made, use, offer to sell, +sell, import and otherwise transfer the Package with respect to any +patent claims licensable by the Copyright Holder that are necessarily +infringed by the Package. If you institute patent litigation +(including a cross-claim or counterclaim) against any party alleging +that the Package constitutes direct or contributory patent +infringement, then this Artistic License to you shall terminate on the +date that such litigation is filed. -(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND -CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED +(14) Disclaimer of Warranty: +THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS +IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR -NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. -UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY -OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. +NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL +LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + From 1b5debd6bf4465ae9b1a807b8c11d78586166043 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Tue, 22 Oct 2013 23:55:54 -0700 Subject: [PATCH 038/157] fix 'using' display in sidebar --- _includes/sidebar.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 396c37e..da1ee81 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -36,10 +36,8 @@

Who's using this license?

    - {% for using_hash in page.using %} - {% for using in using_hash %} -
  • {{ using[0] }}
    • - {% endfor %} + {% for using in page.using %} +
  • {{ using[0] }}
    • {% endfor %}
From af62acc3f65a1216965d446f4b92850909c981ba Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Tue, 22 Oct 2013 23:58:11 -0700 Subject: [PATCH 039/157] remove garbage 'using' link --- licenses/agpl.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/licenses/agpl.txt b/licenses/agpl.txt index c6a35bd..49d258d 100644 --- a/licenses/agpl.txt +++ b/licenses/agpl.txt @@ -22,9 +22,6 @@ forbidden: - no-liability - no-sublicense -using: - Some Project: "#" - --- GNU AFFERO GENERAL PUBLIC LICENSE From 0527976cee5d575efe67efa6adb141dfccf4d758 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Wed, 23 Oct 2013 00:07:51 -0700 Subject: [PATCH 040/157] add HTML::Proofer --- CONTRIBUTING.md | 9 +++++++++ Gemfile | 5 +++++ Gemfile.lock | 18 ++++++++++++++++++ Rakefile | 6 ++++++ 4 files changed, 38 insertions(+) create mode 100644 Rakefile diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ba55c10..afc29b2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,3 +30,12 @@ changes, type in a commit message, and click the `Propose File Change` button. That’s it! For more advanced changes, check out [the bootstrap instructions](https://github.com/github/choosealicense.com#run-it-on-your-machine) in the [project's readme](https://github.com/github/choosealicense.com/blob/master/README.md). + +## Testing + +[HTML::Proofer](https://github.com/gjtorikian/html-proofer) is set up to validate all links within the project. You can run this locally to ensure that your changes are valid: + +```shell +bundle install +bundle exec rake test +``` diff --git a/Gemfile b/Gemfile index 98a042b..05020f6 100644 --- a/Gemfile +++ b/Gemfile @@ -2,3 +2,8 @@ source 'https://rubygems.org' ruby File.read('.ruby-version').strip gem "github-pages" + +group :test do + gem "html-proofer" + gem "rake" +end diff --git a/Gemfile.lock b/Gemfile.lock index 2ad15af..f10679a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,10 +5,15 @@ GEM classifier (1.3.3) fast-stemmer (>= 1.0.0) colorator (0.1) + colored (1.2) commander (4.1.5) highline (~> 1.6.11) directory_watcher (1.4.1) + ethon (0.6.1) + ffi (>= 1.3.0) + mime-types (~> 1.18) fast-stemmer (1.0.2) + ffi (1.9.0) github-pages (4) RedCloth (= 4.2.9) jekyll (= 1.1.2) @@ -18,6 +23,10 @@ GEM rdiscount (= 1.6.8) redcarpet (= 2.2.2) highline (1.6.19) + html-proofer (0.1.1) + colored (~> 1.2) + nokogiri (= 1.6.0) + typhoeus (~> 0.6.3) jekyll (1.1.2) classifier (~> 1.3) colorator (~> 0.1) @@ -33,14 +42,21 @@ GEM liquid (2.5.1) maruku (0.6.1) syntax (>= 1.0.0) + mime-types (1.25) + mini_portile (0.5.1) + nokogiri (1.6.0) + mini_portile (~> 0.5.0) posix-spawn (0.3.6) pygments.rb (0.5.2) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) + rake (10.1.0) rdiscount (1.6.8) redcarpet (2.2.2) safe_yaml (0.7.1) syntax (1.0.0) + typhoeus (0.6.5) + ethon (~> 0.6.1) yajl-ruby (1.1.0) PLATFORMS @@ -48,3 +64,5 @@ PLATFORMS DEPENDENCIES github-pages + html-proofer + rake diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..8feeb72 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +require "html/proofer" + +task :test do + sh "bundle exec jekyll build" + HTML::Proofer.new("./_site").run +end From b5ff5db7852ca7667ecd1ace02d84e4d3c4f9cf6 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Wed, 23 Oct 2013 00:20:44 -0700 Subject: [PATCH 041/157] tweaks to make html-proofing pass --- Rakefile | 3 ++- index.html | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index 8feeb72..9ee2964 100644 --- a/Rakefile +++ b/Rakefile @@ -2,5 +2,6 @@ require "html/proofer" task :test do sh "bundle exec jekyll build" - HTML::Proofer.new("./_site").run + # ignore href="#" for the "Copy to clipboard" button + HTML::Proofer.new("./_site", :href_ignore => ["#"]).run end diff --git a/index.html b/index.html index ccc3372..fe5bc4b 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@ description: A site to provide non-judgmental guidance on choosing a license for