diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index deab7e44..4647e747 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index d7b3efca..d8218ecc 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -8,8 +8,8 @@
       <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Buttons{{/i}} <b class="caret"></b></a>
         <ul class="dropdown-menu">
-          <li><a href="#buttonGroups">Button groups</a></li>
-          <li><a href="#buttonDropdowns">Button dropdowns</a></li>
+          <li><a href="#buttonGroups">{{_i}}Button groups{{/i}}</a></li>
+          <li><a href="#buttonDropdowns">{{_i}}Button dropdowns{{/i}}</a></li>
         </ul>
       </li>
       <li class="dropdown">
@@ -752,17 +752,17 @@
   &lt;div class="navbar-inner"&gt;
     &lt;div class="container"&gt;
       
-      &lt;!-- .btn-navbar is used as the toggle for collapsed navbar content --&gt;
+      &lt;!-- {{_i}}.btn-navbar is used as the toggle for collapsed navbar content{{/i}} --&gt;
       &lt;a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"&gt;
         &lt;span class="icon-bar"&gt;&lt;/span&gt;
         &lt;span class="icon-bar"&gt;&lt;/span&gt;
         &lt;span class="icon-bar"&gt;&lt;/span&gt;
       &lt;/a&gt;
       
-      &lt;!-- Be sure to leave the brand out there if you want it shown --&gt;
+      &lt;!-- {{_i}}Be sure to leave the brand out there if you want it shown{{/i}} --&gt;
       &lt;a class="brand" href="#"&gt;{{_i}}Project name{{/i}}&lt;/a&gt;
 
-      &lt;!-- Everything you want hidden at 940px or less, place within here --&gt;
+      &lt;!-- {{_i}}Everything you want hidden at 940px or less, place within here{{/i}} --&gt;
       &lt;div class="nav-collapse"&gt;
         &lt;!-- .nav, .navbar-search, .navbar-form, etc --&gt;
       &lt;/div&gt;
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index f7cadc08..2f3acc20 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -3,7 +3,7 @@
 <header class="jumbotron masthead">
   <div class="inner">
     <h1>{{_i}}Bootstrap, from Twitter{{/i}}</h1>
-    <p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
+    <p>{{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}</p>
     <p class="download-info">
       <a href="https://github.com/twitter/bootstrap/" class="btn btn-primary btn-large">{{_i}}View project on GitHub{{/i}}</a>
       <a href="assets/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap{{/i}}</a>
@@ -11,7 +11,7 @@
   </div>
 
   <ul class="quick-links">
-    <li><a href="./upgrading.html">Upgrading from 1.4</a></li>
+    <li><a href="./upgrading.html">{{_i}}Upgrading from 1.4{{/i}}</a></li>
     <li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Issues{{/i}}</a></li>
     <li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">{{_i}}Roadmap{{/i}}</a></li>
     <li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">{{_i}}Changelog{{/i}}</a></li>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index aedd21f5..3233a9b7 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -947,17 +947,17 @@ $('#my-alert').bind('closed', function () {
             <h3>{{_i}}Markup{{/i}}</h3>
           <p>{{_i}}Data attributes are integral to the button plugin. Check out the example code below for the various markup types.{{/i}}</p>
 <pre class="prettyprint linenums">
-&lt;!-- Add data-toggle="button" to activate toggling on a single button --&gt;
+&lt;!-- {{_i}}Add data-toggle="button" to activate toggling on a single button{{/i}} --&gt;
 &lt;button class="btn" data-toggle="button"&gt;Single Toggle&lt;/button&gt;
 
-&lt;!-- Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group --&gt;
+&lt;!-- {{_i}}Add data-toggle="buttons-checkbox" for checkbox style toggling on btn-group{{/i}} --&gt;
 &lt;div class="btn-group" data-toggle="buttons-checkbox"&gt;
   &lt;button class="btn"&gt;Left&lt;/button&gt;
   &lt;button class="btn"&gt;Middle&lt;/button&gt;
   &lt;button class="btn"&gt;Right&lt;/button&gt;
 &lt;/div&gt;
 
-&lt;!-- Add data-toggle="buttons-radio" for radio style toggling on btn-group --&gt;
+&lt;!-- {{_i}}Add data-toggle="buttons-radio" for radio style toggling on btn-group{{/i}} --&gt;
 &lt;div class="btn-group" data-toggle="buttons-radio"&gt;
   &lt;button class="btn"&gt;Left&lt;/button&gt;
   &lt;button class="btn"&gt;Middle&lt;/button&gt;
@@ -1052,7 +1052,7 @@ $('#my-alert').bind('closed', function () {
 
           <hr>
           <h2>{{_i}}Using bootstrap-collapse.js{{/i}}</h2>
-          <p>Enable via javascript:</p>
+          <p>{{_i}}Enable via javascript:{{/i}}</p>
           <pre class="prettyprint linenums">$(".collapse").collapse()</pre>
           <h3>{{_i}}Options{{/i}}</h3>
           <table class="table table-bordered table-striped">
@@ -1220,11 +1220,11 @@ $('#myCollapsible').on('hidden', function () {
           <p>{{_i}}Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;div class="carousel"&gt;
-  &lt;!-- Carousel items --&gt;
+  &lt;!-- {{_i}}Carousel items{{/i}} --&gt;
   &lt;div class="carousel-inner"&gt;
     ...
   &lt;/div&gt;
-  &lt;!-- Carousel nav --&gt;
+  &lt;!-- {{_i}}Carousel nav{{/i}} --&gt;
   &lt;a class="carousel-control left" href="#myCarousel" data-slide="prev"&gt;&amp;lsaquo;&lt;/a&gt;
   &lt;a class="carousel-control right" href="#myCarousel" data-slide="next"&gt;&amp;rsaquo;&lt;/a&gt;
 &lt;/div&gt;
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index f69e43c2..eff8d384 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -210,7 +210,7 @@
   <h3>{{_i}}Components{{/i}}</h3>
   <div class="row">
     <div class="span6">
-      <h4>Buttons</h4>
+      <h4>{{_i}}Buttons{{/i}}</h4>
       <table class="table table-bordered table-striped">
         <tbody>
           <tr>
@@ -220,7 +220,7 @@
           </tr>
         </tbody>
       </table>
-      <h4>Forms</h4>
+      <h4>{{_i}}Forms{{/i}}</h4>
       <table class="table table-bordered table-striped">
         <tbody>
           <tr>
@@ -230,7 +230,7 @@
           </tr>
         </tbody>
       </table>
-      <h4>Navbar</h4>
+      <h4>{{_i}}Navbar{{/i}}</h4>
       <table class="table table-bordered table-striped">
         <tbody>
           <tr>
@@ -495,7 +495,7 @@
       </tr>
     </tbody>
   </table>
-  <h3>CSS3 properties</h3>
+  <h3>{{_i}}CSS3 properties{{/i}}</h3>
   <table class="table table-bordered table-striped">
     <thead>
       <tr>
@@ -567,7 +567,7 @@
       </tr>
     </tbody>
   </table>
-  <h3>Backgrounds and gradients</h3>
+  <h3>{{_i}}Backgrounds and gradients{{/i}}</h3>
   <table class="table table-bordered table-striped">
     <thead>
       <tr>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index e20c5240..36df0973 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -21,7 +21,7 @@
     <h1>{{_i}}Grid system <small>12 columns with a responsive twist</small>{{/i}}</h1>
   </div>
 
-  <h2>Default 940px grid</h2>
+  <h2>{{_i}}Default 940px grid{{/i}}</h2>
   <div class="row show-grid">
     <div class="span1">1</div>
     <div class="span1">1</div>
@@ -72,7 +72,7 @@
 
   <br>
 
-  <h2>Offsetting columns</h2>
+  <h2>{{_i}}Offsetting columns{{/i}}</h2>
   <div class="row show-grid">
     <div class="span4">4</div>
     <div class="span4 offset4">4 offset 4</div>
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index 30b843e0..02d1c7fe 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -119,7 +119,6 @@
   <ul>
     <li>{{_i}}Base class changed from <code>.topbar</code> to <code>.navbar</code>{{/i}}</li>
     <li>{{_i}}Now supports static position (default behavior, not fixed) and fixed to the top of viewport via <code>.navbar-fixed-top</code> (previously only supported fixed){{/i}}</li>
-    <li>{{_i}}Removed the <code>.secondary-nav</code> class; instead, just use <code>.pull-right</code> for right-aligned nav{{/i}}</li>
     <li>{{_i}}Added vertical dividers to top-level nav{{/i}}</li>
     <li>{{_i}}Improved support for inline forms in the navbar, which now require <code>.navbar-form</code> to properly scope styles to only the intended forms.{{/i}}</li>
     <li>{{_i}}Navbar search form now requires use of the <code>.navbar-search</code> class and its input the use of <code>.search-query</code>. To position the search form, you <strong>must</strong> use <code>.pull-left</code> or <code>.pull-right</code>.{{/i}}</li>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index f3b18e4e..4d8328b7 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -195,7 +195,6 @@
   <ul>
     <li>Base class changed from <code>.topbar</code> to <code>.navbar</code></li>
     <li>Now supports static position (default behavior, not fixed) and fixed to the top of viewport via <code>.navbar-fixed-top</code> (previously only supported fixed)</li>
-    <li>Removed the <code>.secondary-nav</code> class; instead, just use <code>.pull-right</code> for right-aligned nav</li>
     <li>Added vertical dividers to top-level nav</li>
     <li>Improved support for inline forms in the navbar, which now require <code>.navbar-form</code> to properly scope styles to only the intended forms.</li>
     <li>Navbar search form now requires use of the <code>.navbar-search</code> class and its input the use of <code>.search-query</code>. To position the search form, you <strong>must</strong> use <code>.pull-left</code> or <code>.pull-right</code>.</li>