From 3c29d5da87e560c3cc39c36753c58a60e79664ce Mon Sep 17 00:00:00 2001
From: Haacked <haacked@gmail.com>
Date: Wed, 10 Jul 2013 11:32:22 -0700
Subject: [PATCH] Replace copyright and license with single category

---
 _config.yml              | 7 ++-----
 licenses/apache.txt      | 4 +---
 licenses/eclipse.txt     | 2 +-
 licenses/mozilla.txt     | 1 -
 licenses/no-license.html | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/_config.yml b/_config.yml
index db2827c..03768b1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -4,11 +4,8 @@ rules:
 
   required:
     include-copyright:
-      description: Include the original copyright with the code.
-      label:  Copyright inclusion
-    include-license: 
-      description: Include the full text of the license with the code.
-      label: License inclusion
+      description: Include a copy of the license and copyright with the code.
+      label:  License and copyright notice
     document-changes: 
       description: Indicate significant changes made to the code.
       label: State Changes
diff --git a/licenses/apache.txt b/licenses/apache.txt
index 230f623..68533d5 100644
--- a/licenses/apache.txt
+++ b/licenses/apache.txt
@@ -5,7 +5,7 @@ permalink: apache/
 
 featured: true
 
-description: A permissive license that also grants a license to patent claims from contributors that are necessarily infringed by the software.
+description: A permissive license that also provides an express grant of patent rights from the contributor to the recipient.
 
 note: The Apache Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice at the very end of the license in the appendix.
 
@@ -15,7 +15,6 @@ source: http://www.apache.org/licenses/LICENSE-2.0.html
 
 required:
   - include-copyright
-  - include-license
   - document-changes
 
 permitted:
@@ -26,7 +25,6 @@ permitted:
   - warranty
   
 forbidden:
-  - no-warranty
   - trademark-use
 ---
 
diff --git a/licenses/eclipse.txt b/licenses/eclipse.txt
index 799f2d9..d5683c3 100644
--- a/licenses/eclipse.txt
+++ b/licenses/eclipse.txt
@@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
 source: http://www.eclipse.org/legal/epl-v10.html
 
 required:
-  - disclose-source
+  - include-copyright
   - include-license
 
 permitted:
diff --git a/licenses/mozilla.txt b/licenses/mozilla.txt
index 635100e..3eb6718 100644
--- a/licenses/mozilla.txt
+++ b/licenses/mozilla.txt
@@ -10,7 +10,6 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
 required:
   - disclose-source
   - include-copyright
-  - include-license
 
 permitted:
   - commercial-use
diff --git a/licenses/no-license.html b/licenses/no-license.html
index 69d7014..5a4c9a2 100644
--- a/licenses/no-license.html
+++ b/licenses/no-license.html
@@ -24,4 +24,4 @@ forbidden:
 
 ---
 
-Copyright <<year>> <<fullname>>
+Copyright <<year>> <<fullname>>