From: Chris Rebert <code@chrisrebert.com>
Date: Sun, 4 Oct 2015 18:10:01 +0000 (-0700)
Subject: Add Glyphicons migration guidance
X-Git-Tag: v4.0.0-alpha.2~266^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b4925f0d8f0e3046d0f9e5264c6fdf3157f4f95;p=thirdparty%2Fbootstrap.git

Add Glyphicons migration guidance

[skip sauce]
---

diff --git a/docs/migration.md b/docs/migration.md
index aa9aa114a1..a2f7b8e502 100644
--- a/docs/migration.md
+++ b/docs/migration.md
@@ -31,7 +31,10 @@ Here are the big ticket items you'll want to be aware of when moving from v3 to
 ### Components
 
 - Dropped panels, thumbnails, and wells for a new all-encompassing component, cards.
-- Dropped the Glyphicons icon font.
+- Dropped the Glyphicons icon font. If you need icons, some options are:
+  - the upstream version of [Glyphicons](http://glyphicons.com/)
+  - [Octicons](https://octicons.github.com/)
+  - [Font Awesome](https://fortawesome.github.io/Font-Awesome/)
 - Dropped the Affix jQuery plugin. We recommend using a `position: sticky` polyfill instead. [See the HTML5 Please entry](http://html5please.com/#sticky) for details and specific polyfill recommendations.
 - Refactored nearly all components to use more unnested classes instead of children selectors.