From: Ryan Burnett <ryaburne@fabric.com>
Date: Thu, 12 May 2016 13:40:23 +0000 (-0400)
Subject: Alphabetized carousel options & added "ride" to it
X-Git-Tag: v4.0.0-alpha.6~472^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07474841881f25b2686d50070902f341370b9d4c;p=thirdparty%2Fbootstrap.git

Alphabetized carousel options & added "ride" to it
---

diff --git a/docs/components/carousel.md b/docs/components/carousel.md
index 76278281e5..e825fcaac3 100644
--- a/docs/components/carousel.md
+++ b/docs/components/carousel.md
@@ -156,6 +156,12 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
        <td>5000</td>
        <td>The amount of time to delay between automatically cycling an item. If false, carousel will not automatically cycle.</td>
      </tr>
+     <tr>
+       <td>keyboard</td>
+       <td>boolean</td>
+       <td>true</td>
+       <td>Whether the carousel should react to keyboard events.</td>
+     </tr>
      <tr>
        <td>pause</td>
        <td>string</td>
@@ -163,16 +169,16 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
        <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>
+       <td>ride</td>
+       <td>string</td>
+       <td>false</td>
+       <td>Autoplays the carousel after the user manually cycles the first item. If "carousel", autoplays the carousel on load.</td>
      </tr>
      <tr>
-       <td>keyboard</td>
+       <td>wrap</td>
        <td>boolean</td>
        <td>true</td>
-       <td>Whether the carousel should react to keyboard events.</td>
+       <td>Whether the carousel should cycle continuously or have hard stops.</td>
      </tr>
     </tbody>
   </table>