From 0181d3c643f68f1f4b95b4eebdb532e0d156843f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 5 Aug 2014 17:19:12 -0700 Subject: move license and translations to about section --- docs/_data/nav.yml | 4 ++-- docs/about/license.md | 32 ++++++++++++++++++++++++++++++++ docs/about/translations.md | 16 ++++++++++++++++ docs/getting-started/license.md | 32 -------------------------------- docs/getting-started/translations.md | 16 ---------------- 5 files changed, 50 insertions(+), 50 deletions(-) create mode 100644 docs/about/license.md create mode 100644 docs/about/translations.md delete mode 100644 docs/getting-started/license.md delete mode 100644 docs/getting-started/translations.md (limited to 'docs') diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml index e9c9c403b..90024c254 100644 --- a/docs/_data/nav.yml +++ b/docs/_data/nav.yml @@ -13,8 +13,6 @@ - title: Support # - title: Third party support - title: Accessibility - - title: License - - title: Translations - title: Layout pages: @@ -114,4 +112,6 @@ - title: History - title: Team - title: Brand + - title: License FAQs + - title: Translations # - title: Credits diff --git a/docs/about/license.md b/docs/about/license.md new file mode 100644 index 000000000..402624163 --- /dev/null +++ b/docs/about/license.md @@ -0,0 +1,32 @@ +--- +layout: page +title: License FAQs +--- + +Bootstrap is released under the MIT license and is copyright {{ site.time | date: "%Y" }} Twitter. Boiled down to smaller chunks, it can be described with the following conditions. + +#### It requires you to: + +* Include the license and copyright notice in your works + +#### It permits you to: + +- Freely download and use Bootstrap, in whole or in part, for personal, private, company internal, or commercial purposes +- Use Bootstrap in packages or distributions that you create +- Modify the source code +- Grant a sublicense to modify and distribute Bootstrap to third parties not included in the license + +#### It forbids you to: + +- Hold the authors and license owners liable for damages as Bootstrap is provided without warranty +- Hold the creators or copyright holders of Bootstrap liable +- 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 + +#### It does not require you to: + +- 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 the Bootstrap project (though such feedback is encouraged) + +The full Bootstrap license is located [in the project repository]({{ site.repo }}/blob/master/LICENSE) for more information. diff --git a/docs/about/translations.md b/docs/about/translations.md new file mode 100644 index 000000000..f15465ca5 --- /dev/null +++ b/docs/about/translations.md @@ -0,0 +1,16 @@ +--- +layout: page +title: Translations +--- + +Community members have translated Bootstrap's documentation into various languages. None are officially supported and they may not always be up to date. + + + +**We don't help organize or host translations, we just link to them.** + +Finished a new or better translation? Open a pull request to add it to our list. diff --git a/docs/getting-started/license.md b/docs/getting-started/license.md deleted file mode 100644 index 402624163..000000000 --- a/docs/getting-started/license.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -layout: page -title: License FAQs ---- - -Bootstrap is released under the MIT license and is copyright {{ site.time | date: "%Y" }} Twitter. Boiled down to smaller chunks, it can be described with the following conditions. - -#### It requires you to: - -* Include the license and copyright notice in your works - -#### It permits you to: - -- Freely download and use Bootstrap, in whole or in part, for personal, private, company internal, or commercial purposes -- Use Bootstrap in packages or distributions that you create -- Modify the source code -- Grant a sublicense to modify and distribute Bootstrap to third parties not included in the license - -#### It forbids you to: - -- Hold the authors and license owners liable for damages as Bootstrap is provided without warranty -- Hold the creators or copyright holders of Bootstrap liable -- 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 - -#### It does not require you to: - -- 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 the Bootstrap project (though such feedback is encouraged) - -The full Bootstrap license is located [in the project repository]({{ site.repo }}/blob/master/LICENSE) for more information. diff --git a/docs/getting-started/translations.md b/docs/getting-started/translations.md deleted file mode 100644 index f15465ca5..000000000 --- a/docs/getting-started/translations.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -layout: page -title: Translations ---- - -Community members have translated Bootstrap's documentation into various languages. None are officially supported and they may not always be up to date. - - - -**We don't help organize or host translations, we just link to them.** - -Finished a new or better translation? Open a pull request to add it to our list. -- cgit v1.2.3