From 2fa77bf197050a385e479e1b2e8f61d634499505 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 5 Feb 2013 22:46:45 -0800
Subject: Update link to changelog

---
 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 896a9e8bf..9c11ad924 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1740,7 +1740,7 @@ $('.carousel').carousel({
           <li class="muted">&middot;</li>
           <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
           <li class="muted">&middot;</li>
-          <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
+          <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
         </ul>
       </div>
     </footer>
-- 
cgit v1.2.3


From e3f3542d0b57fdcea0fbff2858b610f85a988d1d Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 6 Feb 2013 17:25:58 -0800
Subject: Fixes #6823: add some docs notes about tooltips in input groups

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 9c11ad924..f4957d91c 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -785,6 +785,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           </div>
 
 
+          <h3>Tooltips in input groups</h3>
+          <p>When using tooltips and popovers with the Bootstrap input groups, you'll have to set the <code>container</code> (documented below) option to avoid unwanted side effects.</p>
+
           <hr class="bs-docs-separator">
 
 
-- 
cgit v1.2.3