aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes
diff options
context:
space:
mode:
authorThomas McDonald <[email protected]>2015-08-25 10:00:36 -0700
committerThomas McDonald <[email protected]>2015-08-25 10:00:36 -0700
commit75374ce51109dd91a87d9b01c0a606e1ce1d3266 (patch)
treee8bff7ae248124347f579e30830325ad0a468435 /docs/_includes
parent757e71252f3c45f885403ef2603878ca87ca419b (diff)
parentab4c07dbdd3da49a4722c319015384c0d4649969 (diff)
downloadbootstrap-75374ce51109dd91a87d9b01c0a606e1ce1d3266.tar.xz
bootstrap-75374ce51109dd91a87d9b01c0a606e1ce1d3266.zip
Merge branch 'v4-dev' into fix-travis-v4
Diffstat (limited to 'docs/_includes')
-rw-r--r--docs/_includes/footer.html4
-rw-r--r--docs/_includes/page-headers.html2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 48074e384..f02cd4ba7 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -3,8 +3,8 @@
<ul class="bd-footer-links">
<li><a href="{{ site.repo }}">GitHub</a></li>
<li><a href="https://twitter.com/getbootstrap">Twitter</a></li>
- <li><a href="../getting-started/#examples">Examples</a></li>
- <li><a href="../about/">About</a></li>
+ <li><a href="{{ site.baseurl }}/examples/">Examples</a></li>
+ <li><a href="{{ site.baseurl }}/about/history/">About</a></li>
</ul>
<p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank">@mdo</a> and <a href="https://twitter.com/fat" target="_blank">@fat</a>. Maintained by the <a href="https://github.com/orgs/twbs/people">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
<p>Currently v{{ site.current_version }}. Code licensed <a rel="license" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, docs <a rel="license" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p>
diff --git a/docs/_includes/page-headers.html b/docs/_includes/page-headers.html
index 053241bc5..26f5f95b1 100644
--- a/docs/_includes/page-headers.html
+++ b/docs/_includes/page-headers.html
@@ -16,7 +16,7 @@
{% elsif page.group == "components" %}
<h1>Components</h1>
<p class="lead">
- Over a dozen reusable components built to provide iconography, dropdowns, input groups, navigation, alerts, and much more.
+ Over a dozen reusable components built to provide buttons, dropdowns, input groups, navigation, alerts, and much more.
</p>
{% elsif page.group == "javascript" %}
<h1>JavaScript plugins</h1>