xfq
diff --git a/‎css3-layout/Overview.html‎
Lines changed: 50 additions & 59 deletions b/‎css3-layout/Overview.html‎
Lines changed: 50 additions & 59 deletions
@@ -35,23 +35,14 @@
 
    <h1>CSS Grid Template Layout Module</h1>
    <!--=================================================================-->
-<<<<<<< local
    <h2 class="no-num no-toc" id=longstatus-date-3-august-2004>Editor's Draft
     23 May 2012</h2>
-=======
-   <h2 class="no-num no-toc" id=editors-draft-17-may-2012>Editor's Draft 17
-    May 2012</h2>
->>>>>>> other
 
    <dl>
     <dt>This version:
 
     <dd><a
-<<<<<<< local
      href="http://www.w3.org/TR/2012/ED-css3-layout-20120523/">http://www.w3.org/TR/2012/ED-css3-layout-20120523/</a>
-=======
-     href="http://www.w3.org/TR/2012/ED-css3-layout-20120517/">http://www.w3.org/TR/2012/ED-css3-layout-20120517/</a>
->>>>>>> other
 
 
     <dt>Latest version:
@@ -122,7 +113,7 @@ <h2 class="no-num no-toc" id=abstract>Abstract</h2>
    arbitrary slots so that the visual order becomes independent of the
    document order.
 
-  <p>The <a href="#lsquoslotrsquo-pseudo-element.">‘<code
+  <p>The <a href="#slot-pseudo-element.">‘<code
    class=css>::slot()</code>’ pseudo-element</a> allows to style the slots
    (backgrounds, borders, etc.)
 
@@ -430,10 +421,11 @@ <h3 id=summary-and-examples><span class=secno>1.1. </span>Summary and
   <p>The properties in this specification work by associating a layout grid
    with an element. Rather than letting an element lay out its descendants in
    a single flow, the policy defined in this module gives an element a
-   <span>grid template,</span> which is a set of <span>slots</span> aligned
-   to an invisible grid, where each slot is a separate flow. The descendants
-   are given a ‘<a href="#flow0"><code class=property>flow</code></a>’
-   property to designate the slot into which they flow.
+   <span>grid template,</span> which is a set of <a href="#slot">slots</a>
+   aligned to an invisible grid, where each slot is a separate flow. The
+   descendants are given a ‘<a href="#flow0"><code
+   class=property>flow</code></a>’ property to designate the slot into
+   which they flow.
 
   <p>Because layouts on the Web have to adapt to different window and paper
    sizes, the rows and columns of the grid can be made fixed or flexible in
@@ -1731,9 +1723,9 @@ <h3 id=slot-sizes><span class=secno>2.6. </span>Calculating the size of the
       class=property>margin-left</code></a>’, ‘<a
       href="#margin-right"><code class=property>margin-right</code></a>’,
       etc., that is set on it by means of the <a
-      href="#lsquoslotrsquo-pseudo-element.">‘<code
-      class=css>::slot()</code>’ pseudo-element</a>). Any ‘<code
-      class=css>auto</code>’ margins are counted as 0 in this case.
+      href="#slot-pseudo-element.">‘<code class=css>::slot()</code>’
+      pseudo-element</a>). Any ‘<code class=css>auto</code>’ margins are
+      counted as 0 in this case.
 
      <li>Otherwise, if the slot spans at least one column whose width is
       specified as ‘<code class=css>max-content</code>’ (or ‘<code
@@ -2166,11 +2158,11 @@ <h2 id=positioning><span class=secno>3. </span>Putting content into a grid
    root (“establishes a block formatting context” in the terminology of
    CSS level 2), very much like a table cell.
 
-  <p>The second way is to absolutely position elements using four <em>grid
-   lines</em> to specify the positions of the four margin edges of the
-   element. Like other positioned elements <a href="#CSS21"
-   rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>, these elements can overlap
-   each other and the ‘<a href="#z-index"><code
+  <p>The second way is to absolutely position elements using four <a
+   href="#grid-line"><em>grid lines</em></a> to specify the positions of the
+   four margin edges of the element. Like other positioned elements <a
+   href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>, these elements
+   can overlap each other and the ‘<a href="#z-index"><code
    class=property>z-index</code></a>’ property applies to them.
    <!--=================================================================-->
 
@@ -2952,9 +2944,8 @@ <h2 id=slot-pseudo><span class=secno>4. </span>Styling slots: the ‘<a
    href="#slot"><code class=css>::slot()</code></a>’ pseudo-element</h2>
 
   <p>The slots of a <a href="#grid-element."><em>grid element</em></a> can be
-   individually addressed with the <dfn
-   id=lsquoslotrsquo-pseudo-element.>‘<code class=css>slot()</code>’
-   pseudo-element.</dfn>
+   individually addressed with the <dfn id=slot-pseudo-element.>‘<code
+   class=css>slot()</code>’ pseudo-element.</dfn>
 
   <div class=example>
    <p>For example, the following sets the background and vertical alignment
@@ -3310,9 +3301,9 @@ <h3 id=vertical-alignment><span class=secno>6.1. </span>Vertical alignment
   <h3 id=paged><span class=secno>6.2. </span>Breaking grid elements across
    pages or columns</h3>
 
-  <p><span>Grid elements</span> may be broken across pages, columns or
-   similar regions (including chained slots of another grid element), subject
-   to the ‘<a href="#break-before0"><code
+  <p><a href="#grid-element.">Grid elements</a> may be broken across pages,
+   columns or similar regions (including chained slots of another grid
+   element), subject to the ‘<a href="#break-before0"><code
    class=property>break-before</code></a>’, ‘<a
    href="#break-after0"><code class=property>break-after</code></a>’ and
    ‘<a href="#break-inside0"><code
@@ -4637,11 +4628,11 @@ <h4 id=use-the-pseudo-class-to-create-additiona><span class=secno>10.2.17.
   <pre>DIV::slot(z) {position: absolute; grid-position: 2 / 2}</pre>
 
   <p>Like other ‘<a href="#slot"><code class=css>::slot()</code></a>’
-   pseudo-elements, it applies to <span>grid elements</span> only (the DIV in
-   this example must be a grid element), but unlike other ‘<a
-   href="#slot"><code class=css>::slot()</code></a>’ pseudo-elements it
-   doesn't style an existing slot, but implicitly creates a new one. (It is
-   some kind of error if the name ‘<code class=css>z</code>’ already
+   pseudo-elements, it applies to <a href="#grid-element.">grid elements</a>
+   only (the DIV in this example must be a grid element), but unlike other
+   ‘<a href="#slot"><code class=css>::slot()</code></a>’ pseudo-elements
+   it doesn't style an existing slot, but implicitly creates a new one. (It
+   is some kind of error if the name ‘<code class=css>z</code>’ already
    exists in the grid template.)
 
   <p>Then you can flow other elements into this slot:
@@ -5273,26 +5264,6 @@ <h2 class=no-num id=index>Index</h2>
   <!--begin-index-->
 
   <ul class=indexlist>
-   <li>‘<code class=css>slot()</code>’ pseudo-element., <a
-    href="#lsquoslotrsquo-pseudo-element."
-    title="‘slot()’ pseudo-element."><strong>4.</strong></a>
-
-   <li>&lt;col-width&gt;, <a href="#ltcol-widthgt"
-    title="&lt;col-width&gt;"><strong>2.2.</strong></a>
-
-   <li><var>&lt;length&gt;</var>, <a href="#ltlengthgt"
-    title="&lt;length&gt;"><strong>1.2.</strong></a>
-
-   <li>&lt;minmax&gt;, <a href="#ltminmaxgt"
-    title="&lt;minmax&gt;"><strong>2.2.</strong></a>, <a href="#ltminmaxgt0"
-    title="&lt;minmax&gt;"><strong>2.3.</strong></a>
-
-   <li>&lt;row-height&gt;, <a href="#ltrow-heightgt"
-    title="&lt;row-height&gt;"><strong>2.3.</strong></a>
-
-   <li><var>&lt;string&gt;</var>, <a href="#ltstringgt"
-    title="&lt;string&gt;"><strong>1.2.</strong></a>
-
    <li>A edge, <a href="#a-edge" title="A edge"><strong>6.1.</strong></a>
 
    <li>anonymous block of a slot, <a href="#anonymous-block"
@@ -5341,6 +5312,9 @@ <h2 class=no-num id=index>Index</h2>
 
    <li>columns, <a href="#columns" title=columns><strong>1.2.</strong></a>
 
+   <li>&lt;col-width&gt;, <a href="#ltcol-widthgt"
+    title="&lt;col-width&gt;"><strong>2.2.</strong></a>
+
    <li>containing block, <a href="#containing-block"
     title="containing block"><strong>3.1.</strong></a>
 
@@ -5369,15 +5343,15 @@ <h2 class=no-num id=index>Index</h2>
    <li>grid ancestor, <a href="#grid-ancestor"
     title="grid ancestor"><strong>2.</strong></a>
 
+   <li>grid-columns, <a href="#grid-columns"
+    title=grid-columns><strong>2.2.</strong></a>
+
    <li>grid element., <a href="#grid-element."
     title="grid element."><strong>2.</strong></a>
 
    <li>grid line,, <a href="#grid-line"
     title="grid line,"><strong>3.2.</strong></a>
 
-   <li>grid-columns, <a href="#grid-columns"
-    title=grid-columns><strong>2.2.</strong></a>
-
    <li>grid-position, <a href="#grid-position0"
     title=grid-position><strong>3.3.</strong></a>
 
@@ -5412,6 +5386,9 @@ <h2 class=no-num id=index>Index</h2>
 
    <li>left, <a href="#left" title=left><strong>1.2.</strong></a>
 
+   <li><a href="#ltlengthgt"><var>&lt;length&gt;</var></a>, <a
+    href="#ltlengthgt" title="&lt;length&gt;"><strong>1.2.</strong></a>
+
    <li>margin, <a href="#margin" title=margin><strong>1.2.</strong></a>
 
    <li>margin-left, <a href="#margin-left"
@@ -5420,6 +5397,10 @@ <h2 class=no-num id=index>Index</h2>
    <li>margin-right, <a href="#margin-right"
     title=margin-right><strong>1.2.</strong></a>
 
+   <li>&lt;minmax&gt;, <a href="#ltminmaxgt"
+    title="&lt;minmax&gt;"><strong>2.2.</strong></a>, <a href="#ltminmaxgt0"
+    title="&lt;minmax&gt;"><strong>2.3.</strong></a>
+
    <li>non-interactive, <a href="#non-interactive"
     title=non-interactive><strong>1.2.</strong></a>
 
@@ -5443,22 +5424,32 @@ <h2 class=no-num id=index>Index</h2>
 
    <li>right, <a href="#right" title=right><strong>1.2.</strong></a>
 
+   <li>&lt;row-height&gt;, <a href="#ltrow-heightgt"
+    title="&lt;row-height&gt;"><strong>2.3.</strong></a>
+
    <li>slot, <a href="#slot" title=slot><strong>2.1.</strong></a>
 
+   <li>‘<a href="#slot"><code class=css>slot()</code></a>’
+    pseudo-element., <a href="#slot-pseudo-element."
+    title="''slot()'' pseudo-element."><strong>4.</strong></a>
+
+   <li><a href="#ltstringgt"><var>&lt;string&gt;</var></a>, <a
+    href="#ltstringgt" title="&lt;string&gt;"><strong>1.2.</strong></a>
+
    <li>top, <a href="#top" title=top><strong>1.2.</strong></a>
 
    <li>vertical, <a href="#vertical-element"
     title=vertical><strong>1.2.</strong></a>
 
+   <li>vertical-align, <a href="#vertical-align"
+    title=vertical-align><strong>1.2.</strong></a>
+
    <li>vertical element, <a href="#vertical-element"
     title="vertical element"><strong>1.2.</strong></a>
 
    <li>vertical writing mode, <a href="#vertical-writing-mode"
     title="vertical writing mode"><strong>1.2.</strong></a>
 
-   <li>vertical-align, <a href="#vertical-align"
-    title=vertical-align><strong>1.2.</strong></a>
-
    <li>width, <a href="#width" title=width><strong>1.2.</strong></a>
 
    <li>writing-mode, <a href="#writing-mode"