From: Mark Otto <markotto@twitter.com>
Date: Tue, 2 Oct 2012 22:10:22 +0000 (-0700)
Subject: fixes #5352: update docs messaging for disable nav links
X-Git-Tag: v2.2.0^2~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2369021ce49e07c073c35426cc978dba2cb1b55;p=thirdparty%2Fbootstrap.git

fixes #5352: update docs messaging for disable nav links
---

diff --git a/docs/components.html b/docs/components.html
index 7623cda4b5..69089635db 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -719,7 +719,7 @@
 </pre>
 
           <h3>Disabled state</h3>
-          <p>For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless custom JavaScript is implemented to prevent those clicks.</p>
+          <p>For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless you remove the <code>href</code> attribute. Alternatively, you could implement custom JavaScript to prevent those clicks.</p>
           <div class="bs-docs-example">
             <ul class="nav nav-pills">
               <li><a href="#">Clickable link</a></li>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 6cb5aa69ec..5351d7fd93 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -648,7 +648,7 @@
 </pre>
 
           <h3>{{_i}}Disabled state{{/i}}</h3>
-          <p>{{_i}}For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless custom JavaScript is implemented to prevent those clicks.{{/i}}</p>
+          <p>{{_i}}For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>. Links will remain clickable, however, unless you remove the <code>href</code> attribute. Alternatively, you could implement custom JavaScript to prevent those clicks.{{/i}}</p>
           <div class="bs-docs-example">
             <ul class="nav nav-pills">
               <li><a href="#">{{_i}}Clickable link{{/i}}</a></li>