aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-17 19:20:08 -0700
committerMark Otto <[email protected]>2013-07-17 19:20:08 -0700
commitf4b9938d8c0c23ff3b1b5e1e8fee9229d2e67bfa (patch)
tree3a4edd23396612c8e75cb03f2180ae6ad989fe55 /docs
parentaa49c919c65ea4eb7777d3f54cdc9da0e1a05f9f (diff)
downloadbootstrap-f4b9938d8c0c23ff3b1b5e1e8fee9229d2e67bfa.tar.xz
bootstrap-f4b9938d8c0c23ff3b1b5e1e8fee9229d2e67bfa.zip
Move license FAQs to the docs, add link to side nav
Diffstat (limited to 'docs')
-rw-r--r--docs/_includes/nav-getting-started.html6
-rw-r--r--docs/getting-started.html46
2 files changed, 52 insertions, 0 deletions
diff --git a/docs/_includes/nav-getting-started.html b/docs/_includes/nav-getting-started.html
index fd6f8c98b..bde8bf404 100644
--- a/docs/_includes/nav-getting-started.html
+++ b/docs/_includes/nav-getting-started.html
@@ -9,6 +9,9 @@
<a href="#whats-included">What's included</a>
</li>
<li>
+ <a href="#browsers">Browser support</a>
+</li>
+<li>
<a href="#examples">Templates and examples</a>
<ul class="nav">
<li><a href="#examples-template">HTML template</a></li>
@@ -16,5 +19,8 @@
</ul>
</li>
<li>
+ <a href="#license-faqs">License FAQs</a>
+</li>
+<li>
<a href="#customizing">Customizing Bootstrap</a>
</li> \ No newline at end of file
diff --git a/docs/getting-started.html b/docs/getting-started.html
index f951cfc78..4ff2a9d88 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -231,6 +231,52 @@ bootstrap/
+ <!-- License FAQs
+ ================================================== -->
+ <div class="bs-docs-section" id="license-faqs">
+ <div class="page-header">
+ <h1>License FAQs</h1>
+ </div>
+ <p class="lead">Bootstrap is released under the Apache 2 license. 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 Twitter open source software, in whole or in part, for personal, company internal or commercial purposes</li>
+ <li>Use Twitter open source software 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 Twitter open source originated software 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 Twitter software</li>
+ <li>Provide clear attribution to Twitter for any distributions that include Twitter open source software</li>
+ </ul>
+ </div>
+ <div class="col-12 col-lg-6">
+ <h4>It does not require you to:</h4>
+ <ul>
+ <li>Include the source of the Twitter software 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 the software back to Twitter (though such feedback is encouraged)</li>
+ </ul>
+ </div>
+ </div>
+ <p>The full Bootstrap license is located <a href="https://github.com/twbs/bootstrap/blob/master/README.md">in the project repository</a> for more information.</p>
+ </div><!-- /.bs-docs-section -->
+
+
+
<div class="bs-docs-section" id="customizing">
<div class="page-header">