Short URL: http://html5.org/r/7109
Index: source
===================================================================
--- source (revision 7108)
+++ source (revision 7109)
@@ -14633,7 +14633,9 @@
</li>
<li><p>Remove any <span title="concept-task">tasks</span> queued by
- the <span>history traversal task source</span>.</p></li>
+ the <span>history traversal task source</span> that are associated
+ with any <code>Document</code> objects in the <span>top-level
+ browsing context</span>'s <span>document family</span>.</p></li>
<li>Remove any earlier entries that share the same
<code>Document</code>.</li>
@@ -75600,7 +75602,18 @@
then the <span>parent browsing context</span> of its <span>nested
browsing context</span> will change.</p>
+ <p>The <dfn>document family</dfn> of a <span>browsing context</span>
+ consists of the union of all the <code>Document</code> objects in
+ that <span>browsing context</span>'s <span>session history</span>
+ and the <span title="document family">document families</span> of
+ all those <code>Document</code> objects. The <span>document
+ family</span> of a <code>Document</code> object consists of the
+ union of all the <span title="document family">document
+ families</span> of the <span title="browsing context">browsing
+ contexts</span> that are <span>nested through</span> the
+ <code>Document</code> object.</p>
+
<h5>Navigating nested browsing contexts in the DOM</h5>
<dl class="domintro">
@@ -78434,7 +78447,10 @@
</li>
<li><p>Remove any <span title="concept-task">tasks</span> queued
- by the <span>history traversal task source</span>.</p></li>
+ by the <span>history traversal task source</span> that are
+ associated with any <code>Document</code> objects in the
+ <span>top-level browsing context</span>'s <span>document
+ family</span>.</p></li>
<li><p>If appropriate, update the <span>current entry</span> to
reflect any state that the user agent wishes to persist. The
@@ -79556,8 +79572,10 @@
</li>
<li><p>Remove any <span title="concept-task">tasks</span>
- queued by the <span>history traversal task
- source</span>.</p></li> <!-- so the network is racing
+ queued by the <span>history traversal task source</span> that
+ are associated with any <code>Document</code> objects in the
+ <span>top-level browsing context</span>'s <span>document
+ family</span>.</p></li> <!-- so the network is racing
history.back(), in the case of setting location.href="" and
then calling history.back() -->
@@ -79969,7 +79987,9 @@
</li>
<li><p>Remove any <span title="concept-task">tasks</span> queued by
- the <span>history traversal task source</span>.</p></li>
+ the <span>history traversal task source</span> that are associated
+ with any <code>Document</code> objects in the <span>top-level
+ browsing context</span>'s <span>document family</span>.</p></li>
<li><p>Append a new entry at the end of the <code>History</code>
object representing the new resource and its <code>Document</code>