correcting merge

Author: Peter Linss

css-sizing/Overview.bs

@@ -454,16 +454,16 @@ Intrinsic Sizes in Table Layout</h3>
 Intrinsic Sizes in Multi-column Layout</h3>
 
 	<p>
-		The <i>min-content inline-size</i> of a multi-column element
+		The <a>min-content inline size</a> of a multi-column element
 		with a computed 'column-width' not ''column-width/auto''
 		is the smaller of
 		its 'column-width'
 		and the largest <a>min-content inline-size contribution</a> of its contents.
 
 	<p>
-		The <i>min-content inline-size</i> of a multi-column element
+		The <a>min-content inline size</a> of a multi-column element
 		with a computed 'column-width' of ''column-width/auto''
-		is the largest <i>min-content inline-size contribution</i> of its contents
+		is the largest <a>min-content inline size contribution</a> of its contents
 		multiplied by its 'column-count'
 		(treating ''column-count/auto'' as ''1'').
 
@@ -473,8 +473,8 @@ Intrinsic Sizes in Multi-column Layout</h3>
 		and a computed 'column-count' not ''column-count/auto''
 		is its 'column-count'
 		multiplied by the larger of
-		its 'column-width' (treating ''column-width/auto'' as 0)
-		and the largest <i>max-content inline-size contribution</i> of its contents.
+		its 'column-width' (treating ''column-width/auto'' as zero)
+		and the largest <a>max-content inline size contribution</a> of its contents.
 
 	<p>
 		The <a>max-content inline size</a> of a multi-column element
@@ -525,7 +525,7 @@ Intrinsic Sizes in Multi-column Layout</h3>
 		and measuring the resulting columns.
 
 	<p>
-		The <i>preferred inline-size</i> of a multi-column element
+		The <a>preferred inline size</a> of a multi-column element
 		with non-''column-width/auto'' 'column-width' and 'column-count'
 		is the product of the 'column-width' and 'column-count',
 		plus the appropriate amount of column gaps.
@@ -555,7 +555,7 @@ Fill-available Sizing</h3>
 				and where the first value is used if it is <a>definite</a> and the second value otherwise.
 		</ul>
 	<p>
-		&hellip;less the box's <i>inline-axis</i> margins
+		&hellip;less the box's <a>inline-axis</a> margins
 		(after any <a href="http://www.w3.org/TR/CSS21/box.html#collapsing-margins">margin collapsing</a>, and treating ''margin/auto'' margins as zero),
 		borders, and padding.