Merge branch '2.2.2-wip' into exploratory

diff --cc docs/base-css.html
index ac99d43b25c1b85ba51f5a0e4929340e947524a0,fa41612d82517e0a9115d45b48636ae0f5ed416d..6a1698aec5736eb1be9e4846f5f6ffa84f53e1cd
--- 1/docs/base-css.html
--- 2/docs/base-css.html
+++ b/docs/base-css.html
@@@ -347,9 -350,9 +347,9 @@@
  </pre>
  
          <h3>Unstyled</h3>
-         <p>Remove default the <code>list-style</code> and left padding on list items (immediate children only).</p>
+         <p>Remove the default <code>list-style</code> and left padding on list items (immediate children only).</p>
          <div class="bs-docs-example">
 -          <ul class="unstyled">
 +          <ul class="list-unstyled">
              <li>Lorem ipsum dolor sit amet</li>
              <li>Consectetur adipiscing elit</li>
              <li>Integer molestie lorem at massa</li>

diff --cc docs/customize.html
Simple merge

diff --cc docs/templates/pages/base-css.mustache
index eeb7a267bd6ba3eaf3e4f854c71f75d15fdb11fc,29c4cebb1e18256f8b96e6b831842cbb4b835a28..449913dc79eb95b1152dd08add09d9c310cb03d9
--- 1/docs/templates/pages/base-css.mustache
--- 2/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@@ -287,9 -287,9 +287,9 @@@
  </pre>
  
          <h3>{{_i}}Unstyled{{/i}}</h3>
-         <p>{{_i}}Remove default the <code>list-style</code> and left padding on list items (immediate children only).{{/i}}</p>
+         <p>{{_i}}Remove the default <code>list-style</code> and left padding on list items (immediate children only).{{/i}}</p>
          <div class="bs-docs-example">
 -          <ul class="unstyled">
 +          <ul class="list-unstyled">
              <li>Lorem ipsum dolor sit amet</li>
              <li>Consectetur adipiscing elit</li>
              <li>Integer molestie lorem at massa</li>

diff --cc docs/templates/pages/customize.mustache
Simple merge