Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	docs/assets/js/application.js
	docs/components.html
	docs/templates/pages/components.mustache
	less/sprites.less

8 files changed, 26 insertions, 17 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 177e2487c..0196c6448 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -149,6 +149,9 @@ section > ul li {
   background-color: #eee;
   border: 1px solid #ddd;
 }
+.show-grid [class*="span"]:hover {
+  background-color: #ddd;
+}
 
 
 
@@ -522,4 +525,4 @@ input.focused {
   .bs-docs-sidenav {
     width: 260px;
   }
-}
\ No newline at end of file
+}
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 4fd6d3617..f880bc05d 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -34,12 +34,12 @@
     })
 
     // add tipsies to grid for scaffolding
-    // if ($('#gridSystem').length) {
-    //   $('#gridSystem').tooltip({
-    //       selector: '.show-grid > div:not(.tooltip)'
-    //     , title: function () { return $(this).width() + 'px' }
-    //   })
-    // }
+    if ($('#gridSystem').length) {
+      $('#gridSystem').tooltip({
+          selector: '.show-grid > [class*="span"]'
+        , title: function () { return $(this).width() + 'px' }
+      })
+    }
 
     // tooltip demo
     $('.tooltip-demo').tooltip({
diff --git a/docs/base-css.html b/docs/base-css.html
index 904c8dc63..9e0a3c1ec 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1535,7 +1535,7 @@ For example, <code><section></code> should be wrapped
 </pre>
 
           <h3>Form actions</h3>
-          <p>End a form with a group of actions (buttons). When placed within a <code>.form-horizontal</code>, the buttons will automatically indent to line up with the form controls.</p>
+          <p>End a form with a group of actions (buttons). When placed within a <code>.form-actions</code>, the buttons will automatically indent to line up with the form controls.</p>
           <form class="bs-docs-example">
             <div class="form-actions">
               <button type="submit" class="btn btn-primary">Save changes</button>
diff --git a/docs/components.html b/docs/components.html
index b88e54b88..aff2088cc 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1171,6 +1171,7 @@
   &lt;li&gt;&lt;a href="#"&gt;2&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="#"&gt;3&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="#"&gt;4&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#"&gt;5&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="#"&gt;Next&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
@@ -1196,7 +1197,7 @@
           </div>
 <pre class="prettyprint linenums">
 &lt;ul class="pagination"&gt;
-  &lt;li class="disabled"&gt;&lt;a href="#"&gt;Prev&lt;/a&gt;&lt;/li&gt;
+  &lt;li class="disabled"&gt;&lt;a href="#"&gt;&amp;laquo;&lt;/a&gt;&lt;/li&gt;
   &lt;li class="active"&gt;&lt;a href="#"&gt;1&lt;/a&gt;&lt;/li&gt;
   ...
 &lt;/ul&gt;
@@ -1204,7 +1205,7 @@
           <p>You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.</p>
 <pre class="prettyprint linenums">
 &lt;ul class="pagination"&gt;
-  &lt;li class="disabled"&gt;&lt;span&gt;Prev&lt;/span&gt;&lt;/li&gt;
+  &lt;li class="disabled"&gt;&lt;span&gt;&amp;laquo;&lt;/span&gt;&lt;/li&gt;
   &lt;li class="active"&gt;&lt;span&gt;1&lt;/span&gt;&lt;/li&gt;
   ...
 &lt;/ul&gt;
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 88ceb0001..e336c3347 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -185,10 +185,11 @@
 &lt;html&gt;
   &lt;head&gt;
     &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
+    &lt;meta name="viewport" content="width=device-width, initial-scale=1.0"&gt;
   &lt;/head&gt;
   &lt;body&gt;
     &lt;h1&gt;Hello, world!&lt;/h1&gt;
-    &lt;script src="http://code.jquery.com/jquery-latest.js"&gt;&lt;/script&gt;
+    &lt;script src="http://code.jquery.com/jquery.js"&gt;&lt;/script&gt;
   &lt;/body&gt;
 &lt;/html&gt;
 </pre>
@@ -198,12 +199,13 @@
 &lt;html&gt;
   &lt;head&gt;
     &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
+    &lt;meta name="viewport" content="width=device-width, initial-scale=1.0"&gt;
     &lt;!-- Bootstrap --&gt;
     &lt;link href="css/bootstrap.min.css" rel="stylesheet" media="screen"&gt;
   &lt;/head&gt;
   &lt;body&gt;
     &lt;h1&gt;Hello, world!&lt;/h1&gt;
-    &lt;script src="http://code.jquery.com/jquery-latest.js"&gt;&lt;/script&gt;
+    &lt;script src="http://code.jquery.com/jquery.js"&gt;&lt;/script&gt;
     &lt;script src="js/bootstrap.min.js"&gt;&lt;/script&gt;
   &lt;/body&gt;
 &lt;/html&gt;
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4ec1eee29..a544d319d 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1472,7 +1472,7 @@
 </pre>
 
           <h3>{{_i}}Form actions{{/i}}</h3>
-          <p>{{_i}}End a form with a group of actions (buttons). When placed within a <code>.form-horizontal</code>, the buttons will automatically indent to line up with the form controls.{{/i}}</p>
+          <p>{{_i}}End a form with a group of actions (buttons). When placed within a <code>.form-actions</code>, the buttons will automatically indent to line up with the form controls.{{/i}}</p>
           <form class="bs-docs-example">
             <div class="form-actions">
               <button type="submit" class="btn btn-primary">{{_i}}Save changes{{/i}}</button>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index bbaae5f1a..788801eab 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1100,6 +1100,7 @@
   &lt;li&gt;&lt;a href="#"&gt;2&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="#"&gt;3&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="#"&gt;4&lt;/a&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;a href="#"&gt;5&lt;/a&gt;&lt;/li&gt;
   &lt;li&gt;&lt;a href="#"&gt;Next&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
@@ -1125,7 +1126,7 @@
           </div>
 <pre class="prettyprint linenums">
 &lt;ul class="pagination"&gt;
-  &lt;li class="disabled"&gt;&lt;a href="#"&gt;Prev&lt;/a&gt;&lt;/li&gt;
+  &lt;li class="disabled"&gt;&lt;a href="#"&gt;&amp;laquo;&lt;/a&gt;&lt;/li&gt;
   &lt;li class="active"&gt;&lt;a href="#"&gt;1&lt;/a&gt;&lt;/li&gt;
   ...
 &lt;/ul&gt;
@@ -1133,7 +1134,7 @@
           <p>You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.</p>
 <pre class="prettyprint linenums">
 &lt;ul class="pagination"&gt;
-  &lt;li class="disabled"&gt;&lt;span&gt;Prev&lt;/span&gt;&lt;/li&gt;
+  &lt;li class="disabled"&gt;&lt;span&gt;&amp;laquo;&lt;/span&gt;&lt;/li&gt;
   &lt;li class="active"&gt;&lt;span&gt;1&lt;/span&gt;&lt;/li&gt;
   ...
 &lt;/ul&gt;
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index 44a70c693..aac7dba4f 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -114,10 +114,11 @@
 &lt;html&gt;
   &lt;head&gt;
     &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
+    &lt;meta name="viewport" content="width=device-width, initial-scale=1.0"&gt;
   &lt;/head&gt;
   &lt;body&gt;
     &lt;h1&gt;Hello, world!&lt;/h1&gt;
-    &lt;script src="http://code.jquery.com/jquery-latest.js"&gt;&lt;/script&gt;
+    &lt;script src="http://code.jquery.com/jquery.js"&gt;&lt;/script&gt;
   &lt;/body&gt;
 &lt;/html&gt;
 </pre>
@@ -127,12 +128,13 @@
 &lt;html&gt;
   &lt;head&gt;
     &lt;title&gt;Bootstrap 101 Template&lt;/title&gt;
+    &lt;meta name="viewport" content="width=device-width, initial-scale=1.0"&gt;
     &lt;!-- Bootstrap --&gt;
     &lt;link href="css/bootstrap.min.css" rel="stylesheet" media="screen"&gt;
   &lt;/head&gt;
   &lt;body&gt;
     &lt;h1&gt;Hello, world!&lt;/h1&gt;
-    &lt;script src="http://code.jquery.com/jquery-latest.js"&gt;&lt;/script&gt;
+    &lt;script src="http://code.jquery.com/jquery.js"&gt;&lt;/script&gt;
     &lt;script src="js/bootstrap.min.js"&gt;&lt;/script&gt;
   &lt;/body&gt;
 &lt;/html&gt;