Editorial: shadow-including rather than shadow-root-including

See WICG/webcomponents#438 for discussion with
Hayato.

dom.bs

@@ -1598,9 +1598,9 @@ into a <var>parent</var> before a <var>child</var>, with an optional
    <li><p>Insert <var>node</var> into <var>parent</var> before <var>child</var> or at the end of
    <var>parent</var> if <var>child</var> is null.
 
-   <li><p>For each <a>shadow-root-including inclusive descendant</a> <var>inclusiveDescendant</var>
-   of <var>node</var>, in <a>shadow-root-including tree order</a>, run the <a>insertion steps</a>
-   with <var>inclusiveDescendant</var>.
+   <li><p>For each <a>shadow-including inclusive descendant</a> <var>inclusiveDescendant</var> of
+   <var>node</var>, in <a>shadow-including tree order</a>, run the <a>insertion steps</a> with
+   <var>inclusiveDescendant</var>.
   </ol>
 
  <li>If <i>suppress observers flag</i> is unset,
@@ -1848,9 +1848,8 @@ steps:
 
  <li><p>Run the <a>removing steps</a> with <var>node</var> and <var>parent</var>.
 
- <li><p>For each <a>shadow-root-including descendant</a> <var>descendant</var> of <var>node</var>,
- in <a>shadow-root-including tree order</a>, run the <a>removing steps</a> with
- <var>descendant</var>.
+ <li><p>For each <a>shadow-including descendant</a> <var>descendant</var> of <var>node</var>, in
+ <a>shadow-including tree order</a>, run the <a>removing steps</a> with <var>descendant</var>.
 
  <li>For each <a>inclusive ancestor</a> <var>inclusiveAncestor</var> of
  <var>parent</var>, if <var>inclusiveAncestor</var> has any <a>registered observers</a>
@@ -4998,26 +4997,24 @@ interface ShadowRoot : DocumentFragment {
 
 <hr>
 
-<p>In
-<dfn export id=concept-shadow-root-including-tree-order>shadow-root-including tree order</dfn>, is
-<a>shadow-root-including preorder, depth-first traversal</a> of a <a>tree</a>.
-<dfn noexport>shadow-root-including preorder, depth-first traversal</dfn> of a <a>tree</a>
+<p>In <dfn export id=concept-shadow-including-tree-order>shadow-including tree order</dfn>, is
+<a>shadow-including preorder, depth-first traversal</a> of a <a>tree</a>.
+<dfn noexport>shadow-including preorder, depth-first traversal</dfn> of a <a>tree</a>
 <var>tree</var> is preorder, depth-first traversal of <var>tree</var>, with for each
 <a for=/>element</a> <var>element</var> encountered in <var>tree</var>, whose
-<a for=Element>shadow root</a> is non-null,
-<a>shadow-root-including preorder, depth-first traversal</a> of the <a for=/>element</a>'s
-<a for=Element>shadow root</a>'s <a>tree</a> just after it is encountered.
+<a for=Element>shadow root</a> is non-null, <a>shadow-including preorder, depth-first traversal</a>
+of the <a for=/>element</a>'s <a for=Element>shadow root</a>'s <a>tree</a> just after it is
+encountered.
 
 <p>An object <var>A</var> is a
-<dfn export id=concept-shadow-root-including-descendant>shadow-root-including descendant</dfn> of an
-object <var>B</var>, if <var>A</var> is a <a>descendant</a> of <var>B</var>, or <var>A</var>'s
+<dfn export id=concept-shadow-including-descendant>shadow-including descendant</dfn> of an object
+<var>B</var>, if <var>A</var> is a <a>descendant</a> of <var>B</var>, or <var>A</var>'s
 <a for=tree>root</a> is a <a for=/>shadow root</a> and <var>A</var>'s <a for=tree>root</a>'s
-<a for=DocumentFragment>host</a> is a <a>shadow-root-including inclusive descendant</a> of
-<var>B</var>.
+<a for=DocumentFragment>host</a> is a <a>shadow-including inclusive descendant</a> of <var>B</var>.
 
 <p>A
-<dfn export id=concept-shadow-root-including-inclusive-descendant>shadow-root-including inclusive descendant</dfn>
-is an object or one of its <a>shadow-root-including descendants</a>.
+<dfn export id=concept-shadow-including-inclusive-descendant>shadow-including inclusive descendant</dfn>
+is an object or one of its <a>shadow-including descendants</a>.
 
 <hr>
 

dom.html

@@ -69,7 +69,7 @@
   <div class="head">
    <p data-fill-with="logo"><a class="logo" href="https://whatwg.org/"> <img alt="WHATWG" height="100" src="https://resources.whatwg.org/logo-dom.svg"> </a> </p>
    <h1 class="p-name no-ref allcaps" id="title">DOM</h1>
-   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Living Standard — Last Updated <time class="dt-updated" datetime="2016-03-16">16 March 2016</time></span></h2>
+   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Living Standard — Last Updated <time class="dt-updated" datetime="2016-03-17">17 March 2016</time></span></h2>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>Participate:
@@ -1076,7 +1076,7 @@ <h4 class="heading settled" data-level="4.2.1" id="mutation-algorithms"><span cl
       <li>
        <p>Insert <var>node</var> into <var>parent</var> before <var>child</var> or at the end of <var>parent</var> if <var>child</var> is null. </p>
       <li>
-       <p>For each <a data-link-type="dfn" href="#concept-shadow-root-including-inclusive-descendant">shadow-root-including inclusive descendant</a> <var>inclusiveDescendant</var> of <var>node</var>, in <a data-link-type="dfn" href="#concept-shadow-root-including-tree-order">shadow-root-including tree order</a>, run the <a data-link-type="dfn" href="#concept-node-insert-ext">insertion steps</a> with <var>inclusiveDescendant</var>. </p>
+       <p>For each <a data-link-type="dfn" href="#concept-shadow-including-inclusive-descendant">shadow-including inclusive descendant</a> <var>inclusiveDescendant</var> of <var>node</var>, in <a data-link-type="dfn" href="#concept-shadow-including-tree-order">shadow-including tree order</a>, run the <a data-link-type="dfn" href="#concept-node-insert-ext">insertion steps</a> with <var>inclusiveDescendant</var>. </p>
      </ol>
     <li>If <i>suppress observers flag</i> is unset, <a data-link-type="dfn" href="#queue-a-mutation-record">queue a mutation record</a> of "<code>childList</code>" for <var>parent</var> with addedNodes <var>nodes</var>, nextSibling <var>child</var>, and previousSibling <var>child</var>’s <a data-link-type="dfn" href="#concept-tree-previous-sibling">previous sibling</a> or <var>parent</var>’s <a data-link-type="dfn" href="#concept-tree-last-child">last child</a> if <var>child</var> is null. 
    </ol>
@@ -1166,8 +1166,7 @@ <h4 class="heading settled" data-level="4.2.1" id="mutation-algorithms"><span cl
     <li>
      <p>Run the <a data-link-type="dfn" href="#concept-node-remove-ext">removing steps</a> with <var>node</var> and <var>parent</var>. </p>
     <li>
-     <p>For each <a data-link-type="dfn" href="#concept-shadow-root-including-descendant">shadow-root-including descendant</a> <var>descendant</var> of <var>node</var>,
- in <a data-link-type="dfn" href="#concept-shadow-root-including-tree-order">shadow-root-including tree order</a>, run the <a data-link-type="dfn" href="#concept-node-remove-ext">removing steps</a> with <var>descendant</var>. </p>
+     <p>For each <a data-link-type="dfn" href="#concept-shadow-including-descendant">shadow-including descendant</a> <var>descendant</var> of <var>node</var>, in <a data-link-type="dfn" href="#concept-shadow-including-tree-order">shadow-including tree order</a>, run the <a data-link-type="dfn" href="#concept-node-remove-ext">removing steps</a> with <var>descendant</var>. </p>
     <li>For each <a data-link-type="dfn" href="#concept-tree-inclusive-ancestor">inclusive ancestor</a> <var>inclusiveAncestor</var> of <var>parent</var>, if <var>inclusiveAncestor</var> has any <a data-link-type="dfn" href="#registered-observer">registered observers</a> whose <b>options</b>' <code class="idl"><a data-link-type="idl" href="#dom-mutationobserverinit-subtree">subtree</a></code> is true, then for each
  such <a data-link-type="dfn" href="#registered-observer">registered observer</a> <var>registered</var>, append a <a data-link-type="dfn" href="#transient-registered-observer">transient registered observer</a> whose <b>observer</b> and <b>options</b> are identical to those of <var>registered</var> and <b>source</b> which is <var>registered</var> to <var>node</var>’s list of <a data-link-type="dfn" href="#registered-observer">registered observers</a>. 
     <li>If <i>suppress observers flag</i> is unset, <a data-link-type="dfn" href="#queue-a-mutation-record">queue a mutation record</a> of "<code>childList</code>" for <var>parent</var> with removedNodes a list solely containing <var>node</var>,
@@ -2780,10 +2779,10 @@ <h3 class="heading settled" data-level="4.8" id="interface-shadowroot"><span cla
    <p><a data-link-type="dfn" href="#concept-shadow-root">Shadow roots</a> have an associated <dfn data-dfn-for="ShadowRoot" data-dfn-type="dfn" data-noexport="" id="shadowroot-encapsulation-mode">encapsulation mode<a class="self-link" href="#shadowroot-encapsulation-mode"></a></dfn> ("<code>open</code>" or "<code>closed</code>").</p>
    <p>The <dfn class="idl-code" data-dfn-for="ShadowRoot" data-dfn-type="attribute" data-export="" id="dom-shadowroot-host"><code>host</code><a class="self-link" href="#dom-shadowroot-host"></a></dfn> attribute’s getter must return the <a data-link-type="dfn" href="#context-object">context object</a>’s <a data-link-type="dfn" href="#concept-documentfragment-host">host</a>. </p>
    <hr>
-   <p>In <dfn data-dfn-type="dfn" data-export="" id="concept-shadow-root-including-tree-order">shadow-root-including tree order<a class="self-link" href="#concept-shadow-root-including-tree-order"></a></dfn>, is <a data-link-type="dfn" href="#shadow-root-including-preorder-depth-first-traversal">shadow-root-including preorder, depth-first traversal</a> of a <a data-link-type="dfn" href="#concept-tree">tree</a>. <dfn data-dfn-type="dfn" data-noexport="" id="shadow-root-including-preorder-depth-first-traversal">shadow-root-including preorder, depth-first traversal<a class="self-link" href="#shadow-root-including-preorder-depth-first-traversal"></a></dfn> of a <a data-link-type="dfn" href="#concept-tree">tree</a> <var>tree</var> is preorder, depth-first traversal of <var>tree</var>, with for each <a data-link-type="dfn" href="#concept-element">element</a> <var>element</var> encountered in <var>tree</var>, whose <a data-link-type="dfn" href="#concept-element-shadow-root">shadow root</a> is non-null, <a data-link-type="dfn" href="#shadow-root-including-preorder-depth-first-traversal">shadow-root-including preorder, depth-first traversal</a> of the <a data-link-type="dfn" href="#concept-element">element</a>’s <a data-link-type="dfn" href="#concept-element-shadow-root">shadow root</a>’s <a data-link-type="dfn" href="#concept-tree">tree</a> just after it is encountered. </p>
-   <p>An object <var>A</var> is a <dfn data-dfn-type="dfn" data-export="" id="concept-shadow-root-including-descendant">shadow-root-including descendant<a class="self-link" href="#concept-shadow-root-including-descendant"></a></dfn> of an
-object <var>B</var>, if <var>A</var> is a <a data-link-type="dfn" href="#concept-tree-descendant">descendant</a> of <var>B</var>, or <var>A</var>’s <a data-link-type="dfn" href="#concept-tree-root">root</a> is a <a data-link-type="dfn" href="#concept-shadow-root">shadow root</a> and <var>A</var>’s <a data-link-type="dfn" href="#concept-tree-root">root</a>’s <a data-link-type="dfn" href="#concept-documentfragment-host">host</a> is a <a data-link-type="dfn" href="#concept-shadow-root-including-inclusive-descendant">shadow-root-including inclusive descendant</a> of <var>B</var>. </p>
-   <p>A <dfn data-dfn-type="dfn" data-export="" id="concept-shadow-root-including-inclusive-descendant">shadow-root-including inclusive descendant<a class="self-link" href="#concept-shadow-root-including-inclusive-descendant"></a></dfn> is an object or one of its <a data-link-type="dfn" href="#concept-shadow-root-including-descendant">shadow-root-including descendants</a>. </p>
+   <p>In <dfn data-dfn-type="dfn" data-export="" id="concept-shadow-including-tree-order">shadow-including tree order<a class="self-link" href="#concept-shadow-including-tree-order"></a></dfn>, is <a data-link-type="dfn" href="#shadow-including-preorder-depth-first-traversal">shadow-including preorder, depth-first traversal</a> of a <a data-link-type="dfn" href="#concept-tree">tree</a>. <dfn data-dfn-type="dfn" data-noexport="" id="shadow-including-preorder-depth-first-traversal">shadow-including preorder, depth-first traversal<a class="self-link" href="#shadow-including-preorder-depth-first-traversal"></a></dfn> of a <a data-link-type="dfn" href="#concept-tree">tree</a> <var>tree</var> is preorder, depth-first traversal of <var>tree</var>, with for each <a data-link-type="dfn" href="#concept-element">element</a> <var>element</var> encountered in <var>tree</var>, whose <a data-link-type="dfn" href="#concept-element-shadow-root">shadow root</a> is non-null, <a data-link-type="dfn" href="#shadow-including-preorder-depth-first-traversal">shadow-including preorder, depth-first traversal</a> of the <a data-link-type="dfn" href="#concept-element">element</a>’s <a data-link-type="dfn" href="#concept-element-shadow-root">shadow root</a>’s <a data-link-type="dfn" href="#concept-tree">tree</a> just after it is
+encountered. </p>
+   <p>An object <var>A</var> is a <dfn data-dfn-type="dfn" data-export="" id="concept-shadow-including-descendant">shadow-including descendant<a class="self-link" href="#concept-shadow-including-descendant"></a></dfn> of an object <var>B</var>, if <var>A</var> is a <a data-link-type="dfn" href="#concept-tree-descendant">descendant</a> of <var>B</var>, or <var>A</var>’s <a data-link-type="dfn" href="#concept-tree-root">root</a> is a <a data-link-type="dfn" href="#concept-shadow-root">shadow root</a> and <var>A</var>’s <a data-link-type="dfn" href="#concept-tree-root">root</a>’s <a data-link-type="dfn" href="#concept-documentfragment-host">host</a> is a <a data-link-type="dfn" href="#concept-shadow-including-inclusive-descendant">shadow-including inclusive descendant</a> of <var>B</var>. </p>
+   <p>A <dfn data-dfn-type="dfn" data-export="" id="concept-shadow-including-inclusive-descendant">shadow-including inclusive descendant<a class="self-link" href="#concept-shadow-including-inclusive-descendant"></a></dfn> is an object or one of its <a data-link-type="dfn" href="#concept-shadow-including-descendant">shadow-including descendants</a>. </p>
    <hr>
    <p class="XXX">For now you can find more information about this object in <a href="https://w3c.github.io/webcomponents/spec/shadow/">Shadow DOM</a>. The DOM Standard will be
 updated over time to cover more details. </p>
@@ -5459,6 +5458,10 @@ <h3 class="no-num no-ref heading settled" id="index-defined-here"><span class="c
    <li><a href="#concept-range-bp-set">set the end</a><span>, in §5.2</span>
    <li><a href="#concept-range-bp-set">set the start</a><span>, in §5.2</span>
    <li><a href="#dom-node-setuserdata">setUserData()</a><span>, in §8.2</span>
+   <li><a href="#concept-shadow-including-descendant">shadow-including descendant</a><span>, in §4.8</span>
+   <li><a href="#concept-shadow-including-inclusive-descendant">shadow-including inclusive descendant</a><span>, in §4.8</span>
+   <li><a href="#shadow-including-preorder-depth-first-traversal">shadow-including preorder, depth-first traversal</a><span>, in §4.8</span>
+   <li><a href="#concept-shadow-including-tree-order">shadow-including tree order</a><span>, in §4.8</span>
    <li><a href="#shadowroot">ShadowRoot</a><span>, in §4.8</span>
    <li>
     shadow root
@@ -5467,10 +5470,6 @@ <h3 class="no-num no-ref heading settled" id="index-defined-here"><span class="c
      <li><a href="#concept-element-shadow-root">dfn for Element</a><span>, in §4.9</span>
     </ul>
    <li><a href="#dom-element-shadowroot">shadowRoot</a><span>, in §4.9</span>
-   <li><a href="#concept-shadow-root-including-descendant">shadow-root-including descendant</a><span>, in §4.8</span>
-   <li><a href="#concept-shadow-root-including-inclusive-descendant">shadow-root-including inclusive descendant</a><span>, in §4.8</span>
-   <li><a href="#shadow-root-including-preorder-depth-first-traversal">shadow-root-including preorder, depth-first traversal</a><span>, in §4.8</span>
-   <li><a href="#concept-shadow-root-including-tree-order">shadow-root-including tree order</a><span>, in §4.8</span>
    <li><a href="#dictdef-shadowrootinit">ShadowRootInit</a><span>, in §4.9</span>
    <li><a href="#enumdef-shadowrootmode">ShadowRootMode</a><span>, in §4.9</span>
    <li><a href="#dom-nodefilter-show_all">SHOW_ALL</a><span>, in §6.3</span>