From 89b3cb0dacd71fc7b20e125851f05f9ed266b50d Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 11 Aug 2013 15:17:04 -0700
Subject: fixes #9318

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

(limited to 'javascript.html')

diff --git a/javascript.html b/javascript.html
index 253301807..4e2af994a 100644
--- a/javascript.html
+++ b/javascript.html
@@ -273,7 +273,7 @@ $('#myModal').on('show.bs.modal', function (e) {
            <td>remote</td>
            <td>path</td>
            <td>false</td>
-           <td><p>If a remote URL is provided, content will be loaded via jQuery's <code>load</code> method and injected into the <code>.modal-body</code>. If you're using the data api, you may alternatively use the <code>href</code> attribute to specify the remote source. An example of this is shown below:</p>
+           <td><p>If a remote URL is provided, content will be loaded via jQuery's <code>load</code> method and injected into the root of the modal element. If you're using the data api, you may alternatively use the <code>href</code> attribute to specify the remote source. An example of this is shown below:</p>
 {% highlight html %}
 <a data-toggle="modal" href="remote.html" data-target="#modal">Click me</a>
 {% endhighlight %}
-- 
cgit v1.2.3


From 92c2ad98e753c64a2bd6e3fb94870a2ad3ee0333 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 11 Aug 2013 15:41:06 -0700
Subject: fixes #8983

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

(limited to 'javascript.html')

diff --git a/javascript.html b/javascript.html
index 4e2af994a..c3a6b0a32 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1722,6 +1722,12 @@ $('.carousel').carousel()
            <td>"hover"</td>
            <td>Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.</td>
          </tr>
+         <tr>
+           <td>wrap</td>
+           <td>boolean</td>
+           <td>true</td>
+           <td>Whether the carousel should cycle continuously or have hard stops.</td>
+         </tr>
         </tbody>
       </table>
     </div><!-- /.bs-table-scrollable -->
-- 
cgit v1.2.3