From f4b9938d8c0c23ff3b1b5e1e8fee9229d2e67bfa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 17 Jul 2013 19:20:08 -0700 Subject: [PATCH] Move license FAQs to the docs, add link to side nav --- docs/_includes/nav-getting-started.html | 6 ++++ docs/getting-started.html | 46 +++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/docs/_includes/nav-getting-started.html b/docs/_includes/nav-getting-started.html index fd6f8c98b0..bde8bf4045 100644 --- a/docs/_includes/nav-getting-started.html +++ b/docs/_includes/nav-getting-started.html @@ -8,6 +8,9 @@
  • What's included
    • +
  • + Browser support +
  • Templates and examples
    • +
  • + License FAQs +
  • Customizing Bootstrap
    • \ No newline at end of file diff --git a/docs/getting-started.html b/docs/getting-started.html index f951cfc785..4ff2a9d88f 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -231,6 +231,52 @@ bootstrap/ + +
    +
    +

    License FAQs

    +
    +

    Bootstrap is released under the Apache 2 license. Boiled down to smaller chunks, it can be described with the following conditions.

    + +
    +
    +

    It allows you to:

    +
      +
    • Freely download and use Twitter open source software, in whole or in part, for personal, company internal or commercial purposes
      • +
    • Use Twitter open source software in packages or distributions that you create
      • +
    +
    +
    +

    It forbids you to:

    +
      +
    • Redistribute any piece of Twitter open source originated software without proper attribution
      • +
    • Use any marks owned by Twitter in any way that might state or imply that Twitter endorses your distribution
      • +
    • Use any marks owned by Twitter in any way that might state or imply that you created the Twitter software in question
      • +
    +
    +
    +
    +
    +

    It requires you to:

    +
      +
    • Include a copy of the license in any redistribution you may make that includes Twitter software
      • +
    • Provide clear attribution to Twitter for any distributions that include Twitter open source software
      • +
    +
    +
    +

    It does not require you to:

    +
      +
    • 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
      • +
    • Submit changes that you make to the software back to Twitter (though such feedback is encouraged)
      • +
    +
    +
    +

    The full Bootstrap license is located in the project repository for more information.

    +
    + + +