[selectors] Export the term 'scoping method'.

Author: tabatkins

selectors/Overview.html

@@ -11,7 +11,7 @@
    rel=dcterms.rights>
   <meta content="Selectors Level 4" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2014-03-10 name=dcterms.date>
+  <meta content=2014-03-20 name=dcterms.date>
   <meta content="Elika J. Etemad" name=dcterms.creator>
   <meta content="Tab Atkins Jr." name=dcterms.creator>
   <meta content=W3C name=dcterms.publisher>
@@ -32,13 +32,13 @@
 
    <h1 id=title>Selectors Level 4</h1>
 
-   <h2 class="no-num no-toc">Editor's Draft 10 March 2014</h2>
+   <h2 class="no-num no-toc">Editor's Draft 20 March 2014</h2>
 
    <dl>
     <dt>This version:
 
     <dd><a href="http://dev.w3.org/csswg/selectors4/">
-     http://www.w3.org/TR/2014/ED-selectors4-20140310/</a>
+     http://www.w3.org/TR/2014/ED-selectors4-20140320/</a>
 
     <dt>Editor's draft:
 
@@ -1511,12 +1511,13 @@ <h3 id=scoping><span class=secno>3.5. </span> Scoped Selectors</h3>
    title="virtual scoping root">virtual</dfn> one (such as a
    <code>DocumentFragment</code>).
 
-  <p>There are two methods of scoping selectors:
+  <p>There are two <dfn data-export=data-export id=scoping-methods
+   title="scoping method | selector scoping method">scoping methods</dfn> for
+   selectors:
 
   <dl>
-   <dt><dfn data-export=data-export id=scope-contained-selectors
-    title="scope-contained | scope-contained selector">scope-contained
-    selectors</dfn>
+   <dt><dfn data-export=data-export id=scope-contained
+    title="scope-contained | scope-contained selector">scope-contained</dfn>
 
    <dd> With this method of scoping, selectors match as if the <a
     href="#scoping-root"><i>scoping root</i></a> were the root of the
@@ -1527,7 +1528,6 @@ <h3 id=scoping><span class=secno>3.5. </span> Scoped Selectors</h3>
 
    <dt><dfn data-export=data-export id=scope-filtered
     title="scope-filtered | scope-filtered selector">scope-filtered</dfn>
-    selectors
 
    <dd> With this method of scoping, a selector matches if the <a
     href="#subjects"><i>subject</i></a> of the selector is within the scope,
@@ -1545,7 +1545,7 @@ <h3 id=scoping><span class=secno>3.5. </span> Scoped Selectors</h3>
 
    <p> On the other hand, the selectors within an <a href="#ref-HTML5"
     rel=biblioentry>[HTML5]<!--{{HTML5}}--></a> scoped stylesheet define <a
-    href="#scope-contained-selectors"><i>scope-contained</i></a> selectors.
+    href="#scope-contained"><i>scope-contained</i></a> selectors.
   </div>
 
   <p>Unless otherwise specified, the <a href="#scoping-root"><i>scoping
@@ -1571,8 +1571,8 @@ <h3 id=relative><span class=secno>3.6. </span> Relative Selectors</h3>
    href="#absolutize">absolutized</a> before matching.
 
   <p> Relative selectors, once absolutized, can additionally be <a
-   href="#scope-contained-selectors"><i>scope-contained</i></a> (such as
-   within the <code>::distributed()</code> pseudo-class [[SHADOWDOM]]) or <a
+   href="#scope-contained"><i>scope-contained</i></a> (such as within the
+   <code>::distributed()</code> pseudo-class [[SHADOWDOM]]) or <a
    href="#scope-filtered"><i>scope-filtered</i></a>.
 
   <h4 id=absolutizing><span class=secno>3.6.1. </span> Absolutizing a
@@ -4386,7 +4386,7 @@ <h3 id=match-a-selector><span class=secno>17.3. </span> Match A Selector</h3>
    selector</dfn> <var title="">selector</var> against a tree of nodes
    <var>nodes</var>. Optionally, a <a href="#scoping-root"><i>scoping
    root</i></a> and scoping method (<a
-   href="#scope-contained-selectors"><i>scope-contained</i></a> or <a
+   href="#scope-contained"><i>scope-contained</i></a> or <a
    href="#scope-filtered"><i>scope-filtered</i></a>) may be provided.
    Optionally, an explicit <a href="#reference-element-set"><i>reference
    element set</i></a> <var>element set</var> (which may be empty) may be
@@ -4607,8 +4607,8 @@ <h3 id=normative-references><span class=secno>21.1. </span> Normative
    <dt id=ref-RFC2119>[RFC2119]
 
    <dd>S. Bradner. <a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>Key
-    words for use in RFCs to Indicate Requirement Levels.</cite></a> Internet
-    RFC 2119. URL: <a
+    words for use in RFCs to Indicate Requirement Levels.</cite></a> RFC
+    2119. URL: <a
     href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a>
    </dd>
    <!---->
@@ -4643,8 +4643,8 @@ <h3 id=informative-references><span class=secno>21.2. </span> Informative
 
    <dd>A. Phillips; M. Davis. <a
     href="ftp://ftp.rfc-editor.org/in-notes/bcp/bcp47.txt"><cite>Tags for
-    Identifying Languages.</cite></a> September 2009. BCP 47. Internet Best
-    Current Practice. Currently represented by RFC 5646. URL: <a
+    Identifying Languages.</cite></a> September 2009. BCP 47. Currently
+    represented by RFC 5646. URL: <a
     href="ftp://ftp.rfc-editor.org/in-notes/bcp/bcp47.txt">ftp://ftp.rfc-editor.org/in-notes/bcp/bcp47.txt</a>
    </dd>
    <!---->
@@ -4711,7 +4711,7 @@ <h3 id=informative-references><span class=secno>21.2. </span> Informative
 
    <dd>A. Phillips; M. Davis. <a
     href="http://www.ietf.org/rfc/rfc4647.txt"><cite>Matching of Language
-    Tags.</cite></a> September 2006. Internet RFC 4647. URL: <a
+    Tags.</cite></a> September 2006. RFC 4647. URL: <a
     href="http://www.ietf.org/rfc/rfc4647.txt">http://www.ietf.org/rfc/rfc4647.txt</a>
    </dd>
    <!---->

selectors/Overview.src.html

@@ -766,18 +766,18 @@ <h3 id="scoping">
   and may be either a true element (the <dfn data-export>scoping element</dfn>)
   or a <dfn data-export title="virtual scoping root">virtual</dfn> one (such as a <code>DocumentFragment</code>).
 
-  <p>There are two methods of scoping selectors:
+  <p>There are two <dfn data-export title="scoping method | selector scoping method">scoping methods</dfn> for selectors:
 
   <dl>
-    <dt><dfn data-export title="scope-contained | scope-contained selector">scope-contained selectors</dfn>
+    <dt><dfn data-export title="scope-contained | scope-contained selector">scope-contained</dfn>
     <dd>
       With this method of scoping, selectors match as if
       the <i>scoping root</i> were the root of the document:
       all <i>compound selectors</i> must be represented within the scope.
       (The <code>:root</code> pseudo-class, however,
       still only matches the actual root of the document.)
 
-    <dt><dfn data-export title="scope-filtered | scope-filtered selector">scope-filtered</dfn> selectors
+    <dt><dfn data-export title="scope-filtered | scope-filtered selector">scope-filtered</dfn>
     <dd>
       With this method of scoping, a selector matches if
       the <i>subject</i> of the selector is within the scope,