merge conflicts

Author: tabatkins

selectors4/Overview.html

@@ -2252,24 +2252,25 @@ <h3 id=scope-pseudo><span class=secno>7.5. </span> The contextual reference
    element pseudo-class ‘<a href="#scope"><code
    class=css>:scope</code></a>’</h3>
 
-  <p class=issue>Should this be renamed to <code>:context</code>, since it's
-   referencing a <em>context</em>ual reference element?
-
-  <p>The <a href="#scope"><code>:scope</code></a> pseudo-class represents any
-   element that is in the <a
-   href="#contextual-reference-element-set"><i>contextual reference element
-   set</i></a>. If no contextual reference element set is given, <a
-   href="#scope"><code>:scope</code></a> is equivalent to <code>:root</code>.
-   
-
-  <p>The <dfn id=contextual-reference-element-set>contextual reference
-   element set</dfn> is a (potentially empty) explicitly-specified set of
+  <p> The <a href="#scope"><code>:scope</code></a> pseudo-class represents
+   any element that is in the <dfn
+   id=contextual-reference-element-set>contextual reference element
+   set</dfn>. This is is a (potentially empty) explicitly-specified set of
    elements, such as that specified by the <code>querySelector()</code> call
    in <a href="#SELECTORS-API2"
-   rel=biblioentry>[SELECTORS-API2]<!--{{SELECTORS-API2}}--></a>.
+   rel=biblioentry>[SELECTORS-API2]<!--{{SELECTORS-API2}}--></a>, or the
+   parent element of a <a
+   href="http://www.whatwg.org/specs/web-apps/current-work/multipage/semantics.html#the-style-element">scoped
+   <code>&lt;style></code> element</a> in <a href="#HTML5"
+   rel=biblioentry>[HTML5]<!--{{HTML5}}--></a>, which is used to "scope" a
+   selector so that it only matches within a subtree.
+
+  <p> If no contextual reference element set is given, <a
+   href="#scope"><code>:scope</code></a> is equivalent to <code>:root</code>.
    Specifications intending for this pseudo-class to match specific elements
-   rather than the document's root element must define a contextual reference
-   element set.
+   rather than the document's root element must define a <a
+   href="#contextual-reference-element-set"><i>contextual reference element
+   set</i></a>.
 
   <h2 id=useraction-pseudos><span class=secno>8. </span> User Action
    Pseudo-classes</h2>

selectors4/Overview.src.html

@@ -1546,19 +1546,20 @@ <h3 id=target-pseudo>
 <h3 id=scope-pseudo>
 The contextual reference element pseudo-class '':scope''</h3>
 
-  <p class="issue">Should this be renamed to <code>:context</code>, since
-  it's referencing a <em>context</em>ual reference element?</p>
-
-  <p>The <code>:scope</code> pseudo-class represents any element that is in
-  the <i>contextual reference element set</i>. If no contextual reference
-  element set is given, <code>:scope</code> is equivalent to <code>:root</code>.
-
-  <p>The <dfn>contextual reference element set</dfn> is a (potentially empty)
-  explicitly-specified set of elements, such as that specified by the
-  <code>querySelector()</code> call in [[SELECTORS-API2]].
-  Specifications intending for this pseudo-class to match specific elements
-  rather than the document's root element must define a contextual reference
-  element set.
+  <p>
+    The <code>:scope</code> pseudo-class represents any element that is in
+    the <dfn>contextual reference element set</dfn>.
+    This is is a (potentially empty) explicitly-specified set of elements,
+    such as that specified by the <code>querySelector()</code> call in [[SELECTORS-API2]],
+    or the parent element of a <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/semantics.html#the-style-element">scoped <code>&lt;style></code> element</a> in [[HTML5]],
+    which is used to "scope" a selector so that it only matches within a subtree.
+
+  <p>
+    If no contextual reference element set is given, 
+    <code>:scope</code> is equivalent to <code>:root</code>.
+    Specifications intending for this pseudo-class to match specific elements
+    rather than the document's root element 
+    must define a <i>contextual reference element set</i>.
 
 <h2 id=useraction-pseudos>
 User Action Pseudo-classes</h2>