From a84092d2257ba8e000e2c656e6cb1b8415d0d9ac Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 11 Feb 2012 17:25:47 -0800
Subject: [PATCH] update buttons docs for .disabled class per #1774

---
 docs/assets/bootstrap.zip              | Bin 52683 -> 52683 bytes
 docs/base-css.html                     |   8 ++++++--
 docs/templates/pages/base-css.mustache |   8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index dc3849f1d43427fceab85e301b465deb459ea1bf..9055e367ec6d86a56c10d82f58660b02c2473477 100644
GIT binary patch
delta 448
zcmX>-oB8x?W}X0VW)?065D@R4$fL-1SH#@^zR2W_r-iwYBmz{~?!hG{_Hi%)70<8*
zi`^61c>62|lSKFARh*7&_kpVJiERGJ8O#n;Guchh2(0L?$mTl1cLpG#JSQ`#zRjzg
z4D>)I1<3Gc=BDe1hHx@4BkYG*Gg+n38SE&a5xIqx0w5z^G}^+1w4160Kz6T~qyn}Z
z;&hN!py2yS22jDps*@E#BI;XApdy<Sw_Fwh8D@4;pXn~h!{U?cPO^bSYEH{cUUX8N
z=^jW_79?`(q&JKQG{o(cKNHv<u-vv&4lp^OO7YV!5FV0g#t`$tsxO=lMB+J}@kX{A
cX!g1@MliF1JjSzjNW6rzP7t2(<n3og0HzbD`2YX_

delta 448
zcmX>-oB8x?W}X0VW)?065Mb<_$fL;iNx<Cyi@@ZKr-iv-5=@;F160{Q!zCv6aWDbJ
zX4rzoJ_~HTeHJ7zc@?K4RAlo<&R}*X#?HxZf<|ByKM8EE6MSa?QkCaq237?WTIFP*
z2UImNK!!gvH(ft8gp+|8VL!+kpb;vC&M+f#3o8XcLN6L^VM5wX)dC<>S4>jDaN*?l
zlMJ8^TC6%*5u{9giwWBophrFnY);&ASp;O5*-3q-PaqGAPp&)322xaWT4wU1lj2OD
zL87uCky|Idk$7&W{9!zx{%xlmAo{^7#ZS9H<RGR2<!eqG!{mXy3#S8-cur@$(d=G#
a#t3FM&|b!~c1XO0vrbHqsF}R|tOx)DYN;3i

diff --git a/docs/base-css.html b/docs/base-css.html
index 2ee0f2d29..46cf982c6 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1310,15 +1310,19 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
       </p>
       <br>
       <h3>Disabled state</h3>
-      <p>For disabled buttons, use <code>.btn-disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
+      <p>For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code>&lt;button&gt;</code> elements.</p>
       <p>
         <a href="#" class="btn btn-large btn-primary disabled">Primary link</a>
         <a href="#" class="btn btn-large disabled">Link</a>
       </p>
-      <p>
+      <p style="margin-bottom: 18px;">
         <button class="btn btn-large btn-primary disabled" disabled="disabled">Primary button</button>
         <button class="btn btn-large" disabled>Button</button>
       </p>
+      <p>
+        <span class="label label-info">Heads up!</span>
+        We use <code>.disabled</code> as a utility class here, similar to the common <code>.active</code> class, so no prefix is required.
+      </p>
     </div>
     <div class="span4">
       <h3>One class, multiple tags</h3>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 01b79c7a5..e56f45ca0 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1234,15 +1234,19 @@
       </p>
       <br>
       <h3>{{_i}}Disabled state{{/i}}</h3>
-      <p>{{_i}}For disabled buttons, use <code>.btn-disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.{{/i}}</p>
+      <p>{{_i}}For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code>&lt;button&gt;</code> elements.{{/i}}</p>
       <p>
         <a href="#" class="btn btn-large btn-primary disabled">{{_i}}Primary link{{/i}}</a>
         <a href="#" class="btn btn-large disabled">{{_i}}Link{{/i}}</a>
       </p>
-      <p>
+      <p style="margin-bottom: 18px;">
         <button class="btn btn-large btn-primary disabled" disabled="disabled">{{_i}}Primary button{{/i}}</button>
         <button class="btn btn-large" disabled>{{_i}}Button{{/i}}</button>
       </p>
+      <p>
+        <span class="label label-info">{{_i}}Heads up!{{/i}}</span>
+        {{_i}}We use <code>.disabled</code> as a utility class here, similar to the common <code>.active</code> class, so no prefix is required.{{/i}}
+      </p>
     </div>
     <div class="span4">
       <h3>{{_i}}One class, multiple tags{{/i}}</h3>