From de53f62a0464f92fe0c175478dc38696eebbda99 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 4 Jun 2012 23:57:48 -0700
Subject: [PATCH] more changes to js and components, playing with new docs
 subnav

---
 docs/assets/css/docs.css                  |  10 +-
 docs/components.html                      | 937 ++++++++++------------
 docs/javascript.html                      | 176 ++--
 docs/scaffolding.html                     |  17 +-
 docs/templates/pages/components.mustache  | 937 ++++++++++------------
 docs/templates/pages/javascript.mustache  | 172 ++--
 docs/templates/pages/scaffolding.mustache |  17 +-
 7 files changed, 1079 insertions(+), 1187 deletions(-)

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 9fdfec0dcf..dcf65ad981 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -11,12 +11,18 @@
 body {
   position: relative;
   padding-top: 90px;
+  font-size: 14px;
   background-color: #fff;
   background-image: url(../img/grid-18px-masked.png);
   background-repeat: repeat-x;
   background-position: 0 40px;
 }
 
+body,
+li {
+  line-height: 20px;
+}
+
 .bs-docs-container {
   max-width: 780px;
   margin: 0 auto;
@@ -24,6 +30,9 @@ body {
 
 /* Tweak navbar brand link to be super sleek
 -------------------------------------------------- */
+.navbar {
+  font-size: 13px;
+}
 .navbar-fixed-top .brand {
   padding-right: 0;
   padding-left: 0;
@@ -603,7 +612,6 @@ form.well {
 .bs-docs-example > p {
   font-size: 13px;
   line-height: 18px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 .bs-docs-example p:last-child {
   margin-bottom: 0;
diff --git a/docs/components.html b/docs/components.html
index 281cea9647..72b86200f8 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -908,13 +908,12 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </a>
-        <a class="brand" href="#">Project name</a>
+        <a class="brand" href="#">Title</a>
         <div class="nav-collapse">
           <ul class="nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#">Link</a></li>
             <li><a href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
               <ul class="dropdown-menu">
@@ -950,10 +949,9 @@
     </div><!-- /navbar-inner -->
   </div><!-- /navbar -->
 
-  <div class="row">
-    <div class="span8">
-      <h3>Navbar scaffolding</h3>
-      <p>The navbar requires only a few divs to structure it well for static or fixed display.</p>
+
+  <h3>Navbar scaffolding</h3>
+  <p>The navbar requires only a few divs to structure it well for static or fixed display.</p>
 <pre class="prettyprint linenums">
 &lt;div class="navbar"&gt;
   &lt;div class="navbar-inner"&gt;
@@ -963,47 +961,42 @@
   &lt;/div&gt;
 &lt;/div&gt;
 </pre>
-      <h3>Fixed navbar</h3>
-      <p>Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, <code>.navbar</code>.</p>
-      <div class="row">
-        <div class="span4">
+  <h3>Fixed navbar</h3>
+  <p>Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, <code>.navbar</code>.</p>
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-fixed-top"&gt;
   ...
 &lt;/div&gt;
 </pre>
-        </div><!--/span-->
-        <div class="span4">
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-fixed-bottom"&gt;
   ...
 &lt;/div&gt;
 </pre>
-        </div><!--/span-->
-      </div><!--/row-->
-      <p>When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p>
-      <h3>Brand name</h3>
-      <p>A simple link to show your brand or project name only requires an anchor tag.</p>
+
+  <p>When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p>
+  <h3>Brand name</h3>
+  <p>A simple link to show your brand or project name only requires an anchor tag.</p>
 <pre class="prettyprint linenums">
 &lt;a class="brand" href="#"&gt;
   Project name
 &lt;/a&gt;
 </pre>
-      <h3>Forms in navbar</h3>
-      <p>To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.</p>
+  <h3>Forms in navbar</h3>
+  <p>To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.</p>
 <pre class="prettyprint linenums">
 &lt;form class="navbar-form pull-left"&gt;
   &lt;input type="text" class="span2"&gt;
 &lt;/form&gt;
 </pre>
-      <p>For a more customized search form, add <code>.navbar-search</code> to the <code>form</code> and <code>.search-query</code> to the input for specialized styles in the navbar.</p>
+  <p>For a more customized search form, add <code>.navbar-search</code> to the <code>form</code> and <code>.search-query</code> to the input for specialized styles in the navbar.</p>
 <pre class="prettyprint linenums">
 &lt;form class="navbar-search pull-left"&gt;
   &lt;input type="text" class="search-query" placeholder="Search"&gt;
 &lt;/form&gt;
 </pre>
-      <h3>Optional responsive variation</h3>
-      <p>Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.</p>
+  <h3>Optional responsive variation</h3>
+  <p>Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.</p>
 <pre class="prettyprint linenums">
 &lt;div class="navbar"&gt;
   &lt;div class="navbar-inner"&gt;
@@ -1028,14 +1021,12 @@
   &lt;/div&gt;
 &lt;/div&gt;
 </pre>
-      <div class="alert alert-info">
-        <strong>Heads up!</strong> The responsive navbar requires the <a href="./javascript.html#collapse">collapse plugin</a> and <a href="./scaffolding.html#responsive">responsive Bootstrap CSS file</a>.
-      </div>
+  <div class="alert alert-info">
+    <strong>Heads up!</strong> The responsive navbar requires the <a href="./javascript.html#collapse">collapse plugin</a> and <a href="./scaffolding.html#responsive">responsive Bootstrap CSS file</a>.
+  </div>
 
-    </div><!-- /.span -->
-    <div class="span4">
-      <h3>Nav links</h3>
-      <p>Nav items are simple to add via unordered lists.</p>
+  <h3>Nav links</h3>
+  <p>Nav items are simple to add via unordered lists.</p>
 <pre class="prettyprint linenums">
 &lt;ul class="nav"&gt;
   &lt;li class="active"&gt;
@@ -1045,7 +1036,7 @@
   &lt;li&gt;&lt;a href="#"&gt;Link&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-      <p>You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:</p>
+  <p>You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:</p>
 <pre class="prettyprint linenums">
 &lt;ul class="nav"&gt;
   ...
@@ -1053,10 +1044,10 @@
   ...
 &lt;/ul&gt;
 </pre>
-      <h3>Component alignment</h3>
-      <p>To align a nav, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.</p>
-      <h3>Adding dropdown menus</h3>
-      <p>Adding dropdowns and dropups to the nav is super simple, but does require the use of <a href="./javascript.html#dropdowns">our javascript plugin</a>.</p>
+  <h3>Component alignment</h3>
+  <p>To align a nav, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.</p>
+  <h3>Adding dropdown menus</h3>
+  <p>Adding dropdowns and dropups to the nav is super simple, but does require the use of <a href="./javascript.html#dropdowns">our javascript plugin</a>.</p>
 <pre class="prettyprint linenums">
 &lt;ul class="nav"&gt;
   &lt;li class="dropdown"&gt;
@@ -1072,12 +1063,10 @@
   &lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-      <p><a class="btn" href="./javascript.html#dropdowns">Get the javascript &rarr;</a></p>
-      <hr>
-      <h3>Text in the navbar</h3>
-      <p>Wrap strings of text in a <code>&lt;.navbar-text&gt;</code>, usually on a <code>&lt;p&gt;</code> tag for proper leading and color.</p>
-    </div><!-- /.span -->
-  </div><!-- /.row -->
+  <p><a class="btn" href="./javascript.html#dropdowns">Get the javascript &rarr;</a></p>
+  <hr>
+  <h3>Text in the navbar</h3>
+  <p>Wrap strings of text in a <code>&lt;.navbar-text&gt;</code>, usually on a <code>&lt;p&gt;</code> tag for proper leading and color.</p>
 
 </section>
 
@@ -1090,29 +1079,26 @@
     <h1>Breadcrumbs <small></small></h1>
   </div>
 
-  <div class="row">
-    <div class="span6">
-      <h3>Why use them</h3>
-      <p>Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation. Keep their use sparse and succinct to be most effective.</p>
+  <h3>Why use them</h3>
+  <p>Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation. Keep their use sparse and succinct to be most effective.</p>
 
-      <h3>Examples</h3>
-      <p>A single example shown as it might be displayed across multiple pages.</p>
-      <ul class="breadcrumb">
-        <li class="active">Home</li>
-      </ul>
-      <ul class="breadcrumb">
-        <li><a href="#">Home</a> <span class="divider">/</span></li>
-        <li class="active">Library</li>
-      </ul>
-      <ul class="breadcrumb">
-        <li><a href="#">Home</a> <span class="divider">/</span></li>
-        <li><a href="#">Library</a> <span class="divider">/</span></li>
-        <li class="active">Data</li>
-      </ul>
-    </div>
-    <div class="span6">
-      <h3>Markup</h3>
-      <p>HTML is your standard unordered list with links.</p>
+  <h3>Examples</h3>
+  <p>A single example shown as it might be displayed across multiple pages.</p>
+  <ul class="breadcrumb">
+    <li class="active">Home</li>
+  </ul>
+  <ul class="breadcrumb">
+    <li><a href="#">Home</a> <span class="divider">/</span></li>
+    <li class="active">Library</li>
+  </ul>
+  <ul class="breadcrumb">
+    <li><a href="#">Home</a> <span class="divider">/</span></li>
+    <li><a href="#">Library</a> <span class="divider">/</span></li>
+    <li class="active">Data</li>
+  </ul>
+
+  <h3>Markup</h3>
+  <p>HTML is your standard unordered list with links.</p>
 <pre class="prettyprint linenums">
 &lt;ul class="breadcrumb"&gt;
   &lt;li&gt;
@@ -1124,8 +1110,6 @@
   &lt;li class="active"&gt;Data&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-    </div>
-  </div>
 
 </section>
 
@@ -1139,59 +1123,56 @@
   </div>
 
   <h2>Multicon-page pagination</h2>
-  <div class="row">
-    <div class="span4">
-      <h3>When to use</h3>
-      <p>Ultra simplistic and minimally styled pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.</p>
-      <h3>Stateful page links</h3>
-      <p>Links are customizable and work in a number of circumstances with the right class. <code>.disabled</code> for unclickable links and <code>.active</code> for current page.</p>
-      <h3>Flexible alignment</h3>
-      <p>Add either of two optional classes to change the alignment of pagination links: <code>.pagination-centered</code> and <code>.pagination-right</code>.</p>
-    </div>
-    <div class="span4">
-      <h3>Examples</h3>
-      <p>The default pagination component is flexible and works in a number of variations.</p>
-      <div class="pagination">
-        <ul>
-          <li class="disabled"><a href="#">&laquo;</a></li>
-          <li class="active"><a href="#">1</a></li>
-          <li><a href="#">2</a></li>
-          <li><a href="#">3</a></li>
-          <li><a href="#">4</a></li>
-          <li><a href="#">&raquo;</a></li>
-        </ul>
-      </div>
-      <div class="pagination">
-        <ul>
-          <li><a href="#">&laquo;</a></li>
-          <li><a href="#">10</a></li>
-          <li class="active"><a href="#">11</a></li>
-          <li><a href="#">12</a></li>
-          <li><a href="#">&raquo;</a></li>
-        </ul>
-      </div>
-      <div class="pagination">
-        <ul>
-          <li><a href="#">&laquo;</a></li>
-          <li class="active"><a href="#">10</a></li>
-          <li class="disabled"><a href="#">...</a></li>
-          <li><a href="#">20</a></li>
-          <li><a href="#">&raquo;</a></li>
-        </ul>
-      </div>
-      <div class="pagination pagination-centered">
-        <ul>
-          <li class="active"><a href="#">1</a></li>
-          <li><a href="#">2</a></li>
-          <li><a href="#">3</a></li>
-          <li><a href="#">4</a></li>
-          <li><a href="#">5</a></li>
-        </ul>
-      </div>
-    </div>
-    <div class="span4">
-      <h3>Markup</h3>
-      <p>Wrapped in a <code>&lt;div&gt;</code>, pagination is just a <code>&lt;ul&gt;</code>.</p>
+
+  <h3>When to use</h3>
+  <p>Ultra simplistic and minimally styled pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.</p>
+  <h3>Stateful page links</h3>
+  <p>Links are customizable and work in a number of circumstances with the right class. <code>.disabled</code> for unclickable links and <code>.active</code> for current page.</p>
+  <h3>Flexible alignment</h3>
+  <p>Add either of two optional classes to change the alignment of pagination links: <code>.pagination-centered</code> and <code>.pagination-right</code>.</p>
+
+  <h3>Examples</h3>
+  <p>The default pagination component is flexible and works in a number of variations.</p>
+  <div class="pagination">
+    <ul>
+      <li class="disabled"><a href="#">&laquo;</a></li>
+      <li class="active"><a href="#">1</a></li>
+      <li><a href="#">2</a></li>
+      <li><a href="#">3</a></li>
+      <li><a href="#">4</a></li>
+      <li><a href="#">&raquo;</a></li>
+    </ul>
+  </div>
+  <div class="pagination">
+    <ul>
+      <li><a href="#">&laquo;</a></li>
+      <li><a href="#">10</a></li>
+      <li class="active"><a href="#">11</a></li>
+      <li><a href="#">12</a></li>
+      <li><a href="#">&raquo;</a></li>
+    </ul>
+  </div>
+  <div class="pagination">
+    <ul>
+      <li><a href="#">&laquo;</a></li>
+      <li class="active"><a href="#">10</a></li>
+      <li class="disabled"><a href="#">...</a></li>
+      <li><a href="#">20</a></li>
+      <li><a href="#">&raquo;</a></li>
+    </ul>
+  </div>
+  <div class="pagination pagination-centered">
+    <ul>
+      <li class="active"><a href="#">1</a></li>
+      <li><a href="#">2</a></li>
+      <li><a href="#">3</a></li>
+      <li><a href="#">4</a></li>
+      <li><a href="#">5</a></li>
+    </ul>
+  </div>
+
+  <h3>Markup</h3>
+  <p>Wrapped in a <code>&lt;div&gt;</code>, pagination is just a <code>&lt;ul&gt;</code>.</p>
 <pre class="prettyprint linenums">
 &lt;div class="pagination"&gt;
   &lt;ul&gt;
@@ -1206,24 +1187,20 @@
   &lt;/ul&gt;
 &lt;/div&gt;
 </pre>
-    </div>
-  </div><!-- /row -->
 
   <h2>Pager <small>For quick previous and next links</small></h2>
-  <div class="row">
-    <div class="span4">
-      <h3>About pager</h3>
-      <p>The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.</p>
-      <h4>Optional disabled state</h4>
-      <p>Pager links also use the general <code>.disabled</code> class from the pagination.</p>
-    </div>
-    <div class="span4">
-      <h3>Default example</h3>
-      <p>By default, the pager centers links.</p>
-      <ul class="pager">
-        <li><a href="#">Previous</a></li>
-        <li><a href="#">Next</a></li>
-      </ul>
+
+  <h3>About pager</h3>
+  <p>The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.</p>
+  <h4>Optional disabled state</h4>
+  <p>Pager links also use the general <code>.disabled</code> class from the pagination.</p>
+
+  <h3>Default example</h3>
+  <p>By default, the pager centers links.</p>
+  <ul class="pager">
+    <li><a href="#">Previous</a></li>
+    <li><a href="#">Next</a></li>
+  </ul>
 <pre class="prettyprint linenums">
 &lt;ul class="pager"&gt;
   &lt;li&gt;
@@ -1234,14 +1211,13 @@
   &lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-    </div>
-    <div class="span4">
-      <h3>Aligned links</h3>
-      <p>Alternatively, you can align each link to the sides:</p>
-      <ul class="pager">
-        <li class="previous"><a href="#">&larr; Older</a></li>
-        <li class="next"><a href="#">Newer &rarr;</a></li>
-      </ul>
+
+  <h3>Aligned links</h3>
+  <p>Alternatively, you can align each link to the sides:</p>
+  <ul class="pager">
+    <li class="previous"><a href="#">&larr; Older</a></li>
+    <li class="next"><a href="#">Newer &rarr;</a></li>
+  </ul>
 <pre class="prettyprint linenums">
 &lt;ul class="pager"&gt;
   &lt;li class="previous"&gt;
@@ -1252,8 +1228,7 @@
   &lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-    </div>
-  </div><!-- /row -->
+
 </section>
 
 
@@ -1332,92 +1307,89 @@
   <div class="page-header">
     <h1>Badges <small>Indicators and unread counts</small></h1>
   </div>
-  <div class="row">
-    <div class="span4">
-      <h3>About</h3>
-      <p>Badges are small, simple components for displaying an indicator or count of some sort. They're commonly found in email clients like Mail.app or on mobile apps for push notifications.</p>
-    </div><!-- /.span -->
-    <div class="span8">
-      <h3>Available classes</h3>
-      <table class="table table-bordered table-striped">
-        <thead>
-          <tr>
-            <th>Name</th>
-            <th>Example</th>
-            <th>Markup</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td>
-              Default
-            </td>
-            <td>
-              <span class="badge">1</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge"&gt;1&lt;/span&gt;</code>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Success
-            </td>
-            <td>
-              <span class="badge badge-success">2</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge badge-success"&gt;2&lt;/span&gt;</code>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Warning
-            </td>
-            <td>
-              <span class="badge badge-warning">4</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge badge-warning"&gt;4&lt;/span&gt;</code>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Important
-            </td>
-            <td>
-              <span class="badge badge-important">6</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge badge-important"&gt;6&lt;/span&gt;</code>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Info
-            </td>
-            <td>
-              <span class="badge badge-info">8</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge badge-info"&gt;8&lt;/span&gt;</code>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              Inverse
-            </td>
-            <td>
-              <span class="badge badge-inverse">10</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge badge-inverse"&gt;10&lt;/span&gt;</code>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div><!-- /.span -->
-  </div><!-- /.row -->
+
+  <h3>About</h3>
+  <p>Badges are small, simple components for displaying an indicator or count of some sort. They're commonly found in email clients like Mail.app or on mobile apps for push notifications.</p>
+
+  <h3>Available classes</h3>
+  <table class="table table-bordered table-striped">
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Example</th>
+        <th>Markup</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>
+          Default
+        </td>
+        <td>
+          <span class="badge">1</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge"&gt;1&lt;/span&gt;</code>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Success
+        </td>
+        <td>
+          <span class="badge badge-success">2</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge badge-success"&gt;2&lt;/span&gt;</code>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Warning
+        </td>
+        <td>
+          <span class="badge badge-warning">4</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge badge-warning"&gt;4&lt;/span&gt;</code>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Important
+        </td>
+        <td>
+          <span class="badge badge-important">6</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge badge-important"&gt;6&lt;/span&gt;</code>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Info
+        </td>
+        <td>
+          <span class="badge badge-info">8</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge badge-info"&gt;8&lt;/span&gt;</code>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          Inverse
+        </td>
+        <td>
+          <span class="badge badge-inverse">10</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge badge-inverse"&gt;10&lt;/span&gt;</code>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
 </section>
 
 
@@ -1429,11 +1401,10 @@
     <h1>Typographic components <small>Page header and hero unit for segmenting content</small></h1>
   </div>
   <h2>Hero unit</h2>
-  <div class="row">
-    <div class="span4">
-      <p>Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.</p>
-      <h3>Markup</h3>
-      <p>Wrap your content in a <code>div</code> like so:</p>
+
+  <p>Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.</p>
+  <h3>Markup</h3>
+  <p>Wrap your content in a <code>div</code> like so:</p>
 <pre class="prettyprint linenums">
 &lt;div class="hero-unit"&gt;
   &lt;h1&gt;Heading&lt;/h1&gt;
@@ -1445,31 +1416,29 @@
   &lt;/p&gt;
 &lt;/div&gt;
 </pre>
+
+  <div class="bs-docs-example">
+    <div class="hero-unit">
+      <h1>Hello, world!</h1>
+      <p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
+      <p><a class="btn btn-primary btn-large">Learn more</a></p>
     </div>
-    <div class="span8">
-      <div class="hero-unit">
-        <h1>Hello, world!</h1>
-        <p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
-        <p><a class="btn btn-primary btn-large">Learn more</a></p>
-      </div>
-    </div>
-  </div><!-- /row -->
+  </div>
+
   <h2>Page header</h2>
-  <div class="row">
-    <div class="span4">
-      <p>A simple shell for an <code>h1</code> to appropriately space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code>, element as well most other components (with additional styles).</p>
+
+  <p>A simple shell for an <code>h1</code> to appropriately space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code>, element as well most other components (with additional styles).</p>
+  <div class="bs-docs-example">
+    <div class="page-header">
+      <h1>Example page header <small>Subtext for header</small></h1>
     </div>
-    <div class="span8">
-      <div class="page-header">
-        <h1>Example page header <small>Subtext for header</small></h1>
-      </div>
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="page-header"&gt;
   &lt;h1&gt;Example page header&lt;/h1&gt;
 &lt;/div&gt;
 </pre>
-    </div>
-  </div><!-- /row -->
+
 </section>
 
 
@@ -1481,80 +1450,67 @@
     <h1>Thumbnails <small>Grids of images, videos, text, and more</small></h1>
   </div>
 
-  <div class="row">
-    <div class="span6">
-      <h2>Default thumbnails</h2>
-      <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
-      <ul class="thumbnails">
-        <li class="span3">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-          </a>
-        </li>
-        <li class="span3">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-          </a>
-        </li>
-        <li class="span3">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-          </a>
-        </li>
-        <li class="span3">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-          </a>
-        </li>
-      </ul>
-    </div>
-    <div class="span6">
-      <h2>Highly customizable</h2>
-      <p>With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.</p>
-      <ul class="thumbnails">
-        <li class="span3">
-          <div class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-            <div class="caption">
-              <h5>Thumbnail label</h5>
-              <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a href="#" class="btn btn-primary">Action</a> <a href="#" class="btn">Action</a></p>
-            </div>
-          </div>
-        </li>
-        <li class="span3">
-          <div class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-            <div class="caption">
-              <h5>Thumbnail label</h5>
-              <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a href="#" class="btn btn-primary">Action</a> <a href="#" class="btn">Action</a></p>
-            </div>
-          </div>
-        </li>
-      </ul>
-    </div>
-  </div>
+  <h2>Default thumbnails</h2>
+  <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
+  <ul class="thumbnails">
+    <li class="span3">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+      </a>
+    </li>
+    <li class="span3">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+      </a>
+    </li>
+    <li class="span3">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+      </a>
+    </li>
+    <li class="span3">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+      </a>
+    </li>
+  </ul>
 
-  <div class="row">
-    <div class="span4">
-      <h3>Why use thumbnails</h3>
-      <p>Thumbnails (previously <code>.media-grid</code> up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.</p>
-    </div>
-    <div class="span4">
-      <h3>Simple, flexible markup</h3>
-      <p>Thumbnail markup is simple&mdash;a <code>ul</code> with any number of <code>li</code> elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.</p>
-    </div>
-    <div class="span4">
-      <h3>Uses grid column sizes</h3>
-      <p>Lastly, the thumbnails component uses existing grid system classes&mdash;like <code>.span2</code> or <code>.span3</code>&mdash;for control of thumbnail dimensions.</p>
-    </div>
-  </div>
+  <h2>Highly customizable</h2>
+  <p>With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.</p>
+  <ul class="thumbnails">
+    <li class="span3">
+      <div class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+        <div class="caption">
+          <h5>Thumbnail label</h5>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a href="#" class="btn btn-primary">Action</a> <a href="#" class="btn">Action</a></p>
+        </div>
+      </div>
+    </li>
+    <li class="span3">
+      <div class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+        <div class="caption">
+          <h5>Thumbnail label</h5>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a href="#" class="btn btn-primary">Action</a> <a href="#" class="btn">Action</a></p>
+        </div>
+      </div>
+    </li>
+  </ul>
+
+  <h3>Why use thumbnails</h3>
+  <p>Thumbnails (previously <code>.media-grid</code> up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.</p>
 
-  <div class="row">
-    <div class="span6">
-      <h2>The markup</h2>
-      <p>As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup <strong>for linked images</strong>:</p>
+  <h3>Simple, flexible markup</h3>
+  <p>Thumbnail markup is simple&mdash;a <code>ul</code> with any number of <code>li</code> elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.</p>
+
+  <h3>Uses grid column sizes</h3>
+  <p>Lastly, the thumbnails component uses existing grid system classes&mdash;like <code>.span2</code> or <code>.span3</code>&mdash;for control of thumbnail dimensions.</p>
+
+  <h2>The markup</h2>
+  <p>As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup <strong>for linked images</strong>:</p>
 <pre class="prettyprint linenums">
 &lt;ul class="thumbnails"&gt;
   &lt;li class="span3"&gt;
@@ -1565,7 +1521,7 @@
   ...
 &lt;/ul&gt;
 </pre>
-      <p>For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <code>&lt;a&gt;</code> for a <code>&lt;div&gt;</code> like so:</p>
+  <p>For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <code>&lt;a&gt;</code> for a <code>&lt;div&gt;</code> like so:</p>
 <pre class="prettyprint linenums">
 &lt;ul class="thumbnails"&gt;
   &lt;li class="span3"&gt;
@@ -1578,44 +1534,41 @@
   ...
 &lt;/ul&gt;
 </pre>
-    </div>
-    <div class="span6">
-      <h2>More examples</h2>
-      <p>Explore all your options with the various grid classes available to you. You can also mix and match different sizes.</p>
-      <ul class="thumbnails">
-        <li class="span4">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/360x268" alt="">
-          </a>
-        </li>
-        <li class="span2">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/160x120" alt="">
-          </a>
-        </li>
-        <li class="span2">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/160x120" alt="">
-          </a>
-        </li>
-        <li class="span2">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/160x120" alt="">
-          </a>
-        </li>
-        <li class="span2">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/160x120" alt="">
-          </a>
-        </li>
-        <li class="span2">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/160x120" alt="">
-          </a>
-        </li>
-      </ul>
-    </div>
-  </div>
+
+  <h2>More examples</h2>
+  <p>Explore all your options with the various grid classes available to you. You can also mix and match different sizes.</p>
+  <ul class="thumbnails">
+    <li class="span4">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/360x268" alt="">
+      </a>
+    </li>
+    <li class="span2">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/160x120" alt="">
+      </a>
+    </li>
+    <li class="span2">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/160x120" alt="">
+      </a>
+    </li>
+    <li class="span2">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/160x120" alt="">
+      </a>
+    </li>
+    <li class="span2">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/160x120" alt="">
+      </a>
+    </li>
+    <li class="span2">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/160x120" alt="">
+      </a>
+    </li>
+  </ul>
 
 </section>
 
@@ -1629,37 +1582,35 @@
   </div>
 
   <h2>Lightweight defaults</h2>
-  <div class="row">
-    <div class="span4">
-      <h3>Rewritten base class</h3>
-      <p>With Bootstrap 2, we've simplified the base class: <code>.alert</code> instead of <code>.alert-message</code>. We've also reduced the minimum required markup&mdash;no <code>&lt;p&gt;</code> is required by default, just the outer <code>&lt;div&gt;</code>.</p>
-      <h3>Single alert message</h3>
-      <p>For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to <code>.alert-block</code>.</p>
-      <hr>
-      <h3>Goes great with javascript</h3>
-      <p>Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.</p>
-      <p><a class="btn js-btn" href="./javascript.html#alerts">Get the plugin &raquo;</a></p>
-    </div>
-    <div class="span8">
-      <h3>Example alerts</h3>
-      <p>Wrap your message and an optional close icon in a div with simple class.</p>
-      <div class="alert">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <strong>Warning!</strong> Best check yo self, you're not looking too good.
-      </div>
+
+  <h3>Rewritten base class</h3>
+  <p>With Bootstrap 2, we've simplified the base class: <code>.alert</code> instead of <code>.alert-message</code>. We've also reduced the minimum required markup&mdash;no <code>&lt;p&gt;</code> is required by default, just the outer <code>&lt;div&gt;</code>.</p>
+  <h3>Single alert message</h3>
+  <p>For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to <code>.alert-block</code>.</p>
+  <hr>
+  <h3>Goes great with javascript</h3>
+  <p>Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.</p>
+  <p><a class="btn js-btn" href="./javascript.html#alerts">Get the plugin &raquo;</a></p>
+
+  <h3>Example alerts</h3>
+  <p>Wrap your message and an optional close icon in a div with simple class.</p>
+  <div class="alert">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <strong>Warning!</strong> Best check yo self, you're not looking too good.
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="alert"&gt;
   &lt;button class="close" data-dismiss="alert"&gt;&times;&lt;/button&gt;
   &lt;strong&gt;Warning!&lt;/strong&gt; Best check yo self, you're not looking too good.
 &lt;/div&gt;
 </pre>
-      <p><span class="label label-info">Heads up!</span> iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>&lt;button&gt;</code> element with the data attribute, which we have opted to do for our docs. When using <code>&lt;button&gt;</code>, you must include <code>type="button"</code> or your forms may not submit.</p>
-      <p>Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.</p>
-      <div class="alert alert-block">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <h4 class="alert-heading">Warning!</h4>
-        <p>Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
-      </div>
+  <p><span class="label label-info">Heads up!</span> iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>&lt;button&gt;</code> element with the data attribute, which we have opted to do for our docs. When using <code>&lt;button&gt;</code>, you must include <code>type="button"</code> or your forms may not submit.</p>
+  <p>Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.</p>
+  <div class="alert alert-block">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <h4 class="alert-heading">Warning!</h4>
+    <p>Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="alert alert-block"&gt;
   &lt;a class="close" data-dismiss="alert" href="#"&gt;&times;&lt;/a&gt;
@@ -1667,48 +1618,41 @@
   Best check yo self, you're not...
 &lt;/div&gt;
 </pre>
-    </div>
-  </div>
 
   <h2>Contextual alternatives <small>Add optional classes to change an alert's connotation</small></h2>
-  <div class="row">
-    <div class="span4">
-      <h3>Error or danger</h3>
-      <div class="alert alert-error">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <strong>Oh snap!</strong> Change a few things up and try submitting again.
-      </div>
+
+  <h3>Error or danger</h3>
+  <div class="alert alert-error">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <strong>Oh snap!</strong> Change a few things up and try submitting again.
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="alert alert-error"&gt;
   ...
 &lt;/div&gt;
 </pre>
-    </div>
-    <div class="span4">
-      <h3>Success</h3>
-      <div class="alert alert-success">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <strong>Well done!</strong> You successfully read this important alert message.
-      </div>
+
+  <h3>Success</h3>
+  <div class="alert alert-success">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <strong>Well done!</strong> You successfully read this important alert message.
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="alert alert-success"&gt;
   ...
 &lt;/div&gt;
 </pre>
-    </div>
-    <div class="span4">
-      <h3>Information</h3>
-      <div class="alert alert-info">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
-      </div>
+
+  <h3>Information</h3>
+  <div class="alert alert-info">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="alert alert-info"&gt;
   ...
 &lt;/div&gt;
 </pre>
-    </div>
-  </div>
 
 </section>
 
@@ -1722,39 +1666,36 @@
   </div>
 
   <h2>Examples and markup</h2>
-  <div class="row">
-    <div class="span4">
-      <h3>Basic</h3>
-      <p>Default progress bar with a vertical gradient.</p>
-      <div class="progress">
-        <div class="bar" style="width: 60%;"></div>
-      </div>
+
+  <h3>Basic</h3>
+  <p>Default progress bar with a vertical gradient.</p>
+  <div class="progress">
+    <div class="bar" style="width: 60%;"></div>
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="progress"&gt;
   &lt;div class="bar"
        style="width: 60%;"&gt;&lt;/div&gt;
 &lt;/div&gt;
 </pre>
-    </div>
-    <div class="span4">
-      <h3>Striped</h3>
-      <p>Uses a gradient to create a striped effect (no IE).</p>
-      <div class="progress progress-striped">
-        <div class="bar" style="width: 20%;"></div>
-      </div>
+
+  <h3>Striped</h3>
+  <p>Uses a gradient to create a striped effect (no IE).</p>
+  <div class="progress progress-striped">
+    <div class="bar" style="width: 20%;"></div>
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="progress progress-striped"&gt;
   &lt;div class="bar"
        style="width: 20%;"&gt;&lt;/div&gt;
 &lt;/div&gt;
 </pre>
-    </div>
-    <div class="span4">
-      <h3>Animated</h3>
-      <p>Takes the striped example and animates it (no IE).</p>
-      <div class="progress progress-striped active">
-        <div class="bar" style="width: 45%"></div>
-      </div>
+
+  <h3>Animated</h3>
+  <p>Takes the striped example and animates it (no IE).</p>
+  <div class="progress progress-striped active">
+    <div class="bar" style="width: 45%"></div>
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="progress progress-striped
      active"&gt;
@@ -1762,55 +1703,47 @@
        style="width: 40%;"&gt;&lt;/div&gt;
 &lt;/div&gt;
 </pre>
-    </div>
-  </div>
 
   <h2>Options and browser support</h2>
-  <div class="row">
-    <div class="span3">
-      <h3>Additional colors</h3>
-      <p>Progress bars use some of the same button and alert classes for consistent styles.</p>
-      <div class="progress progress-info" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 20%"></div>
-      </div>
-      <div class="progress progress-success" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 40%"></div>
-      </div>
-      <div class="progress progress-warning" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 60%"></div>
-      </div>
-      <div class="progress progress-danger" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 80%"></div>
-      </div>
-    </div>
-     <div class="span3">
-      <h3>Striped bars</h3>
-      <p>Similar to the solid colors, we have varied striped progress bars.</p>
-      <div class="progress progress-info progress-striped" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 20%"></div>
-      </div>
-      <div class="progress progress-success progress-striped" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 40%"></div>
-      </div>
-      <div class="progress progress-warning progress-striped" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 60%"></div>
-      </div>
-      <div class="progress progress-danger progress-striped" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 80%"></div>
-      </div>
-    </div>
-    <div class="span3">
-      <h3>Behavior</h3>
-      <p>Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.</p>
-      <p>If you use the <code>.active</code> class, your <code>.progress-striped</code> progress bars will animate the stripes left to right.</p>
-    </div>
-    <div class="span3">
-      <h3>Browser support</h3>
-      <p>Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-9 or older versions of Firefox.</p>
-      <p>Opera and IE do not support animations at this time.</p>
-    </div>
+
+  <h3>Additional colors</h3>
+  <p>Progress bars use some of the same button and alert classes for consistent styles.</p>
+  <div class="progress progress-info" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 20%"></div>
+  </div>
+  <div class="progress progress-success" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 40%"></div>
+  </div>
+  <div class="progress progress-warning" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 60%"></div>
+  </div>
+  <div class="progress progress-danger" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 80%"></div>
+  </div>
+
+  <h3>Striped bars</h3>
+  <p>Similar to the solid colors, we have varied striped progress bars.</p>
+  <div class="progress progress-info progress-striped" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 20%"></div>
+  </div>
+  <div class="progress progress-success progress-striped" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 40%"></div>
+  </div>
+  <div class="progress progress-warning progress-striped" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 60%"></div>
+  </div>
+  <div class="progress progress-danger progress-striped" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 80%"></div>
   </div>
 
+  <h3>Behavior</h3>
+  <p>Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.</p>
+  <p>If you use the <code>.active</code> class, your <code>.progress-striped</code> progress bars will animate the stripes left to right.</p>
+
+  <h3>Browser support</h3>
+  <p>Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-9 or older versions of Firefox.</p>
+  <p>Opera and IE do not support animations at this time.</p>
+
 </section>
 
 
@@ -1823,20 +1756,19 @@
   <div class="page-header">
     <h1>Miscellaneous <small>Lightweight utility components</small></h1>
   </div>
-  <div class="row">
-    <div class="span8">
-      <h2>Wells</h2>
-      <p>Use the well as a simple effect on an element to give it an inset effect.</p>
-      <div class="well">
-        Look, I'm in a well!
-      </div>
+
+  <h2>Wells</h2>
+  <p>Use the well as a simple effect on an element to give it an inset effect.</p>
+  <div class="well">
+    Look, I'm in a well!
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="well"&gt;
   ...
 &lt;/div&gt;
 </pre>
-      <h4>Optional classes</h4>
-      <p>Control padding and rounded corners with two optional modifier classes.</p>
+  <h4>Optional classes</h4>
+  <p>Control padding and rounded corners with two optional modifier classes.</p>
 <pre class="prettyprint linenums">
 &lt;div class="well well-large"&gt;
   ...
@@ -1847,18 +1779,18 @@
   ...
 &lt;/div&gt;
 </pre>
-      <h2>Close icon</h2>
-      <p>Use the generic close icon for dismissing content like modals and alerts.</p>
-      <p><button class="close" style="float: none;">&times;</button></p>
+  <h2>Close icon</h2>
+  <p>Use the generic close icon for dismissing content like modals and alerts.</p>
+  <p><button class="close" style="float: none;">&times;</button></p>
 <pre class="prettyprint linenums">&lt;button class="close"&gt;&amp;times;&lt;/button&gt;</pre>
-      <p>iOS devices require an href="#" for click events if you rather use an anchor.</p>
+  <p>iOS devices require an href="#" for click events if you rather use an anchor.</p>
 <pre class="prettyprint linenums">&lt;a class="close" href="#"&gt;&amp;times;&lt;/a&gt;</pre>
 
-      <h2>Helper classes</h2>
-      <p>Simple, focused classes for small display or behavior tweaks.</p>
+  <h2>Helper classes</h2>
+  <p>Simple, focused classes for small display or behavior tweaks.</p>
 
-      <h4>.pull-left</h4>
-      <p>Float an element left</p>
+  <h4>.pull-left</h4>
+  <p>Float an element left</p>
 <pre class="prettyprint linenums">
 class="pull-left"
 </pre>
@@ -1868,9 +1800,8 @@ class="pull-left"
 }
 </pre>
 
-
-      <h4>.pull-right</h4>
-      <p>Float an element right</p>
+  <h4>.pull-right</h4>
+  <p>Float an element right</p>
 <pre class="prettyprint linenums">
 class="pull-right"
 </pre>
@@ -1880,8 +1811,8 @@ class="pull-right"
 }
 </pre>
 
-      <h4>.muted</h4>
-      <p>Change an element's color to <code>#999</code></p>
+  <h4>.muted</h4>
+  <p>Change an element's color to <code>#999</code></p>
 <pre class="prettyprint linenums">
 class="muted"
 </pre>
@@ -1891,8 +1822,8 @@ class="muted"
 }
 </pre>
 
-      <h4>.clearfix</h4>
-      <p>Clear the <code>float</code> on any element</p>
+  <h4>.clearfix</h4>
+  <p>Clear the <code>float</code> on any element</p>
 <pre class="prettyprint linenums">
 class="clearfix"
 </pre>
@@ -1910,8 +1841,6 @@ class="clearfix"
 }
 </pre>
 
-    </div><!--/span-->
-  </div><!--/row-->
 </section>
 
 
diff --git a/docs/javascript.html b/docs/javascript.html
index f1ca221a59..7e604a37b9 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -76,94 +76,94 @@
 
     <div class="bs-docs-container">
 
-      <!-- Masthead
-      ================================================== -->
-      <header class="jumbotron subhead" id="overview">
-        <h1>Javascript for Bootstrap</h1>
-        <p class="lead">Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
-        <div class="subnav">
-          <ul class="nav nav-pills">
-            <li><a href="#javascript">All plugins</a></li>
-            <li><a href="#modals">Modal</a></li>
-            <li><a href="#dropdowns">Dropdown</a></li>
-            <li><a href="#scrollspy">Scrollspy</a></li>
-            <li><a href="#tabs">Tab</a></li>
-            <li><a href="#tooltips">Tooltip</a></li>
-            <li><a href="#popovers">Popover</a></li>
-            <li><a href="#alerts">Alert</a></li>
-            <li><a href="#buttons">Button</a></li>
-            <li><a href="#collapse">Collapse</a></li>
-            <li><a href="#carousel">Carousel</a></li>
-            <li><a href="#typeahead">Typeahead</a></li>
-          </ul>
-        </div>
-      </header>
-
-
-      <!-- Using Javascript w/ Bootstrap
-      ================================================== -->
-      <section id="javascript">
-        <div class="page-header">
-          <h1>jQuery plugins <small>A dozen Bootstrap plugins to get you started</small></h1>
-        </div>
-      <div class="row">
-        <div class="span3">
-          <h3><a href="./javascript.html#modals">Modals</a></h3>
-          <p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#dropdowns">Dropdowns</a></h3>
-          <p>Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#scrollspy">Scrollspy</a></h3>
-          <p>Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#tabs">Togglable tabs</a></h3>
-          <p>Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.</p>
-        </div>
-      </div> <!-- /row -->
-      <div class="row">
-        <div class="span3">
-          <h3><a href="./javascript.html#tooltips">Tooltips</a></h3>
-          <p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images&mdash;they use CSS3 for animations and data-attributes for local title storage.</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#popovers">Popovers</a> <small class="muted">*</small></h3>
-          <p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p>
-          <p class="muted"><strong>*</strong> Requires <a href="#tooltips">Tooltips</a> to be included</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#alerts">Alert messages</a></h3>
-          <p>The alert plugin is a tiny class for adding close functionality to alerts.</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#buttons">Buttons</a></h3>
-          <p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p>
-        </div>
-      </div> <!-- /row -->
-      <div class="row" style="margin-bottom: 9px;">
-        <div class="span3">
-          <h3><a href="./javascript.html#collapse">Collapse</a></h3>
-          <p>Get base styles and flexible support for collapsible components like accordions and navigation.</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#carousel">Carousel</a></h3>
-          <p>Create a merry-go-round of any content you wish to provide an interactive slideshow of content.</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
-          <p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p>
-        </div>
-        <div class="span3">
-          <h3>Transitions <small class="muted">*</small></h3>
-          <p>For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.</p>
-          <p class="muted"><strong>*</strong> Required for animation in plugins</p>
-        </div>
-      </div> <!-- /row -->
-      <div class="alert alert-info"><strong>Heads up!</strong>  If you have downloaded the latest version of Bootstrap, both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all of these plugins.</div>
-    </section>
+<!-- Masthead
+================================================== -->
+<header class="jumbotron subhead" id="overview">
+  <h1>Javascript for Bootstrap</h1>
+  <p class="lead">Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li><a href="#javascript">All plugins</a></li>
+      <li><a href="#modals">Modal</a></li>
+      <li><a href="#dropdowns">Dropdown</a></li>
+      <li><a href="#scrollspy">Scrollspy</a></li>
+      <li><a href="#tabs">Tab</a></li>
+      <li><a href="#tooltips">Tooltip</a></li>
+      <li><a href="#popovers">Popover</a></li>
+      <li><a href="#alerts">Alert</a></li>
+      <li><a href="#buttons">Button</a></li>
+      <li><a href="#collapse">Collapse</a></li>
+      <li><a href="#carousel">Carousel</a></li>
+      <li><a href="#typeahead">Typeahead</a></li>
+    </ul>
+  </div>
+</header>
+
+
+  <!-- Using Javascript w/ Bootstrap
+  ================================================== -->
+  <section id="javascript">
+    <div class="page-header">
+      <h1>jQuery plugins <small>A dozen Bootstrap plugins to get you started</small></h1>
+    </div>
+  <div class="row">
+    <div class="span4">
+      <h3><a href="./javascript.html#modals">Modals</a></h3>
+      <p>A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#dropdowns">Dropdowns</a></h3>
+      <p>Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#scrollspy">Scrollspy</a></h3>
+      <p>Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#tabs">Togglable tabs</a></h3>
+      <p>Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.</p>
+    </div>
+  </div> <!-- /row -->
+  <div class="row">
+    <div class="span4">
+      <h3><a href="./javascript.html#tooltips">Tooltips</a></h3>
+      <p>A new take on the jQuery Tipsy plugin, Tooltips don't rely on images&mdash;they use CSS3 for animations and data-attributes for local title storage.</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#popovers">Popovers</a> <small class="muted">*</small></h3>
+      <p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p>
+      <p class="muted"><strong>*</strong> Requires <a href="#tooltips">Tooltips</a> to be included</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#alerts">Alert messages</a></h3>
+      <p>The alert plugin is a tiny class for adding close functionality to alerts.</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#buttons">Buttons</a></h3>
+      <p>Do more with buttons. Control button states or create groups of buttons for more components like toolbars.</p>
+    </div>
+  </div> <!-- /row -->
+  <div class="row" style="margin-bottom: 9px;">
+    <div class="span4">
+      <h3><a href="./javascript.html#collapse">Collapse</a></h3>
+      <p>Get base styles and flexible support for collapsible components like accordions and navigation.</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#carousel">Carousel</a></h3>
+      <p>Create a merry-go-round of any content you wish to provide an interactive slideshow of content.</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
+      <p>A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.</p>
+    </div>
+    <div class="span4">
+      <h3>Transitions <small class="muted">*</small></h3>
+      <p>For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.</p>
+      <p class="muted"><strong>*</strong> Required for animation in plugins</p>
+    </div>
+  </div> <!-- /row -->
+  <div class="alert alert-info"><strong>Heads up!</strong>  If you have downloaded the latest version of Bootstrap, both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all of these plugins.</div>
+</section>
 
 
 
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 5bd5dcef74..cd80fc80ac 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -81,7 +81,20 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Scaffolding</h1>
   <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
-  <div class="subnav">
+
+  <div class="bs-docs-contents">
+    <h4>Contents</h4>
+    <ul>
+      <li><a href="#global">Global styles</a></li>
+      <li><a href="#gridSystem">Grid system</a></li>
+      <li><a href="#fluidGridSystem">Fluid grid system</a></li>
+      <li><a href="#gridCustomization">Customizing</a></li>
+      <li><a href="#layouts">Layouts</a></li>
+      <li><a href="#responsive">Responsive design</a></li>
+    </ul>
+  </div>
+
+<!--   <div class="subnav">
     <ul class="nav nav-pills">
       <li><a href="#global">Global styles</a></li>
       <li><a href="#gridSystem">Grid system</a></li>
@@ -91,7 +104,7 @@
       <li><a href="#responsive">Responsive design</a></li>
     </ul>
   </div>
-</header>
+ --></header>
 
 
 
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 99d98dab70..ad452fe9c3 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -830,13 +830,12 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </a>
-        <a class="brand" href="#">{{_i}}Project name{{/i}}</a>
+        <a class="brand" href="#">{{_i}}Title{{/i}}</a>
         <div class="nav-collapse">
           <ul class="nav">
             <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
             <li><a href="#">{{_i}}Link{{/i}}</a></li>
             <li><a href="#">{{_i}}Link{{/i}}</a></li>
-            <li><a href="#">{{_i}}Link{{/i}}</a></li>
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{_i}}Dropdown{{/i}} <b class="caret"></b></a>
               <ul class="dropdown-menu">
@@ -872,10 +871,9 @@
     </div><!-- /navbar-inner -->
   </div><!-- /navbar -->
 
-  <div class="row">
-    <div class="span8">
-      <h3>{{_i}}Navbar scaffolding{{/i}}</h3>
-      <p>{{_i}}The navbar requires only a few divs to structure it well for static or fixed display.{{/i}}</p>
+
+  <h3>{{_i}}Navbar scaffolding{{/i}}</h3>
+  <p>{{_i}}The navbar requires only a few divs to structure it well for static or fixed display.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;div class="navbar"&gt;
   &lt;div class="navbar-inner"&gt;
@@ -885,47 +883,42 @@
   &lt;/div&gt;
 &lt;/div&gt;
 </pre>
-      <h3>{{_i}}Fixed navbar{{/i}}</h3>
-      <p>{{_i}}Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, <code>.navbar</code>.{{/i}}</p>
-      <div class="row">
-        <div class="span4">
+  <h3>{{_i}}Fixed navbar{{/i}}</h3>
+  <p>{{_i}}Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, <code>.navbar</code>.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-fixed-top"&gt;
   ...
 &lt;/div&gt;
 </pre>
-        </div><!--/span-->
-        <div class="span4">
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-fixed-bottom"&gt;
   ...
 &lt;/div&gt;
 </pre>
-        </div><!--/span-->
-      </div><!--/row-->
-      <p>{{_i}}When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}</p>
-      <h3>{{_i}}Brand name{{/i}}</h3>
-      <p>{{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}</p>
+
+  <p>{{_i}}When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}</p>
+  <h3>{{_i}}Brand name{{/i}}</h3>
+  <p>{{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;a class="brand" href="#"&gt;
   {{_i}}Project name{{/i}}
 &lt;/a&gt;
 </pre>
-      <h3>{{_i}}Forms in navbar{{/i}}</h3>
-      <p>{{_i}}To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.{{/i}}</p>
+  <h3>{{_i}}Forms in navbar{{/i}}</h3>
+  <p>{{_i}}To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;form class="navbar-form pull-left"&gt;
   &lt;input type="text" class="span2"&gt;
 &lt;/form&gt;
 </pre>
-      <p>{{_i}}For a more customized search form, add <code>.navbar-search</code> to the <code>form</code> and <code>.search-query</code> to the input for specialized styles in the navbar.{{/i}}</p>
+  <p>{{_i}}For a more customized search form, add <code>.navbar-search</code> to the <code>form</code> and <code>.search-query</code> to the input for specialized styles in the navbar.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;form class="navbar-search pull-left"&gt;
   &lt;input type="text" class="search-query" placeholder="{{_i}}Search{{/i}}"&gt;
 &lt;/form&gt;
 </pre>
-      <h3>{{_i}}Optional responsive variation{{/i}}</h3>
-      <p>{{_i}}Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.{{/i}}</p>
+  <h3>{{_i}}Optional responsive variation{{/i}}</h3>
+  <p>{{_i}}Depending on the amount of content in your topbar, you might want to implement the responsive options. To do so, wrap your nav content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;div class="navbar"&gt;
   &lt;div class="navbar-inner"&gt;
@@ -950,14 +943,12 @@
   &lt;/div&gt;
 &lt;/div&gt;
 </pre>
-      <div class="alert alert-info">
-        <strong>{{_i}}Heads up!{{/i}}</strong> The responsive navbar requires the <a href="./javascript.html#collapse">collapse plugin</a> and <a href="./scaffolding.html#responsive">responsive Bootstrap CSS file</a>.
-      </div>
+  <div class="alert alert-info">
+    <strong>{{_i}}Heads up!{{/i}}</strong> The responsive navbar requires the <a href="./javascript.html#collapse">collapse plugin</a> and <a href="./scaffolding.html#responsive">responsive Bootstrap CSS file</a>.
+  </div>
 
-    </div><!-- /.span -->
-    <div class="span4">
-      <h3>{{_i}}Nav links{{/i}}</h3>
-      <p>{{_i}}Nav items are simple to add via unordered lists.{{/i}}</p>
+  <h3>{{_i}}Nav links{{/i}}</h3>
+  <p>{{_i}}Nav items are simple to add via unordered lists.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;ul class="nav"&gt;
   &lt;li class="active"&gt;
@@ -967,7 +958,7 @@
   &lt;li&gt;&lt;a href="#"&gt;{{_i}}Link{{/i}}&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-      <p>{{_i}}You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:{{/i}}</p>
+  <p>{{_i}}You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;ul class="nav"&gt;
   ...
@@ -975,10 +966,10 @@
   ...
 &lt;/ul&gt;
 </pre>
-      <h3>{{_i}}Component alignment{{/i}}</h3>
-      <p>{{_i}}To align a nav, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.{{/i}}</p>
-      <h3>{{_i}}Adding dropdown menus{{/i}}</h3>
-      <p>{{_i}}Adding dropdowns and dropups to the nav is super simple, but does require the use of <a href="./javascript.html#dropdowns">our javascript plugin</a>.{{/i}}</p>
+  <h3>{{_i}}Component alignment{{/i}}</h3>
+  <p>{{_i}}To align a nav, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.{{/i}}</p>
+  <h3>{{_i}}Adding dropdown menus{{/i}}</h3>
+  <p>{{_i}}Adding dropdowns and dropups to the nav is super simple, but does require the use of <a href="./javascript.html#dropdowns">our javascript plugin</a>.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;ul class="nav"&gt;
   &lt;li class="dropdown"&gt;
@@ -994,12 +985,10 @@
   &lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-      <p><a class="btn" href="./javascript.html#dropdowns">{{_i}}Get the javascript &rarr;{{/i}}</a></p>
-      <hr>
-      <h3>{{_i}}Text in the navbar{{/i}}</h3>
-      <p>{{_i}}Wrap strings of text in a <code>&lt;.navbar-text&gt;</code>, usually on a <code>&lt;p&gt;</code> tag for proper leading and color.{{/i}}</p>
-    </div><!-- /.span -->
-  </div><!-- /.row -->
+  <p><a class="btn" href="./javascript.html#dropdowns">{{_i}}Get the javascript &rarr;{{/i}}</a></p>
+  <hr>
+  <h3>{{_i}}Text in the navbar{{/i}}</h3>
+  <p>{{_i}}Wrap strings of text in a <code>&lt;.navbar-text&gt;</code>, usually on a <code>&lt;p&gt;</code> tag for proper leading and color.{{/i}}</p>
 
 </section>
 
@@ -1012,29 +1001,26 @@
     <h1>{{_i}}Breadcrumbs{{/i}} <small></small></h1>
   </div>
 
-  <div class="row">
-    <div class="span6">
-      <h3>{{_i}}Why use them{{/i}}</h3>
-      <p>{{_i}}Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation. Keep their use sparse and succinct to be most effective.{{/i}}</p>
+  <h3>{{_i}}Why use them{{/i}}</h3>
+  <p>{{_i}}Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation. Keep their use sparse and succinct to be most effective.{{/i}}</p>
 
-      <h3>{{_i}}Examples{{/i}}</h3>
-      <p>{{_i}}A single example shown as it might be displayed across multiple pages.{{/i}}</p>
-      <ul class="breadcrumb">
-        <li class="active">{{_i}}Home{{/i}}</li>
-      </ul>
-      <ul class="breadcrumb">
-        <li><a href="#">{{_i}}Home{{/i}}</a> <span class="divider">/</span></li>
-        <li class="active">{{_i}}Library{{/i}}</li>
-      </ul>
-      <ul class="breadcrumb">
-        <li><a href="#">{{_i}}Home{{/i}}</a> <span class="divider">/</span></li>
-        <li><a href="#">{{_i}}Library{{/i}}</a> <span class="divider">/</span></li>
-        <li class="active">{{_i}}Data{{/i}}</li>
-      </ul>
-    </div>
-    <div class="span6">
-      <h3>{{_i}}Markup{{/i}}</h3>
-      <p>{{_i}}HTML is your standard unordered list with links.{{/i}}</p>
+  <h3>{{_i}}Examples{{/i}}</h3>
+  <p>{{_i}}A single example shown as it might be displayed across multiple pages.{{/i}}</p>
+  <ul class="breadcrumb">
+    <li class="active">{{_i}}Home{{/i}}</li>
+  </ul>
+  <ul class="breadcrumb">
+    <li><a href="#">{{_i}}Home{{/i}}</a> <span class="divider">/</span></li>
+    <li class="active">{{_i}}Library{{/i}}</li>
+  </ul>
+  <ul class="breadcrumb">
+    <li><a href="#">{{_i}}Home{{/i}}</a> <span class="divider">/</span></li>
+    <li><a href="#">{{_i}}Library{{/i}}</a> <span class="divider">/</span></li>
+    <li class="active">{{_i}}Data{{/i}}</li>
+  </ul>
+
+  <h3>{{_i}}Markup{{/i}}</h3>
+  <p>{{_i}}HTML is your standard unordered list with links.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;ul class="breadcrumb"&gt;
   &lt;li&gt;
@@ -1046,8 +1032,6 @@
   &lt;li class="active"&gt;{{_i}}Data{{/i}}&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-    </div>
-  </div>
 
 </section>
 
@@ -1061,59 +1045,56 @@
   </div>
 
   <h2>{{_i}}Multicon-page pagination{{/i}}</h2>
-  <div class="row">
-    <div class="span4">
-      <h3>{{_i}}When to use{{/i}}</h3>
-      <p>{{_i}}Ultra simplistic and minimally styled pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.{{/i}}</p>
-      <h3>{{_i}}Stateful page links{{/i}}</h3>
-      <p>{{_i}}Links are customizable and work in a number of circumstances with the right class. <code>.disabled</code> for unclickable links and <code>.active</code> for current page.{{/i}}</p>
-      <h3>{{_i}}Flexible alignment{{/i}}</h3>
-      <p>{{_i}}Add either of two optional classes to change the alignment of pagination links: <code>.pagination-centered</code> and <code>.pagination-right</code>.{{/i}}</p>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Examples{{/i}}</h3>
-      <p>{{_i}}The default pagination component is flexible and works in a number of variations.{{/i}}</p>
-      <div class="pagination">
-        <ul>
-          <li class="disabled"><a href="#">&laquo;</a></li>
-          <li class="active"><a href="#">1</a></li>
-          <li><a href="#">2</a></li>
-          <li><a href="#">3</a></li>
-          <li><a href="#">4</a></li>
-          <li><a href="#">&raquo;</a></li>
-        </ul>
-      </div>
-      <div class="pagination">
-        <ul>
-          <li><a href="#">&laquo;</a></li>
-          <li><a href="#">10</a></li>
-          <li class="active"><a href="#">11</a></li>
-          <li><a href="#">12</a></li>
-          <li><a href="#">&raquo;</a></li>
-        </ul>
-      </div>
-      <div class="pagination">
-        <ul>
-          <li><a href="#">&laquo;</a></li>
-          <li class="active"><a href="#">10</a></li>
-          <li class="disabled"><a href="#">...</a></li>
-          <li><a href="#">20</a></li>
-          <li><a href="#">&raquo;</a></li>
-        </ul>
-      </div>
-      <div class="pagination pagination-centered">
-        <ul>
-          <li class="active"><a href="#">1</a></li>
-          <li><a href="#">2</a></li>
-          <li><a href="#">3</a></li>
-          <li><a href="#">4</a></li>
-          <li><a href="#">5</a></li>
-        </ul>
-      </div>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Markup{{/i}}</h3>
-      <p>{{_i}}Wrapped in a <code>&lt;div&gt;</code>, pagination is just a <code>&lt;ul&gt;</code>.{{/i}}</p>
+
+  <h3>{{_i}}When to use{{/i}}</h3>
+  <p>{{_i}}Ultra simplistic and minimally styled pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.{{/i}}</p>
+  <h3>{{_i}}Stateful page links{{/i}}</h3>
+  <p>{{_i}}Links are customizable and work in a number of circumstances with the right class. <code>.disabled</code> for unclickable links and <code>.active</code> for current page.{{/i}}</p>
+  <h3>{{_i}}Flexible alignment{{/i}}</h3>
+  <p>{{_i}}Add either of two optional classes to change the alignment of pagination links: <code>.pagination-centered</code> and <code>.pagination-right</code>.{{/i}}</p>
+
+  <h3>{{_i}}Examples{{/i}}</h3>
+  <p>{{_i}}The default pagination component is flexible and works in a number of variations.{{/i}}</p>
+  <div class="pagination">
+    <ul>
+      <li class="disabled"><a href="#">&laquo;</a></li>
+      <li class="active"><a href="#">1</a></li>
+      <li><a href="#">2</a></li>
+      <li><a href="#">3</a></li>
+      <li><a href="#">4</a></li>
+      <li><a href="#">&raquo;</a></li>
+    </ul>
+  </div>
+  <div class="pagination">
+    <ul>
+      <li><a href="#">&laquo;</a></li>
+      <li><a href="#">10</a></li>
+      <li class="active"><a href="#">11</a></li>
+      <li><a href="#">12</a></li>
+      <li><a href="#">&raquo;</a></li>
+    </ul>
+  </div>
+  <div class="pagination">
+    <ul>
+      <li><a href="#">&laquo;</a></li>
+      <li class="active"><a href="#">10</a></li>
+      <li class="disabled"><a href="#">...</a></li>
+      <li><a href="#">20</a></li>
+      <li><a href="#">&raquo;</a></li>
+    </ul>
+  </div>
+  <div class="pagination pagination-centered">
+    <ul>
+      <li class="active"><a href="#">1</a></li>
+      <li><a href="#">2</a></li>
+      <li><a href="#">3</a></li>
+      <li><a href="#">4</a></li>
+      <li><a href="#">5</a></li>
+    </ul>
+  </div>
+
+  <h3>{{_i}}Markup{{/i}}</h3>
+  <p>{{_i}}Wrapped in a <code>&lt;div&gt;</code>, pagination is just a <code>&lt;ul&gt;</code>.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;div class="pagination"&gt;
   &lt;ul&gt;
@@ -1128,24 +1109,20 @@
   &lt;/ul&gt;
 &lt;/div&gt;
 </pre>
-    </div>
-  </div><!-- /row -->
 
   <h2>{{_i}}Pager{{/i}} <small>{{_i}}For quick previous and next links{{/i}}</small></h2>
-  <div class="row">
-    <div class="span4">
-      <h3>{{_i}}About pager{{/i}}</h3>
-      <p>{{_i}}The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.{{/i}}</p>
-      <h4>{{_i}}Optional disabled state{{/i}}</h4>
-      <p>{{_i}}Pager links also use the general <code>.disabled</code> class from the pagination.{{/i}}</p>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Default example{{/i}}</h3>
-      <p>{{_i}}By default, the pager centers links.{{/i}}</p>
-      <ul class="pager">
-        <li><a href="#">{{_i}}Previous{{/i}}</a></li>
-        <li><a href="#">{{_i}}Next{{/i}}</a></li>
-      </ul>
+
+  <h3>{{_i}}About pager{{/i}}</h3>
+  <p>{{_i}}The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.{{/i}}</p>
+  <h4>{{_i}}Optional disabled state{{/i}}</h4>
+  <p>{{_i}}Pager links also use the general <code>.disabled</code> class from the pagination.{{/i}}</p>
+
+  <h3>{{_i}}Default example{{/i}}</h3>
+  <p>{{_i}}By default, the pager centers links.{{/i}}</p>
+  <ul class="pager">
+    <li><a href="#">{{_i}}Previous{{/i}}</a></li>
+    <li><a href="#">{{_i}}Next{{/i}}</a></li>
+  </ul>
 <pre class="prettyprint linenums">
 &lt;ul class="pager"&gt;
   &lt;li&gt;
@@ -1156,14 +1133,13 @@
   &lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Aligned links{{/i}}</h3>
-      <p>{{_i}}Alternatively, you can align each link to the sides:{{/i}}</p>
-      <ul class="pager">
-        <li class="previous"><a href="#">{{_i}}&larr; Older{{/i}}</a></li>
-        <li class="next"><a href="#">{{_i}}Newer &rarr;{{/i}}</a></li>
-      </ul>
+
+  <h3>{{_i}}Aligned links{{/i}}</h3>
+  <p>{{_i}}Alternatively, you can align each link to the sides:{{/i}}</p>
+  <ul class="pager">
+    <li class="previous"><a href="#">{{_i}}&larr; Older{{/i}}</a></li>
+    <li class="next"><a href="#">{{_i}}Newer &rarr;{{/i}}</a></li>
+  </ul>
 <pre class="prettyprint linenums">
 &lt;ul class="pager"&gt;
   &lt;li class="previous"&gt;
@@ -1174,8 +1150,7 @@
   &lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-    </div>
-  </div><!-- /row -->
+
 </section>
 
 
@@ -1254,92 +1229,89 @@
   <div class="page-header">
     <h1>{{_i}}Badges{{/i}} <small>{{_i}}Indicators and unread counts{{/i}}</small></h1>
   </div>
-  <div class="row">
-    <div class="span4">
-      <h3>About</h3>
-      <p>{{_i}}Badges are small, simple components for displaying an indicator or count of some sort. They're commonly found in email clients like Mail.app or on mobile apps for push notifications.{{/i}}</p>
-    </div><!-- /.span -->
-    <div class="span8">
-      <h3>Available classes</h3>
-      <table class="table table-bordered table-striped">
-        <thead>
-          <tr>
-            <th>{{_i}}Name{{/i}}</th>
-            <th>{{_i}}Example{{/i}}</th>
-            <th>{{_i}}Markup{{/i}}</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td>
-              {{_i}}Default{{/i}}
-            </td>
-            <td>
-              <span class="badge">1</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge"&gt;1&lt;/span&gt;</code>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              {{_i}}Success{{/i}}
-            </td>
-            <td>
-              <span class="badge badge-success">2</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge badge-success"&gt;2&lt;/span&gt;</code>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              {{_i}}Warning{{/i}}
-            </td>
-            <td>
-              <span class="badge badge-warning">4</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge badge-warning"&gt;4&lt;/span&gt;</code>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              {{_i}}Important{{/i}}
-            </td>
-            <td>
-              <span class="badge badge-important">6</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge badge-important"&gt;6&lt;/span&gt;</code>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              {{_i}}Info{{/i}}
-            </td>
-            <td>
-              <span class="badge badge-info">8</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge badge-info"&gt;8&lt;/span&gt;</code>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              {{_i}}Inverse{{/i}}
-            </td>
-            <td>
-              <span class="badge badge-inverse">10</span>
-            </td>
-            <td>
-              <code>&lt;span class="badge badge-inverse"&gt;10&lt;/span&gt;</code>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </div><!-- /.span -->
-  </div><!-- /.row -->
+
+  <h3>About</h3>
+  <p>{{_i}}Badges are small, simple components for displaying an indicator or count of some sort. They're commonly found in email clients like Mail.app or on mobile apps for push notifications.{{/i}}</p>
+
+  <h3>Available classes</h3>
+  <table class="table table-bordered table-striped">
+    <thead>
+      <tr>
+        <th>{{_i}}Name{{/i}}</th>
+        <th>{{_i}}Example{{/i}}</th>
+        <th>{{_i}}Markup{{/i}}</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>
+          {{_i}}Default{{/i}}
+        </td>
+        <td>
+          <span class="badge">1</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge"&gt;1&lt;/span&gt;</code>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          {{_i}}Success{{/i}}
+        </td>
+        <td>
+          <span class="badge badge-success">2</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge badge-success"&gt;2&lt;/span&gt;</code>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          {{_i}}Warning{{/i}}
+        </td>
+        <td>
+          <span class="badge badge-warning">4</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge badge-warning"&gt;4&lt;/span&gt;</code>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          {{_i}}Important{{/i}}
+        </td>
+        <td>
+          <span class="badge badge-important">6</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge badge-important"&gt;6&lt;/span&gt;</code>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          {{_i}}Info{{/i}}
+        </td>
+        <td>
+          <span class="badge badge-info">8</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge badge-info"&gt;8&lt;/span&gt;</code>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          {{_i}}Inverse{{/i}}
+        </td>
+        <td>
+          <span class="badge badge-inverse">10</span>
+        </td>
+        <td>
+          <code>&lt;span class="badge badge-inverse"&gt;10&lt;/span&gt;</code>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+
 </section>
 
 
@@ -1351,11 +1323,10 @@
     <h1>{{_i}}Typographic components{{/i}} <small>{{_i}}Page header and hero unit for segmenting content{{/i}}</small></h1>
   </div>
   <h2>{{_i}}Hero unit{{/i}}</h2>
-  <div class="row">
-    <div class="span4">
-      <p>{{_i}}Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.{{/i}}</p>
-      <h3>{{_i}}Markup{{/i}}</h3>
-      <p>{{_i}}Wrap your content in a <code>div</code> like so:{{/i}}</p>
+
+  <p>{{_i}}Bootstrap provides a lightweight, flexible component called a hero unit to showcase content on your site. It works well on marketing and content-heavy sites.{{/i}}</p>
+  <h3>{{_i}}Markup{{/i}}</h3>
+  <p>{{_i}}Wrap your content in a <code>div</code> like so:{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;div class="hero-unit"&gt;
   &lt;h1&gt;{{_i}}Heading{{/i}}&lt;/h1&gt;
@@ -1367,31 +1338,29 @@
   &lt;/p&gt;
 &lt;/div&gt;
 </pre>
+
+  <div class="bs-docs-example">
+    <div class="hero-unit">
+      <h1>{{_i}}Hello, world!{{/i}}</h1>
+      <p>{{_i}}This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.{{/i}}</p>
+      <p><a class="btn btn-primary btn-large">{{_i}}Learn more{{/i}}</a></p>
     </div>
-    <div class="span8">
-      <div class="hero-unit">
-        <h1>{{_i}}Hello, world!{{/i}}</h1>
-        <p>{{_i}}This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.{{/i}}</p>
-        <p><a class="btn btn-primary btn-large">{{_i}}Learn more{{/i}}</a></p>
-      </div>
-    </div>
-  </div><!-- /row -->
+  </div>
+
   <h2>{{_i}}Page header{{/i}}</h2>
-  <div class="row">
-    <div class="span4">
-      <p>{{_i}}A simple shell for an <code>h1</code> to appropriately space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code>, element as well most other components (with additional styles).{{/i}}</p>
+
+  <p>{{_i}}A simple shell for an <code>h1</code> to appropriately space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code>, element as well most other components (with additional styles).{{/i}}</p>
+  <div class="bs-docs-example">
+    <div class="page-header">
+      <h1>{{_i}}Example page header{{/i}} <small>{{_i}}Subtext for header{{/i}}</small></h1>
     </div>
-    <div class="span8">
-      <div class="page-header">
-        <h1>{{_i}}Example page header{{/i}} <small>{{_i}}Subtext for header{{/i}}</small></h1>
-      </div>
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="page-header"&gt;
   &lt;h1&gt;{{_i}}Example page header{{/i}}&lt;/h1&gt;
 &lt;/div&gt;
 </pre>
-    </div>
-  </div><!-- /row -->
+
 </section>
 
 
@@ -1403,80 +1372,67 @@
     <h1>{{_i}}Thumbnails{{/i}} <small>{{_i}}Grids of images, videos, text, and more{{/i}}</small></h1>
   </div>
 
-  <div class="row">
-    <div class="span6">
-      <h2>{{_i}}Default thumbnails{{/i}}</h2>
-      <p>{{_i}}By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.{{/i}}</p>
-      <ul class="thumbnails">
-        <li class="span3">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-          </a>
-        </li>
-        <li class="span3">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-          </a>
-        </li>
-        <li class="span3">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-          </a>
-        </li>
-        <li class="span3">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-          </a>
-        </li>
-      </ul>
-    </div>
-    <div class="span6">
-      <h2>{{_i}}Highly customizable{{/i}}</h2>
-      <p>{{_i}}With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.{{/i}}</p>
-      <ul class="thumbnails">
-        <li class="span3">
-          <div class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-            <div class="caption">
-              <h5>{{_i}}Thumbnail label{{/i}}</h5>
-              <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a href="#" class="btn btn-primary">{{_i}}Action{{/i}}</a> <a href="#" class="btn">{{_i}}Action{{/i}}</a></p>
-            </div>
-          </div>
-        </li>
-        <li class="span3">
-          <div class="thumbnail">
-            <img src="http://placehold.it/260x180" alt="">
-            <div class="caption">
-              <h5>{{_i}}Thumbnail label{{/i}}</h5>
-              <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a href="#" class="btn btn-primary">{{_i}}Action{{/i}}</a> <a href="#" class="btn">{{_i}}Action{{/i}}</a></p>
-            </div>
-          </div>
-        </li>
-      </ul>
-    </div>
-  </div>
+  <h2>{{_i}}Default thumbnails{{/i}}</h2>
+  <p>{{_i}}By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.{{/i}}</p>
+  <ul class="thumbnails">
+    <li class="span3">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+      </a>
+    </li>
+    <li class="span3">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+      </a>
+    </li>
+    <li class="span3">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+      </a>
+    </li>
+    <li class="span3">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+      </a>
+    </li>
+  </ul>
 
-  <div class="row">
-    <div class="span4">
-      <h3>{{_i}}Why use thumbnails{{/i}}</h3>
-      <p>{{_i}}Thumbnails (previously <code>.media-grid</code> up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.{{/i}}</p>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Simple, flexible markup{{/i}}</h3>
-      <p>{{_i}}Thumbnail markup is simple&mdash;a <code>ul</code> with any number of <code>li</code> elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.{{/i}}</p>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Uses grid column sizes{{/i}}</h3>
-      <p>{{_i}}Lastly, the thumbnails component uses existing grid system classes&mdash;like <code>.span2</code> or <code>.span3</code>&mdash;for control of thumbnail dimensions.{{/i}}</p>
-    </div>
-  </div>
+  <h2>{{_i}}Highly customizable{{/i}}</h2>
+  <p>{{_i}}With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.{{/i}}</p>
+  <ul class="thumbnails">
+    <li class="span3">
+      <div class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+        <div class="caption">
+          <h5>{{_i}}Thumbnail label{{/i}}</h5>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a href="#" class="btn btn-primary">{{_i}}Action{{/i}}</a> <a href="#" class="btn">{{_i}}Action{{/i}}</a></p>
+        </div>
+      </div>
+    </li>
+    <li class="span3">
+      <div class="thumbnail">
+        <img src="http://placehold.it/260x180" alt="">
+        <div class="caption">
+          <h5>{{_i}}Thumbnail label{{/i}}</h5>
+          <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+          <p><a href="#" class="btn btn-primary">{{_i}}Action{{/i}}</a> <a href="#" class="btn">{{_i}}Action{{/i}}</a></p>
+        </div>
+      </div>
+    </li>
+  </ul>
+
+  <h3>{{_i}}Why use thumbnails{{/i}}</h3>
+  <p>{{_i}}Thumbnails (previously <code>.media-grid</code> up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.{{/i}}</p>
+
+  <h3>{{_i}}Simple, flexible markup{{/i}}</h3>
+  <p>{{_i}}Thumbnail markup is simple&mdash;a <code>ul</code> with any number of <code>li</code> elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.{{/i}}</p>
+
+  <h3>{{_i}}Uses grid column sizes{{/i}}</h3>
+  <p>{{_i}}Lastly, the thumbnails component uses existing grid system classes&mdash;like <code>.span2</code> or <code>.span3</code>&mdash;for control of thumbnail dimensions.{{/i}}</p>
 
-  <div class="row">
-    <div class="span6">
-      <h2>{{_i}}The markup{{/i}}</h2>
-      <p>{{_i}}As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup <strong>for linked images</strong>:{{/i}}</p>
+  <h2>{{_i}}The markup{{/i}}</h2>
+  <p>{{_i}}As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup <strong>for linked images</strong>:{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;ul class="thumbnails"&gt;
   &lt;li class="span3"&gt;
@@ -1487,7 +1443,7 @@
   ...
 &lt;/ul&gt;
 </pre>
-      <p>{{_i}}For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <code>&lt;a&gt;</code> for a <code>&lt;div&gt;</code> like so:{{/i}}</p>
+  <p>{{_i}}For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <code>&lt;a&gt;</code> for a <code>&lt;div&gt;</code> like so:{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;ul class="thumbnails"&gt;
   &lt;li class="span3"&gt;
@@ -1500,44 +1456,41 @@
   ...
 &lt;/ul&gt;
 </pre>
-    </div>
-    <div class="span6">
-      <h2>{{_i}}More examples{{/i}}</h2>
-      <p>{{_i}}Explore all your options with the various grid classes available to you. You can also mix and match different sizes.{{/i}}</p>
-      <ul class="thumbnails">
-        <li class="span4">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/360x268" alt="">
-          </a>
-        </li>
-        <li class="span2">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/160x120" alt="">
-          </a>
-        </li>
-        <li class="span2">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/160x120" alt="">
-          </a>
-        </li>
-        <li class="span2">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/160x120" alt="">
-          </a>
-        </li>
-        <li class="span2">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/160x120" alt="">
-          </a>
-        </li>
-        <li class="span2">
-          <a href="#" class="thumbnail">
-            <img src="http://placehold.it/160x120" alt="">
-          </a>
-        </li>
-      </ul>
-    </div>
-  </div>
+
+  <h2>{{_i}}More examples{{/i}}</h2>
+  <p>{{_i}}Explore all your options with the various grid classes available to you. You can also mix and match different sizes.{{/i}}</p>
+  <ul class="thumbnails">
+    <li class="span4">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/360x268" alt="">
+      </a>
+    </li>
+    <li class="span2">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/160x120" alt="">
+      </a>
+    </li>
+    <li class="span2">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/160x120" alt="">
+      </a>
+    </li>
+    <li class="span2">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/160x120" alt="">
+      </a>
+    </li>
+    <li class="span2">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/160x120" alt="">
+      </a>
+    </li>
+    <li class="span2">
+      <a href="#" class="thumbnail">
+        <img src="http://placehold.it/160x120" alt="">
+      </a>
+    </li>
+  </ul>
 
 </section>
 
@@ -1551,37 +1504,35 @@
   </div>
 
   <h2>{{_i}}Lightweight defaults{{/i}}</h2>
-  <div class="row">
-    <div class="span4">
-      <h3>{{_i}}Rewritten base class{{/i}}</h3>
-      <p>{{_i}}With Bootstrap 2, we've simplified the base class: <code>.alert</code> instead of <code>.alert-message</code>. We've also reduced the minimum required markup&mdash;no <code>&lt;p&gt;</code> is required by default, just the outer <code>&lt;div&gt;</code>.{{/i}}</p>
-      <h3>{{_i}}Single alert message{{/i}}</h3>
-      <p>{{_i}}For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to <code>.alert-block</code>.{{/i}}</p>
-      <hr>
-      <h3>{{_i}}Goes great with javascript{{/i}}</h3>
-      <p>{{_i}}Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.{{/i}}</p>
-      <p><a class="btn js-btn" href="./javascript.html#alerts">{{_i}}Get the plugin &raquo;</a>{{/i}}</p>
-    </div>
-    <div class="span8">
-      <h3>{{_i}}Example alerts{{/i}}</h3>
-      <p>{{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}</p>
-      <div class="alert">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
-      </div>
+
+  <h3>{{_i}}Rewritten base class{{/i}}</h3>
+  <p>{{_i}}With Bootstrap 2, we've simplified the base class: <code>.alert</code> instead of <code>.alert-message</code>. We've also reduced the minimum required markup&mdash;no <code>&lt;p&gt;</code> is required by default, just the outer <code>&lt;div&gt;</code>.{{/i}}</p>
+  <h3>{{_i}}Single alert message{{/i}}</h3>
+  <p>{{_i}}For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to <code>.alert-block</code>.{{/i}}</p>
+  <hr>
+  <h3>{{_i}}Goes great with javascript{{/i}}</h3>
+  <p>{{_i}}Bootstrap comes with a great jQuery plugin that supports alert messages, making dismissing them quick and easy.{{/i}}</p>
+  <p><a class="btn js-btn" href="./javascript.html#alerts">{{_i}}Get the plugin &raquo;</a>{{/i}}</p>
+
+  <h3>{{_i}}Example alerts{{/i}}</h3>
+  <p>{{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}</p>
+  <div class="alert">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="alert"&gt;
   &lt;button class="close" data-dismiss="alert"&gt;&times;&lt;/button&gt;
   &lt;strong&gt;{{_i}}Warning!{{/i}}&lt;/strong&gt; {{_i}}Best check yo self, you're not looking too good.{{/i}}
 &lt;/div&gt;
 </pre>
-      <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>&lt;button&gt;</code> element with the data attribute, which we have opted to do for our docs. When using <code>&lt;button&gt;</code>, you must include <code>type="button"</code> or your forms may not submit.{{/i}}</p>
-      <p>{{_i}}Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.{{/i}}</p>
-      <div class="alert alert-block">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <h4 class="alert-heading">{{_i}}Warning!{{/i}}</h4>
-        <p>{{_i}}Best check yo self, you're not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
-      </div>
+  <p><span class="label label-info">{{_i}}Heads up!{{/i}}</span> {{_i}}iOS devices require an <code>href="#"</code> for the dismissal of alerts. Be sure to include it and the data attribute for anchor close icons. Alternatively, you may use a <code>&lt;button&gt;</code> element with the data attribute, which we have opted to do for our docs. When using <code>&lt;button&gt;</code>, you must include <code>type="button"</code> or your forms may not submit.{{/i}}</p>
+  <p>{{_i}}Easily extend the standard alert message with two optional classes: <code>.alert-block</code> for more padding and text controls and <code>.alert-heading</code> for a matching heading.{{/i}}</p>
+  <div class="alert alert-block">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <h4 class="alert-heading">{{_i}}Warning!{{/i}}</h4>
+    <p>{{_i}}Best check yo self, you're not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="alert alert-block"&gt;
   &lt;a class="close" data-dismiss="alert" href="#"&gt;&times;&lt;/a&gt;
@@ -1589,48 +1540,41 @@
   {{_i}}Best check yo self, you're not...{{/i}}
 &lt;/div&gt;
 </pre>
-    </div>
-  </div>
 
   <h2>{{_i}}Contextual alternatives{{/i}} <small>{{_i}}Add optional classes to change an alert's connotation{{/i}}</small></h2>
-  <div class="row">
-    <div class="span4">
-      <h3>{{_i}}Error or danger{{/i}}</h3>
-      <div class="alert alert-error">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <strong>{{_i}}Oh snap!{{/i}}</strong> {{_i}}Change a few things up and try submitting again.{{/i}}
-      </div>
+
+  <h3>{{_i}}Error or danger{{/i}}</h3>
+  <div class="alert alert-error">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <strong>{{_i}}Oh snap!{{/i}}</strong> {{_i}}Change a few things up and try submitting again.{{/i}}
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="alert alert-error"&gt;
   ...
 &lt;/div&gt;
 </pre>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Success{{/i}}</h3>
-      <div class="alert alert-success">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <strong>{{_i}}Well done!{{/i}}</strong> {{_i}}You successfully read this important alert message.{{/i}}
-      </div>
+
+  <h3>{{_i}}Success{{/i}}</h3>
+  <div class="alert alert-success">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <strong>{{_i}}Well done!{{/i}}</strong> {{_i}}You successfully read this important alert message.{{/i}}
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="alert alert-success"&gt;
   ...
 &lt;/div&gt;
 </pre>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Information{{/i}}</h3>
-      <div class="alert alert-info">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        <strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}This alert needs your attention, but it's not super important.{{/i}}
-      </div>
+
+  <h3>{{_i}}Information{{/i}}</h3>
+  <div class="alert alert-info">
+    <button type="button" class="close" data-dismiss="alert">&times;</button>
+    <strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}This alert needs your attention, but it's not super important.{{/i}}
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="alert alert-info"&gt;
   ...
 &lt;/div&gt;
 </pre>
-    </div>
-  </div>
 
 </section>
 
@@ -1644,39 +1588,36 @@
   </div>
 
   <h2>{{_i}}Examples and markup{{/i}}</h2>
-  <div class="row">
-    <div class="span4">
-      <h3>{{_i}}Basic{{/i}}</h3>
-      <p>{{_i}}Default progress bar with a vertical gradient.{{/i}}</p>
-      <div class="progress">
-        <div class="bar" style="width: 60%;"></div>
-      </div>
+
+  <h3>{{_i}}Basic{{/i}}</h3>
+  <p>{{_i}}Default progress bar with a vertical gradient.{{/i}}</p>
+  <div class="progress">
+    <div class="bar" style="width: 60%;"></div>
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="progress"&gt;
   &lt;div class="bar"
        style="width: 60%;"&gt;&lt;/div&gt;
 &lt;/div&gt;
 </pre>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Striped{{/i}}</h3>
-      <p>{{_i}}Uses a gradient to create a striped effect (no IE).{{/i}}</p>
-      <div class="progress progress-striped">
-        <div class="bar" style="width: 20%;"></div>
-      </div>
+
+  <h3>{{_i}}Striped{{/i}}</h3>
+  <p>{{_i}}Uses a gradient to create a striped effect (no IE).{{/i}}</p>
+  <div class="progress progress-striped">
+    <div class="bar" style="width: 20%;"></div>
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="progress progress-striped"&gt;
   &lt;div class="bar"
        style="width: 20%;"&gt;&lt;/div&gt;
 &lt;/div&gt;
 </pre>
-    </div>
-    <div class="span4">
-      <h3>{{_i}}Animated{{/i}}</h3>
-      <p>{{_i}}Takes the striped example and animates it (no IE).{{/i}}</p>
-      <div class="progress progress-striped active">
-        <div class="bar" style="width: 45%"></div>
-      </div>
+
+  <h3>{{_i}}Animated{{/i}}</h3>
+  <p>{{_i}}Takes the striped example and animates it (no IE).{{/i}}</p>
+  <div class="progress progress-striped active">
+    <div class="bar" style="width: 45%"></div>
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="progress progress-striped
      active"&gt;
@@ -1684,55 +1625,47 @@
        style="width: 40%;"&gt;&lt;/div&gt;
 &lt;/div&gt;
 </pre>
-    </div>
-  </div>
 
   <h2>{{_i}}Options and browser support{{/i}}</h2>
-  <div class="row">
-    <div class="span3">
-      <h3>{{_i}}Additional colors{{/i}}</h3>
-      <p>{{_i}}Progress bars use some of the same button and alert classes for consistent styles.{{/i}}</p>
-      <div class="progress progress-info" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 20%"></div>
-      </div>
-      <div class="progress progress-success" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 40%"></div>
-      </div>
-      <div class="progress progress-warning" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 60%"></div>
-      </div>
-      <div class="progress progress-danger" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 80%"></div>
-      </div>
-    </div>
-     <div class="span3">
-      <h3>{{_i}}Striped bars{{/i}}</h3>
-      <p>{{_i}}Similar to the solid colors, we have varied striped progress bars.{{/i}}</p>
-      <div class="progress progress-info progress-striped" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 20%"></div>
-      </div>
-      <div class="progress progress-success progress-striped" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 40%"></div>
-      </div>
-      <div class="progress progress-warning progress-striped" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 60%"></div>
-      </div>
-      <div class="progress progress-danger progress-striped" style="margin-bottom: 9px;">
-        <div class="bar" style="width: 80%"></div>
-      </div>
-    </div>
-    <div class="span3">
-      <h3>{{_i}}Behavior{{/i}}</h3>
-      <p>{{_i}}Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.{{/i}}</p>
-      <p>{{_i}}If you use the <code>.active</code> class, your <code>.progress-striped</code> progress bars will animate the stripes left to right.{{/i}}</p>
-    </div>
-    <div class="span3">
-      <h3>{{_i}}Browser support{{/i}}</h3>
-      <p>{{_i}}Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-9 or older versions of Firefox.{{/i}}</p>
-      <p>{{_i}}Opera and IE do not support animations at this time.{{/i}}</p>
-    </div>
+
+  <h3>{{_i}}Additional colors{{/i}}</h3>
+  <p>{{_i}}Progress bars use some of the same button and alert classes for consistent styles.{{/i}}</p>
+  <div class="progress progress-info" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 20%"></div>
+  </div>
+  <div class="progress progress-success" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 40%"></div>
+  </div>
+  <div class="progress progress-warning" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 60%"></div>
+  </div>
+  <div class="progress progress-danger" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 80%"></div>
+  </div>
+
+  <h3>{{_i}}Striped bars{{/i}}</h3>
+  <p>{{_i}}Similar to the solid colors, we have varied striped progress bars.{{/i}}</p>
+  <div class="progress progress-info progress-striped" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 20%"></div>
+  </div>
+  <div class="progress progress-success progress-striped" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 40%"></div>
+  </div>
+  <div class="progress progress-warning progress-striped" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 60%"></div>
+  </div>
+  <div class="progress progress-danger progress-striped" style="margin-bottom: 9px;">
+    <div class="bar" style="width: 80%"></div>
   </div>
 
+  <h3>{{_i}}Behavior{{/i}}</h3>
+  <p>{{_i}}Progress bars use CSS3 transitions, so if you dynamically adjust the width via javascript, it will smoothly resize.{{/i}}</p>
+  <p>{{_i}}If you use the <code>.active</code> class, your <code>.progress-striped</code> progress bars will animate the stripes left to right.{{/i}}</p>
+
+  <h3>{{_i}}Browser support{{/i}}</h3>
+  <p>{{_i}}Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-9 or older versions of Firefox.{{/i}}</p>
+  <p>{{_i}}Opera and IE do not support animations at this time.{{/i}}</p>
+
 </section>
 
 
@@ -1745,20 +1678,19 @@
   <div class="page-header">
     <h1>{{_i}}Miscellaneous{{/i}} <small>{{_i}}Lightweight utility components{{/i}}</small></h1>
   </div>
-  <div class="row">
-    <div class="span8">
-      <h2>{{_i}}Wells{{/i}}</h2>
-      <p>{{_i}}Use the well as a simple effect on an element to give it an inset effect.{{/i}}</p>
-      <div class="well">
-        {{_i}}Look, I'm in a well!{{/i}}
-      </div>
+
+  <h2>{{_i}}Wells{{/i}}</h2>
+  <p>{{_i}}Use the well as a simple effect on an element to give it an inset effect.{{/i}}</p>
+  <div class="well">
+    {{_i}}Look, I'm in a well!{{/i}}
+  </div>
 <pre class="prettyprint linenums">
 &lt;div class="well"&gt;
   ...
 &lt;/div&gt;
 </pre>
-      <h4>{{_i}}Optional classes{{/i}}</h4>
-      <p>{{_i}}Control padding and rounded corners with two optional modifier classes.{{/i}}</p>
+  <h4>{{_i}}Optional classes{{/i}}</h4>
+  <p>{{_i}}Control padding and rounded corners with two optional modifier classes.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;div class="well well-large"&gt;
   ...
@@ -1769,18 +1701,18 @@
   ...
 &lt;/div&gt;
 </pre>
-      <h2>{{_i}}Close icon{{/i}}</h2>
-      <p>{{_i}}Use the generic close icon for dismissing content like modals and alerts.{{/i}}</p>
-      <p><button class="close" style="float: none;">&times;</button></p>
+  <h2>{{_i}}Close icon{{/i}}</h2>
+  <p>{{_i}}Use the generic close icon for dismissing content like modals and alerts.{{/i}}</p>
+  <p><button class="close" style="float: none;">&times;</button></p>
 <pre class="prettyprint linenums">&lt;button class="close"&gt;&amp;times;&lt;/button&gt;</pre>
-      <p>{{_i}}iOS devices require an href="#" for click events if you rather use an anchor.{{/i}}</p>
+  <p>{{_i}}iOS devices require an href="#" for click events if you rather use an anchor.{{/i}}</p>
 <pre class="prettyprint linenums">&lt;a class="close" href="#"&gt;&amp;times;&lt;/a&gt;</pre>
 
-      <h2>{{_i}}Helper classes{{/i}}</h2>
-      <p>{{_i}}Simple, focused classes for small display or behavior tweaks.{{/i}}</p>
+  <h2>{{_i}}Helper classes{{/i}}</h2>
+  <p>{{_i}}Simple, focused classes for small display or behavior tweaks.{{/i}}</p>
 
-      <h4>{{_i}}.pull-left{{/i}}</h4>
-      <p>{{_i}}Float an element left{{/i}}</p>
+  <h4>{{_i}}.pull-left{{/i}}</h4>
+  <p>{{_i}}Float an element left{{/i}}</p>
 <pre class="prettyprint linenums">
 class="pull-left"
 </pre>
@@ -1790,9 +1722,8 @@ class="pull-left"
 }
 </pre>
 
-
-      <h4>{{_i}}.pull-right{{/i}}</h4>
-      <p>{{_i}}Float an element right{{/i}}</p>
+  <h4>{{_i}}.pull-right{{/i}}</h4>
+  <p>{{_i}}Float an element right{{/i}}</p>
 <pre class="prettyprint linenums">
 class="pull-right"
 </pre>
@@ -1802,8 +1733,8 @@ class="pull-right"
 }
 </pre>
 
-      <h4>{{_i}}.muted{{/i}}</h4>
-      <p>{{_i}}Change an element's color to <code>#999</code>{{/i}}</p>
+  <h4>{{_i}}.muted{{/i}}</h4>
+  <p>{{_i}}Change an element's color to <code>#999</code>{{/i}}</p>
 <pre class="prettyprint linenums">
 class="muted"
 </pre>
@@ -1813,8 +1744,8 @@ class="muted"
 }
 </pre>
 
-      <h4>{{_i}}.clearfix{{/i}}</h4>
-      <p>{{_i}}Clear the <code>float</code> on any element{{/i}}</p>
+  <h4>{{_i}}.clearfix{{/i}}</h4>
+  <p>{{_i}}Clear the <code>float</code> on any element{{/i}}</p>
 <pre class="prettyprint linenums">
 class="clearfix"
 </pre>
@@ -1832,6 +1763,4 @@ class="clearfix"
 }
 </pre>
 
-    </div><!--/span-->
-  </div><!--/row-->
 </section>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index e9654f5e67..848112513a 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1,91 +1,91 @@
-      <!-- Masthead
-      ================================================== -->
-      <header class="jumbotron subhead" id="overview">
-        <h1>{{_i}}Javascript for Bootstrap{{/i}}</h1>
-        <p class="lead">{{_i}}Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.{{/i}}
-        <div class="subnav">
-          <ul class="nav nav-pills">
-            <li><a href="#javascript">{{_i}}All plugins{{/i}}</a></li>
-            <li><a href="#modals">{{_i}}Modal{{/i}}</a></li>
-            <li><a href="#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
-            <li><a href="#scrollspy">{{_i}}Scrollspy{{/i}}</a></li>
-            <li><a href="#tabs">{{_i}}Tab{{/i}}</a></li>
-            <li><a href="#tooltips">{{_i}}Tooltip{{/i}}</a></li>
-            <li><a href="#popovers">{{_i}}Popover{{/i}}</a></li>
-            <li><a href="#alerts">{{_i}}Alert{{/i}}</a></li>
-            <li><a href="#buttons">{{_i}}Button{{/i}}</a></li>
-            <li><a href="#collapse">{{_i}}Collapse{{/i}}</a></li>
-            <li><a href="#carousel">{{_i}}Carousel{{/i}}</a></li>
-            <li><a href="#typeahead">{{_i}}Typeahead{{/i}}</a></li>
-          </ul>
-        </div>
-      </header>
+<!-- Masthead
+================================================== -->
+<header class="jumbotron subhead" id="overview">
+  <h1>{{_i}}Javascript for Bootstrap{{/i}}</h1>
+  <p class="lead">{{_i}}Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.{{/i}}
+  <div class="subnav">
+    <ul class="nav nav-pills">
+      <li><a href="#javascript">{{_i}}All plugins{{/i}}</a></li>
+      <li><a href="#modals">{{_i}}Modal{{/i}}</a></li>
+      <li><a href="#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
+      <li><a href="#scrollspy">{{_i}}Scrollspy{{/i}}</a></li>
+      <li><a href="#tabs">{{_i}}Tab{{/i}}</a></li>
+      <li><a href="#tooltips">{{_i}}Tooltip{{/i}}</a></li>
+      <li><a href="#popovers">{{_i}}Popover{{/i}}</a></li>
+      <li><a href="#alerts">{{_i}}Alert{{/i}}</a></li>
+      <li><a href="#buttons">{{_i}}Button{{/i}}</a></li>
+      <li><a href="#collapse">{{_i}}Collapse{{/i}}</a></li>
+      <li><a href="#carousel">{{_i}}Carousel{{/i}}</a></li>
+      <li><a href="#typeahead">{{_i}}Typeahead{{/i}}</a></li>
+    </ul>
+  </div>
+</header>
 
 
-      <!-- Using Javascript w/ Bootstrap
-      ================================================== -->
-      <section id="javascript">
-        <div class="page-header">
-          <h1>{{_i}}jQuery plugins{{/i}} <small>{{_i}}A dozen Bootstrap plugins to get you started{{/i}}</small></h1>
-        </div>
-      <div class="row">
-        <div class="span3">
-          <h3><a href="./javascript.html#modals">{{_i}}Modals{{/i}}</a></h3>
-          <p>{{_i}}A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.{{/i}}</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#dropdowns">{{_i}}Dropdowns{{/i}}</a></h3>
-          <p>{{_i}}Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.{{/i}}</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#scrollspy">{{_i}}Scrollspy{{/i}}</a></h3>
-          <p>{{_i}}Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.{{/i}}</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#tabs">{{_i}}Togglable tabs{{/i}}</a></h3>
-          <p>{{_i}}Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.{{/i}}</p>
-        </div>
-      </div> <!-- /row -->
-      <div class="row">
-        <div class="span3">
-          <h3><a href="./javascript.html#tooltips">{{_i}}Tooltips{{/i}}</a></h3>
-          <p>{{_i}}A new take on the jQuery Tipsy plugin, Tooltips don't rely on images&mdash;they use CSS3 for animations and data-attributes for local title storage.{{/i}}</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#popovers">{{_i}}Popovers{{/i}}</a> <small class="muted">*</small></h3>
-          <p>{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information.{{/i}}</p>
-          <p class="muted"><strong>*</strong> {{_i}}Requires <a href="#tooltips">Tooltips</a> to be included{{/i}}</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#alerts">{{_i}}Alert messages{{/i}}</a></h3>
-          <p>{{_i}}The alert plugin is a tiny class for adding close functionality to alerts.{{/i}}</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#buttons">{{_i}}Buttons{{/i}}</a></h3>
-          <p>{{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}</p>
-        </div>
-      </div> <!-- /row -->
-      <div class="row" style="margin-bottom: 9px;">
-        <div class="span3">
-          <h3><a href="./javascript.html#collapse">{{_i}}Collapse{{/i}}</a></h3>
-          <p>{{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#carousel">{{_i}}Carousel{{/i}}</a></h3>
-          <p>{{_i}}Create a merry-go-round of any content you wish to provide an interactive slideshow of content.{{/i}}</p>
-        </div>
-        <div class="span3">
-          <h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
-          <p>{{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}</p>
-        </div>
-        <div class="span3">
-          <h3>{{_i}}Transitions{{/i}} <small class="muted">*</small></h3>
-          <p>{{_i}}For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.{{/i}}</p>
-          <p class="muted"><strong>*</strong> {{_i}}Required for animation in plugins{{/i}}</p>
-        </div>
-      </div> <!-- /row -->
-      <div class="alert alert-info"><strong>{{_i}}Heads up!{{/i}}</strong> {{_i}} If you have downloaded the latest version of Bootstrap, both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all of these plugins.{{/i}}</div>
-    </section>
+  <!-- Using Javascript w/ Bootstrap
+  ================================================== -->
+  <section id="javascript">
+    <div class="page-header">
+      <h1>{{_i}}jQuery plugins{{/i}} <small>{{_i}}A dozen Bootstrap plugins to get you started{{/i}}</small></h1>
+    </div>
+  <div class="row">
+    <div class="span4">
+      <h3><a href="./javascript.html#modals">{{_i}}Modals{{/i}}</a></h3>
+      <p>{{_i}}A streamlined, but flexible, take on the traditional javascript modal plugin with only the minimum required functionality and smart defaults.{{/i}}</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#dropdowns">{{_i}}Dropdowns{{/i}}</a></h3>
+      <p>{{_i}}Add dropdown menus to nearly anything in Bootstrap with this simple plugin. Bootstrap features full dropdown menu support on in the navbar, tabs, and pills.{{/i}}</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#scrollspy">{{_i}}Scrollspy{{/i}}</a></h3>
+      <p>{{_i}}Use scrollspy to automatically update the links in your navbar to show the current active link based on scroll position.{{/i}}</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#tabs">{{_i}}Togglable tabs{{/i}}</a></h3>
+      <p>{{_i}}Use this plugin to make tabs and pills more useful by allowing them to toggle through tabbable panes of local content.{{/i}}</p>
+    </div>
+  </div> <!-- /row -->
+  <div class="row">
+    <div class="span4">
+      <h3><a href="./javascript.html#tooltips">{{_i}}Tooltips{{/i}}</a></h3>
+      <p>{{_i}}A new take on the jQuery Tipsy plugin, Tooltips don't rely on images&mdash;they use CSS3 for animations and data-attributes for local title storage.{{/i}}</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#popovers">{{_i}}Popovers{{/i}}</a> <small class="muted">*</small></h3>
+      <p>{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information.{{/i}}</p>
+      <p class="muted"><strong>*</strong> {{_i}}Requires <a href="#tooltips">Tooltips</a> to be included{{/i}}</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#alerts">{{_i}}Alert messages{{/i}}</a></h3>
+      <p>{{_i}}The alert plugin is a tiny class for adding close functionality to alerts.{{/i}}</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#buttons">{{_i}}Buttons{{/i}}</a></h3>
+      <p>{{_i}}Do more with buttons. Control button states or create groups of buttons for more components like toolbars.{{/i}}</p>
+    </div>
+  </div> <!-- /row -->
+  <div class="row" style="margin-bottom: 9px;">
+    <div class="span4">
+      <h3><a href="./javascript.html#collapse">{{_i}}Collapse{{/i}}</a></h3>
+      <p>{{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#carousel">{{_i}}Carousel{{/i}}</a></h3>
+      <p>{{_i}}Create a merry-go-round of any content you wish to provide an interactive slideshow of content.{{/i}}</p>
+    </div>
+    <div class="span4">
+      <h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
+      <p>{{_i}}A basic, easily extended plugin for quickly creating elegant typeaheads with any form text input.{{/i}}</p>
+    </div>
+    <div class="span4">
+      <h3>{{_i}}Transitions{{/i}} <small class="muted">*</small></h3>
+      <p>{{_i}}For simple transition effects, include bootstrap-transition.js once to slide in modals or fade out alerts.{{/i}}</p>
+      <p class="muted"><strong>*</strong> {{_i}}Required for animation in plugins{{/i}}</p>
+    </div>
+  </div> <!-- /row -->
+  <div class="alert alert-info"><strong>{{_i}}Heads up!{{/i}}</strong> {{_i}} If you have downloaded the latest version of Bootstrap, both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all of these plugins.{{/i}}</div>
+</section>
 
 
 
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 6b0b2a919c..3033c7b028 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -3,7 +3,20 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Scaffolding{{/i}}</h1>
   <p class="lead">{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}</p>
-  <div class="subnav">
+
+  <div class="bs-docs-contents">
+    <h4>Contents</h4>
+    <ul>
+      <li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
+      <li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
+      <li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
+      <li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
+      <li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
+      <li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
+    </ul>
+  </div>
+
+<!--   <div class="subnav">
     <ul class="nav nav-pills">
       <li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
       <li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
@@ -13,7 +26,7 @@
       <li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
     </ul>
   </div>
-</header>
+ --></header>
 
 
 
-- 
GitLab