From 5b9e2bf1265eb50c0d4105b2eb3da12280c37430 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Tue, 17 Jun 2014 12:57:54 -0700
Subject: popovers.html: fix typo: "Dimissmisable"

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

(limited to 'docs/_includes/js')

diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
index 2ee670741..53320fc4a 100644
--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
@@ -111,10 +111,10 @@ sagittis lacus vel augue laoreet rutrum faucibus.">
   <h4>Dismiss on next click</h4>
   <p>Use the <code>focus</code> trigger to dismiss popovers on their next click.</p>
   <div class="bs-example" style="padding-bottom: 24px;">
-    <button type="button" class="btn btn-lg btn-danger bs-docs-popover-dismiss" data-toggle="popover" title="Dimissmisable popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissable popover</button>
+    <button type="button" class="btn btn-lg btn-danger bs-docs-popover-dismiss" data-toggle="popover" title="Dismissable popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissable popover</button>
   </div>
 {% highlight html %}
-<button type="button" class="btn btn-lg btn-danger popover-dismiss" data-toggle="popover" title="Dimissmisable popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissable popover</button>
+<button type="button" class="btn btn-lg btn-danger popover-dismiss" data-toggle="popover" title="Dismissable popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissable popover</button>
 {% endhighlight %}
 {% highlight js %}
 $('.popover-dismiss').popover({
-- 
cgit v1.2.3


From 128e52ff29be0f275bb92693c9db3ba34d5c003d Mon Sep 17 00:00:00 2001
From: Bas Bosman <github@nazgul.nu>
Date: Tue, 17 Jun 2014 23:35:35 +0200
Subject: Fix dismissible spelling

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

(limited to 'docs/_includes/js')

diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html
index 53320fc4a..db3cf0e59 100644
--- a/docs/_includes/js/popovers.html
+++ b/docs/_includes/js/popovers.html
@@ -111,10 +111,10 @@ sagittis lacus vel augue laoreet rutrum faucibus.">
   <h4>Dismiss on next click</h4>
   <p>Use the <code>focus</code> trigger to dismiss popovers on their next click.</p>
   <div class="bs-example" style="padding-bottom: 24px;">
-    <button type="button" class="btn btn-lg btn-danger bs-docs-popover-dismiss" data-toggle="popover" title="Dismissable popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissable popover</button>
+    <button type="button" class="btn btn-lg btn-danger bs-docs-popover-dismiss" data-toggle="popover" title="Dismissible popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissible popover</button>
   </div>
 {% highlight html %}
-<button type="button" class="btn btn-lg btn-danger popover-dismiss" data-toggle="popover" title="Dismissable popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissable popover</button>
+<button type="button" class="btn btn-lg btn-danger popover-dismiss" data-toggle="popover" title="Dismissible popover" data-content="And here's some amazing content. It's very engaging. Right?">Dismissible popover</button>
 {% endhighlight %}
 {% highlight js %}
 $('.popover-dismiss').popover({
-- 
cgit v1.2.3


From 34248437c3bc7278f912c9005d3fd4877b723d83 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 19 Jun 2014 19:54:25 -0700
Subject: tweak alert per #13875

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

(limited to 'docs/_includes/js')

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>
-- 
cgit v1.2.3