merge

Author: tabatkins

css-align/Overview.bs

@@ -334,9 +334,9 @@ Baseline Alignment: the ''baseline'' and ''last-baseline'' keywords</h3>
 Distributed Alignment: the ''<content-distribution>/stretch'', ''space-between'', ''space-around'', and ''space-evenly'' keywords</h3>
 
 	The distribution values are used by 'justify-content' and 'align-content'
-	to distribute the items in the <a>alignment subject</a>
+	to distribute the <a>alignment subjects</a>
 	evenly between the start and end edges of the <a>alignment container</a>.
-	When the <a>alignment subject</a> cannot be distributed in this way,
+	When the <a>alignment subjects</a> cannot be distributed in this way,
 	they behave as their <dfn export>fallback alignment</dfn>.
 	Each distribution value has an associated <<content-position>> as a <a>fallback alignment</a>,
 	but one can alternatively be explicitly specified in the property.
@@ -346,40 +346,40 @@ Distributed Alignment: the ''<content-distribution>/stretch'', ''space-between''
 	<dl dfn-type="value" dfn-for="<content-distribution>">
 		<dt><dfn>space-between</dfn>
 		<dd>
-			The items are evenly distributed in the <a>alignment container</a>.
-			The first item is placed flush with the start edge of the <a>alignment container</a>,
-			the last item is placed flush with the end edge of the <a>alignment container</a>,
-			and the remaining items are distributed so that the spacing between any two adjacent items is the same.
+			The <a>alignment subjects</a> are evenly distributed in the <a>alignment container</a>.
+			The first <a>alignment subject</a> is placed flush with the start edge of the <a>alignment container</a>,
+			the last <a>alignment subject</a> is placed flush with the end edge of the <a>alignment container</a>,
+			and the remaining <a>alignment subjects</a> are distributed so that the spacing between any two adjacent <a>alignment subjects</a> is the same.
 			Unless otherwise specified,
 			this value falls back to ''start''.
 
 		<dt><dfn>space-around</dfn>
 		<dd>
-			The items are evenly distributed in the <a>alignment container</a>,
+			The <a>alignment subjects</a> are evenly distributed in the <a>alignment container</a>,
 			with a half-size space on either end.
-			The items are distributed so that the spacing between any two adjacent items is the same,
-			and the spacing before the first and after the last item is half the size of the other spacing.
+			The <a>alignment subjects</a> are distributed so that the spacing between any two adjacent <a>alignment subjects</a> is the same,
+			and the spacing before the first and after the last <a>alignment subject</a> is half the size of the other spacing.
 			Unless otherwise specified,
 			this value falls back to ''center''.
 
 		<dt><dfn>space-evenly</dfn>
 		<dd>
-			The items are evenly distributed in the <a>alignment container</a>,
+			The <a>alignment subjects</a> are evenly distributed in the <a>alignment container</a>,
 			with a full-size space on either end.
-			The items are distributed so that the spacing between any two adjacent items,
-			before the first item,
-			and after the last item
+			The <a>alignment subjects</a> are distributed so that the spacing between any two adjacent <a>alignment subjects</a>,
+			before the first <a>alignment subject</a>,
+			and after the last <a>alignment subject</a>
 			is the same.
 			Unless otherwise specified,
 			this value falls back to ''center''.
 
 		<dt><dfn>stretch</dfn>
 		<dd>
-			If the combined size of the items is less than the size of the <a>alignment container</a>,
-			any ''width/auto''-sized items have their size increased equally so that the combined size exactly fills the <a>alignment container</a>,
+			If the combined size of the <a>alignment subjects</a> is less than the size of the <a>alignment container</a>,
+			any ''width/auto''-sized <a>alignment subjects</a> have their size increased equally so that the combined size exactly fills the <a>alignment container</a>,
 			and then clamped by their 'max-width'/'max-height' constraints.
 
-			The items are then aligned as per ''flex-start''.
+			The <a>alignment subjects</a> are then aligned as per ''flex-start''.
 			<span class='note'>(For layout modes other than flex layout, ''flex-start'' is identical to ''start''.)</span>
 	</dl>