diff options
| author | Jacob Thornton <[email protected]> | 2013-07-23 22:59:33 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-07-23 22:59:33 -0700 |
| commit | 3cfa1c8a30beb081167105b7ea006e9089e566f5 (patch) | |
| tree | 9a15de39e176d18912ad198151f67572273e11f5 /getting-started.html | |
| parent | 6841c5096888b9a1f8b4b9453adac23cee3788d9 (diff) | |
| parent | 1d1bd62598f309eeffb9fa4e277e02b633520a7f (diff) | |
| download | bootstrap-3cfa1c8a30beb081167105b7ea006e9089e566f5.tar.xz bootstrap-3cfa1c8a30beb081167105b7ea006e9089e566f5.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
dist/js/bootstrap.min.js
Diffstat (limited to 'getting-started.html')
| -rw-r--r-- | getting-started.html | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/getting-started.html b/getting-started.html index d55e9656e..435865ebf 100644 --- a/getting-started.html +++ b/getting-started.html @@ -161,20 +161,20 @@ bootstrap/ <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> + <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 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> + <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 Twitter open source originated software without proper attribution</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> @@ -184,15 +184,15 @@ bootstrap/ <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> + <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 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> + <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 Twitter (though such feedback is encouraged)</li> </ul> </div> </div> |