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

docs/javascript.html

@@ -914,7 +914,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           <p>Closes an alert.</p>
           <pre class="prettyprint linenums">$(".alert-message").alert('close')</pre>
           <h3>Events</h3>
-          <p>Bootstrap's alert class exposes a few events for hooking into alert functionality. </p>
+          <p>Bootstrap's alert class exposes a few events for hooking into alert functionality.</p>
           <table class="table table-bordered table-striped">
             <thead>
              <tr>
@@ -935,7 +935,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           </table>
 <pre class="prettyprint linenums">
 $('#my-alert').bind('closed', function () {
-  // do something ...
+  // do something…
 })</pre>
         </div>
       </div>
@@ -1024,7 +1024,7 @@ $('#my-alert').bind('closed', function () {
           <h4>$().button('toggle')</h4>
           <p>Toggles push state. Gives btn the look that it's been activated.</p>
           <p><span class="label notice">Notice</span> You can enable auto toggling of a button by using the <code>data-toggle</code> attribute.</p>
-          <pre class="prettyprint linenums">&lt;button class="btn" data-toggle="button" &gt;...&lt;/button&gt;</pre>
+          <pre class="prettyprint linenums">&lt;button class="btn" data-toggle="button" &gt;…&lt;/button&gt;</pre>
           <h4>$().button('loading')</h4>
           <p>Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute <code>data-loading-text</code>.
           </p>
@@ -1166,7 +1166,7 @@ $('#myCollapsible').collapse({
             </thead>
             <tbody>
              <tr>
-               <td>show</td>
+               <td>show/td>
                <td>This event fires immediately when the <code>show</code> instance method is called.</td>
              </tr>
              <tr>
@@ -1188,7 +1188,7 @@ $('#myCollapsible').collapse({
 
 <pre class="prettyprint linenums">
 $('#myCollapsible').on('hidden', function () {
-  // do something ...
+  // do something…
 })</pre>
         </div>
       </div>
@@ -1293,7 +1293,7 @@ $('.myCarousel').carousel({
           <h4>.carousel('next')</h4>
           <p>Cycles to the next item.</p>
           <h3>Events</h3>
-          <p>Bootstrap's modal class exposes a few events for hooking into modal functionality. </p>
+          <p>Bootstrap's modal class exposes a few events for hooking into modal functionality.</p>
           <table class="table table-bordered table-striped">
             <thead>
              <tr>

js/tests/vendor/jquery.js

@@ -1461,7 +1461,7 @@ jQuery.support = (function() {
 	// Check if div with explicit width and no margin-right incorrectly
 	// gets computed margin-right based on width of container. For more
 	// info see bug #3333
-	// Fails in WebKit before Feb 2012 nightlies
+	// Fails in WebKit before Feb 2011 nightlies
 	// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
 	if ( window.getComputedStyle ) {
 		marginDiv = document.createElement( "div" );