From: Mark Otto <otto@github.com>
Date: Wed, 18 Dec 2013 23:26:07 +0000 (-0800)
Subject: update license faqs for apache
X-Git-Tag: v3.1.0~141^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccc894361f2c1fd8f403723e30aca6ff4beafa1f;p=thirdparty%2Fbootstrap.git

update license faqs for apache
---

diff --git a/getting-started.html b/getting-started.html
index 4e7640c1e3..01adb3d184 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -992,39 +992,34 @@ if (isAndroid) {
     </div>
     <p class="lead">Bootstrap is released under the MIT license and is copyright {{ site.time | date: "%Y" }} Twitter. Boiled down to smaller chunks, it can be described with the following conditions.</p>
 
-    <div class="row">
-      <div class="col-12 col-lg-6">
-        <h4>It allows you to:</h4>
-        <ul>
-          <li>Freely download and use Bootstrap, in whole or in part, for personal, company internal or commercial purposes</li>
-          <li>Use Bootstrap in packages or distributions that you create</li>
-        </ul>
-      </div>
-      <div class="col-12 col-lg-6">
-        <h4>It forbids you to:</h4>
-        <ul>
-          <li>Redistribute any piece of Bootstrap without proper attribution</li>
-          <li>Use any marks owned by Twitter in any way that might state or imply that Twitter endorses your distribution</li>
-          <li>Use any marks owned by Twitter in any way that might state or imply that you created the Twitter software in question</li>
-        </ul>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-12 col-lg-6">
-        <h4>It requires you to:</h4>
-        <ul>
-          <li>Include a copy of the license in any redistribution you may make that includes Bootstrap</li>
-          <li>Provide clear attribution to Twitter for any distributions that include Bootstrap</li>
-        </ul>
-      </div>
-      <div class="col-12 col-lg-6">
-        <h4>It does not require you to:</h4>
-        <ul>
-          <li>Include the source of Bootstrap itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it</li>
-          <li>Submit changes that you make to Bootstrap back to the Bootstrap project (though such feedback is encouraged)</li>
-        </ul>
-      </div>
-    </div>
+    <h4>It requires you to:</h4>
+    <ul>
+      <li>Include the license and copyright notice in your works</li>
+    </ul>
+
+    <h4>It permits you to:</h4>
+    <ul>
+      <li>Freely download and use Bootstrap, in whole or in part, for personal, private, company internal, or commercial purposes</li>
+      <li>Use Bootstrap in packages or distributions that you create</li>
+      <li>Modify the source code</li>
+      <li>Grant a sublicense to modify and distribute Bootstrap to third parties not included in the lincense</li>
+    </ul>
+
+    <h4>It forbids you to:</h4>
+    <ul>
+      <li>Hold the authors and license owners liable for damanges as Bootstrap is provided without warranty</li>
+      <li>Hold the creators or copyright holders of Bootstrap liable</li>
+      <li>Redistribute any piece of Bootstrap without proper attribution</li>
+      <li>Use any marks owned by Twitter in any way that might state or imply that Twitter endorses your distribution</li>
+      <li>Use any marks owned by Twitter in any way that might state or imply that you created the Twitter software in question</li>
+    </ul>
+
+    <h4>It does not require you to:</h4>
+    <ul>
+      <li>Include the source of Bootstrap itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it</li>
+      <li>Submit changes that you make to Bootstrap back to the Bootstrap project (though such feedback is encouraged)</li>
+    </ul>
+
     <p>The full Bootstrap license is located <a href="{{ site.repo }}/blob/master/LICENSE">in the project repository</a> for more information.</p>
   </div><!-- /.bs-docs-section -->