Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
	docs/templates/pages/index.mustache

diff --cc docs/index.html
index 25e76cb5453776e0a2ee4da46e26dcbfefbbf8be,d0c0bcae602bf6320dfa21e4b1a9fe16b7f549fb..0beff1e7e26ee693126ec85578fe8d7cacfd6854
--- 1/docs/index.html
--- 2/docs/index.html
+++ b/docs/index.html
@@@ -74,13 -74,13 +74,13 @@@
              <div class="benefits">
                <h4>Feature highlights</h4>
                <ul>
 -                <li><span>&times;</span> Built on LESS</li>
 -                <li><span>&times;</span> Complete styleguide docs</li>
 -                <li><span>&times;</span> Fully responsive design</li>
 -                <li><span>&times;</span> Small footprint (7kb gzipped)</li>
 -                <li><span>&times;</span> Support for IE7 and up</li>
 -                <li><span>&times;</span> Custom jQuery plugins</li>
 -                <li><span>&times;</span> Dozens of components</li>
 +                <li><span>&#10004;</span> Built on LESS</li>
 +                <li><span>&#10004;</span> Complete style guide docs</li>
 +                <li><span>&#10004;</span> Fully responsive design</li>
-                 <li><span>&#10004;</span> Small CSS footprint (10kb gzipped)</li>
++                <li><span>&#10004;</span> Small footprint (10kb gzipped)</li>
 +                <li><span>&#10004;</span> Support for IE7 and up</li>
 +                <li><span>&#10004;</span> Custom jQuery plugins</li>
 +                <li><span>&#10004;</span> Dozens of components</li>
                </ul>
              </div>
            </div>
@@@ -217,33 -217,33 +217,32 @@@
            ================================================== -->
            <h1>Get started in no time.</h1>
            <p class="marketing-byline">Quickly start using Bootstrap within your workflow and development process.</p>
- 
 -          <table class="table table-bordered getting-started">
 -            <tbody>
 -              <tr>
 -                <td class="quick-start">
 -                  <h3>Hotlink the CSS</h3>
 -                  <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
 -                  <form>
 -                    <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
 -                  </form>
 -                </td>
 -                <td class="quick-start">
 -                  <h3>Use it with LESS</h3>
 -                  <p>A fan of using LESS? No problem, just clone the repo and add these lines:</p>
 -                  <form>
 -                    <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
 -      &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
 -                  </form>
 -                </td>
 -                <td class="quick-start">
 -                  <h3>Fork on GitHub</h3>
 -                  <p>Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.</p>
 -                  <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
 -                  <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
 -                </td>
 -              </tr>
 -            </tbody>
 -          </table>
 +          <div class="getting-started">
 +            <div class="row">
 +              <div class="span4">
 +                <h3>Hotlink the CSS</h3>
 +                <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
 +                <form>
 +                  <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
 +                </form>
 +              </div> 
 +              <div class="span4">
-                 <h3>Use it with LESS.js</h3>
++                <h3>Use it with LESS</h3>
 +                <p>A fan of using LESS? No problem, just download the repo and add these lines to your page:</p>
 +                <form>
 +                  <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
 +    &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
 +                </form>
 +              </div> 
 +              <div class="span4">
 +                <h3>Fork on GitHub</h3>
 +                <p>Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.</p>
 +                <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
 +                <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
 +              </div> 
 +            </div><!-- /row -->
 +          </div><!-- /getting-started -->
 +
          </div><!-- /.marketing -->
        </div><!-- /#overview -->
       <!-- Footer

diff --cc docs/templates/pages/index.mustache
index dc99d2c83e4a3262e16863043f7f47f7d1a65f32,1e77d4a25a9471d3cf1143e802c7cdf870e1ef9b..7616de4f1152a8c0c93e979e4790612b79c36565
--- 1/docs/templates/pages/index.mustache
--- 2/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@@ -12,15 -12,15 +12,15 @@@
              </p>
  
              <div class="benefits">
-               <h4>Feature highlights</h4>
+               <h4>{{_i}}Feature highlights{{/i}}</h4>
                <ul>
-                 <li><span>&#10004;</span> Built on LESS</li>
-                 <li><span>&#10004;</span> Complete style guide docs</li>
-                 <li><span>&#10004;</span> Fully responsive design</li>
-                 <li><span>&#10004;</span> Small CSS footprint (10kb gzipped)</li>
-                 <li><span>&#10004;</span> Support for IE7 and up</li>
-                 <li><span>&#10004;</span> Custom jQuery plugins</li>
-                 <li><span>&#10004;</span> Dozens of components</li>
 -                <li>{{_i}}<span>&times;</span> Built on LESS{{/i}}</li>
 -                <li>{{_i}}<span>&times;</span> Complete styleguide docs{{/i}}</li>
 -                <li>{{_i}}<span>&times;</span> Fully responsive design{{/i}}</li>
 -                <li>{{_i}}<span>&times;</span> Small footprint (7kb gzipped){{/i}}</li>
 -                <li>{{_i}}<span>&times;</span> Support for IE7 and up{{/i}}</li>
 -                <li>{{_i}}<span>&times;</span> Custom jQuery plugins{{/i}}</li>
 -                <li>{{_i}}<span>&times;</span> Dozens of components{{/i}}</li>
++                <li>{{_i}}<span>&#10004;</span> Built on LESS{{/i}}</li>
++                <li>{{_i}}<span>&#10004;</span> Complete style guide docs{{/i}}</li>
++                <li>{{_i}}<span>&#10004;</span> Fully responsive design{{/i}}</li>
++                <li>{{_i}}<span>&#10004;</span> Small footprint (10kb gzipped){{/i}}</li>
++                <li>{{_i}}<span>&#10004;</span> Support for IE7 and up{{/i}}</li>
++                <li>{{_i}}<span>&#10004;</span> Custom jQuery plugins{{/i}}</li>
++                <li>{{_i}}<span>&#10004;</span> Dozens of components{{/i}}</li>
                </ul>
              </div>
            </div>
@@@ -155,34 -155,34 +155,33 @@@
  
            <!-- Quickstart options
            ================================================== -->
-           <h1>Get started in no time.</h1>
-           <p class="marketing-byline">Quickly start using Bootstrap within your workflow and development process.</p>
- 
+           <h1>{{_i}}Get started in no time.{{/i}}</h1>
+           <p class="marketing-byline">{{_i}}Quickly start using Bootstrap within your workflow and development process.{{/i}}</p>
 -          <table class="table table-bordered getting-started">
 -            <tbody>
 -              <tr>
 -                <td class="quick-start">
 -                  <h3>{{_i}}Hotlink the CSS{{/i}}</h3>
 -                  <p>{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}</p>
 -                  <form>
 -                    <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
 -                  </form>
 -                </td>
 -                <td class="quick-start">
 -                  <h3>{{_i}}Use it with LESS{{/i}}</h3>
 -                  <p>{{_i}}A fan of using LESS? No problem, just clone the repo and add these lines:{{/i}}</p>
 -                  <form>
 -                    <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
 -      &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
 -                  </form>
 -                </td>
 -                <td class="quick-start">
 -                  <h3>{{_i}}Fork on GitHub{{/i}}</h3>
 -                  <p>{{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}</p>
 -                  <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">{{_i}}Bootstrap on GitHub &raquo;{{/i}}</a></p>
 -                  <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
 -                </td>
 -              </tr>
 -            </tbody>
 -          </table>
 +          <div class="getting-started">
 +            <div class="row">
 +              <div class="span4">
-                 <h3>Hotlink the CSS</h3>
-                 <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
++                <h3>{{_i}}Hotlink the CSS{{/i}}</h3>
++                <p>{{_i}}For the quickest and easiest start, just copy this snippet into your webpage.{{/i}}</p>
 +                <form>
 +                  <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
 +                </form>
 +              </div> 
 +              <div class="span4">
-                 <h3>Use it with LESS.js</h3>
-                 <p>A fan of using LESS? No problem, just download the repo and add these lines to your page:</p>
++                <h3>{{_i}}Use it with LESS{{/i}}</h3>
++                <p>{{_i}}A fan of using LESS? No problem, just download the repo and add these lines to your page:{{/i}}</p>
 +                <form>
 +                  <textarea class="copy-code" rows="2">&lt;link rel="stylesheet/less" href="/path/to/bootstrap.less"&gt;
 +    &lt;script src="/path/to/less.js"&gt;&lt;/script&gt;</textarea>
 +                </form>
 +              </div> 
 +              <div class="span4">
-                 <h3>Fork on GitHub</h3>
-                 <p>Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.</p>
-                 <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
-                 <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
++                <h3>{{_i}}Fork on GitHub{{/i}}</h3>
++                <p>{{_i}}Download, fork, pull, file issues, and more with the Bootstrap GitHub repo.{{/i}}</p>
++                <p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">{{_i}}Bootstrap on GitHub &raquo;{{/i}}</a></p>
++                <p class="current-version">{{_i}}Currently{{/i}} <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
 +              </div> 
 +            </div><!-- /row -->
 +          </div><!-- /getting-started -->
 +
          </div><!-- /.marketing -->
        </div><!-- /#overview -->