diff --git a/docs/components/buttons.md b/docs/components/buttons.md
index 4e8d58ab3c..6b22caab82 100644
--- a/docs/components/buttons.md
+++ b/docs/components/buttons.md
@@ -125,7 +125,7 @@ As `` elements don't support the `disabled` attribute, you must add the `.dis
{% callout warning %}
#### Link functionality caveat
-This class uses `pointer-events: none` to try to disable the link functionality of ``s, but that CSS property is not yet standardized and isn't fully supported in Opera 18 and below, or in Internet Explorer 11\. In addition, even in browsers that do support `pointer-events: none`, keyboard navigation remains unaffected, meaning that sighted keyboard users and users of assistive technologies will still be able to activate these links. So to be safe, use custom JavaScript to disable such links.
+The `.disabled` class uses `pointer-events: none` to try to disable the link functionality of ``s, but that CSS property is not yet standardized. In addition, even in browsers that do support `pointer-events: none`, keyboard navigation remains unaffected, meaning that sighted keyboard users and users of assistive technologies will still be able to activate these links. So to be safe, add a `tabindex="-1"` attribute on these links (to prevent them from receiving keyboard focus) and use custom JavaScript to disable their functionality.
{% endcallout %}
## Button plugin
diff --git a/docs/components/pagination.md b/docs/components/pagination.md
index 4230a66471..1ec25b789f 100644
--- a/docs/components/pagination.md
+++ b/docs/components/pagination.md
@@ -43,11 +43,18 @@ Simple pagination inspired by Rdio, great for apps and search results. The large
Links are customizable for different circumstances. Use `.disabled` for unclickable links and `.active` to indicate the current page.
+{% callout warning %}
+#### Link functionality caveat
+
+The `.disabled` class uses `pointer-events: none` to try to disable the link functionality of ``s, but that CSS property is not yet standardized. In addition, even in browsers that do support `pointer-events: none`, keyboard navigation remains unaffected, meaning that sighted keyboard users and users of assistive technologies will still be able to activate these links. So to be safe, add a `tabindex="-1"` attribute on these links (to prevent them from receiving keyboard focus) and use custom JavaScript to disable their functionality.
+{% endcallout %}
+
+
{% example html %}
{% endexample %}
-You can optionally swap out active or disabled anchors for ``, or omit the anchor in the case of the prev/next arrows, to remove click functionality while retaining intended styles.
+You can optionally swap out active or disabled anchors for ``, or omit the anchor in the case of the prev/next arrows, to remove click functionality and prevent keyboard focus while retaining intended styles.
{% example html %}