Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

docs/base-css.html

@@ -40,7 +40,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#grid-system">Grid system</a></li>
                 <li><a href="./scaffolding.html#layouts">Layouts</a></li>
                 <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
               </ul>
@@ -51,7 +51,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#typography">Typography</a></li>
                 <li><a href="./base-css.html#tables">Tables</a></li>
                 <li><a href="./base-css.html#forms">Forms</a></li>
                 <li><a href="./base-css.html#buttons">Buttons</a></li>
@@ -72,6 +72,7 @@
                 <li><a href="./components.html#pagination">Pagination</a></li>
                 <li><a href="./components.html#thumbnails">Thumbnails</a></li>
                 <li><a href="./components.html#alerts">Alert messages</a></li>
+                <li><a href="./components.html#progress">Progress bars</a></li>
               </ul>
             </li>
             <li class="dropdown">
@@ -928,7 +929,7 @@
       <p>States like error, warning, and success are included for each type of form control. Also included are styles for disabled controls.</p>
     </div>
   </div>
-  
+
   <h2>Four types of forms</h2>
   <p>Bootstrap provides simple markup and styles for four styles of common web forms.</p>
   <table class="bordered-table striped-table">

docs/components.html

@@ -40,7 +40,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#grid-system">Grid system</a></li>
                 <li><a href="./scaffolding.html#layouts">Layouts</a></li>
                 <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
               </ul>
@@ -51,7 +51,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#typography">Typography</a></li>
                 <li><a href="./base-css.html#tables">Tables</a></li>
                 <li><a href="./base-css.html#forms">Forms</a></li>
                 <li><a href="./base-css.html#buttons">Buttons</a></li>
@@ -72,6 +72,7 @@
                 <li><a href="./components.html#pagination">Pagination</a></li>
                 <li><a href="./components.html#thumbnails">Thumbnails</a></li>
                 <li><a href="./components.html#alerts">Alert messages</a></li>
+                <li><a href="./components.html#progress">Progress bars</a></li>
               </ul>
             </li>
             <li class="dropdown">
@@ -844,7 +845,7 @@
 
 <!-- Pagination
 ================================================== -->
-<section id="carousel">
+<section id="pagination">
   <div class="page-header">
     <h1>Pagination <small></small></h1>
   </div>
@@ -907,9 +908,9 @@
 
 
 
-<!-- Media
+<!-- Thumbnails
 ================================================== -->
-<section id="media">
+<section id="thumbnails">
   <div class="page-header">
     <h1>Thumbnails <small>Grids of images, videos, text, and more</small></h1>
   </div>
@@ -1148,7 +1149,7 @@
 
 <!-- Progress bars
 ================================================== -->
-      <section id="progresss">
+      <section id="progress">
         <div class="page-header">
           <h1>Progress bars <small>For loading, redirecting, or action status</small></h1>
         </div>

docs/index.html

@@ -41,7 +41,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#grid-system">Grid system</a></li>
                 <li><a href="./scaffolding.html#layouts">Layouts</a></li>
                 <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
               </ul>
@@ -52,7 +52,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#typography">Typography</a></li>
                 <li><a href="./base-css.html#tables">Tables</a></li>
                 <li><a href="./base-css.html#forms">Forms</a></li>
                 <li><a href="./base-css.html#buttons">Buttons</a></li>
@@ -73,6 +73,7 @@
                 <li><a href="./components.html#pagination">Pagination</a></li>
                 <li><a href="./components.html#thumbnails">Thumbnails</a></li>
                 <li><a href="./components.html#alerts">Alert messages</a></li>
+                <li><a href="./components.html#progress">Progress bars</a></li>
               </ul>
             </li>
             <li class="dropdown">

docs/javascript.html

@@ -41,7 +41,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#grid-system">Grid system</a></li>
                 <li><a href="./scaffolding.html#layouts">Layouts</a></li>
                 <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
               </ul>
@@ -52,7 +52,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#typography">Typography</a></li>
                 <li><a href="./base-css.html#tables">Tables</a></li>
                 <li><a href="./base-css.html#forms">Forms</a></li>
                 <li><a href="./base-css.html#buttons">Buttons</a></li>
@@ -73,6 +73,7 @@
                 <li><a href="./components.html#pagination">Pagination</a></li>
                 <li><a href="./components.html#thumbnails">Thumbnails</a></li>
                 <li><a href="./components.html#alerts">Alert messages</a></li>
+                <li><a href="./components.html#progress">Progress bars</a></li>
               </ul>
             </li>
             <li class="dropdown active">

docs/less.html

@@ -40,7 +40,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#grid-system">Grid system</a></li>
                 <li><a href="./scaffolding.html#layouts">Layouts</a></li>
                 <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
               </ul>
@@ -51,7 +51,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#typography">Typography</a></li>
                 <li><a href="./base-css.html#tables">Tables</a></li>
                 <li><a href="./base-css.html#forms">Forms</a></li>
                 <li><a href="./base-css.html#buttons">Buttons</a></li>
@@ -72,6 +72,7 @@
                 <li><a href="./components.html#pagination">Pagination</a></li>
                 <li><a href="./components.html#thumbnails">Thumbnails</a></li>
                 <li><a href="./components.html#alerts">Alert messages</a></li>
+                <li><a href="./components.html#progress">Progress bars</a></li>
               </ul>
             </li>
             <li class="dropdown">

docs/scaffolding.html

@@ -40,7 +40,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#grid-system">Grid system</a></li>
                 <li><a href="./scaffolding.html#layouts">Layouts</a></li>
                 <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
               </ul>
@@ -51,7 +51,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#typography">Typography</a></li>
                 <li><a href="./base-css.html#tables">Tables</a></li>
                 <li><a href="./base-css.html#forms">Forms</a></li>
                 <li><a href="./base-css.html#buttons">Buttons</a></li>
@@ -72,6 +72,7 @@
                 <li><a href="./components.html#pagination">Pagination</a></li>
                 <li><a href="./components.html#thumbnails">Thumbnails</a></li>
                 <li><a href="./components.html#alerts">Alert messages</a></li>
+                <li><a href="./components.html#progress">Progress bars</a></li>
               </ul>
             </li>
             <li class="dropdown">

docs/upgrading.html

@@ -40,7 +40,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./scaffolding.html#grid">Grid system</a></li>
+                <li><a href="./scaffolding.html#grid-system">Grid system</a></li>
                 <li><a href="./scaffolding.html#layouts">Layouts</a></li>
                 <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
               </ul>
@@ -51,7 +51,7 @@
                 <b class="caret"></b>
               </a>
               <ul class="dropdown-menu">
-                <li><a href="./base-css.html#type">Type</a></li>
+                <li><a href="./base-css.html#typography">Typography</a></li>
                 <li><a href="./base-css.html#tables">Tables</a></li>
                 <li><a href="./base-css.html#forms">Forms</a></li>
                 <li><a href="./base-css.html#buttons">Buttons</a></li>
@@ -72,6 +72,7 @@
                 <li><a href="./components.html#pagination">Pagination</a></li>
                 <li><a href="./components.html#thumbnails">Thumbnails</a></li>
                 <li><a href="./components.html#alerts">Alert messages</a></li>
+                <li><a href="./components.html#progress">Progress bars</a></li>
               </ul>
             </li>
             <li class="dropdown">

js/bootstrap-tooltip.js

@@ -115,7 +115,7 @@
         }
 
         placement = typeof this.options.placement == 'function' ?
-          thing.call(this, $tip[0], this.$element[0]) :
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
           this.options.placement
 
         inside = /in/.test(placement)
@@ -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