From 6e8a3bba32312cb13cf70acca0575ff14651437e Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 8 Jan 2012 14:54:36 -0800
Subject: add note about firefox persisting disabled state on buttons

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

(limited to 'docs')

diff --git a/docs/javascript.html b/docs/javascript.html
index f9877dc02..76b5edb87 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -811,6 +811,9 @@ $('#my-alert').bind('closed', function () {
           <p>Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute <code>data-loading-text</code>.
           </p>
            <pre class="prettyprint linenums">&lt;button class="btn" data-loading-text="loading stuff..." &gt;...&lt;/button&gt;</pre>
+          <p>
+            <span class="label notice">Notice</span> Firefox persists the disabled state across page loads. A workaround for this is to use: <code>autocomplete="off"</code>. More info can be found <a href="https://github.com/twitter/bootstrap/issues/793">here</a>.
+          </p>
            <h4>$().button('reset')</h4>
            <p>Resets button state - swaps text to original text.</p>
            <h4>$().button(string)</h4>
-- 
cgit v1.2.3


From dbe5e666af51a4d85923c1a7754da1c929dfc249 Mon Sep 17 00:00:00 2001
From: Maik Schreiber <blizzy@blizzy.de>
Date: Mon, 9 Jan 2012 00:02:13 +0100
Subject: fix typo

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

(limited to 'docs')

diff --git a/docs/components.html b/docs/components.html
index 0c70ef168..104bedf54 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -512,7 +512,7 @@
   &lt;/div&gt;
 &lt;/div&gt;
 </pre>
-      <p>To make the navbar fixed, swamp the <code>.navbar-static</code> class for <code>.navbar-fixed</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.</p>
+      <p>To make the navbar fixed, swap the <code>.navbar-static</code> class for <code>.navbar-fixed</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code>&lt;body&gt;</code>.</p>
 <pre class="prettyprint linenums">
 &lt;div class="navbar navbar-fixed"&gt;
   ...
-- 
cgit v1.2.3


From 7aca72322effb717804af8348d3b58cfa2cbe000 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 8 Jan 2012 15:12:34 -0800
Subject: move hover state out of timeout duh

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

(limited to 'docs')

diff --git a/docs/javascript.html b/docs/javascript.html
index 76b5edb87..f7980d86b 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -517,7 +517,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
       </div>
     </section>
 
-    <!-- Tips
+    <!-- Twipsy
     ================================================== -->
 
     <section id="twipsy">
-- 
cgit v1.2.3