From: Mark Otto <otto@github.com>
Date: Fri, 9 Nov 2012 18:09:04 +0000 (-0800)
Subject: Merge branch '2.2.2-wip' into exploratory
X-Git-Tag: v3.0.0-rc1~886
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a4ce9ba1872c06fe3107fd1330070d08706ec1c;p=thirdparty%2Fbootstrap.git

Merge branch '2.2.2-wip' into exploratory
---

1a4ce9ba1872c06fe3107fd1330070d08706ec1c
diff --cc docs/base-css.html
index ac99d43b25,fa41612d82..6a1698aec5
--- a/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/templates/pages/base-css.mustache
index eeb7a267bd,29c4cebb1e..449913dc79
--- a/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>