diff --git a/_config.yml b/_config.yml index db2827c..3f14b70 100644 --- a/_config.yml +++ b/_config.yml @@ -4,20 +4,17 @@ 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 notice with the code. + label: License and copyright notice 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. + 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 - 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 non-open-source application. + label: Library usage rename: description: You must change the name of the software if you modify it. label: Rename @@ -35,23 +32,20 @@ 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 + 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: - 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 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. - 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 diff --git a/_layouts/default.html b/_layouts/default.html index 21f36c7..99734f4 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,5 +1,13 @@ {% include header.html %} + {% unless page.class == "home" %} +
+ {% endunless %} + {{ content }} -{% include footer.html %} \ No newline at end of file +{% include footer.html %} diff --git a/about.md b/about.md index 1800d92..bdba212 100644 --- a/about.md +++ b/about.md @@ -14,11 +14,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 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 8297af8..6d421ae 100644 --- a/index.html +++ b/index.html @@ -15,7 +15,7 @@ hide_breadcrumbs: true- 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. @@ -25,17 +25,17 @@ hide_breadcrumbs: true
- 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 contributors to users.
Apache, SVN, and NuGet use the Apache License.
-- 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 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.
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 230f623..4781065 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 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.
@@ -15,7 +15,6 @@ source: http://www.apache.org/licenses/LICENSE-2.0.html
required:
- include-copyright
- - include-license
- document-changes
permitted:
@@ -23,11 +22,12 @@ permitted:
- modifications
- distribution
- sublicense
- - warranty
+ - patent-grant
forbidden:
- - no-warranty
- trademark-use
+ - no-liability
+
---
Apache License
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 0c9b7ec..27668df 100644
--- a/licenses/bsd.txt
+++ b/licenses/bsd.txt
@@ -14,14 +14,12 @@ required:
permitted:
- commercial-use
- - modification
+ - modifications
- distribution
- sublicense
- - warranty
forbidden:
- no-liability
- - trademark-use
---
diff --git a/licenses/eclipse.txt b/licenses/eclipse.txt
index 799f2d9..0a5ea74 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:
@@ -18,11 +18,10 @@ permitted:
- distribution
- 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..18b0b95 100644
--- a/licenses/gpl-v2.txt
+++ b/licenses/gpl-v2.txt
@@ -16,7 +16,7 @@ permitted:
- commercial-use
- modifications
- distribution
- - warranty
+ - patent-grant
forbidden:
- no-liability
diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt
index e32063a..47e6212 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.
@@ -20,7 +20,7 @@ permitted:
- commercial-use
- modifications
- distribution
- - warranty
+ - patent-grant
forbidden:
- no-liability
diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt
index 2541a9e..1de27ed 100644
--- a/licenses/lgpl-v2.1.txt
+++ b/licenses/lgpl-v2.1.txt
@@ -11,13 +11,15 @@ note: The Free Software Foundation recommends taking the additional step of addi
required:
- include-copyright
- - nonstatic-linkage
+ - library-usage
+ - disclose-source
permitted:
- commercial-use
- modifications
- distribution
- sublicense
+ - patent-grant
forbidden:
- no-liability
diff --git a/licenses/lgpl-v3.txt b/licenses/lgpl-v3.txt
index 4c251ee..3c98621 100644
--- a/licenses/lgpl-v3.txt
+++ b/licenses/lgpl-v3.txt
@@ -11,13 +11,15 @@ note: The Free Software Foundation recommends taking the additional step of addi
required:
- include-copyright
- - nonstatic-linkage
+ - library-usage
+ - disclose-source
permitted:
- commercial-use
- modifications
- distribution
- sublicense
+ - patent-grant
forbidden:
- no-liability
diff --git a/licenses/mozilla.txt b/licenses/mozilla.txt
index 635100e..c18e566 100644
--- a/licenses/mozilla.txt
+++ b/licenses/mozilla.txt
@@ -10,14 +10,13 @@ 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
- modifications
- distribution
- sublicense
- - warranty
+ - patent-grant
forbidden:
- no-liability
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 <