From: Chris Rebert <code@rebertia.com>
Date: Sat, 27 Sep 2014 01:20:51 +0000 (-0700)
Subject: Port #13988 over to hosted docs
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99c1c37cd9b4e22247d0f834649e4120044ff0ec;p=thirdparty%2Fbootstrap.git

Port #13988 over to hosted docs
---

diff --git a/javascript/index.html b/javascript/index.html
index a4227b49e5..2929d3586f 100644
--- a/javascript/index.html
+++ b/javascript/index.html
@@ -2014,7 +2014,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>