Merge pull request #5474 from EB-Forks/fix/gh-5428

Editorial change, no need for IPR commitment.

Author: tabatkins

css-extensions-1/Overview.bs

@@ -18,7 +18,7 @@ Introduction</h2>
 	one often encounters significant repetition in certain features.
 	For example, a given media query might be repeated in several places,
 	or a selector meant to apply to all heading elements
-	requires specifying '':matches(h1, h2, h3, h4, h5, h6)'' in every location that uses it.
+	requires specifying '':is(h1, h2, h3, h4, h5, h6)'' in every location that uses it.
 
 	This repetition makes stylesheets more verbose and difficult to read,
 	and also affects maintenance,
@@ -84,7 +84,7 @@ Extension Names</h2>
 	</div>
 
 	This defines a <a>custom selector</a> which is written as a <a spec=selectors>pseudo-class</a> with the given <<extension-name>>,
-	and represents a '':matches()'' selector using the provided <<selector-list>> as its argument.
+	and represents a '':is()'' selector using the provided <<selector-list>> as its argument.
 
 	<div class='example'>
 		For example, if an author wanted to easily refer to all heading elements in their HTML document,

css-nesting-1/Overview.bs

@@ -99,7 +99,7 @@ Nesting Selector: the ''&'' selector {#nest-selector}
 	<div class="note">
 		The <a>nesting selector</a> can be desugared
 		by replacing it with the parent style rule's selector,
-		wrapped in a '':matches()'' selector.
+		wrapped in a '':is()'' selector.
 		For example,
 
 		<pre class=lang-css>
@@ -111,7 +111,7 @@ Nesting Selector: the ''&'' selector {#nest-selector}
 		is equivalent to
 
 		<pre class=lang-css>
-		:matches(a, b) c { color: blue; }
+		:is(a, b) c { color: blue; }
 		</pre>
 	</div>
 
@@ -221,8 +221,8 @@ Direct Nesting {#direct}
 		}
 		/* equivalent to
 		   .foo, .bar { color: blue; }
-		   :matches(.foo, .bar) + .baz,
-		   :matches(.foo, .bar).qux { color: red; }
+		   :is(.foo, .bar) + .baz,
+		   :is(.foo, .bar).qux { color: red; }
 		 */
 		</pre>
 

css-scoping-1/Overview.bs

@@ -274,7 +274,7 @@ Selecting Into the Light: the '':host'', '':host()'', and '':host-context()'' ps
 	plus the [=specificity=] of its argument.
 
 	Note: This is different from the specificity of similar pseudo-classes,
-	like '':matches()'' or '':not()'',
+	like '':is()'' or '':not()'',
 	which <em>only</em> take the specificity of their argument.
 	This is because '':host'' is affirmatively selecting an element all by itself,
 	like a "normal" pseudo-class;

css-tables-3/Overview.bs

@@ -3241,13 +3241,13 @@ Using CSS Tables does not incur any privacy risk to mitigate.
 	RULES (part 1/3)
 	http://codepen.io/FremyCompany/pen/GopJMp
 -->
-	table:matches([rules=all i], [rules=rows i], [rules=cols i], [rules=groups i], [rules=none i]) {
+	table:is([rules=all i], [rules=rows i], [rules=cols i], [rules=groups i], [rules=none i]) {
 		border-collapse: collapse;
 		border-style: hidden;
 	}
 
-	table:matches([rules=all i], [rules=rows i], [rules=cols i], [rules=groups i], [rules=none i]),
-	table:matches([rules=all i], [rules=rows i], [rules=cols i], [rules=groups i], [rules=none i]) > :matches(thead,tbody,tfoot) > tr > :matches(th,td) {
+	table:is([rules=all i], [rules=rows i], [rules=cols i], [rules=groups i], [rules=none i]),
+	table:is([rules=all i], [rules=rows i], [rules=cols i], [rules=groups i], [rules=none i]) > :is(thead,tbody,tfoot) > tr > :is(th,td) {
 		border-color: black;
 	}
 
@@ -3258,28 +3258,28 @@ Using CSS Tables does not incur any privacy risk to mitigate.
 	table[border=$border] /* if(parseInt($border) > 0) */ {
 		border: /*(parseInt($border) * 1px)*/ outset rgb(128, 128, 128);
 	}
-	table[border=$border] > :matches(thead,tbody,tfoot) > tr > :matches(th,td) /* if(parseInt($border) > 0) */ {
+	table[border=$border] > :is(thead,tbody,tfoot) > tr > :is(th,td) /* if(parseInt($border) > 0) */ {
 		border: 1px inset rgb(128, 128, 128);
 	}
 
 <!--
 	RULES (part 2/3)
 	http://codepen.io/FremyCompany/pen/GopJMp
 -->
-	table[rules=all i] > :matches(thead,tbody,tfoot) > tr > :matches(th,td) {
+	table[rules=all i] > :is(thead,tbody,tfoot) > tr > :is(th,td) {
 		border: 1px solid grey;
 	}
-	table[rules=rows i] > :matches(thead,tbody,tfoot) > tr > :matches(th,td) {
+	table[rules=rows i] > :is(thead,tbody,tfoot) > tr > :is(th,td) {
 		border: 1px solid grey;
 		border-left: none;
 		border-right: none;
 	}
-	table[rules=cols i] > :matches(thead,tbody,tfoot) > tr > :matches(th,td) {
+	table[rules=cols i] > :is(thead,tbody,tfoot) > tr > :is(th,td) {
 		border: 1px solid grey;
 		border-top: none;
 		border-bottom: none;
 	}
-	table[rules=none i] > :matches(thead,tbody,tfoot) > tr > :matches(th,td) {
+	table[rules=none i] > :is(thead,tbody,tfoot) > tr > :is(th,td) {
 		border: none;
 	}
 
@@ -3288,7 +3288,7 @@ Using CSS Tables does not incur any privacy risk to mitigate.
 	http://codepen.io/FremyCompany/pen/jWbPXY
 	https://jsfiddle.net/ewv08n0r/
 -->
-	table[rules=groups i] > :matches(thead,tbody,tfoot) {
+	table[rules=groups i] > :is(thead,tbody,tfoot) {
 		border-top-width: 1px; border-top-style: solid;
 		border-bottom-width: 1px; border-bottom-style: solid;
 	}
@@ -3320,7 +3320,7 @@ Using CSS Tables does not incur any privacy risk to mitigate.
 <!--
 	Others:
 -->
-	table[cellpadding=$x] > :matches(thead,tbody,tfoot) > tr > :matches(th,td) /* if(parseInt($x)>0) */ {
+	table[cellpadding=$x] > :is(thead,tbody,tfoot) > tr > :is(th,td) /* if(parseInt($x)>0) */ {
 		padding: /*(parseInt($x) * 1px)*/;
 	}
 	table[cellspacing=$x] /* if(parseInt($x)>0) */ {
@@ -3345,10 +3345,10 @@ Using CSS Tables does not incur any privacy risk to mitigate.
 	table[bordercolor=$color] {
 		border-color: /*parseHTMLColor($color)*/;
 	}
-	table[bordercolor] > :matches(tbody, thead, tfoot, tr, colgroup, col),
-	table[bordercolor] > :matches(tbody, thead, tfoot) > tr,
-	table[bordercolor] > :matches(tbody, thead, tfoot) > tr > :matches(td, th),
-	table[bordercolor] > tr > :matches(td, th)
+	table[bordercolor] > :is(tbody, thead, tfoot, tr, colgroup, col),
+	table[bordercolor] > :is(tbody, thead, tfoot) > tr,
+	table[bordercolor] > :is(tbody, thead, tfoot) > tr > :is(td, th),
+	table[bordercolor] > tr > :is(td, th)
 	table[bordercolor] > colgroup > col
 	) {
 		border-color: inherit;
@@ -3371,29 +3371,29 @@ Using CSS Tables does not incur any privacy risk to mitigate.
 	NON-TABLE ATTRIBUTES:
 -->
 	caption[align=bottom i] { caption-side: bottom; }
-	:matches(thead,tbody,tfoot,tr,td,th)[valign=top i] {
+	:is(thead,tbody,tfoot,tr,td,th)[valign=top i] {
 		vertical-align: top;
 	}
-	:matches(thead,tbody,tfoot,tr,td,th)[valign=middle i] {
+	:is(thead,tbody,tfoot,tr,td,th)[valign=middle i] {
 		vertical-align: middle;
 	}
-	:matches(thead,tbody,tfoot,tr,td,th)[valign=bottom i] {
+	:is(thead,tbody,tfoot,tr,td,th)[valign=bottom i] {
 		vertical-align: bottom;
 	}
-	:matches(thead,tbody,tfoot,tr,td,th)[valign=baseline i] {
+	:is(thead,tbody,tfoot,tr,td,th)[valign=baseline i] {
 		vertical-align: baseline;
 	}
 
-	:matches(thead,tbody,tfoot,tr,td,th)[align=absmiddle i] {
+	:is(thead,tbody,tfoot,tr,td,th)[align=absmiddle i] {
 		text-align: center;
 	}
 
-	:matches(colgroup,col,thead,tbody,tfoot,tr,td,th)[hidden] {
+	:is(colgroup,col,thead,tbody,tfoot,tr,td,th)[hidden] {
 		visibility: collapse;
 	}
 
-	:matches(td,th)[nowrap] { white-space: nowrap; }
-	:matches(td,th)[nowrap][width=$w] /* if(quirksMode && parseInt($w) > 0) */ {
+	:is(td,th)[nowrap] { white-space: nowrap; }
+	:is(td,th)[nowrap][width=$w] /* if(quirksMode && parseInt($w) > 0) */ {
 		white-space: normal;
 	}
 

selectors-4/deferred-for-level-5

@@ -21,8 +21,8 @@ Reference combinators <code>/ref/</code></h3>
 		is focused or hovered-over:
 
 		<pre>
-		label:matches(:hover, :focus) /for/ input,       /* association by "for" attribute */
-		label:matches(:hover, :focus):not([for]) input { /* association by containment */
+		label:is(:hover, :focus) /for/ input,       /* association by "for" attribute */
+		label:is(:hover, :focus):not([for]) input { /* association by containment */
 			box-shadow: yellow 0 0 10px;
 		}
 		</pre>