From 83b32524044083c135e3f17ff5ef83bb701a7333 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 18 Dec 2014 22:35:37 -0800 Subject: [PATCH] migration to layout and nav --- docs/_data/nav.yml | 2 ++ docs/_layouts/default.html | 3 +++ docs/migration.md | 6 ++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml index f7910c01ae..336ddbee79 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 efc125494c..4fcda0e039 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -31,6 +31,9 @@ {% elsif page.url contains "about" %}

About

Learn about the project's history, meet the maintaining teams, and find out how to use the Bootstrap brand.

+ {% elsif page.url contains "migration" %} +

Migration

+

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.

{% endif %} {% include ads.html %} diff --git a/docs/migration.md b/docs/migration.md index 4b7c360e6d..3d87399cd9 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.