Merge branch '2.1.2-wip' into exploratory

Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache

4 files changed, 37 insertions, 15 deletions

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index e41aa408e..1a91ff387 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -89,14 +89,14 @@
 </pre>
 
           <h3>{{_i}}Bold{{/i}}</h3>
-          <p>{{_i}}For emphasizing a snippet of text with <strong>important</strong>{{/i}}</p>
+          <p>{{_i}}For emphasizing a snippet of text with a heavier font-weight.{{/i}}</p>
           <div class="bs-docs-example">
             <p>The following snippet of text is <strong>rendered as bold text</strong>.</p>
           </div>
           <pre class="prettyprint">&lt;strong&gt;rendered as bold text&lt;/strong&gt;</pre>
 
           <h3>{{_i}}Italics{{/i}}</h3>
-          <p>{{_i}}For emphasizing a snippet of text with <em>stress</em>{{/i}}</p>
+          <p>{{_i}}For emphasizing a snippet of text with italics.{{/i}}</p>
           <div class="bs-docs-example">
             <p>The following snippet of text is <em>rendered as italicized text</em>.</p>
           </div>
@@ -446,7 +446,7 @@
 
 
           <h2>{{_i}}Optional classes{{/i}}</h2>
-          <p>{{_i}}Add any of the follow classes to the <code>.table</code> base class.{{/i}}</p>
+          <p>{{_i}}Add any of the following classes to the <code>.table</code> base class.{{/i}}</p>
 
           <h3><code>{{_i}}.table-striped{{/i}}</code></h3>
           <p>{{_i}}Adds zebra-striping to any table row within the <code>&lt;tbody&gt;</code> via the <code>:nth-child</code> CSS selector (not available in IE8).{{/i}}</p>
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index bfc2e8a3a..5086c5632 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -170,21 +170,21 @@
           </div>
           <p class="lead">{{_i}}Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.{{/i}}</p>
           <div class="row bootstrap-examples">
-            <div class="span3">
+            <div class="span4">
               <a class="thumbnail" href="examples/hero.html">
                 <img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
               </a>
               <h4>{{_i}}Basic marketing site{{/i}}</h4>
               <p>{{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}</p>
             </div>
-            <div class="span3">
+            <div class="span4">
               <a class="thumbnail" href="examples/fluid.html">
                 <img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
               </a>
               <h4>{{_i}}Fluid layout{{/i}}</h4>
               <p>{{_i}}Uses our new responsive, fluid grid system to create a seamless liquid layout.{{/i}}</p>
             </div>
-            <div class="span3">
+            <div class="span4">
               <a class="thumbnail" href="examples/starter-template.html">
                 <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
               </a>
@@ -192,28 +192,39 @@
               <p>{{_i}}A barebones HTML document with all the Bootstrap CSS and JavaScript included.{{/i}}</p>
             </div>
 
-            <div class="span3">
+            <div class="span4">
               <a class="thumbnail" href="examples/marketing-narrow.html">
                 <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt="">
               </a>
               <h4>{{_i}}Narrow marketing{{/i}}</h4>
               <p>{{_i}}Slim, lightweight marketing template for small projects or teams.{{/i}}</p>
             </div>
-            <div class="span3">
+            <div class="span4">
               <a class="thumbnail" href="examples/signin.html">
                 <img src="assets/img/examples/bootstrap-example-signin.png" alt="">
               </a>
               <h4>{{_i}}Sign in{{/i}}</h4>
               <p>{{_i}}Barebones sign in form with custom, larger form controls and a flexible layout.{{/i}}</p>
             </div>
-            <div class="span3">
+            <div class="span4">
+              <a class="thumbnail" href="examples/sticky-footer.html">
+                <img src="assets/img/examples/bootstrap-example-sticky-footer.png" alt="">
+              </a>
+              <h4>{{_i}}Sticky footer{{/i}}</h4>
+              <p>{{_i}}Pin a fixed-height footer to the bottom of the user's viewport.{{/i}}</p>
+            </div>
+
+<!--
+            <div class="span4">
               <a class="thumbnail" href="examples/carousel.html">
                 <img src="assets/img/examples/bootstrap-example-carousel.png" alt="">
               </a>
               <h4>{{_i}}Carousel jumbotron{{/i}}</h4>
               <p>{{_i}}A more interactive riff on the basic marketing site featuring a prominent carousel.{{/i}}</p>
             </div>
+-->
           </div>
+
         </section>
 
 
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 43e9ff410..0b4e8e3f1 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -2,11 +2,22 @@
   <div class="container">
     <h1>{{_i}}Bootstrap{{/i}}</h1>
     <p>{{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}</p>
-    <p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.2']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a></p>
+    <p>
+      <a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.2']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
+    </p>
     <ul class="masthead-links">
-      <li><a href="http://github.com/twitter/bootstrap" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);"{{/production}}>{{_i}}GitHub project{{/i}}</a></li>
-      <li><a href="./extend.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"{{/production}}>{{_i}}Extend{{/i}}</a></li>
-      <li>{{_i}}Version 2.1.2{{/i}}</li>
+      <li>
+        <a href="http://github.com/twitter/bootstrap" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);"{{/production}}>{{_i}}GitHub project{{/i}}</a>
+      </li>
+      <li>
+        <a href="./getting-started.html#examples" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);"{{/production}}>{{_i}}Examples{{/i}}</a>
+      </li>
+      <li>
+        <a href="./extend.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"{{/production}}>{{_i}}Extend{{/i}}</a>
+      </li>
+      <li>
+        {{_i}}Version 2.1.2{{/i}}
+      </li>
     </ul>
   </div>
 </div>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 1afb40872..6b7821f10 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -179,10 +179,10 @@ $('#myModal').on('show', function (e) {
             <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">{{_i}}Launch demo modal{{/i}}</a>
           </div>{{! /example }}
 <pre class="prettyprint linenums">
-&lt;-- Button to trigger modal --&gt;
+&lt!-- Button to trigger modal --&gt;
 &lt;a href="#myModal" role="button" class="btn" data-toggle="modal"&gt;{{_i}}Launch demo modal{{/i}}&lt;/a&gt;
 
-&lt;-- Modal --&gt;
+&lt!-- Modal --&gt;
 &lt;div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"&gt;
   &lt;div class="modal-header"&gt;
     &lt;button type="button" class="close" data-dismiss="modal" aria-hidden="true"&gt;&times;&lt;/button&gt;