From 67f199678c6f764f2812260f42b553b22ec740f8 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 19 Mar 2012 15:48:57 -0700
Subject: if interval is false, do not autocycle the carousel

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index a90562767..54177b566 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1308,7 +1308,7 @@ $('#myCollapsible').on('hidden', function () {
                <td>interval</td>
                <td>number</td>
                <td>5000</td>
-               <td>The amount of time to delay between automatically cycling an item.</td>
+               <td>The amount of time to delay between automatically cycling an item. If false, carousel will not automatically cycle.</td>
              </tr>
              <tr>
                <td>pause</td>
-- 
cgit v1.2.3


From 07d23b927ee4eefdee51d4fcbffb3dece33be698 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Mon, 19 Mar 2012 20:29:22 -0700
Subject: add activate to scrollspy docs

---
 docs/javascript.html | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 54177b566..3ee6f795c 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -589,6 +589,21 @@ $('#myModal').on('hidden', function () {
              </tr>
             </tbody>
           </table>
+           <h3>Events</h3>
+          <table class="table table-bordered table-striped">
+            <thead>
+             <tr>
+               <th style="width: 150px;">Event</th>
+               <th>Description</th>
+             </tr>
+            </thead>
+            <tbody>
+             <tr>
+               <td>activate</td>
+               <td>This event fires whenever a new item becomes activated by the scrollspy.</td>
+            </tr>
+            </tbody>
+          </table>
         </div>
       </div>
     </section>
-- 
cgit v1.2.3