Merge branch 'master' into restore_grid_mixins

Conflicts:
	dist/css/bootstrap.min.css

15 files changed, 26 insertions, 26 deletions

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index a57cab745..457a0013b 100644
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -15,7 +15,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
 
@@ -66,7 +66,7 @@
 
     <!-- Carousel
     ================================================== -->
-    <div id="myCarousel" class="carousel slide">
+    <div id="myCarousel" class="carousel slide" data-ride="carousel">
       <!-- Indicators -->
       <ol class="carousel-indicators">
         <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
@@ -195,7 +195,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs-assets/js/jquery.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
     <script src="../../docs-assets/js/holder.js"></script>
   </body>
diff --git a/examples/grid/index.html b/examples/grid/index.html
index 0e90504f8..419ea02d8 100644
--- a/examples/grid/index.html
+++ b/examples/grid/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html
index 02998bb1f..6c6c10344 100644
--- a/examples/jumbotron-narrow/index.html
+++ b/examples/jumbotron-narrow/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html
index d96ecab95..ea1c76a61 100644
--- a/examples/jumbotron/index.html
+++ b/examples/jumbotron/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
@@ -89,7 +89,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs-assets/js/jquery.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html
index e8d08dd86..ac5bb3112 100644
--- a/examples/justified-nav/index.html
+++ b/examples/justified-nav/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html
index 65e9ec585..56496db5b 100644
--- a/examples/navbar-fixed-top/index.html
+++ b/examples/navbar-fixed-top/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
@@ -81,7 +81,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs-assets/js/jquery.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html
index 457885006..864f48e57 100644
--- a/examples/navbar-static-top/index.html
+++ b/examples/navbar-static-top/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
@@ -82,7 +82,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs-assets/js/jquery.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/navbar/index.html b/examples/navbar/index.html
index ce5c90c3f..78ca19215 100644
--- a/examples/navbar/index.html
+++ b/examples/navbar/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
@@ -78,7 +78,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs-assets/js/jquery.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html
index 2aa5c4f57..6db2d0bb5 100644
--- a/examples/non-responsive/index.html
+++ b/examples/non-responsive/index.html
@@ -20,7 +20,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
@@ -91,7 +91,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs-assets/js/jquery.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html
index c8e6a793a..62ac8ef2b 100644
--- a/examples/offcanvas/index.html
+++ b/examples/offcanvas/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
@@ -119,7 +119,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs-assets/js/jquery.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
     <script src="offcanvas.js"></script>
   </body>
diff --git a/examples/signin/index.html b/examples/signin/index.html
index 45cb8db57..46ba71c7a 100644
--- a/examples/signin/index.html
+++ b/examples/signin/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
diff --git a/examples/starter-template/index.html b/examples/starter-template/index.html
index 1efa511bb..e6527ccbc 100644
--- a/examples/starter-template/index.html
+++ b/examples/starter-template/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
@@ -58,7 +58,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs-assets/js/jquery.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html
index 591e4a8bb..12a4fb1a2 100644
--- a/examples/sticky-footer-navbar/index.html
+++ b/examples/sticky-footer-navbar/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
@@ -81,7 +81,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs-assets/js/jquery.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/sticky-footer/index.html b/examples/sticky-footer/index.html
index 1243c1cbc..c8da90cc9 100644
--- a/examples/sticky-footer/index.html
+++ b/examples/sticky-footer/index.html
@@ -18,7 +18,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
diff --git a/examples/theme/index.html b/examples/theme/index.html
index 0ca5a2fc4..7cd41b692 100644
--- a/examples/theme/index.html
+++ b/examples/theme/index.html
@@ -20,7 +20,7 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.6.2/html5shiv.js"></script>
       <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
@@ -347,7 +347,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../docs-assets/js/jquery.js"></script>
+    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
     <script src="../../docs-assets/js/holder.js"></script>
   </body>