[css2] Accepted INS text as per Oslo ftf.

bert-github · bert-github · commit f80c617a6031 · 2003-08-26T12:18:41.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402143
diff --git a/css2/box.src b/css2/box.src
@@ -2,7 +2,7 @@
   'http://www.w3.org/TR/html4/strict.dtd'>
 
 <html lang="en">
-<!-- $Id: box.src,v 1.40 2003-08-26 10:00:27 bbos Exp $ -->
+<!-- $Id: box.src,v 1.41 2003-08-26 12:18:41 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Box model</TITLE>
@@ -308,7 +308,6 @@ positioned boxes do not collapse (not even with their
 in-flow children).
 
 <li id="collapsed-through">
-<ins cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0446.html">
 If the top and bottom margins of a box are adjacent, then it is
 possible for margins to collapse through it. In this case, the
 position of the element depends on its relationship with the other
@@ -325,35 +324,33 @@ through have no effect on the positions of the other elements with
 whose margins they are being collapsed; the top border edge position
 is only required for laying out descendants of these
 elements.</p>
-</ins>
 </li>
 
 </ul>
 
-<ins cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0455.html">
-<div id="what-is-adjacent">
+<div id="what-is-adjoining">
 
 <p>The bottom margin of an in-flow block-level element is always
-adjacent to the top margin of its next in-flow block-level
+adjoining to the top margin of its next in-flow block-level
 sibling.</p>
 
-<p>The top margin of an in-flow block-level element is adjacent to its
+<p>The top margin of an in-flow block-level element is adjoining to its
 first in-flow block-level child's top margin if the element has no top
 border and no top padding.</p>
 
 <p>The bottom margin of an in-flow block-level element with a <span
 class="propinst-height">'height'</span> of 'auto' and <span
 class="propinst-min-height">'min-height'</span> less than the
-element's used height is adjacent to its last in-flow block-level
+element's used height is adjoining to its last in-flow block-level
 child's bottom margin if the element has no bottom padding or
 border.</p>
 
-<p>An element's own margins are adjacent if the <span
+<p>An element's own margins are adjoining if the <span
 class="propinst-min-height">'min-height'</span> property is zero, and
 it has neither vertical borders nor vertical padding, and it has a
 <span class="propinst-height">'height'</span> of either 0 or 'auto',
-and it does not contains a line box, and all of its in-flow children's
-margins (if any) are adjacent.</p>
+and it does not contain a line box, and all of its in-flow children's
+margins (if any) are adjoining.</p>
 
 <p>Collapsing is based on the <em>computed value</em> of <span
 class="propinst-padding">'padding'</span>, <span
@@ -362,7 +359,6 @@ class="propinst-border">'border'</span>. The collapsed margin is
 calculated over the computed value of the various margins.</p>
 
 </div>
-</ins>
 
 <P>Please
 consult the <a href="#mpb-examples">examples of margin, padding, and
