[css-grid-1][css-grid-2] sync levels

Author: fantasai

css-grid-1/Overview.bs

@@ -1684,7 +1684,7 @@ Naming Grid Lines: the <css>[<<custom-ident>>*]</css> syntax</h4>
 		</figure>
 	</div>
 
-	A line name cannot be <css>span</css> or <css>auto</css>,
+	A [=line name=] cannot be <css>span</css> or <css>auto</css>,
 	i.e. the <<custom-ident>> in the <<line-names>> production
 	excludes the keywords <css>span</css> and <css>auto</css>.
 

css-grid-2/Overview.bs

@@ -26,6 +26,7 @@ Link Defaults: css2 (property) margin/min-height/max-height/min-width/max-width,
 <pre class=link-defaults>
 spec:css-align-3;
 	type:value;
+		text:center; for:align-self;
 		text:stretch; for:align-self
 		text:stretch; for:align-content
 		text:space-between; for:justify-content
@@ -1178,7 +1179,9 @@ Grid Items</h2>
 		Use the [=inline size=] calculation rules for non-replaced boxes
 		(defined in [[CSS2/visudet#blockwidth]]).
 
-		Note: This can distort the aspect ratio of the item, if it has one.
+		Note: This can distort the aspect ratio
+		of an item with a [=preferred aspect ratio=],
+		if its size is also constrained in the other axis.
 
 	: all other values
 	:: Size the item as ''width/fit-content''.
@@ -2967,7 +2970,7 @@ Numeric Indexes and Spans</h4>
 Named Lines and Spans</h4>
 
 	Instead of counting lines by number,
-	<a>named lines</a> can be referenced by their name:
+	lines can be referenced by their [=line name=]:
 
 	<div class='example'>
 		<pre>
@@ -2978,7 +2981,7 @@ Named Lines and Spans</h4>
 		</pre>
 	</div>
 
-	Note: Note that if a <a>named grid area</a> and a <a>named line</a> have the same name,
+	Note: Note that if a <a>named grid area</a> has the same name as a [=line name=],
 	the placement algorithm will prefer to use <a>named grid area</a>’s lines instead.
 
 	If there are multiple lines of the same name,
@@ -3107,7 +3110,7 @@ Line-based Placement: the 'grid-row-start', 'grid-column-start', 'grid-row-end',
 		<dt><dfn id='grid-placement-slot'><<custom-ident>></dfn>
 		<dd>
 			First attempt to match the <a>grid area</a>’s edge to a <a>named grid area</a>:
-			if there is a <a>named line</a> with the name <css><<custom-ident>>-start</css> (for 'grid-*-start') / <css><<custom-ident>>-end</css> (for 'grid-*-end'),
+			if there is a [=grid line=] whose [=line name=] is <css><<custom-ident>>-start</css> (for 'grid-*-start') / <css><<custom-ident>>-end</css> (for 'grid-*-end'),
 			contributes the first such line to the <a>grid item</a>’s <a>placement</a>.
 
 			Note: <a>Named grid areas</a> automatically generate [=implicitly-assigned line names=] of this form,
@@ -3418,7 +3421,7 @@ Grid Item Placement Algorithm</h3>
 			</pre>
 
 			The number of columns needed is 6.
-			The <a>explicit grid</a> provides its 5 columns
+			The <a>explicit grid</a> provides 5 columns
 			(from 'grid-template-columns')
 			with lines number 1 through 6,
 			but <code>#grid-item</code>’s column position means it ends on line 7,