From: Mark Otto <markdotto@gmail.com>
Date: Sun, 4 Mar 2018 19:07:31 +0000 (-0800)
Subject: Fix #25746
X-Git-Tag: v4.1.0~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0e1f7dc6e7ebeb54b08c33aaa99028f2dc1dda8;p=thirdparty%2Fbootstrap.git

Fix #25746
---

diff --git a/docs/4.0/migration.md b/docs/4.0/migration.md
index c994086562..52fd7e55c5 100644
--- a/docs/4.0/migration.md
+++ b/docs/4.0/migration.md
@@ -243,8 +243,8 @@ The navbar has been entirely rewritten in flexbox with improved support for alig
 
 ### Labels and badges
 
-- Renamed `.label` to `.badge` to disambiguate from the `<label>` element.
-- Dropped the `.badge` component as it was nearly identical to labels. Use the `.badge-pill` modifier together with the label component instead for that rounded look.
+- Consolidated `.label` and `.badge` to disambiguate from the `<label>` element and simplify related components.
+- Added `.badge-pill` as modifier for rounded "pill" look.
 - Badges are no longer floated automatically in list groups and other components. Utility classes are now required for that.
 - `.badge-default` has been dropped and `.badge-secondary` added to match component modifier classes used elsewhere.