Merge pull request #467 from github/warranty

mlinksva · web-flow · commit 4b39f96c2aa0 · 2016-12-25T11:46:35.000-08:00
no-liability -&gt; liability, warranty
diff --git a/README.md b/README.md
@@ -95,8 +95,9 @@ The license properties (rules) are stored as a bulleted list within the licenses
 #### Limitations
 
 * `trademark-use` - This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.
-* `no-liability` - Software is provided without warranty and the software author/license owner cannot be held liable for damages.
+* `liability` - This license includes a limitation of liability.
 * `patent-use` -  This license explicitly states that it does NOT grant you any rights in the patents of contributors.
+* `warranty` - The license explicitly states that it does NOT provide any warranty.
 
 ## License
 
diff --git a/_data/rules.yml b/_data/rules.yml
@@ -36,9 +36,12 @@ limitations:
 - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.
   label: Trademark Use
   tag: trademark-use
-- description: Software is provided without warranty and the software author/license owner cannot be held liable for damages.
-  label: Hold Liable
-  tag: no-liability
+- description: This license includes a limitation of liability.
+  label: Liability
+  tag: liability
 - description: This license explicitly states that it does NOT grant you any rights in the patents of contributors.
   label: Patent Use
   tag: patent-use
+- description: The license explicitly states that it does NOT provide any warranty.
+  label: Warranty
+  tag: warranty
diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt
@@ -20,7 +20,8 @@ conditions:
 
 limitations:
   - trademark-use
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt
@@ -27,7 +27,8 @@ conditions:
   - same-license
 
 limitations:
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt
@@ -30,7 +30,8 @@ conditions:
 
 limitations:
   - trademark-use
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt
@@ -20,8 +20,9 @@ conditions:
   - document-changes
 
 limitations:
-  - no-liability
+  - liability
   - trademark-use
+  - warranty
 
 ---
 
@@ -135,7 +136,7 @@ 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,
diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt
@@ -19,7 +19,8 @@ conditions:
   - include-copyright
 
 limitations:
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.txt
@@ -17,8 +17,9 @@ conditions:
   - include-copyright
 
 limitations:
-  - no-liability
+  - liability
   - patent-use
+  - warranty
 
 ---
 
diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt
@@ -18,7 +18,8 @@ conditions:
   - include-copyright
 
 limitations:
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt
@@ -19,7 +19,8 @@ conditions:
   - include-copyright
 
 limitations:
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt
@@ -18,9 +18,10 @@ conditions:
   - document-changes
 
 limitations:
-  - no-liability
+  - liability
   - trademark-use
   - patent-use
+  - warranty
 
 ---
 
@@ -75,7 +76,7 @@ exhaustive, and do not form part of our licenses.
      such as asking that all changes be marked or described.
      Although not required by our licenses, you are encouraged to
      respect those requests where reasonable. More_considerations
-     for the public: 
+     for the public:
 	wiki.creativecommons.org/Considerations_for_licensees
 
 =======================================================================
diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt
@@ -19,9 +19,10 @@ conditions:
   - same-license
 
 limitations:
-  - no-liability
+  - liability
   - trademark-use
   - patent-use
+  - warranty
 
 ---
 
@@ -76,7 +77,7 @@ exhaustive, and do not form part of our licenses.
      such as asking that all changes be marked or described.
      Although not required by our licenses, you are encouraged to
      respect those requests where reasonable. More_considerations
-     for the public: 
+     for the public:
 	wiki.creativecommons.org/Considerations_for_licensees
 
 =======================================================================
diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.txt
@@ -19,9 +19,10 @@ permissions:
 conditions: []
 
 limitations:
-  - no-liability
+  - liability
   - trademark-use
   - patent-use
+  - warranty
 
 ---
 
diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt
@@ -27,7 +27,8 @@ conditions:
   - same-license
 
 limitations:
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt
@@ -25,8 +25,9 @@ conditions:
   - same-license
 
 limitations:
-  - no-liability
+  - liability
   - trademark-use
+  - warranty
 
 ---
 
diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt
@@ -29,7 +29,8 @@ conditions:
   - same-license
 
 limitations:
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt
@@ -32,7 +32,8 @@ conditions:
   - same-license
 
 limitations:
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/isc.txt b/_licenses/isc.txt
@@ -22,7 +22,8 @@ conditions:
   - include-copyright
 
 limitations:
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt
@@ -25,7 +25,8 @@ conditions:
   - same-license
 
 limitations:
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt
@@ -26,7 +26,8 @@ conditions:
   - same-license
 
 limitations:
-  - no-liability
+  - liability
+  - warranty
 
 ---
 
diff --git a/_licenses/lppl-1.3c.txt b/_licenses/lppl-1.3c.txt
diff --git a/_licenses/mit.txt b/_licenses/mit.txt
diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt
diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt
diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt
diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt
diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt
diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt
diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt
