Merge branch 'master' of github.com:twbs/bootstrap

docs/examples/blog/index.html

@@ -166,6 +166,6 @@
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
-    <script src="../../assets/js/holder.js"></script>
+    <script src="../../assets/js/docs.min.js"></script>
   </body>
 </html>

docs/examples/carousel/index.html

@@ -201,6 +201,6 @@
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
-    <script src="../../assets/js/holder.js"></script>
+    <script src="../../assets/js/docs.min.js"></script>
   </body>
 </html>

docs/examples/cover/index.html

@@ -70,6 +70,6 @@
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
-    <script src="../../assets/js/holder.js"></script>
+    <script src="../../assets/js/docs.min.js"></script>
   </body>
 </html>

docs/examples/dashboard/index.html

@@ -238,6 +238,6 @@
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
-    <script src="../../assets/js/holder.js"></script>
+    <script src="../../assets/js/docs.min.js"></script>
   </body>
 </html>

docs/examples/theme/index.html

@@ -379,6 +379,6 @@
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
-    <script src="../../assets/js/holder.js"></script>
+    <script src="../../assets/js/docs.min.js"></script>
   </body>
 </html>