[css-grid-1] Remove all mentions of 'row axis' and 'column axis' to prevent confusion. Fixes w3c#1299

Author: fantasai

css-grid-1/Overview.bs

@@ -107,8 +107,8 @@ Introduction</h2>
 		     two rows of items,
 		     the first being three items a third of the space each,
 		     and the second being five items, a fifth of the space each.
-		     There is therefore alignment along the row axis, but not along the column axis.">
-		<figcaption>Exemplary Flex Layout Example</figcaption>
+		     There is therefore alignment along the “rows”, but not along the “columns”.">
+		<figcaption>Representative Flex Layout Example</figcaption>
 	</figure>
 
 	<figure>
@@ -117,7 +117,7 @@ Introduction</h2>
 		     two rows of items,
 		     the first being four items&mdash;the last of which spans both rows,
 		     and the second being two items&mdash;the first of which spans the first two columns&mdash; plus the spanned item from the first row.">
-		<figcaption>Exemplary Grid Layout Example</figcaption>
+		<figcaption>Representative Grid Layout Example</figcaption>
 	</figure>
 
 	In addition, due to its ability to explicitly position items in the grid,
@@ -561,9 +561,9 @@ Grid Layout Concepts and Terminology</h2>
 	into which <a>grid items</a> (representing the <a>grid container</a>’s content) can be placed.
 	There are two sets of <a>grid lines</a>:
 	one set defining <dfn export lt="grid column" local-lt="column">columns</dfn>
-	that run along the <a href="https://www.w3.org/TR/css3-writing-modes/#block-axis">block axis</a> (the <dfn export>column axis</dfn>),
+	that run along the <a href="https://www.w3.org/TR/css3-writing-modes/#block-axis">block axis</a>,
 	and an orthogonal set defining <dfn export lt="grid row" local-lt="row">rows</dfn>
-	along the <a href="https://www.w3.org/TR/css3-writing-modes/#inline-axis">inline axis</a> (the <dfn export>row axis</dfn>).
+	along the <a href="https://www.w3.org/TR/css3-writing-modes/#inline-axis">inline axis</a>.
 	[[!CSS3-WRITING-MODES]]
 
 <!--
@@ -578,14 +578,6 @@ Grid Layout Concepts and Terminology</h2>
 		<figcaption>Grid lines: Three in the block axis and four in the inline axis.</figcaption>
 	</figure>
 
-	Note: The “column axis” term as used here was chosen to match the <a>block axis</a>
-	because this matches the visual orientation of the column boxes themselves
-	and matches the direction that a column grows as more items are added to it.
-	As a result, it does not match the axis in which new columns are added
-	or in which their track size is measured,
-	which is the <a lt="inline axis">inline</a> or <a>row axis</a>
-	The opposite logic, of course, applies to the “row axis”.
-
 <h3 id="grid-line-concept">
 Grid Lines</h3>
 
@@ -2302,7 +2294,7 @@ Implicit Track Sizing: the 'grid-auto-rows' and 'grid-auto-columns' properties</
 				grid-row: auto;
 
 				/* Ensure the button area spans the entire grid element
-				   in the row axis. */
+				   in the inline axis. */
 				grid-column: 1 / -1;
 				text-align: end;
 			}
@@ -3260,7 +3252,7 @@ Alignment and Spacing</h2>
 	what margins can do in block layout.
 	<a>Grid items</a> also respect the <a>box alignment properties</a>
 	from the <a href="http://www.w3.org/TR/css-align/">CSS Box Alignment Module</a> [[!CSS-ALIGN-3]],
-	which allow easy keyword-based alignment of items in both the <a>row axis</a> and <a>column axis</a>.
+	which allow easy keyword-based alignment of items in both the rows and columns.
 
 	By default,
 	<a>grid items</a> stretch to fill their <a>grid area</a>.
@@ -3342,7 +3334,7 @@ Aligning with <a value for="margin">auto</a> margins</h3>
 	</ul>
 
 <h3 id='row-align'>
-Row-axis Alignment: the 'justify-self' and 'justify-items' properties</h3>
+Inline-axis Alignment: the 'justify-self' and 'justify-items' properties</h3>
 
 	<a>Grid items</a> can be aligned in the inline dimension
 	by using the 'justify-self' property on the <a>grid item</a>
@@ -3364,7 +3356,7 @@ Row-axis Alignment: the 'justify-self' and 'justify-items' properties</h3>
 	and instead uses its <a>fallback alignment</a>.
 
 <h3 id='column-align'>
-Column-axis Alignment: the 'align-self' and 'align-items' properties</h3>
+Block-axis Alignment: the 'align-self' and 'align-items' properties</h3>
 
 	<a>Grid items</a> can also be aligned in the block dimension
 	(perpendicular to the inline dimension)