From 7295849a881cc04ffd5ba3258a96946788a838a6 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 10:59:35 -0700 Subject: [PATCH 01/25] homepage text tweaking per legal review --- css/application.css | 2 +- index.html | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/css/application.css b/css/application.css index 1802421..cdec959 100644 --- a/css/application.css +++ b/css/application.css @@ -204,7 +204,7 @@ strong { margin-left: 0; margin-top: 16px; } -.situations .reciprocity { +.situations .copyleft { margin-top: 3px; } .situations h3 { diff --git a/index.html b/index.html index 46d74c3..046187c 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@ class: home

I want it simple and permissive.

- The MIT License is a permissive license that is short and to the point. It doesn’t include any warranties and lets people do anything they want with your code (with attribution back to you). + The MIT License is a permissive license that is short and to the point. It lets people do anything they want with your code as long as they provide attribution back to you and don’t hold you liable.

jQuery and Rails use the MIT License. @@ -24,17 +24,17 @@ class: home

I’m concerned about patents.

- The Apache License is a permissive license similar to the MIT License, but also contains a patent license for any code that infringes on a contributor’s patents. + The Apache License is a permissive license similar to the MIT License, but also provides an express grant of patent rights from the contributor to the recipient.

Apache, SVN, and NuGet use the Apache License.

-
  • +
  • -

    I care about reciprocity.

    +

    I care about sharing improvements.

    - The GPL (V2 or V3) is a reciprocal license that requires that folks who modify your code also license their changes under the GPL. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations. + The GPL (V2 or V3) is a copyleft license that requires that people who modify your code disclose their changes when they distribute their program that includes your code. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations.

    Linux and Git use the GPL. From 776046f049a5c854fcee8d6acfa44977a11319f4 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 11:20:40 -0700 Subject: [PATCH 02/25] Add public domain license --- licenses/public-domain.txt | 144 +++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 licenses/public-domain.txt diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt new file mode 100644 index 0000000..8c74d89 --- /dev/null +++ b/licenses/public-domain.txt @@ -0,0 +1,144 @@ +--- +layout: license +permalink: public-domain/ +class: license-types +title: Public Domain (CC0) + +description: You disclaim all rights to the code and dedicate it to the public domain allowing others to do anything with the work they wish even without attributing you. However, because laws vary in different countries, the Creative Commons has a CC0 license that licenses the work as close to the spirit of public domain everywhere. + +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. You can alternatively use the [Creative Commons CC0 tool](http://creativecommons.org/choose/zero/) to generate HTML with embedded metadata to mark your work as CC0. + +required: + +permitted: + - private-use + - commercial-use + - modifications + - distribution + - sublicense + +forbidden: + +--- + +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file From 47a12aca162853b9f55e01f62fecaf174145688e Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Wed, 10 Jul 2013 15:00:18 -0400 Subject: [PATCH 03/25] Add comma --- licenses/public-domain.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index 8c74d89..b966f98 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -4,7 +4,7 @@ permalink: public-domain/ class: license-types title: Public Domain (CC0) -description: You disclaim all rights to the code and dedicate it to the public domain allowing others to do anything with the work they wish even without attributing you. However, because laws vary in different countries, the Creative Commons has a CC0 license that licenses the work as close to the spirit of public domain everywhere. +description: You disclaim all rights to the code and dedicate it to the public domain allowing others to do anything with the work they wish, even without attributing you. However, because laws vary in different countries, the Creative Commons has a CC0 license that licenses the work as close to the spirit of public domain everywhere. 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. You can alternatively use the [Creative Commons CC0 tool](http://creativecommons.org/choose/zero/) to generate HTML with embedded metadata to mark your work as CC0. @@ -141,4 +141,4 @@ express Statement of Purpose. Work. d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to - this CC0 or use of the Work. \ No newline at end of file + this CC0 or use of the Work. From 3ae89614b18214f1ae9c941ef341cf0bea3c4d0d Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 13:55:10 -0700 Subject: [PATCH 04/25] Tried to tone down language about the choices Rather than say these are the ones you only need to choose, we just say most projects will be fine with one of these choices. --- about.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/about.md b/about.md index 72f0691..cfdeb8b 100644 --- a/about.md +++ b/about.md @@ -20,11 +20,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. If you’re looking for a comprehensive list, we recommend the Open Source Initiative website. -We think there are too many options, which adds to the confusion. On the homepage, we break it down into just three licenses. For the vast majority of projects, these are probably the only three you will need to choose from. Just in case you have specific needs not covered by those three, we also highlight a few other licenses to consider. +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 -Choosealicense.com isn't just about open source, the site itself is open source as well. See something you think could be done better? Feel free to [fork the project](https://github.com/github/choosealicense.com) on GitHub and submit a pull request. We'd welcome your improvements. +Choosealicense.com isn’t just about open source, the site itself is open source as well. See something you think could be done better? Feel free to [fork the project](https://github.com/github/choosealicense.com) on GitHub and submit a pull request. We'd welcome your improvements. ## Disclaimer From 70aaba7ba03f8940b0ceb9ddb8a488ecbbca2a5f Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 14:01:00 -0700 Subject: [PATCH 05/25] Tweaks per content review --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 046187c..d99fbe0 100644 --- a/index.html +++ b/index.html @@ -24,7 +24,7 @@ class: home

    I’m concerned about patents.

    - The Apache License is a permissive license similar to the MIT License, but also provides an express grant of patent rights from the contributor to the recipient. + The Apache License is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users.

    Apache, SVN, and NuGet use the Apache License. @@ -34,7 +34,7 @@ class: home

    I care about sharing improvements.

    - The GPL (V2 or V3) is a copyleft license that requires that people who modify your code disclose their changes when they distribute their program that includes your code. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations. + 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 adds a restriction restricting use in hardware that forbids software alterations.

    Linux and Git use the GPL. From c90a6a615c358242e7c098d4b643393a507e40df Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Fri, 12 Jul 2013 14:58:06 -0400 Subject: [PATCH 06/25] clarify bsd 2 clause --- licenses/bsd.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/licenses/bsd.txt b/licenses/bsd.txt index 0c9b7ec..909cdfc 100644 --- a/licenses/bsd.txt +++ b/licenses/bsd.txt @@ -14,14 +14,13 @@ required: permitted: - commercial-use - - modification + - modifications - distribution - sublicense - warranty forbidden: - no-liability - - trademark-use --- From fd1ea0b72d5dc514059706d87a062fd0f1630663 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 14:03:18 -0700 Subject: [PATCH 07/25] Improve public domain description --- licenses/public-domain.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index b966f98..bf536b7 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -4,7 +4,7 @@ permalink: public-domain/ class: license-types title: Public Domain (CC0) -description: You disclaim all rights to the code and dedicate it to the public domain allowing others to do anything with the work they wish, even without attributing you. However, because laws vary in different countries, the Creative Commons has a CC0 license that licenses the work as close to the spirit of public domain everywhere. +description: Because copyright attaches automatically in many countries, the Creative Commons CC0 License is recommended to ensure that your work is available everywhere under terms that most closely follow the spirit of a public domain work. 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. You can alternatively use the [Creative Commons CC0 tool](http://creativecommons.org/choose/zero/) to generate HTML with embedded metadata to mark your work as CC0. From 3c29d5da87e560c3cc39c36753c58a60e79664ce Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 11:32:22 -0700 Subject: [PATCH 08/25] Replace copyright and license with single category --- _config.yml | 7 ++----- licenses/apache.txt | 4 +--- licenses/eclipse.txt | 2 +- licenses/mozilla.txt | 1 - licenses/no-license.html | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/_config.yml b/_config.yml index db2827c..03768b1 100644 --- a/_config.yml +++ b/_config.yml @@ -4,11 +4,8 @@ rules: required: include-copyright: - description: Include the original copyright with the code. - label: Copyright inclusion - include-license: - description: Include the full text of the license with the code. - label: License inclusion + description: Include a copy of the license and copyright with the code. + label: License and copyright notice document-changes: description: Indicate significant changes made to the code. label: State Changes diff --git a/licenses/apache.txt b/licenses/apache.txt index 230f623..68533d5 100644 --- a/licenses/apache.txt +++ b/licenses/apache.txt @@ -5,7 +5,7 @@ permalink: apache/ featured: true -description: A permissive license that also grants a license to patent claims from contributors that are necessarily infringed by the software. +description: A permissive license that also provides an express grant of patent rights from the contributor to the recipient. note: The Apache Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice at the very end of the license in the appendix. @@ -15,7 +15,6 @@ source: http://www.apache.org/licenses/LICENSE-2.0.html required: - include-copyright - - include-license - document-changes permitted: @@ -26,7 +25,6 @@ permitted: - warranty forbidden: - - no-warranty - trademark-use --- diff --git a/licenses/eclipse.txt b/licenses/eclipse.txt index 799f2d9..d5683c3 100644 --- a/licenses/eclipse.txt +++ b/licenses/eclipse.txt @@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of source: http://www.eclipse.org/legal/epl-v10.html required: - - disclose-source + - include-copyright - include-license permitted: diff --git a/licenses/mozilla.txt b/licenses/mozilla.txt index 635100e..3eb6718 100644 --- a/licenses/mozilla.txt +++ b/licenses/mozilla.txt @@ -10,7 +10,6 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of required: - disclose-source - include-copyright - - include-license permitted: - commercial-use diff --git a/licenses/no-license.html b/licenses/no-license.html index 69d7014..5a4c9a2 100644 --- a/licenses/no-license.html +++ b/licenses/no-license.html @@ -24,4 +24,4 @@ forbidden: --- -Copyright <> <> +Copyright <> <> From 2c0cda0e5361921afd786ebdb6bef5619bfbb6b5 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 11:48:00 -0700 Subject: [PATCH 09/25] Fixup GPL description --- licenses/gpl-v3.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt index e32063a..3417489 100644 --- a/licenses/gpl-v3.txt +++ b/licenses/gpl-v3.txt @@ -5,7 +5,7 @@ permalink: gpl-v3/ featured: true -description: GPL is the most widely used free software license and is fully reciprocal. Derived works must be distributed under the same license. +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. 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 927154fc191d918d4feba1c96868bfbaf0b8a0de Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 11:55:23 -0700 Subject: [PATCH 10/25] Fixup description of disclose-source Added a call-out about LGPL --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 03768b1..96b4fa3 100644 --- a/_config.yml +++ b/_config.yml @@ -10,7 +10,7 @@ rules: description: Indicate significant changes made to the code. label: State Changes disclose-source: - description: Source code must be made available when distributing the software. + description: Source code must be made available when distributing the software. In the case of LGPL only the source for the library (and not the entire program) must be made available. label: Disclose Source nonstatic-linkage: description: The library must be linked in a way that allows it to be replaced with a similar library From c4c48d498c3506ebb0c051f6145917203c05a637 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 11:55:57 -0700 Subject: [PATCH 11/25] Change nonstatic to library usage Per review, we should call it library usage. Also pointed out that LGPL does require disclosing source. --- _config.yml | 6 +++--- licenses/lgpl-v2.1.txt | 3 ++- licenses/lgpl-v3.txt | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/_config.yml b/_config.yml index 96b4fa3..67c531b 100644 --- a/_config.yml +++ b/_config.yml @@ -12,9 +12,9 @@ rules: disclose-source: description: Source code must be made available when distributing the software. In the case of LGPL only the source for the library (and not the entire program) must be made available. label: Disclose Source - nonstatic-linkage: - description: The library must be linked in a way that allows it to be replaced with a similar library - label: Nonstatic Linkage + library-usage: + description: The library may be used within a proprietary application. + label: Library usage rename: description: You must change the name of the software if you modify it. label: Rename diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt index 2541a9e..de57c2e 100644 --- a/licenses/lgpl-v2.1.txt +++ b/licenses/lgpl-v2.1.txt @@ -11,7 +11,8 @@ note: The Free Software Foundation recommends taking the additional step of addi required: - include-copyright - - nonstatic-linkage + - library-usage + - disclose-source permitted: - commercial-use diff --git a/licenses/lgpl-v3.txt b/licenses/lgpl-v3.txt index 4c251ee..228b511 100644 --- a/licenses/lgpl-v3.txt +++ b/licenses/lgpl-v3.txt @@ -11,7 +11,8 @@ note: The Free Software Foundation recommends taking the additional step of addi required: - include-copyright - - nonstatic-linkage + - library-usage + - disclose-source permitted: - commercial-use From 2f1bae8a8fbe48e7c9e4aa5440206f54e92efaa9 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 11:58:01 -0700 Subject: [PATCH 12/25] Clarified trademark-use description Also removed it from BSD as the license text doesn't explicitly mention trademork. --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 67c531b..282f0da 100644 --- a/_config.yml +++ b/_config.yml @@ -44,7 +44,7 @@ rules: description: Software is released without warranty and the software/license owner cannot be charged for damages. label: Liability trademark-use: - description: "You may NOT use the names, logos, or trademarks of contributors." + description: "While this is 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: description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. From f0f4402f355a5539f6ab55e3112b0f962a332109 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 12:03:09 -0700 Subject: [PATCH 13/25] Added patent-grant category --- _config.yml | 3 +++ licenses/apache.txt | 3 +++ licenses/eclipse.txt | 2 +- licenses/gpl-v2.txt | 1 + licenses/gpl-v3.txt | 1 + licenses/lgpl-v2.1.txt | 1 + licenses/lgpl-v3.txt | 1 + licenses/mozilla.txt | 1 + 8 files changed, 12 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 282f0da..56b58f5 100644 --- a/_config.yml +++ b/_config.yml @@ -38,6 +38,9 @@ rules: private-use: description: You may use and modify the software without distributing it. label: Private Use + patent-grant: + description: While all open source licenses have an implicit grant of patent rights, this license provides an express grant of patent rights from the contributor to the recipient. + label: Patent Grant forbidden: no-warranty: diff --git a/licenses/apache.txt b/licenses/apache.txt index 68533d5..b31b884 100644 --- a/licenses/apache.txt +++ b/licenses/apache.txt @@ -23,9 +23,12 @@ permitted: - distribution - sublicense - warranty + - patent-grant forbidden: - trademark-use + - no-liability + --- Apache License diff --git a/licenses/eclipse.txt b/licenses/eclipse.txt index d5683c3..d6005e9 100644 --- a/licenses/eclipse.txt +++ b/licenses/eclipse.txt @@ -19,10 +19,10 @@ permitted: - modifications - sublicense - warranty + - patent-grant forbidden: - no-liability - - trademark-use --- Eclipse Public License - v 1.0 diff --git a/licenses/gpl-v2.txt b/licenses/gpl-v2.txt index 65c3d0b..3efb5fe 100644 --- a/licenses/gpl-v2.txt +++ b/licenses/gpl-v2.txt @@ -17,6 +17,7 @@ permitted: - modifications - distribution - warranty + - patent-grant forbidden: - no-liability diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt index 3417489..45f30b6 100644 --- a/licenses/gpl-v3.txt +++ b/licenses/gpl-v3.txt @@ -21,6 +21,7 @@ permitted: - modifications - distribution - warranty + - patent-grant forbidden: - no-liability diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt index de57c2e..1de27ed 100644 --- a/licenses/lgpl-v2.1.txt +++ b/licenses/lgpl-v2.1.txt @@ -19,6 +19,7 @@ permitted: - modifications - distribution - sublicense + - patent-grant forbidden: - no-liability diff --git a/licenses/lgpl-v3.txt b/licenses/lgpl-v3.txt index 228b511..3c98621 100644 --- a/licenses/lgpl-v3.txt +++ b/licenses/lgpl-v3.txt @@ -19,6 +19,7 @@ permitted: - modifications - distribution - sublicense + - patent-grant forbidden: - no-liability diff --git a/licenses/mozilla.txt b/licenses/mozilla.txt index 3eb6718..09134ce 100644 --- a/licenses/mozilla.txt +++ b/licenses/mozilla.txt @@ -17,6 +17,7 @@ permitted: - distribution - sublicense - warranty + - patent-grant forbidden: - no-liability From 300f796aa9494fa5d90c016d81b4669a8a9ebdcb Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 12:03:22 -0700 Subject: [PATCH 14/25] Add no-liability to public domain --- licenses/public-domain.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index bf536b7..89bf58a 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -18,6 +18,7 @@ permitted: - sublicense forbidden: + - no-liability --- From dca341d4726e51bb698580ff07433e4966630d97 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 14:04:55 -0700 Subject: [PATCH 15/25] Making things less lawyery --- licenses/apache.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/apache.txt b/licenses/apache.txt index b31b884..594eceb 100644 --- a/licenses/apache.txt +++ b/licenses/apache.txt @@ -5,7 +5,7 @@ permalink: apache/ featured: true -description: A permissive license that also provides an express grant of patent rights from the contributor to the recipient. +description: A permissive license that also provides an express grant of patent rights from contributors to users. note: The Apache Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice at the very end of the license in the appendix. From d2436b76e2a012fa0cad7934d0a522bceff522b7 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 11 Jul 2013 08:42:32 -0400 Subject: [PATCH 16/25] s/proprietary/non-open-source/ --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 56b58f5..e7791c7 100644 --- a/_config.yml +++ b/_config.yml @@ -13,7 +13,7 @@ rules: description: Source code must be made available when distributing the software. In the case of LGPL only 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 proprietary application. + description: The library may be used within a non-open-source application. label: Library usage rename: description: You must change the name of the software if you modify it. From 596cfa1a3228eb1a51582abeec9ab95ae2edd9e3 Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Fri, 12 Jul 2013 14:35:35 -0700 Subject: [PATCH 17/25] Add the word "notice" to description --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index e7791c7..7a9882b 100644 --- a/_config.yml +++ b/_config.yml @@ -4,7 +4,7 @@ rules: required: include-copyright: - description: Include a copy of the license and copyright with the code. + description: Include a copy of the license and copyright notice with the code. label: License and copyright notice document-changes: description: Indicate significant changes made to the code. From d9617c50c821443d70a08fa6a4c5ac325d33d227 Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Fri, 12 Jul 2013 14:37:11 -0700 Subject: [PATCH 18/25] Removed "only" per hoolio suggestion --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 7a9882b..2ba3268 100644 --- a/_config.yml +++ b/_config.yml @@ -10,7 +10,7 @@ rules: 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 only the source for the library (and not the entire program) must be made available. + 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. From 23f2cce6e8ba75380902b83c99405338eec2bcbd Mon Sep 17 00:00:00 2001 From: Phil Haack Date: Fri, 12 Jul 2013 14:39:23 -0700 Subject: [PATCH 19/25] Fixed trademark-use description. --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 2ba3268..14b174b 100644 --- a/_config.yml +++ b/_config.yml @@ -47,7 +47,7 @@ rules: description: Software is released without warranty and the software/license owner cannot be charged for damages. label: Liability trademark-use: - description: "While this is implicitly true of all licenses, this license explicitly states that you may NOT use the names, logos, or trademarks of contributors." + 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: description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. From 3b83a075e1fafefc0631261db535053ffc651fea Mon Sep 17 00:00:00 2001 From: Haacked Date: Fri, 12 Jul 2013 14:47:18 -0700 Subject: [PATCH 20/25] Change liability label --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 14b174b..a0e548f 100644 --- a/_config.yml +++ b/_config.yml @@ -51,7 +51,7 @@ rules: label: Use Trademark no-liability: description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. - label: Liability + label: Hold Liable 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 From ba67cba0eafe025dbe03880b322f42056d87b6d9 Mon Sep 17 00:00:00 2001 From: Haacked Date: Fri, 12 Jul 2013 14:47:31 -0700 Subject: [PATCH 21/25] Cosmetic cleanup and remove unused category --- _config.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/_config.yml b/_config.yml index a0e548f..bf14b24 100644 --- a/_config.yml +++ b/_config.yml @@ -43,11 +43,8 @@ rules: label: Patent Grant forbidden: - no-warranty: - description: Software is released without warranty and the software/license owner cannot be charged for damages. - label: Liability 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." + 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: description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. From fb92ca17074f4693f75e3c759ad4637f03455a50 Mon Sep 17 00:00:00 2001 From: Haacked Date: Fri, 12 Jul 2013 15:01:08 -0700 Subject: [PATCH 22/25] Removed warranty category --- _config.yml | 3 --- licenses/agpl.txt | 1 - licenses/apache.txt | 1 - licenses/bsd-3-clause.txt | 1 - licenses/bsd.txt | 1 - licenses/eclipse.txt | 1 - licenses/gpl-v2.txt | 1 - licenses/gpl-v3.txt | 1 - licenses/mozilla.txt | 1 - 9 files changed, 11 deletions(-) diff --git a/_config.yml b/_config.yml index bf14b24..3f14b70 100644 --- a/_config.yml +++ b/_config.yml @@ -32,9 +32,6 @@ rules: sublicense: description: You may grant a sublicense to modify and distribute this software to third parties not included in the license. label: Sublicensing - warranty: - description: You may place a warranty on the software. - label: Warranty private-use: description: You may use and modify the software without distributing it. label: Private Use diff --git a/licenses/agpl.txt b/licenses/agpl.txt index 6799aac..68f5270 100644 --- a/licenses/agpl.txt +++ b/licenses/agpl.txt @@ -17,7 +17,6 @@ permitted: - commercial-use - modifications - distribution - - warranty forbidden: - no-liability diff --git a/licenses/apache.txt b/licenses/apache.txt index 594eceb..4781065 100644 --- a/licenses/apache.txt +++ b/licenses/apache.txt @@ -22,7 +22,6 @@ permitted: - modifications - distribution - sublicense - - warranty - patent-grant forbidden: diff --git a/licenses/bsd-3-clause.txt b/licenses/bsd-3-clause.txt index 5ee0e58..f6ada79 100644 --- a/licenses/bsd-3-clause.txt +++ b/licenses/bsd-3-clause.txt @@ -15,7 +15,6 @@ permitted: - modifications - distribution - sublicense - - warranty forbidden: - no-liability diff --git a/licenses/bsd.txt b/licenses/bsd.txt index 909cdfc..27668df 100644 --- a/licenses/bsd.txt +++ b/licenses/bsd.txt @@ -17,7 +17,6 @@ permitted: - modifications - distribution - sublicense - - warranty forbidden: - no-liability diff --git a/licenses/eclipse.txt b/licenses/eclipse.txt index d6005e9..0a5ea74 100644 --- a/licenses/eclipse.txt +++ b/licenses/eclipse.txt @@ -18,7 +18,6 @@ permitted: - distribution - modifications - sublicense - - warranty - patent-grant forbidden: diff --git a/licenses/gpl-v2.txt b/licenses/gpl-v2.txt index 3efb5fe..18b0b95 100644 --- a/licenses/gpl-v2.txt +++ b/licenses/gpl-v2.txt @@ -16,7 +16,6 @@ permitted: - commercial-use - modifications - distribution - - warranty - patent-grant forbidden: diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt index 45f30b6..47e6212 100644 --- a/licenses/gpl-v3.txt +++ b/licenses/gpl-v3.txt @@ -20,7 +20,6 @@ permitted: - commercial-use - modifications - distribution - - warranty - patent-grant forbidden: diff --git a/licenses/mozilla.txt b/licenses/mozilla.txt index 09134ce..c18e566 100644 --- a/licenses/mozilla.txt +++ b/licenses/mozilla.txt @@ -16,7 +16,6 @@ permitted: - modifications - distribution - sublicense - - warranty - patent-grant forbidden: From 98f7a3c730b82d7b0561c5a330a388a9da83b838 Mon Sep 17 00:00:00 2001 From: Haacked Date: Fri, 12 Jul 2013 16:18:48 -0700 Subject: [PATCH 23/25] Fix link in public domain license --- licenses/public-domain.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index 89bf58a..c1bcefb 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -6,7 +6,7 @@ title: Public Domain (CC0) description: Because copyright attaches automatically in many countries, the Creative Commons CC0 License is recommended to ensure that your work is available everywhere under terms that most closely follow the spirit of a public domain work. -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. You can alternatively use the [Creative Commons CC0 tool](http://creativecommons.org/choose/zero/) to generate HTML with embedded metadata to mark your work as CC0. +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. You can alternatively use the Creative Commons CC0 tool to generate HTML with embedded metadata to mark your work as CC0. required: From 380731aaecccfd65ae7a09b088f93c697ab76a30 Mon Sep 17 00:00:00 2001 From: James Dennes Date: Sat, 13 Jul 2013 12:01:06 +0200 Subject: [PATCH 24/25] Added Home link to /licenses and /no-license. Previously there was no way of navigating back to the main page from /licenses and /no-licenses. --- about.md | 2 +- licenses.html | 6 ++++++ no-license.html | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/about.md b/about.md index cfdeb8b..0ff8408 100644 --- a/about.md +++ b/about.md @@ -6,7 +6,7 @@ permalink: /about/

    1. - Home + Home
    diff --git a/licenses.html b/licenses.html index 32f7035..fae8ffb 100644 --- a/licenses.html +++ b/licenses.html @@ -4,6 +4,12 @@ permalink: licenses/ class: license-types --- +
      +
    1. + Home +
      2. +
    +

    Featured

    {% for page in site.pages %} diff --git a/no-license.html b/no-license.html index b4beaa7..d1d1ece 100644 --- a/no-license.html +++ b/no-license.html @@ -3,6 +3,12 @@ layout: default permalink: no-license/ --- +
      +
    1. + Home +
      2. +
    +

    No License

    You're under no obligation to choose a license and it's your right not to include one with your code or project. But please note that opting out of open source licenses doesn't mean you're opting out of copyright law. From 8ae085df6590a7486cec8b01aebbd0514e0a43c5 Mon Sep 17 00:00:00 2001 From: James Dennes Date: Sat, 13 Jul 2013 16:38:01 +0200 Subject: [PATCH 25/25] Cleaned up breadcrumbs. The breadcrumbs navigation is now in the default template. The removes some duplication. The only page it shouldn't be shown on is the home page. --- _layouts/default.html | 8 ++++++++ about.md | 6 ------ licenses.html | 6 ------ no-license.html | 6 ------ 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index b127fea..28287de 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -20,6 +20,14 @@

    + {% unless page.class == "home" %} +
      +
    1. + Home +
      2. +
    + {% endunless %} + {{ content }}