diff --git a/components.html b/components.html
index 393f184004..59b3f4cee6 100644
--- a/components.html
+++ b/components.html
@@ -1607,7 +1607,7 @@ base_url: "../"
 
     <div class="bs-callout bs-callout-warning">
       <h4>Context-specific usage</h4>
-      <p>Like the standard <a href="{{ page.base_url }}css#buttons">button classes</a>, <code>.navbar-btn</code> can be used to style <code>&lt;a&gt;</code> and <code>&lt;input&gt;</code> elements in most contexts. However, neither <code>.navbar-btn</code> nor the other button classes should be used within a <code>.navbar-nav</code>.</p>
+      <p>Like the standard <a href="{{ page.base_url }}css#buttons">button classes</a>, <code>.navbar-btn</code> can be used on <code>&lt;a&gt;</code> and <code>&lt;input&gt;</code> elements. However, neither <code>.navbar-btn</code> nor the standard button classes should be used on <code>&lt;a&gt;</code> elements within <code>.navbar-nav</code>.</p>
     </div>
 
     <h2 id="navbar-text">Text</h2>
diff --git a/css.html b/css.html
index 12032c497a..1eea9152ba 100644
--- a/css.html
+++ b/css.html
@@ -2216,6 +2216,10 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       <h4>Link functionality not impacted</h4>
       <p>This class will only change the <code>&lt;a&gt;</code>'s appearance, not its functionality. Use custom JavaScript to disable links here.</p>
     </div>
+    <div class="bs-callout bs-callout-warning">
+      <h4>Context-specific usage</h4>
+      <p>While button classes can be used on <code>&lt;a&gt;</code> and <code>&lt;button&gt;</code> elements, only <code>&lt;button&gt;</code> elements are supported within our nav and navbar components.</p>
+    </div>
 
 
     <h2 id="buttons-tags">Button tags</h2>