From abb112173e26c6785ee472ee3fa41bd06e16e1cc Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Tue, 25 Jun 2013 20:52:49 +0200
Subject: Add callout to docs: 3rd-party libs not supported

---
 docs/javascript.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 955ad31f8..d8ddfa98c 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -64,6 +64,11 @@ $('#myModal').on('show.bs.modal', function (e) {
   if (!data) return e.preventDefault() // stops modal from being shown
 })
 {% endhighlight %}
+
+    <div class="bs-callout">
+      <h4>Third-party libraries</h4>
+      <p><strong>Bootstrap does not support third-party JavaScript libraries</strong> like Prototype or jQuery UI. Despite <code>.noConflict</code> and namespaced events, there may be compatibility problems that you need to fix on your own.</p>
+    </div>
   </div>
 
 
-- 
cgit v1.2.3


From 0f0e7fc3769c70525f21d50988041534a8efcc81 Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Tue, 25 Jun 2013 21:19:19 +0200
Subject: Add a link to the mailing list for JS help

---
 docs/javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index d8ddfa98c..a46126a0a 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -67,7 +67,7 @@ $('#myModal').on('show.bs.modal', function (e) {
 
     <div class="bs-callout">
       <h4>Third-party libraries</h4>
-      <p><strong>Bootstrap does not support third-party JavaScript libraries</strong> like Prototype or jQuery UI. Despite <code>.noConflict</code> and namespaced events, there may be compatibility problems that you need to fix on your own.</p>
+      <p><strong>Bootstrap does not support third-party JavaScript libraries</strong> like Prototype or jQuery UI. Despite <code>.noConflict</code> and namespaced events, there may be compatibility problems that you need to fix on your own. Ask on the <a href="http://groups.google.com/group/twitter-bootstrap">mailing list</a> if you need help.</p>
     </div>
   </div>
 
-- 
cgit v1.2.3


From a87ea9345beced2cea2009362c9aead9a2510e09 Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Tue, 25 Jun 2013 21:59:34 +0200
Subject: Add IDs, adjust text

---
 docs/javascript.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index a46126a0a..9a5a5b6f0 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -65,9 +65,9 @@ $('#myModal').on('show.bs.modal', function (e) {
 })
 {% endhighlight %}
 
-    <div class="bs-callout">
+    <div class="bs-callout" id="callout-third-party-libs">
       <h4>Third-party libraries</h4>
-      <p><strong>Bootstrap does not support third-party JavaScript libraries</strong> like Prototype or jQuery UI. Despite <code>.noConflict</code> and namespaced events, there may be compatibility problems that you need to fix on your own. Ask on the <a href="http://groups.google.com/group/twitter-bootstrap">mailing list</a> if you need help.</p>
+      <p><strong>Bootstrap does not officially support third-party JavaScript libraries</strong> like Prototype or jQuery UI. Despite <code>.noConflict</code> and namespaced events, there may be compatibility problems that you need to fix on your own. Ask on the <a href="http://groups.google.com/group/twitter-bootstrap">mailing list</a> if you need help.</p>
     </div>
   </div>
 
-- 
cgit v1.2.3