[css-cascade-4][css-cascade-5] Sync levels

Author: fantasai

css-cascade-4/Overview.bs

@@ -84,7 +84,7 @@ Introduction</h2>
 	Properties values are assigned to various parts of the document
 	via [=property declarations=],
 	which assign the property a value
-	(e.g. ''red'', ''12pt'', ''border/dotted'')
+	(e.g. ''red'', ''12pt'', ''border-style/dotted'')
 	for the associated element or box.
 
 	One of the fundamental design principles of CSS is <a lt="cascade">cascading</a>,
@@ -160,13 +160,14 @@ Importing Style Sheets: the ''@import'' rule</h2>
 
 	<pre class='prod'>
 		@import [ <<url>> | <<string>> ]
-		        [ supports( [ <<supports-condition>> | <<declaration>> ] ) ]?
-		        <<media-query-list>>? ;</pre>
+		        <<import-conditions>> ;
+
+		<dfn export>&lt;import-conditions></dfn> = [ supports( [ <<supports-condition>> | <<declaration>> ] ) ]?
+		                     <<media-query-list>>?</pre>
 
 	where the <<url>> or <<string>> gives the URL of the style sheet to be imported,
-	and the optional [<<supports-condition>>|<<declaration>>] and <<media-query-list>>
-	(collectively, the <dfn export>import conditions</dfn>)
-	state the conditions under which it applies.
+	and the optional <<import-condition>>
+	state the [=import conditions=] under which it applies.
 
 	<div class="example">
 		The following <a href="#conditional-import">conditional <css>@import</css> rule</a>
@@ -195,7 +196,7 @@ Importing Style Sheets: the ''@import'' rule</h2>
 <h3 id=conditional-import>
 Conditional ''@import'' Rules</h3>
 
-	The <a>import conditions</a> allow the import to be media&ndash; or feature-support&ndash;dependent.
+	<dfn export>Import conditions</dfn> allow the import to be media&ndash; or feature-support&ndash;dependent.
 	In the absence of any <a>import conditions</a>, the import is unconditional.
 	(Specifying ''@media/all'' for the <<media-query-list>> has the same effect.)
 	If the <a>import conditions</a> do not match,
@@ -226,7 +227,7 @@ Conditional ''@import'' Rules</h3>
 		<pre class='lang-css'>
 		@import url("fallback-layout.css") supports(not (display: flex));
 		@supports (display: flex) {
-			...
+		  ...
 		}
 		</pre>
 	</div>
@@ -984,7 +985,7 @@ Cascade Sorting Order</h3>
 		<dt id='cascade-specificity'>Specificity
 		<dd>
 			The <a href="https://www.w3.org/TR/selectors/#specificity">Selectors module</a> [[!SELECT]] describes how to compute the specificity of a selector.
-			Each declaration has the same specificity as the style rule it appears in.
+			Each [=declaration=] has the same specificity as the style rule it appears in.
 			For the purpose of this step,
 			declarations that do not belong to a style rule
 			(such as the <a href="https://www.w3.org/TR/css-style-attr/#interpret">contents of a style attribute</a>)
@@ -993,10 +994,12 @@ Cascade Sorting Order</h3>
 
 		<dt id='cascade-order'>Order of Appearance
 		<dd>
-			The last declaration in document order wins.
+			The last [=declaration=] in document order wins.
 			For this purpose:
 
 			<ul>
+				<li>Style sheets are ordered
+					in [[final CSS style sheets]] order.
 				<li>Declarations from <a at-rule lt="@import">imported style sheets</a>
 					are ordered as if their style sheets were substituted in place of the ''@import'' rule.
 				<li>Declarations from style sheets independently linked by the originating document
@@ -1314,6 +1317,7 @@ Non-trivial changes since the <a href="https://www.w3.org/TR/2022/CR-css-cascade
 
 <!-- to 11 Jan 2022  -->
 	* Clarify that all “aliases” of a property are reverted by ''revert''.
+	* Clarify that style sheets are ordered in [[final CSS style sheets]] order.
 
 <h3 id="changes-2021-10">
 Changes since the 15 Oct 2021 Working Draft</h3>

css-cascade-5/Overview.bs

@@ -139,8 +139,8 @@ Importing Style Sheets: the ''@import'' rule</h2>
 		        [ layer | layer(<<layer-name>>) ]?
 		        <<import-condition>> ;
 
-		<dfn export>&lt;import-condition></dfn> = [ supports( [ <<supports-condition>> | <<declaration>> ] ) ]?
-		                     <<media-query-list>>? ;</pre>
+		<dfn export>&lt;import-conditions></dfn> = [ supports( [ <<supports-condition>> | <<declaration>> ] ) ]?
+		                     <<media-query-list>>?</pre>
 
 	where:
 
@@ -158,8 +158,8 @@ Importing Style Sheets: the ''@import'' rule</h2>
 		(just as if declared by an ''@layer'' rule wrapped
 		in the appropriate [=conditional group rules=]).
 
-	* the optional <<import-condition>>
-		states the conditions under which it applies.
+	* the optional <<import-conditions>>
+		states the [=import conditions=] under which it applies.
 
 	<div class="example">
 		The following <a href="#conditional-import">conditional <css>@import</css> rule</a>
@@ -198,7 +198,7 @@ Importing Style Sheets: the ''@import'' rule</h2>
 <h3 id=conditional-import>
 Conditional ''@import'' Rules</h3>
 
-	The <a>import conditions</a> allow the import to be media&ndash; or feature-support&ndash;dependent.
+	<dfn export>Import conditions</dfn> allow the import to be media&ndash; or feature-support&ndash;dependent.
 	In the absence of any <a>import conditions</a>, the import is unconditional.
 	(Specifying ''@media/all'' for the <<media-query-list>> has the same effect.)
 	If the <a>import conditions</a> do not match,
@@ -474,7 +474,7 @@ Value Processing</h2>
 
 	Once a user agent has parsed a document and constructed a document tree,
 	it must assign,
-	to every element in the tree,
+	to every element in the [=flat tree=],
 	and correspondingly to every box in the formatting structure,
 	a value to every property that applies to the target media type.
 
@@ -1056,7 +1056,8 @@ Cascade Sorting Order</h3>
 			For this purpose:
 
 			<ul>
-				<li>Style sheets are ordered as in <a href="https://drafts.csswg.org/cssom/#documentorshadowroot-final-css-style-sheets">final CSS style sheets</a>.
+				<li>Style sheets are ordered
+					in [[final CSS style sheets]] order.
 				<li>Declarations from <a at-rule lt="@import">imported style sheets</a>
 					are ordered as if their style sheets were substituted in place of the ''@import'' rule.
 				<li>Declarations from style sheets independently linked by the originating document
@@ -1996,6 +1997,7 @@ Non-trivial changes since the <a href="CSS Cascading and Inheritance Level 5">Ca
 
 <!-- to 11 Jan 2022 -->
 	* Clarify that all “aliases” of a property are reverted by ''revert''/''revert-layer''.
+	* Clarify that style sheets are ordered in [[final CSS style sheets]] order.
 
 <h3 id="changes-2021-10">
 Changes since the 15 Oct 2021 Working Draft</h3>