From ced204c7746e7ead0c9da02edbbd785e08792422 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 23 Jul 2013 20:16:02 -0700 Subject: [PATCH] Clear up license FAQs by using "Bootstrap" as noun instead of "Twitter open source software" --- getting-started.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/getting-started.html b/getting-started.html index d55e9656e5..435865ebf5 100644 --- a/getting-started.html +++ b/getting-started.html @@ -161,20 +161,20 @@ bootstrap/ -

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

+

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.

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
  • +
  • Freely download and use Bootstrap, in whole or in part, for personal, company internal or commercial purposes
  • +
  • Use Bootstrap in packages or distributions that you create

It forbids you to:

    -
  • Redistribute any piece of Twitter open source originated software without proper attribution
  • +
  • Redistribute any piece of Bootstrap 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
@@ -184,15 +184,15 @@ bootstrap/

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
  • +
  • Include a copy of the license in any redistribution you may make that includes Bootstrap
  • +
  • Provide clear attribution to Twitter for any distributions that include Bootstrap

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