changes.

Author: rachelandrew

css-multicol-2/Overview.bs

@@ -360,14 +360,13 @@ The multi-column model</h2>
 
 	The column boxes are ordered
 	in the [=inline base direction=] of the multicol container
-	and arranged into 
-	<dfn lt="multi-column row | multi-col row | multicol row">multicol rows</dfn>.
-	A multicol row contains at least one <dfn lt="multi-column line | multi-col line | multicol line">multicol line</dfn>,
-	but may contain additional multicol lines due to spanning elements.
+	and arranged into <dfn lt="multi-column row | multi-col row | multicol row">multicol rows</dfn>.
+	A multicol row contains at least one <dfn lt="multi-column line | multi-col line | multicol line">multicol line</dfn>
+	or spanning element.
 	The <dfn export>column width</dfn> is the length of the column box in the inline direction.
 	The <dfn export>column height</dfn> is the length of the column box in the block direction.
-	All column boxes in a row have the same column width,
-	and all column boxes in a row have the same column height.
+	All column boxes in a line have the same column width,
+	and all column boxes in a line have the same column height.
 
 	<wpt title="The following tests relate to baseline alignment of the content of columns, 
 	though this is not defined in this specification.">
@@ -532,9 +531,11 @@ The multi-column model</h2>
 	hit-test-in-vertical-rl.html
 	</wpt>
 
-	Within each [=multicol row=] in the multi-column container,
+	In the inline direction, within each [=multicol line=] in the multi-column container,
 	adjacent column boxes are separated by a <dfn noexport>column gap</dfn>,
 	which may contain a <dfn noexport>column rule</dfn>.
+	In the block direction, [=column rows=] are separated by a <dfn noexport>column gap</dfn>,
+	which may contain a <dfn noexport>column rule</dfn>.
 	All column gaps in the same multi-column container are equal.
 	All column rules in the same multi-column container are also equal, if they appear;
 	column rules only appear between columns that both have content.
@@ -543,7 +544,7 @@ The multi-column model</h2>
 	inside one multicol row, and the height of each column will be equivalent to the
 	used height of the multi-column container's content box.
 	However, [=fragmentation=] or [=spanners=]
-	can split the content of the [=multi-column container=]
+	can split the content of the [=multicol row=]
 	into multiple [=multicol lines=].
 
 	If the multi-column container is paginated, the height of each column is
@@ -554,7 +555,7 @@ The multi-column model</h2>
 	the height of each column is defined by the 'column-height' property.
 	If there is more content than will fit in a single row a new multicol row is created
 	in the block direction, with columns of the size defined by the 'column-height' property.
-	This row contains at least one multicol line.
+	This row contains at least one multicol line or one spanning element.
 
 	When a <i>spanning element</i> divides the
 	multi-column container: a new multicol line is created.