Skip to content
Browse files

Adopt a node into a document first and then do base URL fixup.

  • Loading branch information...
1 parent b9cacee commit 47872553a05c10f308449feccc1ca356d725a560 @annevk annevk committed Dec 22, 2012
Showing with 34 additions and 34 deletions.
  1. +16 −16 Overview.src.html
  2. +18 −18 dom-core.html
View
32 Overview.src.html
@@ -1530,7 +1530,7 @@ <h2 class=no-num>Goals</h2>
<span title=concept-tree-next-sibling>next sibling</span>.
<li><p><span title=concept-node-adopt>Adopt</span>
- <var title>node</var> with <var title>parent</var>'s
+ <var title>node</var> into <var title>parent</var>'s
<span title=concept-node-document>node document</span>.
<li><p><span title=concept-node-insert>Insert</span> <var title>node</var>
@@ -1712,7 +1712,7 @@ <h2 class=no-num>Goals</h2>
<span title=concept-tree-next-sibling>next sibling</span>.
<li><p><span title=concept-node-adopt>Adopt</span>
- <var title>node</var> with <var title>parent</var>'s
+ <var title>node</var> into <var title>parent</var>'s
<span title=concept-node-document>node document</span>.
<li><p><span title=concept-node-remove>Remove</span> <var title>child</var>
@@ -1750,7 +1750,7 @@ <h2 class=no-num>Goals</h2>
<ol>
<li><p>If <var title>node</var> is not null,
- <span title=concept-node-adopt>adopt</span> <var title>node</var> with
+ <span title=concept-node-adopt>adopt</span> <var title>node</var> into
<var title>parent</var>'s
<span title=concept-node-document>node document</span>.
@@ -2650,7 +2650,7 @@ <h2 class=no-num>Goals</h2>
<p class=note>A <span title=concept-node>node</span>'s
<span title=concept-node-document>node document</span> can be changed by
-the "<span title=concept-node-adopt>adopt</span>" algorithm.
+the <span title=concept-node-adopt>adopt</span> algorithm.
<p>Each <span title=concept-node>node</span> also has an associated
<dfn title=concept-node-base-url>base URL</dfn>.
@@ -4310,24 +4310,24 @@ <h2 class=no-num>Goals</h2>
<var title>deep</var> is true.
</ol>
-<p>To <dfn title=concept-node-adopt>adopt</dfn> a <var title>node</var>,
-with an <var title>ownerDocument</var>, run these steps:
+<p>To <dfn title=concept-node-adopt>adopt</dfn> a <var title>node</var> into
+a <var title>document</var>, run these steps:
<ol>
- <li><p>If <var title>node</var> is an
- <span title=concept-element>element</span>, it is
- <span>affected by a base URL change</span>.
-
<li><p>If <var title>node</var>'s
- <span title=concept-tree-parent>parent</span> is not null, <span title=concept-node-remove>remove</span>
- <var title>node</var> from its
- <span title=concept-tree-parent>parent</span>.
+ <span title=concept-tree-parent>parent</span> is not null,
+ <span title=concept-node-remove>remove</span> <var title>node</var> from
+ its <span title=concept-tree-parent>parent</span>.
<li><p>Set <span title=concept-node-document>node document</span> for
<var title>node</var> and all its
<span title=concept-tree-descendant>descendants</span>
<!--AttrExodus as well as any associated <code>Attr</code> nodes-->
- to <var title>ownerDocument</var>.
+ to <var title>document</var>.
+
+ <li><p>If <var title>node</var> is an
+ <span title=concept-element>element</span>, it is
+ <span>affected by a base URL change</span>.
</ol>
<p>The
@@ -4341,7 +4341,7 @@ <h2 class=no-num>Goals</h2>
"<code>NotSupportedError</code>" exception and terminate these steps.
<li><p><span title=concept-node-adopt>Adopt</span> <var title>node</var>
- with the <span>context object</span>.
+ into the <span>context object</span>.
<li><p>Return <var title>node</var>.
</ol>
@@ -8840,7 +8840,7 @@ <h2 class=no-num>Goals</h2>
constants have been changed to use unsigned short, rather than just short.
<p>The <code title>expandEntityReferences</code> attribute has been removed
-from the <code>NodeIterator</code> and <code>TreeWalker</code> objects.
+from the <code>NodeIterator</code> and <code>TreeWalker</code> interfaces.
<p>The <code title=dom-NodeIterator-referenceNode>referenceNode</code> and
<code title=dom-NodeIterator-pointerBeforeReferenceNode>pointerBeforeReferenceNode</code>
View
36 dom-core.html
@@ -10,7 +10,7 @@
<p><a class="logo" href="//www.whatwg.org/"><img alt="WHATWG" height="100" src="//resources.whatwg.org/logo-dom.svg" width="100"></a></p>
<h1>DOM</h1>
- <h2 class="no-num no-toc" id="living-standard-—-last-updated-20-december-2012">Living Standard — Last Updated 20 December 2012</h2>
+ <h2 class="no-num no-toc" id="living-standard-—-last-updated-22-december-2012">Living Standard — Last Updated 22 December 2012</h2>
<dl>
<dt>This Version:
@@ -42,7 +42,7 @@ <h2 class="no-num no-toc" id="living-standard-—-last-updated-20-december-2012"
<p class="copyright"><a href="http://creativecommons.org/publicdomain/zero/1.0/" rel="license"><img alt="CC0" src="http://i.creativecommons.org/p/zero/1.0/80x15.png"></a>
To the extent possible under law, the editors have waived all copyright and
related or neighboring rights to this work. In addition, as of
-20 December 2012, the editors have made this specification available
+22 December 2012, the editors have made this specification available
under the
<a href="http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0" rel="license">Open Web Foundation Agreement Version 1.0</a>,
which is available at
@@ -1603,7 +1603,7 @@ <h4 id="mutation-algorithms"><span class="secno">5.2.1 </span>Mutation algorithm
<a href="#concept-tree-next-sibling" title="concept-tree-next-sibling">next sibling</a>.
<li><p><a href="#concept-node-adopt" title="concept-node-adopt">Adopt</a>
- <var title="">node</var> with <var title="">parent</var>'s
+ <var title="">node</var> into <var title="">parent</var>'s
<a href="#concept-node-document" title="concept-node-document">node document</a>.
<li><p><a href="#concept-node-insert" title="concept-node-insert">Insert</a> <var title="">node</var>
@@ -1785,7 +1785,7 @@ <h4 id="mutation-algorithms"><span class="secno">5.2.1 </span>Mutation algorithm
<a href="#concept-tree-next-sibling" title="concept-tree-next-sibling">next sibling</a>.
<li><p><a href="#concept-node-adopt" title="concept-node-adopt">Adopt</a>
- <var title="">node</var> with <var title="">parent</var>'s
+ <var title="">node</var> into <var title="">parent</var>'s
<a href="#concept-node-document" title="concept-node-document">node document</a>.
<li><p><a href="#concept-node-remove" title="concept-node-remove">Remove</a> <var title="">child</var>
@@ -1823,7 +1823,7 @@ <h4 id="mutation-algorithms"><span class="secno">5.2.1 </span>Mutation algorithm
<ol>
<li><p>If <var title="">node</var> is not null,
- <a href="#concept-node-adopt" title="concept-node-adopt">adopt</a> <var title="">node</var> with
+ <a href="#concept-node-adopt" title="concept-node-adopt">adopt</a> <var title="">node</var> into
<var title="">parent</var>'s
<a href="#concept-node-document" title="concept-node-document">node document</a>.
@@ -2723,7 +2723,7 @@ <h3 id="interface-node"><span class="secno">5.4 </span>Interface <code><a href="
<p class="note">A <a href="#concept-node" title="concept-node">node</a>'s
<a href="#concept-node-document" title="concept-node-document">node document</a> can be changed by
-the "<a href="#concept-node-adopt" title="concept-node-adopt">adopt</a>" algorithm.
+the <a href="#concept-node-adopt" title="concept-node-adopt">adopt</a> algorithm.
<p>Each <a href="#concept-node" title="concept-node">node</a> also has an associated
<dfn id="concept-node-base-url" title="concept-node-base-url">base URL</dfn>.
@@ -4378,24 +4378,24 @@ <h3 id="interface-document"><span class="secno">5.5 </span>Interface <code><a hr
<var title="">deep</var> is true.
</ol>
-<p>To <dfn id="concept-node-adopt" title="concept-node-adopt">adopt</dfn> a <var title="">node</var>,
-with an <var title="">ownerDocument</var>, run these steps:
+<p>To <dfn id="concept-node-adopt" title="concept-node-adopt">adopt</dfn> a <var title="">node</var> into
+a <var title="">document</var>, run these steps:
<ol>
- <li><p>If <var title="">node</var> is an
- <a href="#concept-element" title="concept-element">element</a>, it is
- <a href="#affected-by-a-base-url-change">affected by a base URL change</a>.
-
<li><p>If <var title="">node</var>'s
- <a href="#concept-tree-parent" title="concept-tree-parent">parent</a> is not null, <a href="#concept-node-remove" title="concept-node-remove">remove</a>
- <var title="">node</var> from its
- <a href="#concept-tree-parent" title="concept-tree-parent">parent</a>.
+ <a href="#concept-tree-parent" title="concept-tree-parent">parent</a> is not null,
+ <a href="#concept-node-remove" title="concept-node-remove">remove</a> <var title="">node</var> from
+ its <a href="#concept-tree-parent" title="concept-tree-parent">parent</a>.
<li><p>Set <a href="#concept-node-document" title="concept-node-document">node document</a> for
<var title="">node</var> and all its
<a href="#concept-tree-descendant" title="concept-tree-descendant">descendants</a>
<!--AttrExodus as well as any associated <code>Attr</code> nodes-->
- to <var title="">ownerDocument</var>.
+ to <var title="">document</var>.
+
+ <li><p>If <var title="">node</var> is an
+ <a href="#concept-element" title="concept-element">element</a>, it is
+ <a href="#affected-by-a-base-url-change">affected by a base URL change</a>.
</ol>
<p>The
@@ -4409,7 +4409,7 @@ <h3 id="interface-document"><span class="secno">5.5 </span>Interface <code><a hr
"<code><a href="#notsupportederror">NotSupportedError</a></code>" exception and terminate these steps.
<li><p><a href="#concept-node-adopt" title="concept-node-adopt">Adopt</a> <var title="">node</var>
- with the <a href="#context-object">context object</a>.
+ into the <a href="#context-object">context object</a>.
<li><p>Return <var title="">node</var>.
</ol>
@@ -8866,7 +8866,7 @@ <h3 id="dom-traversal"><span class="secno">10.4 </span>DOM Traversal</h3>
constants have been changed to use unsigned short, rather than just short.
<p>The <code title="">expandEntityReferences</code> attribute has been removed
-from the <code><a href="#nodeiterator">NodeIterator</a></code> and <code><a href="#treewalker">TreeWalker</a></code> objects.
+from the <code><a href="#nodeiterator">NodeIterator</a></code> and <code><a href="#treewalker">TreeWalker</a></code> interfaces.
<p>The <code title="dom-NodeIterator-referenceNode"><a href="#dom-nodeiterator-referencenode">referenceNode</a></code> and
<code title="dom-NodeIterator-pointerBeforeReferenceNode"><a href="#dom-nodeiterator-pointerbeforereferencenode">pointerBeforeReferenceNode</a></code>

0 comments on commit 4787255

Please sign in to comment.
Something went wrong with that request. Please try again.