Replace copyright and license with single category

_config.yml

@@ -4,11 +4,8 @@ rules:
 
   required:
     include-copyright:
-      description: Include the original copyright with the code.
+      description: Include a copy of the license and copyright with the code.
-      label:  Copyright inclusion
+      label:  License and copyright notice
-    include-license: 
-      description: Include the full text of the license with the code.
-      label: License inclusion
     document-changes: 
       description: Indicate significant changes made to the code.
       label: State Changes

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
 ---
 

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:

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

licenses/no-license.html

@@ -24,4 +24,4 @@ forbidden:
 
 ---
 
-Copyright <<year>> <<fullname>>
+Copyright <<year>> <<fullname>>