diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2016-10-20 14:25:00 -0400 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2016-10-20 14:25:00 -0400 |
| commit | 9ee304b973a5675a7a59406fdaeef20870f566ce (patch) | |
| tree | 8820ad86b8cd5899ea1d2c9050881b4ff56c8fee /docs/about | |
| parent | 27cf3d675c80029ff2cea1e14903886c00119e37 (diff) | |
| parent | b5890e0608ad2262cde4a38e90afa19f1cb5d852 (diff) | |
| download | bootstrap-9ee304b973a5675a7a59406fdaeef20870f566ce.tar.xz bootstrap-9ee304b973a5675a7a59406fdaeef20870f566ce.zip | |
Merge branch 'twbs/v4-dev' into v4-dev
Diffstat (limited to 'docs/about')
| -rw-r--r-- | docs/about/brand.md | 3 | ||||
| -rw-r--r-- | docs/about/history.md | 1 | ||||
| -rw-r--r-- | docs/about/license.md | 1 | ||||
| -rw-r--r-- | docs/about/team.md | 1 | ||||
| -rw-r--r-- | docs/about/translations.md | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/docs/about/brand.md b/docs/about/brand.md index fcb8804ae..3687bdceb 100644 --- a/docs/about/brand.md +++ b/docs/about/brand.md @@ -1,10 +1,11 @@ --- layout: docs title: Brand guidelines +description: Documentation and examples for Bootstrap's logo and brand usage guidelines. group: about --- -Have a need for Bootstrap's brand resources? Great! We have only a few guidelines we follow, and in turn ask you to follow as well. These guidelines were inspired by MailChimp's [Brand Assets](http://mailchimp.com/about/brand-assets/). +Have a need for Bootstrap's brand resources? Great! We have only a few guidelines we follow, and in turn ask you to follow as well. These guidelines were inspired by MailChimp's [Brand Assets](https://mailchimp.com/about/brand-assets/). ## Mark and logo diff --git a/docs/about/history.md b/docs/about/history.md index ae4764ee7..590a99c35 100644 --- a/docs/about/history.md +++ b/docs/about/history.md @@ -1,6 +1,7 @@ --- layout: docs title: History +description: A brief overview of the history of Bootstrap. group: about redirect_from: "/about/" --- diff --git a/docs/about/license.md b/docs/about/license.md index 997b1c9ef..d614731bf 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -1,6 +1,7 @@ --- layout: docs title: License FAQs +description: Commonly asked questions about Bootstrap's open source license. group: about --- diff --git a/docs/about/team.md b/docs/about/team.md index 2492471cf..aa575f8f2 100644 --- a/docs/about/team.md +++ b/docs/about/team.md @@ -1,6 +1,7 @@ --- layout: docs title: Team +description: An overview of the founding team and core contributors to Bootstrap. group: about --- diff --git a/docs/about/translations.md b/docs/about/translations.md index de6519bb3..576259d35 100644 --- a/docs/about/translations.md +++ b/docs/about/translations.md @@ -1,6 +1,7 @@ --- layout: docs title: Translations +description: Links to community-translated Bootstrap documentation sites. group: about --- |