Merge branch 'master' of github.com:twbs/bootstrap

1 files changed, 7 insertions, 7 deletions

diff --git a/css.html b/css.html
index 2933272cf..77f1bb1ab 100644
--- a/css.html
+++ b/css.html
@@ -2038,7 +2038,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       <button type="button" class="btn btn-link">Link</button>
     </div>
 {% highlight html %}
-<!-- Standard gray button with gradient -->
+<!-- Standard button -->
 <button type="button" class="btn btn-default">Default</button>
 
 <!-- Provides extra visual weight and identifies the primary action in a set of buttons -->
@@ -2134,12 +2134,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <h3>Anchor element</h3>
     <p>Add the <code>.disabled</code> class to <code>&lt;a&gt;</code> buttons.</p>
     <p class="bs-example">
-      <a href="#" class="btn btn-primary btn-lg disabled">Primary link</a>
-      <a href="#" class="btn btn-default btn-lg disabled">Link</a>
+      <a href="#" class="btn btn-primary btn-lg disabled" role="button">Primary link</a>
+      <a href="#" class="btn btn-default btn-lg disabled" role="button">Link</a>
     </p>
 {% highlight html %}
-<a href="#" class="btn btn-primary btn-lg disabled">Primary link</a>
-<a href="#" class="btn btn-default btn-lg disabled">Link</a>
+<a href="#" class="btn btn-primary btn-lg disabled" role="button">Primary link</a>
+<a href="#" class="btn btn-default btn-lg disabled" role="button">Link</a>
 {% endhighlight %}
     <p>
       We use <code>.disabled</code> as a utility class here, similar to the common <code>.active</code> class, so no prefix is required.
@@ -2153,13 +2153,13 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <h2 id="buttons-tags">Button tags</h2>
     <p>Use the button classes on an <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, or <code>&lt;input&gt;</code> element.</p>
     <form class="bs-example">
-      <a class="btn btn-default" href="#">Link</a>
+      <a class="btn btn-default" href="#" role="button">Link</a>
       <button class="btn btn-default" type="submit">Button</button>
       <input class="btn btn-default" type="button" value="Input">
       <input class="btn btn-default" type="submit" value="Submit">
     </form>
 {% highlight html %}
-<a class="btn btn-default" href="#">Link</a>
+<a class="btn btn-default" href="#" role="button">Link</a>
 <button class="btn btn-default" type="submit">Button</button>
 <input class="btn btn-default" type="button" value="Input">
 <input class="btn btn-default" type="submit" value="Submit">