(Just a merge, no changes)

Author: bert-github

css3-regions/Overview.src.html

@@ -1991,7 +1991,7 @@ <h2 id="regions-visual-formatting-details">Regions visual formatting details</h2
 
     <p>Regions are laid out by CSS and take part in the normal box model and other layout models
         offered by CSS modules such as flexible boxes ([[CSS3-FLEXBOX]]). However, <span>regions</span>
-        layout a fragment of their <span>named flow</span> instead of laying out descendant content as happens with other 
+        lay out a fragment of their <span>named flow</span> instead of laying out descendant content as happens with other 
         boxes.</p>
 
     <p>This section describes the model for laying out <span>regions</span> and for laying out
@@ -2073,17 +2073,17 @@ <h5 id="rfcb-flow-fragment-height-resolution-phase-1">RFCB flow fragment height
     <h5 id="rfcb-flow-fragment-height-resolution-phase-2">RFCB flow fragment height resolution, Phase 2</h5>
 
     <p><span>Named flows</span> are laid out in <span>regions</span>. The 
-        user agent computes the <em><span>flow fragment height</span></em> for
+        user agent resolves the <em><span>flow fragment height</span></em> for
         the <span>RFCB</span>s using the remainder of the flow and accounting for 
         <a href="http://www.w3.org/TR/css3-break/">fragmentation rules</a>.
-        This process accounts for constraints such as the 'max-height' value, as described
+        This process accounts for constraints such as the 'height' or 'max-height' values, as described
         in the CSS 2.1 section on 
         <a href="http://www.w3.org/TR/CSS2/visudet.html#Computing_heights_and_margins">calculating heights 
             and margins</a> (see the <a href="http://www.w3.org/TR/CSS2/visudet.html#normal-block">Block-level 
                 non-replaced elements in normal flow when 'overflow' computes to 'visible'</a> section and the
         <a href="http://www.w3.org/TR/CSS2/visudet.html#block-root-margin">complicated cases</a> section). 
         During this phase, generated content is laid out according to the 
-        <a href="file:///Users/vhardy/work/W3C/mercurial/csswg/css3-regions/Overview.html#processing-model">rules</a> described earlier in this document.
+        <a href="#processing-model">rules</a> described earlier in this document.
         </p>
 
     <h4 id="regions-boxes-layout">Step 2: regions boxes layout</h4>
@@ -2120,13 +2120,13 @@ <h4 id="named-flows-layout">Step 3: named flows layout</h4>
         generated content boxes.</p>
 
     <p>During this phase, generated content is laid out according to the 
-        <a href="file:///Users/vhardy/work/W3C/mercurial/csswg/css3-regions/Overview.html#processing-model">rules</a> 
+        <a href="#processing-model">rules</a> 
         described earlier in this document.</p>
 
     <h3 id="regions-visual-formatting-implementation-note">Regions visual formatting: implementation note</h3>
 
     <p>The process for resolving an RFCB's 'height' and the three-step process used to
-        layout documents containing regions and <span>named flows</span> are
+        lay out documents containing regions and <span>named flows</span> are
         <em>conceptual</em> descriptions of what the layout 
         should yield and implementations should optimize to reduce the number of
         steps and phases necessary wherever possible.</p>