Merge branch 'jdennes-more-consistent-breadcrumb-nav' of https://github.com/github/choosealicense.com into better-templating

_config.yml

@@ -4,20 +4,17 @@ rules:
 
   required:
     include-copyright:
-      description: Include the original copyright with the code.
+      description: Include a copy of the license and copyright notice with the code.
-      label:  Copyright inclusion
+      label:  License and copyright notice
-    include-license: 
-      description: Include the full text of the license with the code.
-      label: License inclusion
     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:
+    library-usage:
-      description: The library must be linked in a way that allows it to be replaced with a similar library
+      description: The library may be used within a non-open-source application. 
-      label: Nonstatic Linkage
+      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

_layouts/default.html

@@ -1,5 +1,13 @@
 {% include header.html %}
 
+      {% unless page.class == "home" %}
+      <ol class='breadcrumbs'>
+        <li>
+          <a href="/">Home</a>
+        </li>
+      </ol>
+      {% endunless %}
+
 {{ content }}
 
 {% include footer.html %}

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&#8217;re looking for a comprehensive list, we recommend the <a href="http://opensource.org/licenses/">Open Source Initiative</a> 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&#8217;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
 

css/application.css

@@ -204,7 +204,7 @@ strong {
   margin-left: 0;
   margin-top: 16px;
 }
-.situations .reciprocity {
+.situations .copyleft {
   margin-top: 3px;
 }
 .situations h3 {

index.html

@@ -15,7 +15,7 @@ hide_breadcrumbs: true
       <a href="licenses/mit"><img height='57' src='images/three-arrows@2x.png' width='72'></a>
       <h3><a href="licenses/mit">I want it simple and permissive.</a></h3>
       <p>
-        The <a href="licenses/mit">MIT License</a> 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 <a href="licenses/mit">MIT License</a> 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.
       </p>
       <p>
         <strong>jQuery</strong> and <strong>Rails</strong> use the MIT License.
@@ -25,17 +25,17 @@ hide_breadcrumbs: true
       <a href="licenses/apache"><img height='72' src='images/lightbulb@2x.png' width='43'></a>
       <h3><a href="licenses/apache">I’m concerned about patents.</a></h3>
       <p>
-        The <a href="licenses/apache/">Apache License</a> 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 <a href="licenses/apache/">Apache License</a> is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users.
       </p>
       <p>
         <strong>Apache</strong>, <strong>SVN</strong>, and <strong>NuGet</strong> use the Apache License.
       </p>
     </li>
-    <li class='reciprocity'>
+    <li class='copyleft'>
       <a href="licenses/gpl-v2"><img height='69' src='images/circular@2x.png' width='72'></a>
-      <h3><a href="licenses/gpl-v3">I care about reciprocity.</a></h3>
+      <h3><a href="licenses/gpl-v3">I care about sharing improvements.</a></h3>
       <p>
-        The GPL (<a href="licenses/gpl-v2">V2</a> or <a href="licenses/gpl-v3">V3</a>) 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 (<a href="licenses/gpl-v2">V2</a> or <a href="licenses/gpl-v3">V3</a>) 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.
       </p>
       <p>
         <strong>Linux</strong> and <strong>Git</strong> use the GPL.

licenses/agpl.txt

@@ -17,7 +17,6 @@ permitted:
   - commercial-use
   - modifications
   - distribution
-  - warranty
 
 forbidden:
   - no-liability

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

licenses/bsd-3-clause.txt

@@ -15,7 +15,6 @@ permitted:
   - modifications
   - distribution
   - sublicense
-  - warranty
 
 forbidden:
   - no-liability

licenses/bsd.txt

@@ -14,14 +14,12 @@ required:
 
 permitted:
   - commercial-use
-  - modification
+  - modifications
   - distribution
   - sublicense
-  - warranty
 
 forbidden:
   - no-liability
-  - trademark-use
 
 ---
 

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

licenses/gpl-v2.txt

@@ -16,7 +16,7 @@ permitted:
   - commercial-use
   - modifications
   - distribution
-  - warranty
+  - patent-grant
 
 forbidden:
   - no-liability

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

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

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

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

licenses/public-domain.txt

@@ -0,0 +1,145 @@
+---
+layout: license
+permalink: public-domain/
+class: license-types
+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 <a href="http://creativecommons.org/choose/zero/">Creative Commons CC0 tool</a> to generate HTML with embedded metadata to mark your work as CC0.
+
+required: 
+
+permitted:
+  - private-use
+  - commercial-use
+  - modifications
+  - distribution
+  - sublicense
+
+forbidden:
+  - no-liability
+
+---
+
+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.