7 files changed, 13 insertions, 12 deletions
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 9a122711a..40bbbfba5 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Base CSS{{/i}}</h1>
   <p class="lead">{{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
       <li><a href="#code">{{_i}}Code{{/i}}</a></li>
       <li><a href="#tables">{{_i}}Tables{{/i}}</a></li>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 16c910bbd..579fd08a6 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Components{{/i}}</h1>
   <p class="lead">{{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#dropdowns">{{_i}}Dropdowns{{/i}}</a></li>
       <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Buttons{{/i}} <b class="caret"></b></a>
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 11280434a..3d5d70c1c 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Customize and download{{/i}}</h1>
   <p class="lead">{{_i}}<a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#components">{{_i}}1. Choose components{{/i}}</a></li>
       <li><a href="#plugins">{{_i}}2. Select jQuery plugins{{/i}}</a></li>
       <li><a href="#variables">{{_i}}3. Customize variables{{/i}}</a></li>
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index d7c971372..9f5e40ace 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -35,7 +35,7 @@
   </div>
 </header>
 
-<hr class="bs-docs-separator">
+<hr class="soften">
 
 <div class="marketing">
   <h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
@@ -77,7 +77,7 @@
     </div>
   </div><!--/row-->
 
-  <hr class="bs-docs-separator">
+  <hr class="soften">
 
   <h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
   <p class="marketing-byline">{{_i}}For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a> or <a href="./examples.html">browse the examples</a>.{{/i}}</p>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 3e558c4f7..52ed45a49 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -4,7 +4,8 @@
   <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">
+    <ul class="nav">
+      <li><a href="#transitions">{{_i}}Transitions{{/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>
@@ -48,7 +49,7 @@
 
 <!-- Transitions
 ================================================== -->
-<section id="modals">
+<section id="transitions">
   <div class="page-header">
     <h1>{{_i}}Transitions{{/i}} <small>bootstrap-transition.js</small></h1>
   </div>
@@ -115,7 +116,7 @@
   <h3>{{_i}}Live demo{{/i}}</h3>
   <p>{{_i}}Toggle a modal via javascript by clicking the button below. It will slide down and fade in from the top of the page.{{/i}}</p>
   <!-- sample modal content -->
-  <div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div id="myModal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-header">
       <button type="button" class="close" data-dismiss="modal">&times;</button>
       <h3 id="myModalLabel">{{_i}}Modal Heading{{/i}}</h3>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index ccd829963..578a037f6 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Using LESS with Bootstrap{{/i}}</h1>
   <p class="lead">{{_i}}Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li>
       <li><a href="#variables">{{_i}}Variables{{/i}}</a></li>
       <li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index ec0bde55e..dd96cec37 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -4,7 +4,7 @@
   <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">
-    <ul class="nav nav-pills">
+    <ul class="nav">
       <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>
@@ -399,12 +399,12 @@
     </thead>
     <tbody>
       <tr>
-        <td>{{_i}}Smartphones{{/i}}</td>
+        <td>{{_i}}Phones{{/i}}</td>
         <td>480px and below</td>
         <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
       </tr>
       <tr>
-        <td>{{_i}}Smartphones to tablets{{/i}}</td>
+        <td>{{_i}}Phones to tablets{{/i}}</td>
         <td>767px and below</td>
         <td class="muted" colspan="2">{{_i}}Fluid columns, no fixed widths{{/i}}</td>
       </tr>