Keep origin in track

25 files changed, 121 insertions, 61 deletions

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 4a9a9eba5..26436c0a2 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index d01791cc5..780719e65 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -7,6 +7,16 @@
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
  */
+.clearfix {
+  *zoom: 1;
+}
+.clearfix:before, .clearfix:after {
+  display: table;
+  content: "";
+}
+.clearfix:after {
+  clear: both;
+}
 .hidden {
   display: none;
   visibility: hidden;
@@ -102,7 +112,7 @@
     margin: 0;
   }
 }
-@media (min-width: 768px) and (max-width: 980px) {
+@media (min-width: 768px) and (max-width: 979px) {
   .row {
     margin-left: -20px;
     *zoom: 1;
@@ -278,7 +288,7 @@
     width: 714px;
   }
 }
-@media (max-width: 980px) {
+@media (max-width: 979px) {
   body {
     padding-top: 0;
   }
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 25c04944a..b5b5f8475 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -33,7 +33,7 @@ html {
   -ms-text-size-adjust: 100%;
 }
 a:focus {
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -94,6 +94,16 @@ textarea {
   overflow: auto;
   vertical-align: top;
 }
+.clearfix {
+  *zoom: 1;
+}
+.clearfix:before, .clearfix:after {
+  display: table;
+  content: "";
+}
+.clearfix:after {
+  clear: both;
+}
 body {
   margin: 0;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -488,6 +498,7 @@ pre {
   white-space: pre;
   white-space: pre-wrap;
   word-break: break-all;
+  word-wrap: break-word;
 }
 pre.prettyprint {
   margin-bottom: 18px;
@@ -530,11 +541,16 @@ input,
 button,
 select,
 textarea {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   font-weight: normal;
   line-height: 18px;
 }
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
 label {
   display: block;
   margin-bottom: 5px;
@@ -573,11 +589,16 @@ input[type="image"], input[type="checkbox"], input[type="radio"] {
   /* IE7 */
 
   line-height: normal;
-  border: 0;
   cursor: pointer;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
+  border: 0 \9;
+  /* IE9 and down */
+
+}
+input[type="image"] {
+  border: 0;
 }
 input[type="file"] {
   width: auto;
@@ -670,7 +691,7 @@ select:focus {
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -1744,7 +1765,7 @@ table .span12 {
   transition: background-position 0.1s linear;
 }
 .btn:focus {
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -1786,6 +1807,11 @@ table .span12 {
 .btn-small [class^="icon-"] {
   margin-top: -1px;
 }
+.btn-mini {
+  padding: 2px 6px;
+  font-size: 11px;
+  line-height: 14px;
+}
 .btn-primary,
 .btn-primary:hover,
 .btn-warning,
diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js
index 4a65b135a..1d69c5f53 100644
--- a/docs/assets/js/bootstrap-alert.js
+++ b/docs/assets/js/bootstrap-alert.js
@@ -51,11 +51,14 @@
 
       $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
 
-      $parent.removeClass('in')
+      $parent
+        .trigger('close')
+        .removeClass('in')
 
       function removeElement() {
-        $parent.remove()
-        $parent.trigger('closed')
+        $parent
+          .trigger('closed')
+          .remove()
       }
 
       $.support.transition && $parent.hasClass('fade') ?
@@ -88,4 +91,4 @@
     $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
   })
 
-}( window.jQuery )
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js
index a3f4657e8..89101ed7b 100644
--- a/docs/assets/js/bootstrap-button.js
+++ b/docs/assets/js/bootstrap-button.js
@@ -95,4 +95,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js
index 2f47edb8d..bad4f46f4 100644
--- a/docs/assets/js/bootstrap-carousel.js
+++ b/docs/assets/js/bootstrap-carousel.js
@@ -61,6 +61,7 @@
 
   , pause: function () {
       clearInterval(this.interval)
+      this.interval = null
       return this
     }
 
@@ -82,6 +83,8 @@
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
 
+      if (!$next.length) return
+
       this.sliding = true
 
       isCycling && this.pause()
@@ -151,4 +154,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js
index 8134cc42f..53bcd7c40 100644
--- a/docs/assets/js/bootstrap-collapse.js
+++ b/docs/assets/js/bootstrap-collapse.js
@@ -133,4 +133,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js
index 48d3ce0f8..ce65aa3b5 100644
--- a/docs/assets/js/bootstrap-dropdown.js
+++ b/docs/assets/js/bootstrap-dropdown.js
@@ -89,4 +89,4 @@
     $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
   })
 
-}( window.jQuery )
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js
index ffbed0d2e..0a69b6a2f 100644
--- a/docs/assets/js/bootstrap-modal.js
+++ b/docs/assets/js/bootstrap-modal.js
@@ -207,4 +207,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js
index 35ff9d0ab..4df81fee9 100644
--- a/docs/assets/js/bootstrap-popover.js
+++ b/docs/assets/js/bootstrap-popover.js
@@ -92,4 +92,4 @@
   , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
   })
 
-}( window.jQuery )
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js
index e8bd0715c..f9aba137b 100644
--- a/docs/assets/js/bootstrap-scrollspy.js
+++ b/docs/assets/js/bootstrap-scrollspy.js
@@ -122,4 +122,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap-tab.js b/docs/assets/js/bootstrap-tab.js
index f19db5da1..78258c6a0 100644
--- a/docs/assets/js/bootstrap-tab.js
+++ b/docs/assets/js/bootstrap-tab.js
@@ -127,4 +127,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js
index 21f2311fb..e1c8b2dc2 100644
--- a/docs/assets/js/bootstrap-tooltip.js
+++ b/docs/assets/js/bootstrap-tooltip.js
@@ -267,4 +267,4 @@
   , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
   }
 
-}( window.jQuery )
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js
index 956350bd0..0b13eccd4 100644
--- a/docs/assets/js/bootstrap-transition.js
+++ b/docs/assets/js/bootstrap-transition.js
@@ -47,5 +47,5 @@
     })()
 
   })
-  
-}( window.jQuery )
+
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js
index 1426185af..e0be49fec 100644
--- a/docs/assets/js/bootstrap-typeahead.js
+++ b/docs/assets/js/bootstrap-typeahead.js
@@ -268,4 +268,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery );
\ No newline at end of file
diff --git a/docs/base-css.html b/docs/base-css.html
index d67d1bd55..c04dc7daa 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1266,37 +1266,37 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
     </thead>
     <tbody>
       <tr>
-        <td><a class="btn" href="#">Default</a></td>
+        <td><button class="btn" href="#">Default</button></td>
         <td><code>.btn</code></td>
         <td>Standard gray button with gradient</td>
       </tr>
       <tr>
-        <td><a class="btn btn-primary" href="#">Primary</a></td>
+        <td><button class="btn btn-primary" href="#">Primary</button></td>
         <td><code>.btn-primary</code></td>
         <td>Provides extra visual weight and identifies the primary action in a set of buttons</td>
       </tr>
       <tr>
-        <td><a class="btn btn-info" href="#">Info</a></td>
+        <td><button class="btn btn-info" href="#">Info</button></td>
         <td><code>.btn-info</code></td>
         <td>Used as an alternate to the default styles</td>
       </tr>
       <tr>
-        <td><a class="btn btn-success" href="#">Success</a></td>
+        <td><button class="btn btn-success" href="#">Success</button></td>
         <td><code>.btn-success</code></td>
         <td>Indicates a successful or positive action</td>
       </tr>
       <tr>
-        <td><a class="btn btn-warning" href="#">Warning</a></td>
+        <td><button class="btn btn-warning" href="#">Warning</button></td>
         <td><code>.btn-warning</code></td>
         <td>Indicates caution should be taken with this action</td>
       </tr>
       <tr>
-        <td><a class="btn btn-danger" href="#">Danger</a></td>
+        <td><button class="btn btn-danger" href="#">Danger</button></td>
         <td><code>.btn-danger</code></td>
         <td>Indicates a dangerous or potentially negative action</td>
       </tr>
   	  <tr>
-        <td><a class="btn btn-inverse" href="#">Inverse</a></td>
+        <td><button class="btn btn-inverse" href="#">Inverse</button></td>
         <td><code>.btn-inverse</code></td>
         <td>Alternate dark gray button, not tied to a semantic action or use</td>
       </tr>
@@ -1313,7 +1313,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
     </div>
     <div class="span4">
       <h3>Multiple sizes</h3>
-      <p>Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for two additional sizes.</p>
+      <p>Fancy larger or smaller buttons? Add <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code> for two additional sizes.</p>
       <p>
         <button class="btn btn-large btn-primary">Primary action</button>
         <button class="btn btn-large">Action</button>
@@ -1322,6 +1322,10 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
         <button class="btn btn-small btn-primary">Primary action</button>
         <button class="btn btn-small">Action</button>
       </p>
+      <p>
+        <button class="btn btn-mini btn-primary">Primary action</button>
+        <button class="btn btn-mini">Action</button>
+      </p>
       <br>
       <h3>Disabled state</h3>
       <p>For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code>&lt;button&gt;</code> elements.</p>
diff --git a/docs/components.html b/docs/components.html
index bab4f9764..617b21a41 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -864,14 +864,14 @@
 &lt;div class="navbar"&gt;
   &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;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;a class="brand" href="#"&gt;Project name&lt;/a&gt;
 
@@ -901,10 +901,18 @@
   &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>
+<pre class="prettyprint linenums">
+&lt;ul class="nav"&gt;
+  ...
+  &lt;li class="divider-vertical"&gt;&lt;/li&gt;
+  ...
+&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 dropdowns</h3>
-      <p>Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdown">our javascript plugin</a>.</p>
+      <p>Adding dropdowns 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;
@@ -920,7 +928,7 @@
   &lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-      <p><a class="btn" href="./javascript.html#dropdown">Get the javascript &rarr;</a></p>
+      <p><a class="btn" href="./javascript.html#dropdowns">Get the javascript &rarr;</a></p>
     </div><!-- /.span -->
   </div><!-- /.row -->
 
diff --git a/docs/javascript.html b/docs/javascript.html
index 4ab4f5af3..612724c79 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -289,7 +289,7 @@
 </pre>
 
 <pre class="prettyprint linenums">
-&lt;div class="modal"&gt;
+&lt;div class="modal" id="myModal"&gt;
   &lt;div class="modal-header"&gt;
     &lt;a class="close" data-dismiss="modal"&gt;&times;&lt;/a&gt;
     &lt;h3&gt;Modal header&lt;/h3&gt;
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 18ec5fb42..525c1152f 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -444,7 +444,7 @@
           </tr>
           <tr>
             <td>Landscape tablets</td>
-            <td>768px to 980px</td>
+            <td>768px to 979px</td>
             <td>42px</td>
             <td>20px</td>
           </tr>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4b2f379c5..acb9cdcb2 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1190,37 +1190,37 @@
     </thead>
     <tbody>
       <tr>
-        <td><a class="btn" href="#">{{_i}}Default{{/i}}</a></td>
+        <td><button class="btn" href="#">{{_i}}Default{{/i}}</button></td>
         <td><code>.btn</code></td>
         <td>{{_i}}Standard gray button with gradient{{/i}}</td>
       </tr>
       <tr>
-        <td><a class="btn btn-primary" href="#">{{_i}}Primary{{/i}}</a></td>
+        <td><button class="btn btn-primary" href="#">{{_i}}Primary{{/i}}</button></td>
         <td><code>.btn-primary</code></td>
         <td>{{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}</td>
       </tr>
       <tr>
-        <td><a class="btn btn-info" href="#">{{_i}}Info{{/i}}</a></td>
+        <td><button class="btn btn-info" href="#">{{_i}}Info{{/i}}</button></td>
         <td><code>.btn-info</code></td>
         <td>{{_i}}Used as an alternate to the default styles{{/i}}</td>
       </tr>
       <tr>
-        <td><a class="btn btn-success" href="#">{{_i}}Success{{/i}}</a></td>
+        <td><button class="btn btn-success" href="#">{{_i}}Success{{/i}}</button></td>
         <td><code>.btn-success</code></td>
         <td>{{_i}}Indicates a successful or positive action{{/i}}</td>
       </tr>
       <tr>
-        <td><a class="btn btn-warning" href="#">{{_i}}Warning{{/i}}</a></td>
+        <td><button class="btn btn-warning" href="#">{{_i}}Warning{{/i}}</button></td>
         <td><code>.btn-warning</code></td>
         <td>{{_i}}Indicates caution should be taken with this action{{/i}}</td>
       </tr>
       <tr>
-        <td><a class="btn btn-danger" href="#">{{_i}}Danger{{/i}}</a></td>
+        <td><button class="btn btn-danger" href="#">{{_i}}Danger{{/i}}</button></td>
         <td><code>.btn-danger</code></td>
         <td>{{_i}}Indicates a dangerous or potentially negative action{{/i}}</td>
       </tr>
   	  <tr>
-        <td><a class="btn btn-inverse" href="#">{{_i}}Inverse{{/i}}</a></td>
+        <td><button class="btn btn-inverse" href="#">{{_i}}Inverse{{/i}}</button></td>
         <td><code>.btn-inverse</code></td>
         <td>{{_i}}Alternate dark gray button, not tied to a semantic action or use{{/i}}</td>
       </tr>
@@ -1237,7 +1237,7 @@
     </div>
     <div class="span4">
       <h3>{{_i}}Multiple sizes{{/i}}</h3>
-      <p>{{_i}}Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for two additional sizes.{{/i}}</p>
+      <p>{{_i}}Fancy larger or smaller buttons? Add <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code> for two additional sizes.{{/i}}</p>
       <p>
         <button class="btn btn-large btn-primary">{{_i}}Primary action{{/i}}</button>
         <button class="btn btn-large">{{_i}}Action{{/i}}</button>
@@ -1246,6 +1246,10 @@
         <button class="btn btn-small btn-primary">{{_i}}Primary action{{/i}}</button>
         <button class="btn btn-small">{{_i}}Action{{/i}}</button>
       </p>
+      <p>
+        <button class="btn btn-mini btn-primary">{{_i}}Primary action{{/i}}</button>
+        <button class="btn btn-mini">{{_i}}Action{{/i}}</button>
+      </p>
       <br>
       <h3>{{_i}}Disabled state{{/i}}</h3>
       <p>{{_i}}For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code>&lt;button&gt;</code> elements.{{/i}}</p>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 8649a9c28..9f9d08e35 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -788,14 +788,14 @@
 &lt;div class="navbar"&gt;
   &lt;div class="navbar-inner"&gt;
     &lt;div class="container"&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;!-- {{_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;
 
@@ -825,10 +825,18 @@
   &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>
+<pre class="prettyprint linenums">
+&lt;ul class="nav"&gt;
+  ...
+  &lt;li class="divider-vertical"&gt;&lt;/li&gt;
+  ...
+&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 dropdowns{{/i}}</h3>
-      <p>{{_i}}Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdown">our javascript plugin</a>.{{/i}}</p>
+      <p>{{_i}}Adding dropdowns 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;
@@ -844,7 +852,7 @@
   &lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-      <p><a class="btn" href="./javascript.html#dropdown">{{_i}}Get the javascript &rarr;{{/i}}</a></p>
+      <p><a class="btn" href="./javascript.html#dropdowns">{{_i}}Get the javascript &rarr;{{/i}}</a></p>
     </div><!-- /.span -->
   </div><!-- /.row -->
 
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c072e306b..ac989f3ed 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -213,7 +213,7 @@
 </pre>
 
 <pre class="prettyprint linenums">
-&lt;div class="modal"&gt;
+&lt;div class="modal" id="myModal"&gt;
   &lt;div class="modal-header"&gt;
     &lt;a class="close" data-dismiss="modal"&gt;&times;&lt;/a&gt;
     &lt;h3&gt;Modal header&lt;/h3&gt;
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index cc3cceea7..50c776e2d 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -368,7 +368,7 @@
           </tr>
           <tr>
             <td>{{_i}}Landscape tablets{{/i}}</td>
-            <td>768px to 980px</td>
+            <td>768px to 979px</td>
             <td>42px</td>
             <td>20px</td>
           </tr>
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index ebe70bcdd..5a82e2dc9 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -39,7 +39,7 @@
   <ul>
     <li>{{_i}}Media queries added for <strong>basic support</strong> across mobile and tablet devices{{/i}}
     <li>{{_i}}Responsive CSS is compiled separately, as bootstrap-responsive.css{{/i}}</li>
-  </ul>  
+  </ul>
 </section>
 
 
@@ -179,13 +179,10 @@
     <li>{{_i}}The <code>animate</code> option was renamed to <code>animation</code>.{{/i}}</li>
     <li>{{_i}}The <code>html</code> option was removed, as the tooltips default to allowing HTML now.{{/i}}</li>
   </ul>
-  <h3>{{_i}}Tooltips{{/i}}</h3>
-  <ul>
-    <li>{{_i}}Values for <code>placement</code> option changed from <code>above</code> and <code>below</code> to <code>top</code> and <code>bottom</code>. (Affects popovers, too.){{/i}}</li>
-  </ul>
   <h3>{{_i}}Popovers{{/i}}</h3>
   <ul>
     <li>{{_i}}Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.{{/i}}</li>
+    <li>{{_i}}The <code>placement</code> option value that was <code>below</code> is now <code>bottom</code>, and <code>above</code> is now <code>top</code>.{{/i}}</li>
   </ul>
   <h3>{{_i}}New plugins{{/i}}</h3>
   <ul>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index 0c9ab1673..f56f22545 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -115,7 +115,7 @@
   <ul>
     <li>Media queries added for <strong>basic support</strong> across mobile and tablet devices
     <li>Responsive CSS is compiled separately, as bootstrap-responsive.css</li>
-  </ul>  
+  </ul>
 </section>
 
 
@@ -255,13 +255,10 @@
     <li>The <code>animate</code> option was renamed to <code>animation</code>.</li>
     <li>The <code>html</code> option was removed, as the tooltips default to allowing HTML now.</li>
   </ul>
-  <h3>Tooltips</h3>
-  <ul>
-    <li>Values for <code>placement</code> option changed from <code>above</code> and <code>below</code> to <code>top</code> and <code>bottom</code>. (Affects popovers, too.)</li>
-  </ul>
   <h3>Popovers</h3>
   <ul>
     <li>Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.</li>
+    <li>The <code>placement</code> option value that was <code>below</code> is now <code>bottom</code>, and <code>above</code> is now <code>top</code>.</li>
   </ul>
   <h3>New plugins</h3>
   <ul>