[css-fonts-4] Re-apply changes from 66ed019 after 6e1e2c2 (#13824)

Author: cdoublev

css-fonts-4/Overview.bs

@@ -2759,7 +2759,7 @@ To parse a <dfn><<font-src-list>></dfn> production, [=parse a list=] of <<font-s
 
 	<pre class="prod">
 		<dfn>&lt;font-src></dfn> = <<url>> [ <dfn value for="@font-face/src" id="format()">format( <<font-format>> )</dfn> ]? [ <dfn value for="@font-face/src" id="tech()">tech( <<font-tech>># )</dfn> ]?
-			| <dfn value for="@font-face/src" id="local()">local( <<family-name>> )</dfn>
+			| <dfn value for="@font-face/src" id="local()">local( <<font-family-name>> )</dfn>
 	</pre>
 
 	<pre class="prod"><dfn id="font-format-values">&lt;font-format&gt;</dfn>
@@ -6058,7 +6058,7 @@ Defining font specific alternates: the <dfn>@font-feature-values</dfn> rule</h3>
 	as the corresponding value of the 'font-variant-alternates' property.
 
 	<pre class=prod export>
-		@font-feature-values = @font-feature-values <<family-name>># { <<declaration-rule-list>> }
+		@font-feature-values = @font-feature-values <<font-family-name>># { <<declaration-rule-list>> }
 
 		<dfn for="@font-feature-values">&lt;font-feature-value-type></dfn> = <<@stylistic>> | <<@historical-forms>> | <<@styleset>> | <<@character-variant>>
 			| <<@swash>> | <<@ornaments>> | <<@annotation>>
@@ -6078,13 +6078,13 @@ Defining font specific alternates: the <dfn>@font-feature-values</dfn> rule</h3>
 	</wpt>
 
 	The ''@font-feature-values'' prelude
-	is a comma-delimited list of font family names that match the definition of <<family-name>>
+	is a comma-delimited list of font family names that match the definition of <<font-family-name>>
 	for the 'font-family!!property' property.
 	This means that only named font families are allowed;
 	rules that include generic or system fonts in the list of font families are syntax errors.
 	However, if a user agent defines a generic font to be a specific named font (e.g. Helvetica),
 	the settings associated with that family name will be used.
-	If syntax errors occur within the <<family-name>> list,
+	If syntax errors occur within the <<font-family-name>> list,
 	the entire rule ''@font-feature-values'' rule is invalid
 	and must be ignored.
 
@@ -6119,7 +6119,7 @@ Defining font specific alternates: the <dfn>@font-feature-values</dfn> rule</h3>
 	or the same type of [=feature value blocks=] in separate ''@font-feature-values'' rules,
 	names can be reused without colliding.
 
-	For each <<family-name>> in the ''@font-feature-values'' prelude,
+	For each <<font-family-name>> in the ''@font-feature-values'' prelude,
 	each [=font feature value declaration=] defines a mapping between a
 	(family name, feature block name, declaration name) [=tuple=]
 	and the list of one or more integers from the declaration's value.
@@ -9486,4 +9486,4 @@ Changes from the 20 September 2018 <a href="https://www.w3.org/TR/2018/REC-css-f
 -->
 <wpt hidden>
 	font-size-zero-1-ref.html
-</wpt>
+</wpt>