diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html
index f4caabc5c6..75967f704f 100644
--- a/docs/_includes/docs-nav.html
+++ b/docs/_includes/docs-nav.html
@@ -211,8 +211,8 @@
     <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="#js-alerts">Alert</a></li>
+    <li><a href="#js-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>
diff --git a/docs/docs.html b/docs/docs.html
index 1af0f367b2..d27c6e2238 100644
--- a/docs/docs.html
+++ b/docs/docs.html
@@ -3677,7 +3677,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <div class="page-header">
       <h1>Pagination</h1>
     </div>
-    <p class="lead">Provide pagination links for your site or app with the multi-page pagination component, or the simpler <a href="./components.html#pagination-pager">pager alternative</a>.</p>
+    <p class="lead">Provide pagination links for your site or app with the multi-page pagination component, or the simpler <a href="./docs/#pagination-pager">pager alternative</a>.</p>
 
     <h2 id="pagination-default">Standard pagination</h2>
     <p>Simple 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>
@@ -4024,7 +4024,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <div class="page-header">
       <h1>Thumbnails</h1>
     </div>
-    <p class="lead">Extend Bootstrap's <a href="./css/#gridsystem">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
+    <p class="lead">Extend Bootstrap's <a href="./docs/#grid">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
 
     <h3>Default thumbnails</h3>
     <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>
@@ -4124,7 +4124,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <div class="page-header">
       <h1>Alerts</h1>
     </div>
-    <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="./javascript.html#alerts">alerts jQuery plugin</a>.</p>
+    <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="./docs/#js-alerts">alerts jQuery plugin</a>.</p>
 
     <h3 id="alerts-default">Default alert</h3>
     <p>Wrap any text and an optional dismiss button in <code>.alert</code> for a basic warning alert message. <strong>To ensure proper behavior across all devices</strong>, be sure to use <code>&lt;button&gt;</code> element with the <code>data-dismiss="alert"</code> data attribute.</p>
@@ -5790,7 +5790,7 @@ $('#example').tooltip(options)
 
       <!-- Alert
       ================================================== -->
-      <section id="alerts">
+      <div class="bs-docs-section" id="js-alerts">
         <div class="page-header">
           <h1>Alert messages <small>bootstrap-alert.js</small></h1>
         </div>
@@ -5863,13 +5863,13 @@ $('#my-alert').bind('closed', function () {
   // do something…
 })
 {% endhighlight %}
-      </section>
+      </div>
 
 
 
           <!-- Buttons
           ================================================== -->
-          <section id="buttons">
+          <div class="bs-docs-section" id="js-buttons">
             <div class="page-header">
               <h1>Buttons <small>bootstrap-button.js</small></h1>
             </div>
@@ -6008,7 +6008,7 @@ $('.nav-tabs').button()
   $('.btn').button('complete')
 </script>
 {% endhighlight %}
-          </section>
+          </div>