aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes/js/buttons.html
diff options
context:
space:
mode:
authorfat <[email protected]>2014-06-23 23:08:23 -0700
committerfat <[email protected]>2014-06-23 23:08:23 -0700
commit0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3 (patch)
tree7b88c388d526ada7b564f1faf44cda92276f2722 /docs/_includes/js/buttons.html
parentf071549c8408241b88a95192e477816d2402eb6e (diff)
parentb31c35b63629ec750f338a646f6b730bd675b734 (diff)
downloadbootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.tar.xz
bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.zip
Merge branch 'master' into fix-13386
Conflicts: js/carousel.js
Diffstat (limited to 'docs/_includes/js/buttons.html')
-rw-r--r--docs/_includes/js/buttons.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_includes/js/buttons.html b/docs/_includes/js/buttons.html
index 154320e48..ee5b3d71d 100644
--- a/docs/_includes/js/buttons.html
+++ b/docs/_includes/js/buttons.html
@@ -144,7 +144,7 @@ $('.btn').button()
<div class="bs-callout bs-callout-danger">
<h4>Cross-browser compatibility</h4>
- <p><a href="https://github.com/twbs/bootstrap/issues/793">Firefox persists the disabled state across page loads</a>. A workaround for this is to use <code>autocomplete="off"</code>.</p>
+ <p><a href="https://github.com/twbs/bootstrap/issues/793">Firefox persists form control states across page loads</a>. A workaround for this is to use <code>autocomplete="off"</code>.</p>
</div>
<h4>$().button('reset')</h4>