From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 3 Jun 2012 04:19:56 +0000 (-0700)
Subject: change note to point out that boostrap.js bundles all plugins #3174
X-Git-Tag: v2.1.0~2^2~337
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a38bc90b482c086e805aa2e942b56cd1429d5766;p=thirdparty%2Fbootstrap.git

change note to point out that boostrap.js bundles all plugins #3174
---

diff --git a/docs/javascript.html b/docs/javascript.html
index ab93f1c33a..f966ba203f 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -162,7 +162,7 @@
           <p class="muted"><strong>*</strong> Required for animation in plugins</p>
         </div>
       </div> <!-- /row -->
-      <div class="alert alert-info"><strong>Heads up!</strong> All javascript plugins require the latest version of jQuery.</div>
+      <div class="alert alert-info"><strong>Heads up!</strong>  If you have downloaded the latest version of Bootstrap, both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all of these plugins.</div>
     </section>
 
 
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 568a6c4742..26ca9b538d 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -84,7 +84,7 @@
           <p class="muted"><strong>*</strong> {{_i}}Required for animation in plugins{{/i}}</p>
         </div>
       </div> <!-- /row -->
-      <div class="alert alert-info"><strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}All javascript plugins require the latest version of jQuery.{{/i}}</div>
+      <div class="alert alert-info"><strong>{{_i}}Heads up!{{/i}}</strong> {{_i}} If you have downloaded the latest version of Bootstrap, both <strong>bootstrap.js</strong> and <strong>bootstrap.min.js</strong> contain all of these plugins.{{/i}}</div>
     </section>