aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-12-18 22:35:37 -0800
committerMark Otto <[email protected]>2014-12-18 22:35:37 -0800
commit83b32524044083c135e3f17ff5ef83bb701a7333 (patch)
treea5bc365cfb95082f8a28632a95bbf7e918a2dc27 /docs
parent94753bc3ec6568f684b2e329244e3190285186f4 (diff)
downloadbootstrap-83b32524044083c135e3f17ff5ef83bb701a7333.tar.xz
bootstrap-83b32524044083c135e3f17ff5ef83bb701a7333.zip
migration to layout and nav
Diffstat (limited to 'docs')
-rw-r--r--docs/_data/nav.yml2
-rw-r--r--docs/_layouts/default.html3
-rw-r--r--docs/migration.md6
3 files changed, 7 insertions, 4 deletions
diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml
index f7910c01a..336ddbee7 100644
--- a/docs/_data/nav.yml
+++ b/docs/_data/nav.yml
@@ -151,3 +151,5 @@
- title: License
- title: Translations
# - title: Credits
+
+- title: Migration
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index efc125494..4fcda0e03 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -31,6 +31,9 @@
{% elsif page.url contains "about" %}
<h1>About</h1>
<p class="lead">Learn about the project's history, meet the maintaining teams, and find out how to use the Bootstrap brand.</p>
+ {% elsif page.url contains "migration" %}
+ <h1>Migration</h1>
+ <p class="lead">Bootstrap 4 is not backwards compatible with v3.x.x. Use this section as a general guide to upgrading from v3.x.x to v4.0.0.</p>
{% endif %}
{% include ads.html %}
diff --git a/docs/migration.md b/docs/migration.md
index 4b7c360e6..3d87399cd 100644
--- a/docs/migration.md
+++ b/docs/migration.md
@@ -3,11 +3,9 @@ layout: page
title: Migrating to v4.x.x
---
-## Migrating from 3.x.x to 4.0.0
+## Summary
-Bootstrap 4 is not backwards compatible with v3.x.x. Use this section as a general guide to upgrading from v3.x.x to v4.0.0. For a broader overview, see [what's new](http://blog.getbootstrap.com/DEAD-LINK-FIX-ME-PLEASE) in the v4.0.0 release announcement.
-
-## At a glance
+For a broader overview, see [what's new](http://blog.getbootstrap.com/DEAD-LINK-FIX-ME-PLEASE) in the v4.0.0 release announcement.
- Dropped IE8 support—v4 is now only IE9+. For sites needing IE8, use v3.
- Switched from `px` to `rem` as our primary unit in CSS.