[css-scoping] merge

Author: tabatkins

css-scoping/Overview.bs

@@ -383,8 +383,8 @@ Selecting Into the Dark: the ''::shadow'' pseudo-element</h4>
 		If one wanted to target ''#not-top'',
 		one way to do it would be with ''x-foo::shadow > div > span''.
 		However, this introduces a strong dependency on the internal structure of the component;
-		in most cases, it's better to use the ''/shadow/'' combinator,
-		like ''x-foo /shadow/ span'',
+		in most cases, it's better to use the descendant combinator,
+		like ''x-foo::shadow span'',
 		to select all the elements of some type in the <a>shadow tree</a>.
 	</div>
 

css-scoping/Overview.html

@@ -54,7 +54,7 @@
 </p>
   <h1 class="p-name no-ref" id=title>CSS Scoping Module Level 1</h1>
   <h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
-    <span class=dt-updated><span class=value-title title=20140322>22 March 2014</span></span></span></h2>
+    <span class=dt-updated><span class=value-title title=20140324>24 March 2014</span></span></span></h2>
   <div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/shadow-styling>http://dev.w3.org/csswg/shadow-styling</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/shadow-styling>http://dev.w3.org/csswg/shadow-styling</a>
     <dt>Feedback:</dt>
         <dd><a href="mailto:www-style@w3.org?subject=%5Bcss-scoping%5D%20feedback">www-style@w3.org</a>
@@ -507,8 +507,8 @@ <h4 class="heading settled heading" data-level=3.2.2 id=shadow-pseudoelement><sp
 <p>		If one wanted to target <span class=css data-link-type=maybe title=#not-top>#not-top</span>,
 		one way to do it would be with <span class=css data-link-type=maybe title="x-foo::shadow > div > span">x-foo::shadow &gt; div &gt; span</span>.
 		However, this introduces a strong dependency on the internal structure of the component;
-		in most cases, it’s better to use the <span class=css data-link-type=maybe title=/shadow/>/shadow/</span> combinator,
-		like <span class=css data-link-type=maybe title="x-foo /shadow/ span">x-foo /shadow/ span</span>,
+		in most cases, it’s better to use the descendant combinator,
+		like <span class=css data-link-type=maybe title="x-foo::shadow span">x-foo::shadow span</span>,
 		to select all the elements of some type in the <a data-link-type=dfn href=#shadow-tree title="shadow tree">shadow tree</a>.
 	</div>