Merge branch 'master' into docs_derp

Conflicts:
	_layouts/default.html

1 files changed, 31 insertions, 36 deletions

diff --git a/getting-started.html b/getting-started.html
index 1dc60d424..0cc159ec7 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -999,42 +999,37 @@ if (isAndroid) {
     <div class="page-header">
       <h1 id="license-faqs">License FAQs</h1>
     </div>
-    <p class="lead">Bootstrap is released under the Apache 2 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>
-    <p>The full Bootstrap license is located <a href="{{ site.repo }}/blob/master/README.md">in the project repository</a> for more information.</p>
+    <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>
+
+    <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 -->