Merge pull request #129 from github/license-family-tabs

License family tabs

.travis.yml

@@ -4,7 +4,7 @@ script: "./script/cibuild"
 
 #environment
 language: ruby
-rvm: 
+rvm:
   - 2.0.0
 
 branches:

CONTRIBUTING.md

@@ -4,13 +4,13 @@ We love Pull Requests! Your contributions help make ChooseALicense.com great.
 
 ## Getting Started
 
-So you want to contribute to ChooseALicense. Great! We welcome any help we can 
+So you want to contribute to ChooseALicense. Great! We welcome any help we can
-get. But first, please make sure you understand what 
+get. But first, please make sure you understand what
 [this site is all about](http://choosealicense.com/about).
 
 It’s not a comprehensive list of all possible licenses.
 
-If you understand the goals of this site and still want to suggest a change, 
+If you understand the goals of this site and still want to suggest a change,
 please:
 
 * Make sure you have a [GitHub account](https://github.com/signup/free)
@@ -20,12 +20,12 @@ please:
 
 ## Making Changes
 
-The easiest way to make a change is to simply edit a file from your browser. 
+The easiest way to make a change is to simply edit a file from your browser.
 When you click the edit button, it will fork the repository under your account.
 Note what issue/issues your patch fixes in the commit message.
 
-For example, to [change this file](https://github.com/github/choosealicense.com/blob/master/CONTRIBUTING.md), 
+For example, to [change this file](https://github.com/github/choosealicense.com/blob/master/CONTRIBUTING.md),
-find it in the GitHub repository. Then click the `Edit` button. Make your 
+find it in the GitHub repository. Then click the `Edit` button. Make your
 changes, type in a commit message, and click the `Propose File Change` button.
 That’s it!
 

Gemfile

@@ -1,7 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
-ruby File.read('.ruby-version').strip
+ruby File.read(".ruby-version").strip
 
 gem "github-pages"
+gem "ffi", "1.9.0"
 
 group :test do
   gem "html-proofer"

Gemfile.lock

@@ -14,25 +14,24 @@ GEM
       mime-types (~> 1.18)
     fast-stemmer (1.0.2)
     ffi (1.9.0)
-    github-pages (4)
+    github-pages (8)
       RedCloth (= 4.2.9)
-      jekyll (= 1.1.2)
+      jekyll (= 1.2.0)
       kramdown (= 1.0.2)
       liquid (= 2.5.1)
       maruku (= 0.6.1)
       rdiscount (= 1.6.8)
       redcarpet (= 2.2.2)
-    highline (1.6.19)
+    highline (1.6.20)
-    html-proofer (0.1.1)
+    html-proofer (0.2.3)
       colored (~> 1.2)
       nokogiri (= 1.6.0)
       typhoeus (~> 0.6.3)
-    jekyll (1.1.2)
+    jekyll (1.2.0)
       classifier (~> 1.3)
       colorator (~> 0.1)
       commander (~> 4.1.3)
       directory_watcher (~> 1.4.1)
-      kramdown (~> 1.0.2)
       liquid (~> 2.5.1)
       maruku (~> 0.5)
       pygments.rb (~> 0.5.0)
@@ -43,7 +42,7 @@ GEM
     maruku (0.6.1)
       syntax (>= 1.0.0)
     mime-types (1.25)
-    mini_portile (0.5.1)
+    mini_portile (0.5.2)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     posix-spawn (0.3.6)
@@ -63,6 +62,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  ffi (= 1.9.0)
   github-pages
   html-proofer
   rake

LICENSE.md

@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

README.md

@@ -5,21 +5,21 @@ Like a Choose Your Own Adventure site, but only much less interesting.
 # Intro
 
 A lot of repositories on GitHub.com don't have a license. GitHub provides
-a license chooser, but if you don't know anything about licenses, how are you 
+a license chooser, but if you don't know anything about licenses, how are you
 supposed to make an informed decision.
 
-ChooseALicense.com is designed to help people make an informed decision about 
+ChooseALicense.com is designed to help people make an informed decision about
-licenses. 
+licenses.
 
 # Immediate Goals
 
 * Politics Free - Let's just not get into it.
 * Well designed, but that goes without saying.
 * The homepage should have just enough to help 99% of folks make a decision.
-* For the 1%, the site will contain a list of licenses common for specific 
+* For the 1%, the site will contain a list of licenses common for specific
 communities and situations.
-* Not comprehensive. Seems like an odd goal, but there are a bajillion 
+* Not comprehensive. Seems like an odd goal, but there are a bajillion
-(I counted) licenses out there. We're going to have to filter that down to a 
+(I counted) licenses out there. We're going to have to filter that down to a
 small list of those that matter.
 
 # Run It On Your Machine
@@ -52,10 +52,10 @@ The licenses on choosealicense.com are regularly imported to GitHub.com to be us
 * `[description]` - The description of the repository
 * `[year]` - The current year
 
-# Rules 
+# Rules
 
-* Rules (the license's properties) are stored as a bulleted list within the licenses YAML front matter. A full list of rules can be found in the repository's `_config.yml` file. Each rule has a name e.g., `include-copyright`, a human-readable label, e.g., `Copyright inclusion`, and a description `Include the original copyright with the code`. To add a new rule, simply add it to config.yml and reference it in the appropriate license. 
+* Rules (the license's properties) are stored as a bulleted list within the licenses YAML front matter. A full list of rules can be found in the repository's `_config.yml` file. Each rule has a name e.g., `include-copyright`, a human-readable label, e.g., `Copyright inclusion`, and a description `Include the original copyright with the code`. To add a new rule, simply add it to config.yml and reference it in the appropriate license.
 
 # License
 
-The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](http://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](http://opensource.org/licenses/mit-license.php). 
+The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](http://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](http://opensource.org/licenses/mit-license.php).

_config.yml

@@ -66,3 +66,4 @@ exclude:
   - Gemfile*
   - script
   - vendor
+  - app.coffee

_includes/breadcrumbs.html

@@ -1,5 +1,5 @@
 {% unless page.hide_breadcrumbs == true %}
-  <ol class='breadcrumbs'>
+  <ol class="breadcrumbs">
     <li>
       {% if page.layout == "license" %}
         <a href="/">Home</a> / <a href="/licenses/">Licenses</a>

_includes/footer.html

@@ -6,7 +6,7 @@
         <p>
           If you have questions or issues, it is always best to consult a legal professional.<br>
           This site is licensed under the <a href="http://creativecommons.org/licenses/by/3.0/">
-          Creative Commons Attribution 3.0 Unported License</a>.</p>
+          Creative Commons Attribution 3.0 Unported License</a>.
         </p>
         <div id="with-♥">
           Demystified with &lt;3 by <a href="http://github.com">GitHub, Inc.</a>
@@ -15,15 +15,15 @@
 
     </div><!-- /container -->
 
-    <script type="text/javascript" src="/javascripts/jquery-1.7.1.min.js"></script>
+    <script src="/javascripts/jquery-1.10.2.min.js"></script>
-    <script type="text/javascript" src="/javascripts/jquery.qtip.min.js"></script>
+    <script src="/javascripts/jquery.qtip.min.js"></script>
 
     {% if page.layout == "license" %}
-      <script type="text/javascript" src="/javascripts/ZeroClipboard.js"></script>
+      <script src="/javascripts/ZeroClipboard.min.js"></script>
     {% endif %}
 
-    <script type="text/javascript" src="/javascripts/annotations.js"></script>
+    <script src="/javascripts/annotations.js"></script>
-    <script type="text/javascript" src="/javascripts/app.js"></script>
+    <script src="/javascripts/app.js"></script>
 
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

_includes/header.html

@@ -1,30 +1,25 @@
 <!DOCTYPE html>
-<html lang='en'>
+<html lang="en">
   <head>
-
+    <meta charset="utf-8">
+    <meta content="IE=edge" http-equiv="X-UA-Compatible">
     <title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title}}</title>
-
-    <meta charset='utf-8'>
-    <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'>
-    
     {% if page.description %}
     <meta name="description" content="{{ page.description | strip_html }}">
     {% endif %}
 
-    <link href='/favicon.ico' rel='shortcut icon' type='image/x-icon'>
+    <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon">
-    <link href='http://fonts.googleapis.com/css?family=Chivo:900' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Chivo:900">
-    <link type="text/css" href="/css/application.css" media="screen" rel="stylesheet">
+    <link rel="stylesheet" href="/css/application.css" media="screen">
-    <link type="text/css" href="/css/jquery.qtip.css" media="screen" rel="stylesheet">
+    <link rel="stylesheet" href="/css/jquery.qtip.min.css" media="screen">
-
+    <script src="/javascripts/modernizr.js"></script>
-    <script type="text/javascript" src="/javascripts/modernizr.js"></script>
-    
     <!--[if (gte IE 6)&(lte IE 8)]>
-      <script src='/javascripts/selectivizr-min.js' type='text/javascript'></script>
+      <script src="/javascripts/selectivizr-min.js"></script>
     <![endif]-->
-    
+
   </head>
   <body class="{{ page.layout }} {{ page.class }}">
-    <div class='container'>
+    <div class="container">
 
       {% include breadcrumbs.html %}
 

_includes/license-overview.html

@@ -0,0 +1,49 @@
+<div class="license-family cf">
+  <div class="license-family-heading">
+    <h3 class="license-family-name"><a href="{{ page.permalink }}">{% if page.category %}{{ page.category }}{% else %}{{ page.title }}{% endif %}</a></h3>
+
+    <p class="license-family-description">{{ page.description }}</p>
+  </div>
+
+  <div class="license-details">
+    <div class="license-variations js-license-variations">
+      <!-- always show this div, even w/o variations, for proper spacing -->
+      {% if page.tab-slug %}
+      <ul class="nav-pills js-nav-pills">
+        {% for variation in site.pages %}
+          {% if variation.category and variation.category == page.category %}
+        <li{% if page.tab-slug == variation.tab-slug %} class="active"{% endif %}><a href="#{{ variation.tab-slug }}" data-selected-tab="variation-{{ variation.tab-slug }}">{{ variation.title }}</a></li>
+          {% endif %}
+        {% endfor %}
+      </ul>
+      {% endif %}
+    </div>
+    {% for variation in site.pages %}
+      {% if variation.category and variation.category == page.category %}
+    <div id="{{ variation.tab-slug }}" class="variation-tab variation-{{ variation.tab-slug }} js-variation-tab{% if page.tab-slug == variation.tab-slug %} active{% endif %}">
+      <table class='license-rules'>
+        <tr>
+        {% assign types = "required|permitted|forbidden" | split: "|" %}
+        {% for type in types %}
+          <th class="label">{{ type | capitalize }}</th>
+        {% endfor %}
+        </tr>
+        <tr>
+        {% for type in types %}
+          <td>
+            <ul class="license-{{ type }}">
+              {% for req in variation[type] %}
+                <li class="{{ req }}">{{ site.rules[type][req].label }}</li>
+              {% endfor %}
+            </ul>
+          </td>
+        {% endfor %}
+        </tr>
+      </table>
+      <p class="small"><a href="{{ variation.permalink }}">View full {{ variation.title }} license »</a></p>
+    </div>
+        {% endif %}
+    {% endfor %}
+  </div>
+</div>
+

_includes/sidebar.html

@@ -1,7 +1,7 @@
-<div class='sidebar'>
+<div class="sidebar">
 
   <a href="#" data-clipboard-target="license-text" class="js-clipboard-button button">Copy license text to clipboard</a>
-    <div class='how-to-apply'>
+    <div class="how-to-apply">
       <h5>How to apply this license</h5>
       <p>
         {{ page.how }}

_layouts/license.html

@@ -1,11 +1,11 @@
 {% include header.html %}
 
       <div class="cf">
-        <div class='license-body'>
+        <div class="license-body">
           <pre id="license-text">
 
 {{ content | replace:"<","[" | replace:">","]" }}
-        
+
           </pre><!-- /license-text -->
         </div><!-- /license-body -->
 

about.md

@@ -2,12 +2,12 @@
 title: About
 layout: default
 permalink: /about/
-title: What’s this about?
+title: What's this about?
 ---
 
 GitHub wants to help developers choose a license for their source code.
 
-If you already know what you’re doing and have a license you prefer to use, that’s great! We’re not here to change your mind. But if you are bewildered by the large number of OSS license choices, maybe we can help.
+If you already know what you're doing and have a license you prefer to use, that's great! We're not here to change your mind. But if you are bewildered by the large number of OSS license choices, maybe we can help.
 
 ## Not comprehensive
 
@@ -31,8 +31,8 @@ This site is not a comprehensive directory of open source licenses.  We think th
 
 ## 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
 
-We are not lawyers. Well most of us anyways. It is not the goal of this site to provide legal advice. The goal of this site is to provide a starting point to help you make an informed choice by providing information on popular open source licenses. If you have any questions regarding the right license for your code or any other legal issues relating to it, it’s always best to consult with a professional.
+We are not lawyers. Well most of us anyways. It is not the goal of this site to provide legal advice. The goal of this site is to provide a starting point to help you make an informed choice by providing information on popular open source licenses. If you have any questions regarding the right license for your code or any other legal issues relating to it, it's always best to consult with a professional.

css/application.css

@@ -19,7 +19,7 @@ time, mark, audio, video {
   vertical-align: baseline;
 }
 
-html {
+html {  
   line-height: 1;
 }
 
@@ -114,7 +114,7 @@ a:hover {
 
 h1 {
   color: #443a33;
-  font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
   font-size: 40px;
   font-weight: 900;
   line-height: 1.1;
@@ -123,8 +123,10 @@ h1 {
 
 h2 {
   color: #443a33;
+  opacity: 0.8;
   font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
-  font-size: 18px;
+  font-size: 24px;
+/*  font-size: 18px; */
   font-weight: 900;
   line-height: 1.1;
   margin-top: 24px;
@@ -133,7 +135,7 @@ h2 {
 
 h3 {
   color: #443a33;
-  font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
   font-size: 15px;
   font-weight: 900;
   line-height: 1.1;
@@ -143,7 +145,7 @@ h3 {
 
 h5 {
   color: #443a33;
-  font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
   font-size: 14px;
   font-weight: 900;
   line-height: 1.1;
@@ -175,12 +177,13 @@ strong {
 }
 .home h2 {
   color: #149ad4;
-  font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
   font-size: 27px;
   font-weight: 900;
   line-height: 70px;
   margin-bottom: 45px;
   vertical-align: middle;
+  opacity: 1;
 }
 .home h2 span {
   color: #e9e6e2;
@@ -208,7 +211,7 @@ strong {
 }
 .triptych h3 {
   color: #443a33;
-  font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
   font-size: 22px;
   font-weight: 900;
   line-height: 1.1;
@@ -226,15 +229,53 @@ strong {
   margin-top: 20px;
 }
 
+.license-family {
+  clear: both;
+  margin-bottom: 50px;
+}
+
+.license-family-heading {
+  float: left;
+  width: 35%;
+}
+
+.license-details {
+  float: left;
+  width: 55%;
+  padding-left: 20px;
+}
+
+.license-variations {
+  height: 31px;
+  padding-top: 23px;
+  margin-left: -10px;
+}
+
+.license-family-name {
+  font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-size: 28px;
+  font-weight: 900;
+  line-height: 1.1;
+}
+
+.license-family-description {
+  color: #5c5855;
+}
+
 .license-rules {
+  border-bottom: solid 1px #d9d7d2;
   font-size: 13px;
   line-height: 1.3;
-  margin-bottom: 40px;
+  margin-bottom: 12px;
   width: 100%;
 }
+.license-rules th,
+.license-rules td {
+  width: 33%;
+}
 .license-rules th {
-  border-bottom: solid 1px #d9d7d2;
+  font-size: 15px;
-  padding: 5px 10px 12px 10px;
+  padding: 5px 10px 5px 0;
   vertical-align: bottom;
 }
 .license-rules th.summary {
@@ -243,10 +284,10 @@ strong {
 .license-rules .name {
   border-right: solid 1px #d9d7d2;
   padding-left: 0;
-  width: 140px;
+  width: 280px;
 }
 .license-rules .name a {
-  font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
   font-size: 28px;
   font-weight: 900;
   line-height: 1.1;
@@ -254,29 +295,19 @@ strong {
 .license-rules .name small a {
   font-size: 16px;
 }
-.license-rules .summary {
-  color: #5c5855;
-}
 .license-rules td {
-  border-bottom: solid 1px #e9e6e2;
+  padding: 4px 0 12px 0;
-  padding: 4px 10px;
+  vertical-align: top;
 }
 .license-rules .label {
-  border-right: solid 1px #d9d7d2;
   font-weight: bold;
 }
 .license-rules li {
   background-position: 0 1px;
   background-repeat: no-repeat;
   background-size: 12px 12px;
-  float: left;
-  display: -moz-inline-stack;
-  display: inline-block;
-  vertical-align: middle;
-  *vertical-align: auto;
-  zoom: 1;
-  *display: inline;
   margin-right: 15px;
+  margin-bottom: 5px;
   padding-left: 16px;
 }
 .license-rules li:hover {
@@ -291,9 +322,6 @@ strong {
 .license-forbidden li {
   background-image: url(../images/red-dot@2x.png);
 }
-.license-rules tr:nth-child(2n) td {
-  background-color: rgba(0, 0, 0, 0.02);
-}
 
 .license-rules-sidebar li {
   float: none;
@@ -395,6 +423,34 @@ strong {
   margin-left: 2em;
 }
 
+.nav-pills > li {
+  float: left;
+  display: block;
+  margin-right: 10px;
+}
+
+.nav-pills > li > a {
+  padding: 5px 10px;
+  border-radius: 3px;
+}
+
+.nav-pills > li.active > a {
+  background-color: #149ad4;
+  color: #f7f4ef;
+}
+
+.variation-tab {
+  display: none;
+}
+
+.variation-tab.active {
+  display: block;
+}
+
+.small {
+  font-size: 90%;
+}
+
 /* Qtip styles */
 .qtip-required {
   background-color: #d0ebf6 ! important;

css/jquery.qtip.css

@@ -1,599 +0,0 @@
-/*! qTip2 - Pretty powerful tooltips - v2.0.0pre - 2012-11-29
-* http://craigsworks.com/projects/qtip2/
-* Copyright (c) 2012 Craig Michael Thompson; Licensed MIT, GPL */
-
-/* Core qTip styles */
-.qtip, .qtip{
-	position: absolute;
-	left: -28000px;
-	top: -28000px;
-	display: none;
-
-	max-width: 280px;
-	min-width: 50px;
-	
-	font-size: 10.5px;
-	line-height: 12px;
-
-	direction: ltr;
-}
-
-	.qtip-content{
-		position: relative;
-		padding: 5px 9px;
-		overflow: hidden;
-
-		text-align: left;
-		word-wrap: break-word;
-	}
-
-	.qtip-titlebar{
-		position: relative;
-		padding: 5px 35px 5px 10px;
-		overflow: hidden;
-
-		border-width: 0 0 1px;
-		font-weight: bold;
-	}
-
-	.qtip-titlebar + .qtip-content{ border-top-width: 0 !important; }
-
-	/* Default close button class */
-	.qtip-close{
-		position: absolute;
-		right: -9px; top: -9px;
-
-		cursor: pointer;
-		outline: medium none;
-
-		border-width: 1px;
-		border-style: solid;
-		border-color: transparent;
-	}
-
-		.qtip-titlebar .qtip-close{
-			right: 4px; top: 50%;
-			margin-top: -9px;
-		}
-	
-		* html .qtip-titlebar .qtip-close{ top: 16px; } /* IE fix */
-
-		.qtip-titlebar .ui-icon,
-		.qtip-icon .ui-icon{
-			display: block;
-			text-indent: -1000em;
-			direction: ltr;
-			vertical-align: middle;
-		}
-
-		.qtip-icon, .qtip-icon .ui-icon{
-			-moz-border-radius: 3px;
-			-webkit-border-radius: 3px;
-			border-radius: 3px;
-			text-decoration: none;
-		}
-
-			.qtip-icon .ui-icon{
-				width: 18px;
-				height: 14px;
-
-				text-align: center;
-				text-indent: 0;
-				font: normal bold 10px/13px Tahoma,sans-serif;
-
-				color: inherit;
-				background: transparent none no-repeat -100em -100em;
-			}
-
-
-/* Applied to 'focused' tooltips e.g. most recently displayed/interacted with */
-.qtip-focus{}
-
-/* Applied on hover of tooltips i.e. added/removed on mouseenter/mouseleave respectively */
-.qtip-hover{}
-
-/* Default tooltip style */
-.qtip-default{
-	border-width: 1px;
-	border-style: solid;
-	border-color: #F1D031;
-
-	background-color: #FFFFA3;
-	color: #555;
-}
-
-	.qtip-default .qtip-titlebar{
-		background-color: #FFEF93;
-	}
-
-	.qtip-default .qtip-icon{
-		border-color: #CCC;
-		background: #F1F1F1;
-		color: #777;
-	}
-	
-	.qtip-default .qtip-titlebar .qtip-close{
-		border-color: #AAA;
-		color: #111;
-	}
-
-
-/*! Light tooltip style */
-.qtip-light{
-	background-color: white;
-	border-color: #E2E2E2;
-	color: #454545;
-}
-
-	.qtip-light .qtip-titlebar{
-		background-color: #f1f1f1;
-	}
-
-
-/*! Dark tooltip style */
-.qtip-dark{
-	background-color: #505050;
-	border-color: #303030;
-	color: #f3f3f3;
-}
-
-	.qtip-dark .qtip-titlebar{
-		background-color: #404040;
-	}
-
-	.qtip-dark .qtip-icon{
-		border-color: #444;
-	}
-
-	.qtip-dark .qtip-titlebar .ui-state-hover{
-		border-color: #303030;
-	}
-
-
-/*! Cream tooltip style */
-.qtip-cream{
-	background-color: #FBF7AA;
-	border-color: #F9E98E;
-	color: #A27D35;
-}
-
-	.qtip-cream .qtip-titlebar{
-		background-color: #F0DE7D;
-	}
-
-	.qtip-cream .qtip-close .qtip-icon{
-		background-position: -82px 0;
-	}
-
-
-/*! Red tooltip style */
-.qtip-red{
-	background-color: #F78B83;
-	border-color: #D95252;
-	color: #912323;
-}
-
-	.qtip-red .qtip-titlebar{
-		background-color: #F06D65;
-	}
-
-	.qtip-red .qtip-close .qtip-icon{
-		background-position: -102px 0;
-	}
-
-	.qtip-red .qtip-icon{
-		border-color: #D95252;
-	}
-
-	.qtip-red .qtip-titlebar .ui-state-hover{
-		border-color: #D95252;
-	}
-
-
-/*! Green tooltip style */
-.qtip-green{
-	background-color: #CAED9E;
-	border-color: #90D93F;
-	color: #3F6219;
-}
-
-	.qtip-green .qtip-titlebar{
-		background-color: #B0DE78;
-	}
-
-	.qtip-green .qtip-close .qtip-icon{
-		background-position: -42px 0;
-	}
-
-
-/*! Blue tooltip style */
-.qtip-blue{
-	background-color: #E5F6FE;
-	border-color: #ADD9ED;
-	color: #5E99BD;
-}
-
-	.qtip-blue .qtip-titlebar{
-		background-color: #D0E9F5;
-	}
-
-	.qtip-blue .qtip-close .qtip-icon{
-		background-position: -2px 0;
-	}
-
-
-/* Add shadows to your tooltips in: FF3+, Chrome 2+, Opera 10.6+, IE9+, Safari 2+ */
-.qtip-shadow{
-	-webkit-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.15);
-	-moz-box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.15);
-	box-shadow: 1px 1px 3px 1px rgba(0, 0, 0, 0.15);
-}
-
-/* Add rounded corners to your tooltips in: FF3+, Chrome 2+, Opera 10.6+, IE9+, Safari 2+ */
-.qtip-rounded,
-.qtip-tipsy,
-.qtip-bootstrap{
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-}
-
-/* Youtube tooltip style */
-.qtip-youtube{
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-	border-radius: 2px;
-	
-	-webkit-box-shadow: 0 0 3px #333;
-	-moz-box-shadow: 0 0 3px #333;
-	box-shadow: 0 0 3px #333;
-
-	color: white;
-	border-width: 0;
-
-	background: #4A4A4A;
-	background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0,#4A4A4A),color-stop(100%,black));
-	background-image: -webkit-linear-gradient(top,#4A4A4A 0,black 100%);
-	background-image: -moz-linear-gradient(top,#4A4A4A 0,black 100%);
-	background-image: -ms-linear-gradient(top,#4A4A4A 0,black 100%);
-	background-image: -o-linear-gradient(top,#4A4A4A 0,black 100%);
-}
-
-	.qtip-youtube .qtip-titlebar{
-		background-color: #4A4A4A;
-		background-color: rgba(0,0,0,0);
-	}
-	
-	.qtip-youtube .qtip-content{
-		padding: .75em;
-		font: 12px arial,sans-serif;
-		
-		filter: progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#4a4a4a,EndColorStr=#000000);
-		-ms-filter: "progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#4a4a4a,EndColorStr=#000000);";
-	}
-
-	.qtip-youtube .qtip-icon{
-		border-color: #222;
-	}
-
-	.qtip-youtube .qtip-titlebar .ui-state-hover{
-		border-color: #303030;
-	}
-
-
-/* jQuery TOOLS Tooltip style */
-.qtip-jtools{
-	background: #232323;
-	background: rgba(0, 0, 0, 0.7);
-	background-image: -webkit-gradient(linear, left top, left bottom, from(#717171), to(#232323));
-	background-image: -moz-linear-gradient(top, #717171, #232323);
-	background-image: -webkit-linear-gradient(top, #717171, #232323);
-	background-image: -ms-linear-gradient(top, #717171, #232323);
-	background-image: -o-linear-gradient(top, #717171, #232323);
-
-	border: 2px solid #ddd;
-	border: 2px solid rgba(241,241,241,1);
-
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-	border-radius: 2px;
-
-	-webkit-box-shadow: 0 0 12px #333;
-	-moz-box-shadow: 0 0 12px #333;
-	box-shadow: 0 0 12px #333;
-}
-
-	/* IE Specific */
-	.qtip-jtools .qtip-titlebar{
-		background-color: transparent;
-		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A);
-		-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A)";
-	}
-	.qtip-jtools .qtip-content{
-		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323);
-		-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323)";
-	}
-
-	.qtip-jtools .qtip-titlebar,
-	.qtip-jtools .qtip-content{
-		background: transparent;
-		color: white;
-		border: 0 dashed transparent;
-	}
-
-	.qtip-jtools .qtip-icon{
-		border-color: #555;
-	}
-
-	.qtip-jtools .qtip-titlebar .ui-state-hover{
-		border-color: #333;
-	}
-
-
-/* Cluetip style */
-.qtip-cluetip{
-	-webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4);
-	-moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4);
-	box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4);
-
-	background-color: #D9D9C2;
-	color: #111;
-	border: 0 dashed transparent;
-}
-
-	.qtip-cluetip .qtip-titlebar{
-		background-color: #87876A;
-		color: white;
-		border: 0 dashed transparent;
-	}
-	
-	.qtip-cluetip .qtip-icon{
-		border-color: #808064;
-	}
-	
-	.qtip-cluetip .qtip-titlebar .ui-state-hover{
-		border-color: #696952;
-		color: #696952;
-	}
-
-
-/* Tipsy style */
-.qtip-tipsy{
-	background: black;
-	background: rgba(0, 0, 0, .87);
-
-	color: white;
-	border: 0 solid transparent;
-
-	font-size: 11px;
-	font-family: 'Lucida Grande', sans-serif;
-	font-weight: bold;
-	line-height: 16px;
-	text-shadow: 0 1px black;
-}
-
-	.qtip-tipsy .qtip-titlebar{
-		padding: 6px 35px 0 10;
-		background-color: transparent;
-	}
-
-	.qtip-tipsy .qtip-content{
-		padding: 6px 10;
-	}
-	
-	.qtip-tipsy .qtip-icon{
-		border-color: #222;
-		text-shadow: none;
-	}
-
-	.qtip-tipsy .qtip-titlebar .ui-state-hover{
-		border-color: #303030;
-	}
-
-
-/* Tipped style */
-.qtip-tipped{
-	border: 3px solid #959FA9;
-
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-
-	background-color: #F9F9F9;
-	color: #454545;
-
-	font-weight: normal;
-	font-family: serif;
-}
-
-	.qtip-tipped .qtip-titlebar{
-		border-bottom-width: 0;
-
-		color: white;
-		background: #3A79B8;
-		background-image: -webkit-gradient(linear, left top, left bottom, from(#3A79B8), to(#2E629D));
-		background-image: -webkit-linear-gradient(top, #3A79B8, #2E629D);
-		background-image: -moz-linear-gradient(top, #3A79B8, #2E629D);
-		background-image: -ms-linear-gradient(top, #3A79B8, #2E629D);
-		background-image: -o-linear-gradient(top, #3A79B8, #2E629D);
-		filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D);
-		-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D)";
-	}
-
-	.qtip-tipped .qtip-icon{
-		border: 2px solid #285589;
-		background: #285589;
-	}
-
-		.qtip-tipped .qtip-icon .ui-icon{
-			background-color: #FBFBFB;
-			color: #555;
-		}
-
-
-/**
- * Twitter Bootstrap style.
- *
- * Tested with IE 8, IE 9, Chrome 18, Firefox 9, Opera 11.
- * Does not work with IE 7.
- */
-.qtip-bootstrap{
-	/** Taken from Bootstrap body */
-	font-size: 14px;
-	line-height: 20px;
-	color: #333333;
-
-	/** Taken from Bootstrap .popover */
-	padding: 1px;
-	background-color: #ffffff;
-	border: 1px solid #ccc;
-	border: 1px solid rgba(0, 0, 0, 0.2);
-	-webkit-border-radius: 6px;
-	-moz-border-radius: 6px;
-	border-radius: 6px;
-	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-	-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-	-webkit-background-clip: padding-box;
-	-moz-background-clip: padding;
-	background-clip: padding-box;
-}
-
-	.qtip-bootstrap .qtip-titlebar{
-		/** Taken from Bootstrap .popover-title */
-		padding: 8px 14px;
-		margin: 0;
-		font-size: 14px;
-		font-weight: normal;
-		line-height: 18px;
-		background-color: #f7f7f7;
-		border-bottom: 1px solid #ebebeb;
-		-webkit-border-radius: 5px 5px 0 0;
-		-moz-border-radius: 5px 5px 0 0;
-		border-radius: 5px 5px 0 0;
-	}
-
-		.qtip-bootstrap .qtip-titlebar .qtip-close{
-			/**
-			 * Overrides qTip2:
-			 * .qtip-titlebar .qtip-close{
-			 *   [...]
-			 *   right: 4px;
-			 *   top: 50%;
-			 *   [...]
-			 *   border-style: solid;
-			 * }
-			 */
-			right: 11px;
-			top: 45%;
-			border-style: none;
-		}
-
-	.qtip-bootstrap .qtip-content{
-		/** Taken from Bootstrap .popover-content */
-		padding: 9px 14px;
-	}
-
-	.qtip-bootstrap .qtip-icon{
-		/**
-		 * Overrides qTip2:
-		 * .qtip-default .qtip-icon {
-		 *   border-color: #CCC;
-		 *   background: #F1F1F1;
-		 *   color: #777;
-		 * }
-		 */
-		background: transparent;
-	}
-
-		.qtip-bootstrap .qtip-icon .ui-icon{
-			/**
-			 * Overrides qTip2:
-			 * .qtip-icon .ui-icon{
-			 *   width: 18px;
-			 *   height: 14px;
-			 * }
-			 */
-			width: auto;
-			height: auto;
-
-			/* Taken from Bootstrap .close */
-			float: right;
-			font-size: 20px;
-			font-weight: bold;
-			line-height: 18px;
-			color: #000000;
-			text-shadow: 0 1px 0 #ffffff;
-			opacity: 0.2;
-			filter: alpha(opacity=20);
-		}
-
-		.qtip-bootstrap .qtip-icon .ui-icon:hover{
-			/* Taken from Bootstrap .close:hover */
-			color: #000000;
-			text-decoration: none;
-			cursor: pointer;
-			opacity: 0.4;
-			filter: alpha(opacity=40);
-		}
-
-
-/* IE9 fix - removes all filters */
-.qtip:not(.ie9haxors) div.qtip-content,
-.qtip:not(.ie9haxors) div.qtip-titlebar{
-	filter: none;
-	-ms-filter: none;
-}
-
-
-/* Tips plugin */
-.qtip .qtip-tip{
-	margin: 0 auto;
-	overflow: hidden;
-	z-index: 10;
-}
-
-	.qtip .qtip-tip,
-	.qtip .qtip-tip .qtip-vml{
-		position: absolute;
-
-		color: #123456;
-		background: transparent;
-		border: 0 dashed transparent;
-	}
-	
-	.qtip .qtip-tip canvas{ top: 0; left: 0; }
-
-	.qtip .qtip-tip .qtip-vml{
-		behavior: url(#default#VML);
-		display: inline-block;
-		visibility: visible;
-	}
-/* Modal plugin */
-#qtip-overlay{
-	position: fixed;
-	left: -10000em;
-	top: -10000em;
-}
-
-	/* Applied to modals with show.modal.blur set to true */
-	#qtip-overlay.blurs{ cursor: pointer; }
-
-	/* Change opacity of overlay here */
-	#qtip-overlay div{
-		position: absolute;
-		left: 0; top: 0;
-		width: 100%; height: 100%;
-
-		background-color: black;
-
-		opacity: 0.7;
-		filter:alpha(opacity=70);
-		-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-	}
-
-
-/* IE6 Modal plugin fix */
-.qtipmodal-ie6fix{
-	position: absolute !important;
-}

index.html

@@ -12,9 +12,9 @@ description: A site to provide non-judgmental guidance on choosing a license for
   <span>}</span>
 </h2>
 <ul class="triptych situations cf">
-  <li class='whatever'>
+  <li class="whatever">
     <a href="licenses/mit">
-      <img height='57' src='images/three-arrows@2x.png' width='72' alt='three arrows'>
+      <img src="images/three-arrows@2x.png" alt="three arrows" width="72" height="57">
       <h3>I want it simple and permissive.</h3>
     </a>
     <p>
@@ -24,9 +24,9 @@ description: A site to provide non-judgmental guidance on choosing a license for
       <strong>jQuery</strong> and <strong>Rails</strong> use the MIT&nbsp;License.
     </p>
   </li>
-  <li class='patents'>
+  <li class="patents">
     <a href="licenses/apache">
-      <img height='72' src='images/lightbulb@2x.png' width='43' alt='light bulb'>
+      <img src="images/lightbulb@2x.png" alt="light bulb" width="43" height="72">
       <h3>I’m concerned about patents.</h3>
     </a>
     <p>
@@ -36,9 +36,9 @@ description: A site to provide non-judgmental guidance on choosing a license for
       <strong>Apache</strong>, <strong>SVN</strong>, and <strong>NuGet</strong> use the Apache&nbsp;License.
     </p>
   </li>
-  <li class='copyleft'>
+  <li class="copyleft">
     <a href="licenses/gpl-v2">
-      <img height='69' src='images/circular@2x.png' width='72' alt='circular arrows'>
+      <img src="images/circular@2x.png" alt="circular arrows" width="72" height="69">
       <h3>I care about sharing improvements.</h3>
     </a>
     <p>

javascripts/app.coffee

@@ -3,7 +3,7 @@ class Choosealicense
   # Checks if Flash is available in the client.
   flashAvailable: ->
     if ActiveXObject?
-      !!(new ActiveXObject('ShockwaveFlash.ShockwaveFlash'))
+      !!(new ActiveXObject("ShockwaveFlash.ShockwaveFlash"))
     else
       !!navigator.mimeTypes["application/x-shockwave-flash"]
 
@@ -36,6 +36,7 @@ class Choosealicense
   constructor: ->
     @initTooltips()
     @initClipboard()
+    @initLicenseVariationNav()
 
   # Init tooltip action
   initTooltips: ->
@@ -92,5 +93,18 @@ class Choosealicense
   clipboardComplete: (client, args) ->
     @innerText = "Copied!"
 
+  # Initializes pill navigation for license variations
+  initLicenseVariationNav: ->
+    $(".js-nav-pills a").click (e) ->
+      selectedTab = $(this).data('selected-tab')
+      nav = $(this).closest('.js-nav-pills')
+      nav.find('li').removeClass('active')
+      nav.closest('.js-license-variations').siblings('.js-variation-tab').removeClass('active')
+
+      $(this).parent('li').addClass('active')
+      $('.' + selectedTab).addClass('active')
+
+      e.preventDefault()
+
 $ ->
   new Choosealicense()

javascripts/app.js

@@ -5,7 +5,7 @@
   Choosealicense = (function() {
     Choosealicense.prototype.flashAvailable = function() {
       if (typeof ActiveXObject !== "undefined" && ActiveXObject !== null) {
-        return !!(new ActiveXObject('ShockwaveFlash.ShockwaveFlash'));
+        return !!(new ActiveXObject("ShockwaveFlash.ShockwaveFlash"));
       } else {
         return !!navigator.mimeTypes["application/x-shockwave-flash"];
       }
@@ -40,6 +40,7 @@
     function Choosealicense() {
       this.initTooltips();
       this.initClipboard();
+      this.initLicenseVariationNav();
     }
 
     Choosealicense.prototype.initTooltips = function() {
@@ -106,6 +107,19 @@
       return this.innerText = "Copied!";
     };
 
+    Choosealicense.prototype.initLicenseVariationNav = function() {
+      return $(".js-nav-pills a").click(function(e) {
+        var nav, selectedTab;
+        selectedTab = $(this).data('selected-tab');
+        nav = $(this).closest('.js-nav-pills');
+        nav.find('li').removeClass('active');
+        nav.closest('.js-license-variations').siblings('.js-variation-tab').removeClass('active');
+        $(this).parent('li').addClass('active');
+        $('.' + selectedTab).addClass('active');
+        return e.preventDefault();
+      });
+    };
+
     return Choosealicense;
 
   })();

licenses.html

@@ -4,34 +4,14 @@ permalink: licenses/
 class: license-types
 ---
 
-<h1>Featured</h1>
+<h1>Licenses</h1>
+
+<h2>Featured Licenses</h2>
 
 {% for page in site.pages %}
   {% if page.layout == "license" %}
     {% if page.featured %}
-    <table class='license-rules'>
+      {% include license-overview.html %}
-      <tr>
-        <th class='name'>
-          <a href="{{ page.permalink }}">{% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %}</a>
-        </th>
-        <th class='summary'>
-         {{ page.description }} <a href="{{ page.permalink }}">View full license »</a>
-        </th>
-      </tr>
-      {% assign types = "required|permitted|forbidden" | split: "|" %}
-      {% for type in types %}
-      <tr>
-        <td class="label">{{ type | capitalize }}</td>
-        <td>
-          <ul class="license-{{ type }}">
-            {% for req in page[type] %}
-              <li class="{{ req }}">{{ site.rules[type][req].label }}</li>
-            {% endfor %}
-          </ul>
-        </td>
-      </tr>
-      {% endfor %}
-    </table>
     {% endif %}
   {% endif %}
 {% endfor %}
@@ -45,29 +25,7 @@ class: license-types
 {% for page in site.pages %}
   {% if page.layout == "license" %}
     {% if page.featured != true and page.hide-from-license-list != true %}
-    <table class='license-rules'>
+      {% include license-overview.html %}
-      <tr>
-        <th class='name'>
-          <a href="{{ page.permalink }}">{% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %}</a>
-        </th>
-        <th class='summary'>
-         {{ page.description }} <a href="{{ page.permalink }}">View full license »</a>
-        </th>
-      </tr>
-      {% assign types = "required|permitted|forbidden" | split: "|" %}
-      {% for type in types %}
-      <tr>
-        <td class="label">{{ type | capitalize }}</td>
-        <td>
-          <ul class="license-{{ type }}">
-            {% for req in page[type] %}
-              <li class="{{ req }}">{{ site.rules[type][req].label }}</li>
-            {% endfor %}
-          </ul>
-        </td>
-      </tr>
-      {% endfor %}
-    </table>
     {% endif %}
   {% endif %}
 {% endfor %}

licenses.json

@@ -1,6 +1,6 @@
 ---
 comment: \
-  because the for loop is being filtered by layout, the normal rindex0 check 
+  because the for loop is being filtered by layout, the normal rindex0 check
   for the trailing comma doesn't work. Count the number of licenses and manually
   increment an index to see if we're on the true last iteration.
 ---
@@ -8,21 +8,21 @@ comment: \
 [
 {% for page in site.pages %}{% if page.layout == "license" %}
   {
-  	"title": "{{ page.title }}",
+    "title": "{{ page.title }}",
-  	"permalink": "{{ page.permalink }}",
+    "permalink": "{{ page.permalink }}",
-  	"featured": {% if page.featured %}true{% else %}false{% endif %},
+    "featured": {% if page.featured %}true{% else %}false{% endif %},
-  	"description": "{{ page.description | replace: '"', '\"' }}",
+    "description": "{{ page.description | replace: '"', '\"' }}",
-  	"how": "{{ page.how | replace: '"', '\"' }}",
+    "how": "{{ page.how | replace: '"', '\"' }}",
-  	"rules": {
+    "rules": {
-  	{% for category in site.rules %}
+    {% for category in site.rules %}
-  		{% assign cat = category[0] %}
+        {% assign cat = category[0] %}
-  		"{{ cat }}": [
+        "{{ cat }}": [
-  		{% for rule in page[cat] %}
+        {% for rule in page[cat] %}
-  			"{{ rule }}"{% if forloop.rindex0 > 0 %},{% endif %}
+            "{{ rule }}"{% if forloop.rindex0 > 0 %},{% endif %}
-  		{% endfor %}
+        {% endfor %}
-  		]{% if forloop.rindex0 > 0 %},{% endif %}
+        ]{% if forloop.rindex0 > 0 %},{% endif %}
-  	{% endfor %}
+    {% endfor %}
-  	}{% assign i = i | plus: 1 %}
+    }{% assign i = i | plus: 1 %}
   }{% if i < count %},{% endif %}
  {% endif %}{% endfor %}
-]
+]

licenses/agpl.txt

@@ -1,6 +1,7 @@
 ---
 title: Affero GPL
-family-title: GPL
+category: GPL
+tab-slug: agpl
 hide-from-license-list: true
 layout: license
 permalink: /licenses/agpl/
@@ -19,6 +20,7 @@ permitted:
   - commercial-use
   - modifications
   - distribution
+  - private-use
 
 forbidden:
   - no-liability
@@ -661,8 +663,8 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
+    it under the terms of the GNU Affero General Public License as published
-    the Free Software Foundation, either version 3 of the License, or
+    by the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,

licenses/apache.txt

@@ -1,6 +1,6 @@
 ---
 title: Apache v2 License
-family-title: Apache
+category: Apache
 layout: license
 permalink: /licenses/apache/
 
@@ -24,7 +24,9 @@ permitted:
   - distribution
   - sublicense
   - patent-grant
-  
+
+  - private-use
+
 forbidden:
   - trademark-use
   - no-liability
@@ -232,4 +234,3 @@ forbidden:
    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.
-

licenses/artistic.txt

@@ -1,31 +1,32 @@
 ---
 layout: license
 title: Artistic License 2.0
-family-title: Artistic
+category: Artistic
 permalink: /licenses/artistic/
 source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt
 
-description: A license that’s heavily favored by the Perl community.
+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.
 
 required:
   - include-copyright
   - document-changes
-  - disclose-source
+
 permitted:
   - commercial-use
   - modifications
   - distribution
   - sublicense
   - private-use
+
 forbidden:
   - no-liability
   - trademark-use
 ---
-		       The Artistic License 2.0
+               The Artistic License 2.0
 
-	       Copyright (c) [year] [fullname]
+           Copyright (c) [year] [fullname]
 
      Everyone is permitted to copy and distribute verbatim copies
       of this license document, but changing it is not allowed.
@@ -42,7 +43,7 @@ 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. 
+a different licensing arrangement.
 
 Definitions
 
@@ -75,7 +76,7 @@ Definitions
 
     "Modified Version" means the Package, if it has been changed, and
     such changes were not explicitly requested by the Copyright
-    Holder. 
+    Holder.
 
     "Original License" means this Artistic License as Distributed with
     the Standard Version of the Package, in its current version or as
@@ -111,7 +112,7 @@ Package will still be considered the Standard Version, and as such
 will be subject to the Original License.
 
 
-Distribution of Modified Versions of the Package as Source 
+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
@@ -133,19 +134,19 @@ you do at least ONE of the following:
     (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,
+    (i)  the Original License or
-	modify and redistribute the Modified Version using the same
+
-	licensing terms that apply to the copy that the licensee
+    (ii)  a license that permits the licensee to freely copy,
-	received, and requires that the Source form of the Modified
+    modify and redistribute the Modified Version using the same
-	Version, and of any works derived from it, be made freely
+    licensing terms that apply to the copy that the licensee
-	available in that license fees are prohibited but Distributor
+    received, and requires that the Source form of the Modified
-	Fees are allowed.
+    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 
+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
@@ -163,7 +164,7 @@ the Source, provided that you comply with Section 4 with respect to
 the Source of the Modified Version.
 
 
-Aggregating or Linking the Package 
+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
@@ -180,7 +181,7 @@ 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 
+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
@@ -224,4 +225,3 @@ 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.
-

licenses/bsd-3-clause.txt

@@ -1,7 +1,8 @@
 ---
 layout: license
 title: BSD (3-Clause) License
-family-title: BSD
+category: BSD
+tab-slug: bsd-3
 hide-from-license-list: true
 permalink: /licenses/bsd-3-clause/
 
@@ -17,6 +18,7 @@ permitted:
   - modifications
   - distribution
   - sublicense
+  - private-use
 
 forbidden:
   - no-liability
@@ -27,27 +29,27 @@ forbidden:
 Copyright (c) [year], [fullname]
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
+Redistribution and use in source and binary forms, with or without
-are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions are met:
 
 * 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,
-  list of conditions and the following disclaimer in the documentation and/or
+  this list of conditions and the following disclaimer in the documentation
-  other materials provided with the distribution.
+  and/or other materials provided with the distribution.
 
 * 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.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

licenses/bsd.txt

@@ -1,7 +1,8 @@
 ---
 layout: license
 title: BSD 2-Clause license
-family-title: BSD
+category: BSD
+tab-slug: bsd
 hide-from-license-list: false
 permalink: /licenses/bsd/
 
@@ -19,6 +20,7 @@ permitted:
   - modifications
   - distribution
   - sublicense
+  - private-use
 
 forbidden:
   - no-liability
@@ -28,23 +30,23 @@ forbidden:
 Copyright (c) [year], [fullname]
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
+Redistribution and use in source and binary forms, with or without
-are permitted provided that the following conditions are met:
+modification, are permitted provided that the following conditions are met:
 
 * 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,
-  list of conditions and the following disclaimer in the documentation and/or
+  this list of conditions and the following disclaimer in the documentation
-  other materials provided with the distribution.
+  and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

licenses/cc0.txt

@@ -0,0 +1,145 @@
+---
+layout: license
+title: CC0 1.0 Universal
+category: Public Domain Dedication
+tab-slug: cc0
+permalink: /licenses/cc0/
+class: license-types
+hide-from-license-list: true
+filename: LICENSE
+
+source: http://creativecommons.org/publicdomain/zero/1.0/
+
+description: The <a href="http://creativecommons.org/publicdomain/zero/1.0/">Creative Commons CC0 Public Domain Dedication</a> waives copyright interest in any a work you've created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach. As with the Unlicense and typical software licenses, CC0 disclaims warranties. CC0 is very similar to the Unlicense.
+
+how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the CC0 into the file.
+
+required:
+
+permitted:
+  - commercial-use
+  - modifications
+  - distribution
+  - private-use
+
+forbidden:
+  - no-liability
+  - sublicense
+
+---
+CC0 1.0 Universal
+
+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.
+
+For more information, please see
+<http://creativecommons.org/publicdomain/zero/1.0/>

licenses/eclipse.txt

@@ -1,7 +1,7 @@
 ---
 layout: license
 title: Eclipse Public License v1.0
-family-title: Eclipse
+category: Eclipse
 permalink: /licenses/eclipse/
 
 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.
@@ -28,6 +28,7 @@ permitted:
   - modifications
   - sublicense
   - patent-grant
+  - private-use
 
 forbidden:
   - no-liability
@@ -50,12 +51,12 @@ b) in the case of each subsequent Contributor:
    ii) additions to the Program;
 
    where such changes and/or additions to the Program originate from and are
-   distributed by that particular Contributor. A Contribution 'originates' from
+   distributed by that particular Contributor. A Contribution 'originates'
-   a Contributor if it was added to the Program by such Contributor itself or
+   from a Contributor if it was added to the Program by such Contributor
-   anyone acting on such Contributor's behalf. Contributions do not include
+   itself or anyone acting on such Contributor's behalf. Contributions do not
-   additions to the Program which: (i) are separate modules of software
+   include additions to the Program which: (i) are separate modules of
-   distributed in conjunction with the Program under their own license
+   software distributed in conjunction with the Program under their own
-   agreement, and (ii) are not derivative works of the Program.
+   license agreement, and (ii) are not derivative works of the Program.
 
 "Contributor" means any person or entity that distributes the Program.
 
@@ -63,7 +64,8 @@ b) in the case of each subsequent Contributor:
 necessarily infringed by the use or sale of its Contribution alone or when
 combined with the Program.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+"Program" means the Contributions distributed in accordance with this
+Agreement.
 
 "Recipient" means anyone who receives the Program under this Agreement,
 including all Contributors.
@@ -71,51 +73,51 @@ including all Contributors.
 2. GRANT OF RIGHTS
   a) Subject to the terms of this Agreement, each Contributor hereby grants
      Recipient a non-exclusive, worldwide, royalty-free copyright license to
-     reproduce, prepare derivative works of, publicly display, publicly perform,
+     reproduce, prepare derivative works of, publicly display, publicly
-     distribute and sublicense the Contribution of such Contributor, if any, and
+     perform, distribute and sublicense the Contribution of such Contributor,
-     such derivative works, in source code and object code form.
+     if any, and such derivative works, in source code and object code form.
   b) Subject to the terms of this Agreement, each Contributor hereby grants
      Recipient a non-exclusive, worldwide, royalty-free patent license under
      Licensed Patents to make, use, sell, offer to sell, import and otherwise
      transfer the Contribution of such Contributor, if any, in source code and
-     object code form. This patent license shall apply to the combination of the
+     object code form. This patent license shall apply to the combination of
-     Contribution and the Program if, at the time the Contribution is added by
+     the Contribution and the Program if, at the time the Contribution is
-     the Contributor, such addition of the Contribution causes such combination
+     added by the Contributor, such addition of the Contribution causes such
-     to be covered by the Licensed Patents. The patent license shall not apply
+     combination to be covered by the Licensed Patents. The patent license
-     to any other combinations which include the Contribution. No hardware per
+     shall not apply to any other combinations which include the Contribution.
-     se is licensed hereunder.
+     No hardware per se is licensed hereunder.
-  c) Recipient understands that although each Contributor grants the licenses to
+  c) Recipient understands that although each Contributor grants the licenses
-     its Contributions set forth herein, no assurances are provided by any
+     to its Contributions set forth herein, no assurances are provided by any
      Contributor that the Program does not infringe the patent or other
      intellectual property rights of any other entity. Each Contributor
-     disclaims any liability to Recipient for claims brought by any other entity
+     disclaims any liability to Recipient for claims brought by any other
-     based on infringement of intellectual property rights or otherwise. As a
+     entity based on infringement of intellectual property rights or
-     condition to exercising the rights and licenses granted hereunder, each
+     otherwise. As a condition to exercising the rights and licenses granted
-     Recipient hereby assumes sole responsibility to secure any other
+     hereunder, each Recipient hereby assumes sole responsibility to secure
-     intellectual property rights needed, if any. For example, if a third party
+     any other intellectual property rights needed, if any. For example, if a
-     patent license is required to allow Recipient to distribute the Program, it
+     third party patent license is required to allow Recipient to distribute
-     is Recipient's responsibility to acquire that license before distributing
+     the Program, it is Recipient's responsibility to acquire that license
-     the Program.
+     before distributing the Program.
   d) Each Contributor represents that to its knowledge it has sufficient
      copyright rights in its Contribution, if any, to grant the copyright
      license set forth in this Agreement.
 
 3. REQUIREMENTS
 
-A Contributor may choose to distribute the Program in object code form under its
+A Contributor may choose to distribute the Program in object code form under
-own license agreement, provided that:
+its own license agreement, provided that:
 
   a) it complies with the terms and conditions of this Agreement; and
   b) its license agreement:
-      i) effectively disclaims on behalf of all Contributors all warranties and
+      i) effectively disclaims on behalf of all Contributors all warranties
-         conditions, express and implied, including warranties or conditions of
+         and conditions, express and implied, including warranties or
-         title and non-infringement, and implied warranties or conditions of
+         conditions of title and non-infringement, and implied warranties or
-         merchantability and fitness for a particular purpose;
+         conditions of merchantability and fitness for a particular purpose;
      ii) effectively excludes on behalf of all Contributors all liability for
          damages, including direct, indirect, special, incidental and
          consequential damages, such as lost profits;
-    iii) states that any provisions which differ from this Agreement are offered
+    iii) states that any provisions which differ from this Agreement are
-         by that Contributor alone and not by any other party; and
+         offered by that Contributor alone and not by any other party; and
      iv) states that source code for the Program is available from such
          Contributor, and informs licensees how to obtain it in a reasonable
          manner on or through a medium customarily used for software exchange.
@@ -124,10 +126,11 @@ When the Program is made available in source code form:
 
   a) it must be made available under this Agreement; and
   b) a copy of this Agreement must be included with each copy of the Program.
-     Contributors may not remove or alter any copyright notices contained within
+     Contributors may not remove or alter any copyright notices contained
-     the Program.
+     within the Program.
 
-Each Contributor must identify itself as the originator of its Contribution, if
+Each Contributor must identify itself as the originator of its Contribution,
+if
 any, in a manner that reasonably allows subsequent Recipients to identify the
 originator of the Contribution.
 
@@ -137,31 +140,32 @@ Commercial distributors of software may accept certain responsibilities with
 respect to end users, business partners and the like. While this license is
 intended to facilitate the commercial use of the Program, the Contributor who
 includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
+which does not create potential liability for other Contributors. Therefore,
-a Contributor includes the Program in a commercial product offering, such
+if a Contributor includes the Program in a commercial product offering, such
 Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
+every other Contributor ("Indemnified Contributor") against any losses,
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
+damages and costs (collectively "Losses") arising from claims, lawsuits and
-actions brought by a third party against the Indemnified Contributor to the
+other legal actions brought by a third party against the Indemnified
-extent caused by the acts or omissions of such Commercial Contributor in
+Contributor to the extent caused by the acts or omissions of such Commercial
-connection with its distribution of the Program in a commercial product
+Contributor in connection with its distribution of the Program in a commercial
-offering. The obligations in this section do not apply to any claims or Losses
+product offering. The obligations in this section do not apply to any claims
-relating to any actual or alleged intellectual property infringement. In order
+or Losses relating to any actual or alleged intellectual property
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+infringement. In order to qualify, an Indemnified Contributor must:
-Contributor in writing of such claim, and b) allow the Commercial Contributor to
+a) promptly notify the Commercial Contributor in writing of such claim, and
-control, and cooperate with the Commercial Contributor in, the defense and any
+b) allow the Commercial Contributor to control, and cooperate with the
-related settlement negotiations. The Indemnified Contributor may participate in
+Commercial Contributor in, the defense and any related settlement
-any such claim at its own expense.
+negotiations. The Indemnified Contributor may participate in any such claim at
+its own expense.
 
 For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
+offering, Product X. That Contributor is then a Commercial Contributor. If
-Commercial Contributor then makes performance claims, or offers warranties
+that Commercial Contributor then makes performance claims, or offers
-related to Product X, those performance claims and warranties are such
+warranties related to Product X, those performance claims and warranties are
-Commercial Contributor's responsibility alone. Under this section, the
+such Commercial Contributor's responsibility alone. Under this section, the
 Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
+Contributors related to those performance claims and warranties, and if a
-requires any other Contributor to pay any damages as a result, the Commercial
+court requires any other Contributor to pay any damages as a result, the
-Contributor must pay those damages.
+Commercial Contributor must pay those damages.
 
 5. NO WARRANTY
 
@@ -169,35 +173,37 @@ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each
-Recipient is solely responsible for determining the appropriateness of using and
+Recipient is solely responsible for determining the appropriateness of using
-distributing the Program and assumes all risks associated with its exercise of
+and distributing the Program and assumes all risks associated with its
-rights under this Agreement , including but not limited to the risks and costs
+exercise of rights under this Agreement , including but not limited to the
-of program errors, compliance with applicable laws, damage to or loss of data,
+risks and costs of program errors, compliance with applicable laws, damage to
-programs or equipment, and unavailability or interruption of operations.
+or loss of data, programs or equipment, and unavailability or interruption of
+operations.
 
 6. DISCLAIMER OF LIABILITY
 
 EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
 CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.
 
 7. GENERAL
 
-If any provision of this Agreement is invalid or unenforceable under applicable
+If any provision of this Agreement is invalid or unenforceable under
-law, it shall not affect the validity or enforceability of the remainder of the
+applicable law, it shall not affect the validity or enforceability of the
-terms of this Agreement, and without further action by the parties hereto, such
+remainder of the terms of this Agreement, and without further action by the
-provision shall be reformed to the minimum extent necessary to make such
+parties hereto, such provision shall be reformed to the minimum extent
-provision valid and enforceable.
+necessary to make such provision valid and enforceable.
 
 If Recipient institutes patent litigation against any entity (including a
 cross-claim or counterclaim in a lawsuit) alleging that the Program itself
 (excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted under
+infringes such Recipient's patent(s), then such Recipient's rights granted
-Section 2(b) shall terminate as of the date such litigation is filed.
+under Section 2(b) shall terminate as of the date such litigation is filed.
 
 All Recipient's rights under this Agreement shall terminate if it fails to
 comply with any of the material terms or conditions of this Agreement and does
@@ -205,26 +211,26 @@ not cure such failure in a reasonable period of time after becoming aware of
 such noncompliance. If all Recipient's rights under this Agreement terminate,
 Recipient agrees to cease use and distribution of the Program as soon as
 reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue and
+and any licenses granted by Recipient relating to the Program shall continue
-survive.
+and survive.
 
 Everyone is permitted to copy and distribute copies of this Agreement, but in
 order to avoid inconsistency the Agreement is copyrighted and may only be
 modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
+publish new versions (including revisions) of this Agreement from time to
-No one other than the Agreement Steward has the right to modify this Agreement.
+time. No one other than the Agreement Steward has the right to modify this
-The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The
-may assign the responsibility to serve as the Agreement Steward to a suitable
+Eclipse Foundation may assign the responsibility to serve as the Agreement
-separate entity. Each new version of the Agreement will be given a
+Steward to a suitable separate entity. Each new version of the Agreement will
-distinguishing version number. The Program (including Contributions) may always
+be given a distinguishing version number. The Program (including
-be distributed subject to the version of the Agreement under which it was
+Contributions) may always be distributed subject to the version of the
-received. In addition, after a new version of the Agreement is published,
+Agreement under which it was received. In addition, after a new version of the
-Contributor may elect to distribute the Program (including its Contributions)
+Agreement is published, Contributor may elect to distribute the Program
-under the new version. Except as expressly stated in Sections 2(a) and 2(b)
+(including its Contributions) under the new version. Except as expressly
-above, Recipient receives no rights or licenses to the intellectual property of
+stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
-any Contributor under this Agreement, whether expressly, by implication,
+licenses to the intellectual property of any Contributor under this Agreement,
-estoppel or otherwise. All rights in the Program not expressly granted under
+whether expressly, by implication, estoppel or otherwise. All rights in the
-this Agreement are reserved.
+Program not expressly granted under this Agreement are reserved.
 
 This Agreement is governed by the laws of the State of New York and the
 intellectual property laws of the United States of America. No party to this

licenses/gpl-v2.txt

@@ -1,12 +1,13 @@
 ---
 title: GPL v2
-family-title: GPL
+category: GPL
+tab-slug: gpl-v2
 hide-from-license-list: false
 layout: license
 permalink: /licenses/gpl-v2/
 source: http://www.gnu.org/licenses/gpl-2.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. There are multiple variants of the GPL each with different requirements, <a href="gpl-v2/">GPL v2</a>, <a href="gpl-v3/">GPL v3</a>, and <a href="agpl/">Affero GPL</a>. 
+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. There are multiple variants of the GPL each with different requirements.
 
 featured: true
 
@@ -24,6 +25,7 @@ permitted:
   - modifications
   - distribution
   - patent-grant
+  - private-use
 
 forbidden:
   - no-liability

licenses/gpl-v3.txt

@@ -1,6 +1,7 @@
 ---
 title: GPL v3
-family-title: GPL
+category: GPL
+tab-slug: gpl-v3
 hide-from-license-list: true
 layout: license
 permalink: /licenses/gpl-v3/
@@ -20,6 +21,7 @@ permitted:
   - modifications
   - distribution
   - patent-grant
+  - private-use
 
 forbidden:
   - no-liability

licenses/lgpl-v2.1.txt

@@ -1,11 +1,12 @@
 ---
 layout: license
 title: LGPL v2.1
-family-title: LGPL
+category: LGPL
+tab-slug: 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. There are two commonly used versions of the LGPL: <a href="lgpl-v2/">LGPL v2.1</a> and <a href="lgpl-v3/">LGPL v3</a>. 
+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. There are two commonly used versions of the LGPL.
 
 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.
 
@@ -22,6 +23,7 @@ permitted:
   - distribution
   - sublicense
   - patent-grant
+  - private-use
 
 forbidden:
   - no-liability
@@ -515,7 +517,8 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+    USA
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -524,7 +527,8 @@ school, if any, to sign a "copyright disclaimer" for the library, if
 necessary.  Here is a sample; alter the names:
 
   Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+  library `Frob' (a library for tweaking knobs) written by James Random
+  Hacker.
 
   {signature of Ty Coon}, 1 April 1990
   Ty Coon, President of Vice

licenses/lgpl-v3.txt

@@ -1,7 +1,8 @@
 ---
 layout: license
 title: LGPL v3
-family-title: LGPL
+category: LGPL
+tab-slug: lgpl-v3
 hide-from-license-list: true
 permalink: /licenses/lgpl-v3/
 source: http://www.gnu.org/licenses/lgpl-3.0.txt
@@ -23,6 +24,7 @@ permitted:
   - distribution
   - sublicense
   - patent-grant
+  - private-use
 
 forbidden:
   - no-liability

licenses/mit.txt

@@ -1,7 +1,7 @@
 ---
 layout: license
 title: MIT License
-family-title: Apache
+category: MIT
 permalink: /licenses/mit/
 source: http://opensource.org/licenses/MIT
 
@@ -19,6 +19,7 @@ permitted:
   - modifications
   - distribution
   - sublicense
+  - private-use
 
 forbidden:
   - no-liability
@@ -29,19 +30,20 @@ The MIT License (MIT)
 
 Copyright (c) [year] [fullname]
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
+Permission is hereby granted, free of charge, to any person obtaining a copy
-this software and associated documentation files (the "Software"), to deal in
+of this software and associated documentation files (the "Software"), to deal
-the Software without restriction, including without limitation the rights to
+in the Software without restriction, including without limitation the rights
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-the Software, and to permit persons to whom the Software is furnished to do so,
+copies of the Software, and to permit persons to whom the Software is
-subject to the following conditions:
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

licenses/mozilla.txt

@@ -1,7 +1,7 @@
 ---
 layout: license
 title: Mozilla Public License Version 2.0
-family-title: Mozilla
+category: Mozilla
 permalink: /licenses/mozilla/
 source: http://www.mozilla.org/MPL/2.0/
 
@@ -19,6 +19,7 @@ permitted:
   - distribution
   - sublicense
   - patent-grant
+  - private-use
 
 forbidden:
   - no-liability
@@ -56,9 +57,9 @@ Mozilla Public License, version 2.0
      a. that the initial Contributor has attached the notice described in
         Exhibit B to the Covered Software; or
 
-     b. that the Covered Software was made available under the terms of version
+     b. that the Covered Software was made available under the terms of
-        1.1 or earlier of the License, but not also under the terms of a
+        version 1.1 or earlier of the License, but not also under the terms of
-        Secondary License.
+        a Secondary License.
 
 1.6. “Executable Form”
 
@@ -66,8 +67,8 @@ Mozilla Public License, version 2.0
 
 1.7. “Larger Work”
 
-     means a work that combines Covered Software with other material, in a separate
+     means a work that combines Covered Software with other material, in a
-     file or files, that is not Covered Software.
+     separate file or files, that is not Covered Software.
 
 1.8. “License”
 
@@ -75,26 +76,26 @@ Mozilla Public License, version 2.0
 
 1.9. “Licensable”
 
-     means having the right to grant, to the maximum extent possible, whether at the
+     means having the right to grant, to the maximum extent possible, whether
-     time of the initial grant or subsequently, any and all of the rights conveyed by
+     at the time of the initial grant or subsequently, any and all of the
-     this License.
+     rights conveyed by this License.
 
 1.10. “Modifications”
 
      means any of the following:
 
-     a. any file in Source Code Form that results from an addition to, deletion
+     a. any file in Source Code Form that results from an addition to,
-        from, or modification of the contents of Covered Software; or
+        deletion from, or modification of the contents of Covered Software; or
 
      b. any new file in Source Code Form that contains any Covered Software.
 
 1.11. “Patent Claims” of a Contributor
 
-      means any patent claim(s), including without limitation, method, process,
+      means any patent claim(s), including without limitation, method,
-      and apparatus claims, in any patent Licensable by such Contributor that
+      process, and apparatus claims, in any patent Licensable by such
-      would be infringed, but for the grant of the License, by the making,
+      Contributor that would be infringed, but for the grant of the License,
-      using, selling, offering for sale, having made, import, or transfer of
+      by the making, using, selling, offering for sale, having made, import,
-      either its Contributions or its Contributor Version.
+      or transfer of either its Contributions or its Contributor Version.
 
 1.12. “Secondary License”
 
@@ -127,25 +128,26 @@ Mozilla Public License, version 2.0
      a. under intellectual property rights (other than patent or trademark)
         Licensable by such Contributor to use, reproduce, make available,
         modify, display, perform, distribute, and otherwise exploit its
-        Contributions, either on an unmodified basis, with Modifications, or as
+        Contributions, either on an unmodified basis, with Modifications, or
-        part of a Larger Work; and
+        as part of a Larger Work; and
 
      b. under Patent Claims of such Contributor to make, use, sell, offer for
-        sale, have made, import, and otherwise transfer either its Contributions
+        sale, have made, import, and otherwise transfer either its
-        or its Contributor Version.
+        Contributions or its Contributor Version.
 
 2.2. Effective Date
 
-     The licenses granted in Section 2.1 with respect to any Contribution become
+     The licenses granted in Section 2.1 with respect to any Contribution
-     effective for each Contribution on the date the Contributor first distributes
+     become effective for each Contribution on the date the Contributor first
-     such Contribution.
+     distributes such Contribution.
 
 2.3. Limitations on Grant Scope
 
-     The licenses granted in this Section 2 are the only rights granted under this
+     The licenses granted in this Section 2 are the only rights granted under
-     License. No additional rights or licenses will be implied from the distribution
+     this License. No additional rights or licenses will be implied from the
-     or licensing of Covered Software under this License. Notwithstanding Section
+     distribution or licensing of Covered Software under this License.
-     2.1(b) above, no patent license is granted by a Contributor:
+     Notwithstanding Section 2.1(b) above, no patent license is granted by a
+     Contributor:
 
      a. for any code that a Contributor has removed from Covered Software; or
 
@@ -154,30 +156,31 @@ Mozilla Public License, version 2.0
         Contributions with other software (except as part of its Contributor
         Version); or
 
-     c. under Patent Claims infringed by Covered Software in the absence of its
+     c. under Patent Claims infringed by Covered Software in the absence of
-        Contributions.
+        its Contributions.
 
-     This License does not grant any rights in the trademarks, service marks, or
+     This License does not grant any rights in the trademarks, service marks,
-     logos of any Contributor (except as may be necessary to comply with the
+     or logos of any Contributor (except as may be necessary to comply with
-     notice requirements in Section 3.4).
+     the notice requirements in Section 3.4).
 
 2.4. Subsequent Licenses
 
      No Contributor makes additional grants as a result of Your choice to
-     distribute the Covered Software under a subsequent version of this License
+     distribute the Covered Software under a subsequent version of this
-     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     License (see Section 10.2) or under the terms of a Secondary License (if
-     under the terms of Section 3.3).
+     permitted under the terms of Section 3.3).
 
 2.5. Representation
 
-     Each Contributor represents that the Contributor believes its Contributions
+     Each Contributor represents that the Contributor believes its
-     are its original creation(s) or it has sufficient rights to grant the
+     Contributions are its original creation(s) or it has sufficient rights to
-     rights to its Contributions conveyed by this License.
+     grant the rights to its Contributions conveyed by this License.
 
 2.6. Fair Use
 
-     This License is not intended to limit any rights You have under applicable
+     This License is not intended to limit any rights You have under
-     copyright doctrines of fair use, fair dealing, or other equivalents.
+     applicable copyright doctrines of fair use, fair dealing, or other
+     equivalents.
 
 2.7. Conditions
 
@@ -190,11 +193,12 @@ Mozilla Public License, version 2.0
 3.1. Distribution of Source Form
 
      All distribution of Covered Software in Source Code Form, including any
-     Modifications that You create or to which You contribute, must be under the
+     Modifications that You create or to which You contribute, must be under
-     terms of this License. You must inform recipients that the Source Code Form
+     the terms of this License. You must inform recipients that the Source
-     of the Covered Software is governed by the terms of this License, and how
+     Code Form of the Covered Software is governed by the terms of this
-     they can obtain a copy of this License. You may not attempt to alter or
+     License, and how they can obtain a copy of this License. You may not
-     restrict the recipients’ rights in the Source Code Form.
+     attempt to alter or restrict the recipients’ rights in the Source Code
+     Form.
 
 3.2. Distribution of Executable Form
 
@@ -206,39 +210,40 @@ Mozilla Public License, version 2.0
         reasonable means in a timely manner, at a charge no more than the cost
         of distribution to the recipient; and
 
-     b. You may distribute such Executable Form under the terms of this License,
+     b. You may distribute such Executable Form under the terms of this
-        or sublicense it under different terms, provided that the license for
+        License, or sublicense it under different terms, provided that the
-        the Executable Form does not attempt to limit or alter the recipients’
+        license for the Executable Form does not attempt to limit or alter the
-        rights in the Source Code Form under this License.
+        recipients’ rights in the Source Code Form under this License.
 
 3.3. Distribution of a Larger Work
 
      You may create and distribute a Larger Work under terms of Your choice,
-     provided that You also comply with the requirements of this License for the
+     provided that You also comply with the requirements of this License for
-     Covered Software. If the Larger Work is a combination of Covered Software
+     the Covered Software. If the Larger Work is a combination of Covered
-     with a work governed by one or more Secondary Licenses, and the Covered
+     Software with a work governed by one or more Secondary Licenses, and the
-     Software is not Incompatible With Secondary Licenses, this License permits
+     Covered Software is not Incompatible With Secondary Licenses, this
-     You to additionally distribute such Covered Software under the terms of
+     License permits You to additionally distribute such Covered Software
-     such Secondary License(s), so that the recipient of the Larger Work may, at
+     under the terms of such Secondary License(s), so that the recipient of
-     their option, further distribute the Covered Software under the terms of
+     the Larger Work may, at their option, further distribute the Covered
-     either this License or such Secondary License(s).
+     Software under the terms of either this License or such Secondary
+     License(s).
 
 3.4. Notices
 
-     You may not remove or alter the substance of any license notices (including
+     You may not remove or alter the substance of any license notices
-     copyright notices, patent notices, disclaimers of warranty, or limitations
+     (including copyright notices, patent notices, disclaimers of warranty, or
-     of liability) contained within the Source Code Form of the Covered
+     limitations of liability) contained within the Source Code Form of the
-     Software, except that You may alter any license notices to the extent
+     Covered Software, except that You may alter any license notices to the
-     required to remedy known factual inaccuracies.
+     extent required to remedy known factual inaccuracies.
 
 3.5. Application of Additional Terms
 
      You may choose to offer, and to charge a fee for, warranty, support,
      indemnity or liability obligations to one or more recipients of Covered
-     Software. However, You may do so only on Your own behalf, and not on behalf
+     Software. However, You may do so only on Your own behalf, and not on
-     of any Contributor. You must make it absolutely clear that any such
+     behalf of any Contributor. You must make it absolutely clear that any
-     warranty, support, indemnity, or liability obligation is offered by You
+     such warranty, support, indemnity, or liability obligation is offered by
-     alone, and You hereby agree to indemnify every Contributor for any
+     You alone, and You hereby agree to indemnify every Contributor for any
      liability incurred by such Contributor as a result of warranty, support,
      indemnity or liability terms You offer. You may include additional
      disclaimers of warranty and limitations of liability specific to any
@@ -247,14 +252,14 @@ Mozilla Public License, version 2.0
 4. Inability to Comply Due to Statute or Regulation
 
    If it is impossible for You to comply with any of the terms of this License
-   with respect to some or all of the Covered Software due to statute, judicial
+   with respect to some or all of the Covered Software due to statute,
-   order, or regulation then You must: (a) comply with the terms of this License
+   judicial order, or regulation then You must: (a) comply with the terms of
-   to the maximum extent possible; and (b) describe the limitations and the code
+   this License to the maximum extent possible; and (b) describe the
-   they affect. Such description must be placed in a text file included with all
+   limitations and the code they affect. Such description must be placed in a
-   distributions of the Covered Software under this License. Except to the
+   text file included with all distributions of the Covered Software under
-   extent prohibited by statute or regulation, such description must be
+   this License. Except to the extent prohibited by statute or regulation,
-   sufficiently detailed for a recipient of ordinary skill to be able to
+   such description must be sufficiently detailed for a recipient of ordinary
-   understand it.
+   skill to be able to understand it.
 
 5. Termination
 
@@ -262,21 +267,22 @@ Mozilla Public License, version 2.0
      fail to comply with any of its terms. However, if You become compliant,
      then the rights granted under this License from a particular Contributor
      are reinstated (a) provisionally, unless and until such Contributor
-     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     explicitly and finally terminates Your grants, and (b) on an ongoing
-     if such Contributor fails to notify You of the non-compliance by some
+     basis, if such Contributor fails to notify You of the non-compliance by
-     reasonable means prior to 60 days after You have come back into compliance.
+     some reasonable means prior to 60 days after You have come back into
-     Moreover, Your grants from a particular Contributor are reinstated on an
+     compliance. Moreover, Your grants from a particular Contributor are
-     ongoing basis if such Contributor notifies You of the non-compliance by
+     reinstated on an ongoing basis if such Contributor notifies You of the
-     some reasonable means, this is the first time You have received notice of
+     non-compliance by some reasonable means, this is the first time You have
-     non-compliance with this License from such Contributor, and You become
+     received notice of non-compliance with this License from such
-     compliant prior to 30 days after Your receipt of the notice.
+     Contributor, and You become compliant prior to 30 days after Your receipt
+     of the notice.
 
 5.2. If You initiate litigation against any entity by asserting a patent
-     infringement claim (excluding declaratory judgment actions, counter-claims,
+     infringement claim (excluding declaratory judgment actions,
-     and cross-claims) alleging that a Contributor Version directly or
+     counter-claims, and cross-claims) alleging that a Contributor Version
-     indirectly infringes any patent, then the rights granted to You by any and
+     directly or indirectly infringes any patent, then the rights granted to
-     all Contributors for the Covered Software under Section 2.1 of this License
+     You by any and all Contributors for the Covered Software under Section
-     shall terminate.
+     2.1 of this License shall terminate.
 
 5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
      license agreements (excluding distributors and resellers) which have been
@@ -285,16 +291,16 @@ Mozilla Public License, version 2.0
 
 6. Disclaimer of Warranty
 
-   Covered Software is provided under this License on an “as is” basis, without
+   Covered Software is provided under this License on an “as is” basis,
-   warranty of any kind, either expressed, implied, or statutory, including,
+   without warranty of any kind, either expressed, implied, or statutory,
-   without limitation, warranties that the Covered Software is free of defects,
+   including, without limitation, warranties that the Covered Software is free
-   merchantable, fit for a particular purpose or non-infringing. The entire
+   of defects, merchantable, fit for a particular purpose or non-infringing.
-   risk as to the quality and performance of the Covered Software is with You.
+   The entire risk as to the quality and performance of the Covered Software
-   Should any Covered Software prove defective in any respect, You (not any
+   is with You. Should any Covered Software prove defective in any respect,
-   Contributor) assume the cost of any necessary servicing, repair, or
+   You (not any Contributor) assume the cost of any necessary servicing,
-   correction. This disclaimer of warranty constitutes an essential part of this
+   repair, or correction. This disclaimer of warranty constitutes an essential
-   License. No use of  any Covered Software is authorized under this License
+   part of this License. No use of  any Covered Software is authorized under
-   except under this disclaimer.
+   this License except under this disclaimer.
 
 7. Limitation of Liability
 
@@ -306,27 +312,29 @@ Mozilla Public License, version 2.0
    goodwill, work stoppage, computer failure or malfunction, or any and all
    other commercial damages or losses, even if such party shall have been
    informed of the possibility of such damages. This limitation of liability
-   shall not apply to liability for death or personal injury resulting from such
+   shall not apply to liability for death or personal injury resulting from
-   party’s negligence to the extent applicable law prohibits such limitation.
+   such party’s negligence to the extent applicable law prohibits such
-   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   limitation. Some jurisdictions do not allow the exclusion or limitation of
-   consequential damages, so this exclusion and limitation may not apply to You.
+   incidental or consequential damages, so this exclusion and limitation may
+   not apply to You.
 
 8. Litigation
 
-   Any litigation relating to this License may be brought only in the courts of
+   Any litigation relating to this License may be brought only in the courts
-   a jurisdiction where the defendant maintains its principal place of business
+   of a jurisdiction where the defendant maintains its principal place of
-   and such litigation shall be governed by laws of that jurisdiction, without
+   business and such litigation shall be governed by laws of that
-   reference to its conflict-of-law provisions. Nothing in this Section shall
+   jurisdiction, without reference to its conflict-of-law provisions. Nothing
-   prevent a party’s ability to bring cross-claims or counter-claims.
+   in this Section shall prevent a party’s ability to bring cross-claims or
+   counter-claims.
 
 9. Miscellaneous
 
-   This License represents the complete agreement concerning the subject matter
+   This License represents the complete agreement concerning the subject
-   hereof. If any provision of this License is held to be unenforceable, such
+   matter hereof. If any provision of this License is held to be
-   provision shall be reformed only to the extent necessary to make it
+   unenforceable, such provision shall be reformed only to the extent
-   enforceable. Any law or regulation which provides that the language of a
+   necessary to make it enforceable. Any law or regulation which provides that
-   contract shall be construed against the drafter shall not be used to construe
+   the language of a contract shall be construed against the drafter shall not
-   this License against a Contributor.
+   be used to construe this License against a Contributor.
 
 
 10. Versions of the License
@@ -340,23 +348,24 @@ Mozilla Public License, version 2.0
 
 10.2. Effect of New Versions
 
-      You may distribute the Covered Software under the terms of the version of
+      You may distribute the Covered Software under the terms of the version
-      the License under which You originally received the Covered Software, or
+      of the License under which You originally received the Covered Software,
-      under the terms of any subsequent version published by the license
+      or under the terms of any subsequent version published by the license
       steward.
 
 10.3. Modified Versions
 
       If you create software not governed by this License, and you want to
-      create a new license for such software, you may create and use a modified
+      create a new license for such software, you may create and use a
-      version of this License if you rename the license and remove any
+      modified version of this License if you rename the license and remove
-      references to the name of the license steward (except to note that such
+      any references to the name of the license steward (except to note that
-      modified license differs from this License).
+      such modified license differs from this License).
 
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+10.4. Distributing Source Code Form that is Incompatible With Secondary
-      If You choose to distribute Source Code Form that is Incompatible With
+      Licenses If You choose to distribute Source Code Form that is
-      Secondary Licenses under the terms of this version of the License, the
+      Incompatible With Secondary Licenses under the terms of this version of
-      notice described in Exhibit B of this License must be attached.
+      the License, the notice described in Exhibit B of this License must be
+      attached.
 
 Exhibit A - Source Code Form License Notice
 
@@ -367,9 +376,10 @@ Exhibit A - Source Code Form License Notice
       obtain one at
       http://mozilla.org/MPL/2.0/.
 
-If it is not possible or desirable to put the notice in a particular file, then
+If it is not possible or desirable to put the notice in a particular file,
-You may include the notice in a location (such as a LICENSE file in a relevant
+then You may include the notice in a location (such as a LICENSE file in a
-directory) where a recipient would be likely to look for such a notice.
+relevant directory) where a recipient would be likely to look for such a
+notice.
 
 You may add additional accurate notices of copyright ownership.
 
@@ -378,4 +388,3 @@ Exhibit B - “Incompatible With Secondary Licenses” Notice
       This Source Code Form is “Incompatible
       With Secondary Licenses”, as defined by
       the Mozilla Public License, v. 2.0.
-

licenses/no-license.html

@@ -1,21 +1,22 @@
 ---
 layout: license
 permalink: /licenses/no-license/
+category: 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.
 
 how: Simply do nothing, though including a copyright notice is recommended.
 
-required: 
+required:
   - include-copyright
 
 permitted:
-  - private-use
   - commercial-use
+  - private-use
 
 forbidden:
   - modifications
@@ -24,4 +25,4 @@ forbidden:
 
 ---
 
-Copyright [year] [fullname]	
+Copyright [year] [fullname]

licenses/unlicense.txt

@@ -1,8 +1,10 @@
 ---
 layout: license
-permalink: /licenses/public-domain/
+title: The Unlicense
+category: Public Domain Dedication
+tab-slug: unlicense
+permalink: /licenses/unlicense/
 class: license-types
-title: Public Domain (Unlicense)
 filename: UNLICENSE
 
 source: http://unlicense.org/UNLICENSE
@@ -11,14 +13,14 @@ description: Because copyright is automatic in most countries, <a href="http://u
 
 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.
 
-required: 
+required:
 
 permitted:
-  - private-use
   - commercial-use
   - modifications
   - distribution
   - sublicense
+  - private-use
 
 forbidden:
   - no-liability

no-license.md

@@ -4,10 +4,10 @@ permalink: no-license/
 title: 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. 
+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.
 
 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.
+If you want to share your work with others, please consider choosing an open source license.

terms-of-service.md

@@ -6,23 +6,23 @@ permalink: /terms-of-service/
 ---
 
 ### 1. Introduction
-Welcome to Choosealicense.com (the “Site”). The Site is operated by GitHub, Inc. (“GitHub” or “we”), a Delaware corporation headquartered in lovely San Francisco, California. This document – the Site’s terms of service – is an agreement between you, the beloved user, and GitHub. It’s referred to as the “Terms” or the “Agreement.” 
+Welcome to Choosealicense.com (the “Site”). The Site is operated by GitHub, Inc. (“GitHub” or “we”), a Delaware corporation headquartered in lovely San Francisco, California. This document – the Site’s terms of service – is an agreement between you, the beloved user, and GitHub. It’s referred to as the “Terms” or the “Agreement.”
-These Terms govern your use of the Site and this Site only. The Terms neither relate to any other GitHub website, service or property nor your use of any other GitHub website, service or property. For example, these Terms don’t govern your use of www.github.com. 
+These Terms govern your use of the Site and this Site only. The Terms neither relate to any other GitHub website, service or property nor your use of any other GitHub website, service or property. For example, these Terms don’t govern your use of www.github.com.
 
 ### 2. Agreement to the Terms
 
 Terms of service agreements are contracts. That means that this Agreement is a contract between you and GitHub for the limited purpose of laying out what our respective rights and obligations are with respect to Choosealicense.com.
-If there’s something in these Terms you don’t agree with or don’t understand, please don’t use the Site. By accessing or using the Site, you signal your agreement with and consent to the Terms. By accessing or using any Website or Service you also represent that you have the legal authority to accept the Terms on behalf of yourself and any party you represent in connection with your use of any Website or Service. 
+If there’s something in these Terms you don’t agree with or don’t understand, please don’t use the Site. By accessing or using the Site, you signal your agreement with and consent to the Terms. By accessing or using any Website or Service you also represent that you have the legal authority to accept the Terms on behalf of yourself and any party you represent in connection with your use of any Website or Service.
 
-Unless otherwise agreed to in writing with GitHub, your use of any Website or Service will always be subject to, at a minimum, the terms and conditions set out in this document. 
+Unless otherwise agreed to in writing with GitHub, your use of any Website or Service will always be subject to, at a minimum, the terms and conditions set out in this document.
 
 ### 3. No legal advice is being provided
 
-GitHub is a lot of things, but it’s not a law firm. GitHub does not provide legal advice. Using the Site or sending us an email about the Site does not create an attorney-client relationship. Use of Choosealicense.com does not constitute legal advice nor does it create an attorney-client relationship. If you have any questions about the Site or its content, you should consult with your own legal counsel before moving forward with your project. In fact, you should always consult with your own lawyer before making any decisions that might have legal ramifications or that may impact your legal rights. 
+GitHub is a lot of things, but it’s not a law firm. GitHub does not provide legal advice. Using the Site or sending us an email about the Site does not create an attorney-client relationship. Use of Choosealicense.com does not constitute legal advice nor does it create an attorney-client relationship. If you have any questions about the Site or its content, you should consult with your own legal counsel before moving forward with your project. In fact, you should always consult with your own lawyer before making any decisions that might have legal ramifications or that may impact your legal rights.
 
 GitHub created the Site to help users get started with their open source projects. And we do hope it helps. But please keep in mind that we’re not lawyers (at least not most of us) and that we make mistakes like everyone else. For that reason, GitHub provides the Site on an “as-is” basis. GitHub makes no warranties regarding any information or licenses provided on or through the Site, and disclaims liability for damages resulting from use of the Site.
 
-The next few sections of these Terms go into greater detail on these disclaimers and lack of warranties. They’re in caps so that you notice them.  
+The next few sections of these Terms go into greater detail on these disclaimers and lack of warranties. They’re in caps so that you notice them.
 
 ### 4. DISCLAIMER OF WARRANTIES
 
@@ -36,7 +36,7 @@ THE GITHUB PARTIES SHALL NOT BE RESPONSIBLE OR LIABLE WHATSOEVER IN ANY MANNER F
 
 ### 6. Indemnification for breach of the Terms
 
-You agree to indemnify and hold harmless the GitHub Parties (defined above) from and against any and all loss, expenses, damages, and costs, including without limitation reasonable attorneys fees, resulting, whether directly or indirectly, from your violation of the Terms. 
+You agree to indemnify and hold harmless the GitHub Parties (defined above) from and against any and all loss, expenses, damages, and costs, including without limitation reasonable attorneys fees, resulting, whether directly or indirectly, from your violation of the Terms.
 
 ### 7. Termination of this Agreement
 
@@ -45,12 +45,12 @@ The disclaimer of warranties, the limitation of liability and the jurisdiction a
 
 ### 8. Miscellaneous Terms
 
-These Terms are governed by and construed by the laws of the State of California, in the United States, exclusive of its choice of law rules. 
+These Terms are governed by and construed by the laws of the State of California, in the United States, exclusive of its choice of law rules.
 
-The parties agree that any disputes or proceedings between GitHub and you concerning these Terms or the Site shall be brought in a federal or state court of competent jurisdiction sitting in the Northern District of California, and hereby consent to the personal jurisdiction and venue of such court. Either party’s failure to insist on or enforce strict performance of any of the Terms shall not be construed as a waiver of any provision or right. 
+The parties agree that any disputes or proceedings between GitHub and you concerning these Terms or the Site shall be brought in a federal or state court of competent jurisdiction sitting in the Northern District of California, and hereby consent to the personal jurisdiction and venue of such court. Either party’s failure to insist on or enforce strict performance of any of the Terms shall not be construed as a waiver of any provision or right.
 
-If any term or part of the Terms is held to be invalid or unenforceable by any law or regulation or final determination of a competent court or tribunal, that provision will be deemed severable and will not affect the validity and enforceability of any remaining provisions. 
+If any term or part of the Terms is held to be invalid or unenforceable by any law or regulation or final determination of a competent court or tribunal, that provision will be deemed severable and will not affect the validity and enforceability of any remaining provisions.
 
-The parties agree that no joint venture, partnership, employment, or agency relationship exists between you and GitHub as a result of these Terms or your use of the Site. 
+The parties agree that no joint venture, partnership, employment, or agency relationship exists between you and GitHub as a result of these Terms or your use of the Site.
 
-These Terms constitute the entire agreement between you and GitHub relating to the Site and supersede all prior, contemporaneous and future communications (with the exception of future amendments to the Terms as made available by GitHub from time to time) between you and GitHub. A printed version of the Terms and of any notice given in electronic form shall be admissible in judicial or administrative proceedings based on or relating to the Terms to the same extent and subject to the same conditions as other business documents and records originally generating and maintained in printed form. 
+These Terms constitute the entire agreement between you and GitHub relating to the Site and supersede all prior, contemporaneous and future communications (with the exception of future amendments to the Terms as made available by GitHub from time to time) between you and GitHub. A printed version of the Terms and of any notice given in electronic form shall be admissible in judicial or administrative proceedings based on or relating to the Terms to the same extent and subject to the same conditions as other business documents and records originally generating and maintained in printed form.