Commit f4b9938d authored by Mark Otto's avatar Mark Otto
Browse files

Move license FAQs to the docs, add link to side nav

parent aa49c919
3 merge requests!8635ignore Gruntfile.js in jekyll,!8656Added rel="stylesheet" to CDN-Examples,!8527Inner properties move 1
Showing with 52 additions and 0 deletions
+52 -0
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
<li> <li>
<a href="#whats-included">What's included</a> <a href="#whats-included">What's included</a>
</li> </li>
<li>
<a href="#browsers">Browser support</a>
</li>
<li> <li>
<a href="#examples">Templates and examples</a> <a href="#examples">Templates and examples</a>
<ul class="nav"> <ul class="nav">
...@@ -15,6 +18,9 @@ ...@@ -15,6 +18,9 @@
<li><a href="#examples-list">List of examples</a></li> <li><a href="#examples-list">List of examples</a></li>
</ul> </ul>
</li> </li>
<li>
<a href="#license-faqs">License FAQs</a>
</li>
<li> <li>
<a href="#customizing">Customizing Bootstrap</a> <a href="#customizing">Customizing Bootstrap</a>
</li> </li>
\ No newline at end of file
...@@ -231,6 +231,52 @@ bootstrap/ ...@@ -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="bs-docs-section" id="customizing">
<div class="page-header"> <div class="page-header">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment