[css-flexbox] merge pre-freezing step into the sizing-inflexible step.

Author: tabatkins

css-flexbox/Overview.bs

@@ -2325,15 +2325,13 @@ Resolving Flexible Lengths</h3>
 			set their used main size
 			to their <i>hypothetical main size</i>.
 
-		<li>
-			<strong>Pre-freeze flexible items that definitely can't grow/shrink.</strong>
 			If the <i>flex grow factor</i> is being used for this algorithm,
-			if any items have a <a>flex base size</a> greater than their max main size,
+			if any flexible items have a <a>flex base size</a> greater than their max main size,
 			set their used main size to their max main size
 			and freeze them.
 
 			If the <i>flex shrink factor</i> is being used for this algorithm,
-			if any items have a <a>flex base size</a> smaller than their min main size,
+			if any flexible items have a <a>flex base size</a> smaller than their min main size,
 			set their used main size to their min main size
 			and freeze them.
 

css-flexbox/Overview.html

@@ -2352,15 +2352,13 @@ <h3 class="heading settled heading" data-level=9.7 id=resolve-flexible-lengths><
 			set their used main size
 			to their <a data-link-type=dfn href=#hypothetical-main-size title="hypothetical main size">hypothetical main size</a>.
 
-		<li>
-			<strong>Pre-freeze flexible items that definitely can’t grow/shrink.</strong>
-			If the <a data-link-type=dfn href=#flex-grow-factor title="flex grow factor">flex grow factor</a> is being used for this algorithm,
-			if any items have a <a data-link-type=dfn href=#flex-base-size title="flex base size">flex base size</a> greater than their max main size,
+<p>If the <a data-link-type=dfn href=#flex-grow-factor title="flex grow factor">flex grow factor</a> is being used for this algorithm,
+			if any flexible items have a <a data-link-type=dfn href=#flex-base-size title="flex base size">flex base size</a> greater than their max main size,
 			set their used main size to their max main size
-			and freeze them.
+			and freeze them.</p>
 
 <p>If the <a data-link-type=dfn href=#flex-shrink-factor title="flex shrink factor">flex shrink factor</a> is being used for this algorithm,
-			if any items have a <a data-link-type=dfn href=#flex-base-size title="flex base size">flex base size</a> smaller than their min main size,
+			if any flexible items have a <a data-link-type=dfn href=#flex-base-size title="flex base size">flex base size</a> smaller than their min main size,
 			set their used main size to their min main size
 			and freeze them.</p>