diff --git a/docs/components/popovers.md b/docs/components/popovers.md
index 4574197dd3..dc966e5a31 100644
--- a/docs/components/popovers.md
+++ b/docs/components/popovers.md
@@ -221,7 +221,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
       <td>string | function</td>
       <td>'right'</td>
       <td>
-        <p>How to position the popover - top | bottom | left | right.</p>
+        <p>How to position the popover - auto | top | bottom | left | right.<br>When <code>auto</code> is specified, it will dynamically reorient the popover.</p>
         <p>When a function is used to determine the placement, it is called with the popover DOM node as its first argument and the triggering element DOM node as its second. The <code>this</code> context is set to the popover instance.</p>
       </td>
     </tr>
diff --git a/docs/components/tooltips.md b/docs/components/tooltips.md
index 865e709e42..d48d8535ed 100644
--- a/docs/components/tooltips.md
+++ b/docs/components/tooltips.md
@@ -200,7 +200,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
       <td>string | function</td>
       <td>'top'</td>
       <td>
-        <p>How to position the tooltip - top | bottom | left | right.</p>
+        <p>How to position the tooltip - auto | top | bottom | left | right.<br>When <code>auto</code> is specified, it will dynamically reorient the tooltip.</p>
         <p>When a function is used to determine the placement, it is called with the tooltip DOM node as its first argument and the triggering element DOM node as its second. The <code>this</code> context is set to the tooltip instance.</p>
       </td>
     </tr>
diff --git a/docs/migration.md b/docs/migration.md
index 2584a22e84..37b9ce3910 100644
--- a/docs/migration.md
+++ b/docs/migration.md
@@ -196,14 +196,6 @@ Dropped entirely for the new card component.
 - `.panel-warning` to `.card-warning` and `.card-inverse` (or use `.bg-warning` on `.card-header`)
 - `.panel-danger` to `.card-danger` and `.card-inverse` (or use `.bg-danger` on `.card-header`)
 
-### Tooltips
-
-- Removed support for `auto` placement options.
-
-### Popovers
-
-- Removed support for `auto` placement options.
-
 ### Carousel
 
 - Overhauled the entire component to simplify design and styling. We have fewer styles for you to override, new indicators, and new icons.