Merge pull request #82 from github/license-categories

License category updates

_config.yml

@@ -4,20 +4,17 @@ rules:
 
   required:
     include-copyright:
-      description: Include the original copyright with the code.
-      label:  Copyright inclusion
-    include-license: 
-      description: Include the full text of the license with the code.
-      label: License inclusion
+      description: Include a copy of the license and copyright notice with the code.
+      label:  License and copyright notice
     document-changes: 
       description: Indicate significant changes made to the code.
       label: State Changes
     disclose-source:
-      description: Source code must be made available when distributing the software.
+      description: Source code must be made available when distributing the software. In the case of LGPL, the source for the library (and not the entire program) must be made available.
       label: Disclose Source
-    nonstatic-linkage:
-      description: The library must be linked in a way that allows it to be replaced with a similar library
-      label: Nonstatic Linkage
+    library-usage:
+      description: The library may be used within a non-open-source application. 
+      label: Library usage
     rename: 
       description: You must change the name of the software if you modify it.
       label: Rename
@@ -35,23 +32,20 @@ rules:
     sublicense: 
       description: You may grant a sublicense to modify and distribute this software to third parties not included in the license.
       label: Sublicensing
-    warranty: 
-      description: You may place a warranty on the software.
-      label: Warranty
     private-use: 
       description: You may use and modify the software without distributing it.
       label: Private Use
+    patent-grant:
+      description: While all open source licenses have an implicit grant of patent rights, this license provides an express grant of patent rights from the contributor to the recipient.
+      label: Patent Grant
 
   forbidden:
-    no-warranty:
-      description: Software is released without warranty and the software/license owner cannot be charged for damages.
-      label: Liability
     trademark-use:
-      description: "You may NOT use the names, logos, or trademarks of contributors."
+      description: While this may be implicitly true of all licenses, this license explicitly states that you may NOT use the names, logos, or trademarks of contributors.
       label: Use Trademark
     no-liability: 
       description: Software is provided without warranty and the software author/license owner cannot be held liable for damages.
-      label: Liability
+      label: Hold Liable
     no-sublicense: 
       description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license.
       label: Sublicensing

licenses/agpl.txt

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

licenses/apache.txt

@@ -5,7 +5,7 @@ permalink: apache/
 
 featured: true
 
-description: A permissive license that also grants a license to patent claims from contributors that are necessarily infringed by the software.
+description: A permissive license that also provides an express grant of patent rights from contributors to users.
 
 note: The Apache Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice at the very end of the license in the appendix.
 
@@ -15,7 +15,6 @@ source: http://www.apache.org/licenses/LICENSE-2.0.html
 
 required:
   - include-copyright
-  - include-license
   - document-changes
 
 permitted:
@@ -23,11 +22,12 @@ permitted:
   - modifications
   - distribution
   - sublicense
-  - warranty
+  - patent-grant
   
 forbidden:
-  - no-warranty
   - trademark-use
+  - no-liability
+
 ---
 
 Apache License

licenses/bsd-3-clause.txt

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

licenses/bsd.txt

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

licenses/eclipse.txt

@@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
 source: http://www.eclipse.org/legal/epl-v10.html
 
 required:
-  - disclose-source
+  - include-copyright
   - include-license
 
 permitted:
@@ -18,11 +18,10 @@ permitted:
   - distribution
   - modifications
   - sublicense
-  - warranty
+  - patent-grant
 
 forbidden:
   - no-liability
-  - trademark-use
 
 ---
 Eclipse Public License - v 1.0

licenses/gpl-v2.txt

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

licenses/gpl-v3.txt

@@ -5,7 +5,7 @@ permalink: gpl-v3/
 
 featured: true
 
-description: GPL is the most widely used free software license and is fully reciprocal. Derived works must be distributed under the same license.
+description: GPL is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license.
 
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
 
@@ -20,7 +20,7 @@ permitted:
   - commercial-use
   - modifications
   - distribution
-  - warranty
+  - patent-grant
 
 forbidden:
   - no-liability

licenses/lgpl-v2.1.txt

@@ -11,13 +11,15 @@ note: The Free Software Foundation recommends taking the additional step of addi
 
 required:
   - include-copyright
-  - nonstatic-linkage
+  - library-usage
+  - disclose-source
 
 permitted:
   - commercial-use
   - modifications
   - distribution
   - sublicense
+  - patent-grant
 
 forbidden:
   - no-liability

licenses/lgpl-v3.txt

@@ -11,13 +11,15 @@ note: The Free Software Foundation recommends taking the additional step of addi
 
 required:
   - include-copyright
-  - nonstatic-linkage
+  - library-usage
+  - disclose-source
 
 permitted:
   - commercial-use
   - modifications
   - distribution
   - sublicense
+  - patent-grant
 
 forbidden:
   - no-liability

licenses/mozilla.txt

@@ -10,14 +10,13 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
 required:
   - disclose-source
   - include-copyright
-  - include-license
 
 permitted:
   - commercial-use
   - modifications
   - distribution
   - sublicense
-  - warranty
+  - patent-grant
 
 forbidden:
   - no-liability

licenses/public-domain.txt

@@ -18,6 +18,7 @@ permitted:
   - sublicense
 
 forbidden:
+  - no-liability
 
 ---