From b444582ccdc8c4f0e4c21357d41498cd46532a70 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 27 Aug 2012 15:20:50 -0700
Subject: [PATCH] fixes #4671: mention collapsing parents in docs for affix
 plugin

---
 docs/javascript.html                     | 2 +-
 docs/templates/pages/javascript.mustache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index c09d19f231..ffe530280e 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1610,7 +1610,7 @@ $('.carousel').carousel({
 
             <div class="alert alert-info">
               <strong>Heads up!</strong>
-              It's up to you to manage the position of a pinned element. This is done by styling <code>affix</code>, <code>affix-top</code>, and <code>affix-bottom</code>.
+              You must manage the position of a pinned element and the behavior of its immediate parent. Position is controlled by <code>affix</code>, <code>affix-top</code>, and <code>affix-bottom</code>. Remember to check for a potentially collapsed parent when the affix kicks in as it's removing content from the normal flow of the page.
             </div>
 
             <h3>Via JavaScript</h3>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 2ee086847d..b3323a3719 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1540,7 +1540,7 @@ $('.carousel').carousel({
 
             <div class="alert alert-info">
               <strong>{{_i}}Heads up!{{/i}}</strong>
-              {{_i}}It's up to you to manage the position of a pinned element. This is done by styling <code>affix</code>, <code>affix-top</code>, and <code>affix-bottom</code>.{{/i}}
+              {{_i}}You must manage the position of a pinned element and the behavior of its immediate parent. Position is controlled by <code>affix</code>, <code>affix-top</code>, and <code>affix-bottom</code>. Remember to check for a potentially collapsed parent when the affix kicks in as it's removing content from the normal flow of the page.{{/i}}
             </div>
 
             <h3>{{_i}}Via JavaScript{{/i}}</h3>
-- 
GitLab