From 730d7f0b13143061fd0607cbe6c303d7bd8b74ec Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Tue, 8 Oct 2013 11:44:30 -0700
Subject: fix #10986

---
 javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'javascript.html')

diff --git a/javascript.html b/javascript.html
index ff07387fd..67cc9779f 100644
--- a/javascript.html
+++ b/javascript.html
@@ -253,7 +253,7 @@ $('#myModal').on('show.bs.modal', function (e) {
         <tbody>
          <tr>
            <td>backdrop</td>
-           <td>boolean</td>
+           <td>boolean or the string <code>'static'</code></td>
            <td>true</td>
            <td>Includes a modal-backdrop element. Alternatively, specify <code>static</code> for a backdrop which doesn't close the modal on click.</td>
          </tr>
-- 
cgit v1.2.3


From ef1fc34e616a0efda482ec54247a84d589244d55 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 9 Oct 2013 19:29:25 -0700
Subject: use data-ride="carousel" in the docs & examples; fixes #11005

---
 javascript.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'javascript.html')

diff --git a/javascript.html b/javascript.html
index 67cc9779f..5eb742cd2 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1665,7 +1665,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
     <h2 id="carousel-examples">Examples</h2>
     <p>The slideshow below shows a generic plugin and component for cycling through elements like a carousel.</p>
     <div class="bs-example">
-      <div id="carousel-example-generic" class="carousel slide bs-docs-carousel-example">
+      <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
         <ol class="carousel-indicators">
           <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
           <li data-target="#carousel-example-generic" data-slide-to="1"></li>
@@ -1691,7 +1691,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
       </div>
     </div><!-- /example -->
 {% highlight html %}
-<div id="carousel-example-generic" class="carousel slide">
+<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
   <!-- Indicators -->
   <ol class="carousel-indicators">
     <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
@@ -1727,7 +1727,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
     <h3>Optional captions</h3>
     <p>Add captions to your slides easily with the <code>.carousel-caption</code> element within any <code>.item</code>. Place just about any optional HTML within there and it will be automatically aligned and formatted.</p>
     <div class="bs-example">
-      <div id="carousel-example-captions" class="carousel slide bs-docs-carousel-example">
+      <div id="carousel-example-captions" class="carousel slide" data-ride="carousel">
         <ol class="carousel-indicators">
           <li data-target="#carousel-example-captions" data-slide-to="0" class="active"></li>
           <li data-target="#carousel-example-captions" data-slide-to="1"></li>
-- 
cgit v1.2.3


From dfdde4631272edb3f22288725292a1a1c46870d8 Mon Sep 17 00:00:00 2001
From: Alex Dahl <hello@alexdahl.com>
Date: Fri, 11 Oct 2013 18:11:58 -0700
Subject: documentation that multiple modals are not supported

---
 javascript.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'javascript.html')

diff --git a/javascript.html b/javascript.html
index 5eb742cd2..a0e96c1c6 100644
--- a/javascript.html
+++ b/javascript.html
@@ -104,6 +104,11 @@ $('#myModal').on('show.bs.modal', function (e) {
     <h2 id="modals-examples">Examples</h2>
     <p>Modals are streamlined, but flexible, dialog prompts with the minimum required functionality and smart defaults.</p>
 
+    <div class="bs-callout bs-callout-warning">
+      <h4>Overlapping modals not supported</h4>
+      <p>Be sure not to open a modal while another is still visible. Showing more than one modal at a time requires custom code.</p>
+    </div>
+
     <h3>Static example</h3>
     <p>A rendered modal with header, body, and set of actions in the footer.</p>
     <div class="bs-example bs-example-modal">
-- 
cgit v1.2.3