merge conflicts

Author: tabatkins

css-flexbox/Overview.bs

@@ -646,8 +646,8 @@ Flex Items</h2>
 <h3 id='abspos-items'>
 Absolutely-Positioned Flex Children</h3>
 
-	An absolutely-positioned child of a <i>flex container</i> does not participate in flex layout.
-	However, it does participate in the <a href="#algo-flex-order">reordering step</a> (see 'order'), 
+	An absolutely-positioned child of a <a>flex container</a> does not participate in flex layout.
+	However, it does participate in the <a href="#algo-flex-order">reordering step</a> (see 'order'),
 	which has an effect in their painting order.
 
 	The <a href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width">static position</a>
@@ -2274,7 +2274,7 @@ Initial Setup</h3>
 			as described in the <a href="#flex-items">Flex Items</a> section.
 
 		<li id='algo-flex-order'>
-			<strong>Re-order the flex items and absolutely positioned flex container children according to their 'order'.</strong>
+			<strong>Re-order the flex items according to their 'order'.</strong>
 			The flex items with the lowest (most negative) 'order' values are first in the ordering.
 			If multiple flex items share an 'order' value,
 			they're ordered by document order.
@@ -3578,7 +3578,7 @@ Changes since the 18 September 2012 Candidate Recommendation</h3>
 					<p>
 						However, if both 'left' and 'right' or both 'top' and 'bottom' are ''auto'',
 						then the used value of those properties
-						are computed from its <dfn id='flex-item-static-position'>static position</dfn>, as follows:
+						are computed from its static position, as follows:
 
 					<p>
 						If both 'left' and 'right' are ''auto'',