From: Mark Otto <markd.otto@gmail.com>
Date: Fri, 28 Oct 2016 05:21:06 +0000 (-0700)
Subject: Merge pull request #19887 from ryanburnett/v4-dev
X-Git-Tag: v4.0.0-alpha.6~472
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63a524b352c1974c3e4ba85c46569547cbe9bb64;p=thirdparty%2Fbootstrap.git

Merge pull request #19887 from ryanburnett/v4-dev

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

63a524b352c1974c3e4ba85c46569547cbe9bb64
diff --cc docs/components/carousel.md
index 1e8d40113c,e825fcaac3..3942309f0f
--- a/docs/components/carousel.md
+++ b/docs/components/carousel.md
@@@ -159,23 -156,29 +159,29 @@@ Options can be passed via data attribut
         <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>
 +       <td>string | null</td>
         <td>"hover"</td>
 -       <td>Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.</td>
 +       <td>If set to <code>"hover"</code>, pauses the cycling of the carousel on <code>mouseenter</code> and resumes the cycling of the carousel on <code>mouseleave</code>. If set to <code>null</code>, hovering over the carousel won't pause it.</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>