From: Chris Rebert <code@rebertia.com>
Date: Mon, 30 Jun 2014 04:16:44 +0000 (-0700)
Subject: doc that you can't use both data-ride and $().carousel() on the same carousel; fixes... 
X-Git-Tag: v3.3.0~421^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dfad4f1addd50a066d28ca605f14d4dc9a2b82f;p=thirdparty%2Fbootstrap.git

doc that you can't use both data-ride and $().carousel() on the same carousel; fixes #13896

[skip sauce]
---

diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html
index b8a0d1e4ba..222caf333c 100644
--- a/docs/_includes/js/carousel.html
+++ b/docs/_includes/js/carousel.html
@@ -132,7 +132,7 @@
 
   <h3>Via data attributes</h3>
   <p>Use data attributes to easily control the position of the carousel. <code>data-slide</code> accepts the keywords <code>prev</code> or <code>next</code>, which alters the slide position relative to its current position. Alternatively, use <code>data-slide-to</code> to pass a raw slide index to the carousel <code>data-slide-to="2"</code>, which shifts the slide position to a particular index beginning with <code>0</code>.</p>
-  <p>The <code>data-ride="carousel"</code> attribute is used to mark a carousel as animating starting at page load.</p>
+  <p>The <code>data-ride="carousel"</code> attribute is used to mark a carousel as animating starting at page load. <strong class="text-danger">It cannot be used in combination with (redundant and unnecessary) explicit JavaScript initialization of the same carousel.</strong></p>
 
   <h3>Via JavaScript</h3>
   <p>Call carousel manually with:</p>