[css2] Generated. Do not edit!

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402852

Author: bert-github

css2/box.html

@@ -411,7 +411,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 <li>Otherwise, either the element's parent is not taking part in the
 margin collapsing, or only the parent's bottom margin is involved. The
 position of the element's top border edge is the same as it would have
-been if the element had a non-zero top border.</li></ul>
+been if the element had a non-zero bottom border.</li></ul>
 
 <p>An element that has had <a
 href="visuren.html#clearance">clearance</a> applied to it never

css2/cascade.html

@@ -219,8 +219,10 @@ <H2>6.3 <a name="at-import">The @import rule</a></h2>
 
 <P>The <a name="x6"><span class="index-def"
 title="@import"><dfn>'@import'</dfn></span></a> rule allows users to
-import style rules from other style sheets. Any @import rules must
-precede all other rules (except the @charset rule, if present). The
+import style rules from other style sheets. In CSS&nbsp;2.1, any
+@import rules must precede all other rules (except the @charset rule,
+if present). See the <a href="syndata.html#at-rules">section on
+parsing</a> for when user agents must ignore @import rules. The
 '@import' keyword must be followed by the URI of the style sheet to
 include. A string is also allowed; it will be interpreted as if it had
 url(...) around it.

css2/changes.html

@@ -693,6 +693,10 @@ <h3 id="c8.3.1"><a name="q43">C.2.36 </a><a href="box.html#collapsing-margins">S
 
 <p>More rigorously <a href="box.html#what-is-adjoining">defined "adjoining" for margin collapsing</a>.</p>
 
+<p>Sixth bullet, second sub-bullet: to find the position of the top
+border edge, assume the element has a <em>bottom</em> (rather than
+top) border.
+
 <h3 id="c8.4"><a name="q44">C.2.37 </a><a href="box.html#padding-properties">Section 8.4 Padding properties</a></h3>
 
 <p>If the containing block's width depends on an element with percentage
@@ -2149,6 +2153,10 @@ <h3 id="xE.2"><a name="q193">C.3.52 </a><a href="zindex.html#painting-order">E.2
 context" to "but any <ins>positioned descendants and<ins> descendants
 which actually create a new stacking context" (3 times).
 
+<p>This change also occurred once in <a
+href="visuren.html#floats">section&nbsp;9.5 (Floats)</a> and once in
+section <a href="visuren.html#layers">section&nbsp;9.9 (Layered
+presentation).</a>
 
 
 <h2>C.4 <a name="clarifications">Clarifications</a></h2>

css2/page.html

@@ -93,9 +93,11 @@ <h2>13.2 <a name="page-box">Page boxes</a>: the @page rule</h2>
 area establish the rectangle that is the initial <a
 href="visudet.html#containing-block-details">containing block</a> of
 the document.
+The canvas background is painted within and covers the page area.
 
 
 <li>The margin area, which surrounds the page area. 
+The page margin area is transparent.
 </ul>
 
 <p>The size of a page box cannot be specified in CSS 2.1.

css2/sample.html

@@ -104,8 +104,7 @@ <H1><a name="q0">Appendix D. Default style sheet for HTML 4</a></H1>
 ol ul, ul ol,
 ul ul, ol ol    { margin-top: 0; margin-bottom: 0 }
 u, ins          { text-decoration: underline }
-br:before       { content: "\A" }
-:before, :after { white-space: pre-line }
+br:before       { content: "\A"; white-space: pre-line }
 center          { text-align: center }
 :link, :visited { text-decoration: underline }
 :focus          { outline: thin dotted invert }

css2/syndata.html

@@ -688,7 +688,12 @@ <h2>4.2 <a name="parsing-errors">Rules for handling parsing
 <p>A user agent conforming to a future CSS specification may accept one or
 more of the other rules as well.</p>
 </li>
-<li><strong>Malformed declarations.</strong>  User agents must handle unexpected tokens encountered while parsing a declaration by reading until the end of the declaration, while observing the rules for matching pairs of (), [], {}, "", and '', and correctly handling escapes. For example, a malformed declaration may be missing a property, colon (:) or value.  The following are all equivalent:
+<li><strong>Malformed declarations.</strong> User agents must handle
+unexpected tokens encountered while parsing a statement by reading
+until the end of the statement, while observing the rules for matching
+pairs of (), [], {}, "", and '', and correctly handling escapes. For
+example, a malformed statement may be missing a property, colon (:) or
+value. The following are all equivalent:
 
 
 <pre class="example"><code>

css2/text.html

@@ -552,14 +552,11 @@ <h2>16.6 <a name="white-space-prop">White space</a>: the <a href="text.html#prop
 
 <div class="example"><P style="display:none">Example(s):</P><p> The following examples show what <a
 href="syndata.html#whitespace">white space</a> behavior is expected
-from the PRE and P elements, the "nowrap" attribute in HTML, and 
-in generated content.
-</p>
+from the PRE and P elements and the "nowrap" attribute in HTML.
 <pre><code class="css">
 pre        { white-space: pre }
 p          { white-space: normal }
 td[nowrap] { white-space: nowrap }
-:before,:after { white-space: pre-line }
 </code></pre>
 <p>In addition, the effect of an HTML PRE element with the <em>non-standard</em> "wrap" attribute  is demonstrated by the following example:
 </p>

css2/visudet.html

@@ -505,8 +505,11 @@ <h3>10.3.7 <a name="abs-non-replaced-width">Absolutely positioned, non-replaced
 <ul>
 <li>The <dfn>static-position containing block</dfn> is the containing
 block of a hypothetical box that would have been the first box of the
-element if its 'position' property had been 'static' and its 'float'
-had been 'none'.
+element if its specified <a href="visuren.html#propdef-position" class="noxref"><span
+class="propinst-position">'position'</span></a> value had been 'static'
+and its specified 'float' had been 'none'. (Note that due to the rules
+in <a href="visuren.html#dis-pos-flo">section&nbsp;9.7</a> this might
+require also assuming a different computed value for 'display'.)
 </li>
 <li>The static position for 'left' is the distance from the left edge
 of the containing block to the left margin edge of a hypothetical box
@@ -1094,10 +1097,11 @@ <h3>10.6.4 <a name="abs-non-replaced-height">Absolutely positioned, non-replaced
 would have had in the normal flow. More precisely, the static position
 for 'top' is the distance from the top edge of the containing block to
 the top margin edge of a hypothetical box that would have been the
-first box of the element if its <a href="visuren.html#propdef-position" class="noxref"><span
-class="propinst-position">'position'</span></a> property had been
-'static' and <a href="visuren.html#propdef-float" class="noxref"><span class="propinst-float">'float'</span></a> had been
-'none'.
+first box of the element if its specified <a href="visuren.html#propdef-position" class="noxref"><span
+class="propinst-position">'position'</span></a> value had been 'static'
+and its specified 'float' had been 'none'. (Note that due to the rules
+in <a href="visuren.html#dis-pos-flo">section&nbsp;9.7</a> this might
+require also assuming a different computed value for 'display'.)
 The value is negative if the hypothetical box is above the containing
 block.
 </p>

css2/visuren.html

@@ -714,9 +714,6 @@ <h3>9.3.2 <a name="position-props">Box offsets</a>: <a href="visuren.html#propde
 positioned boxes, the offset is with respect to the top edges of the
 box itself (i.e., the box is given a position in the normal flow, then
 offset from that position according to these properties).
-<span class="note">
-Note: For absolutely positioned elements whose containing block is based on a block-level element, this property is an offset from the <em>padding</em> edge of that element.
-</span>
 </p>
 
 <div class="propdef">
@@ -746,9 +743,6 @@ <h3>9.3.2 <a name="position-props">Box offsets</a>: <a href="visuren.html#propde
 href="#containing-block">containing block</a>.  For relatively
 positioned boxes, the offset is with respect to the right edge of the
 box itself.
-<span class="note">
-Note: For absolutely positioned elements whose containing block is based on a block-level element, this property is an offset from the <em>padding</em> edge of that element.
-</span>
 </p>
 
 <div class="propdef">
@@ -777,9 +771,6 @@ <h3>9.3.2 <a name="position-props">Box offsets</a>: <a href="visuren.html#propde
 href="#containing-block">containing block</a>. For relatively
 positioned boxes, the offset is with respect to the bottom edge of the
 box itself.
-<span class="note">
-Note: For absolutely positioned elements whose containing block is based on a block-level element, this property is an offset from the <em>padding</em> edge of that element.
-</span>
 </p>
 
 <div class="propdef">
@@ -809,9 +800,6 @@ <h3>9.3.2 <a name="position-props">Box offsets</a>: <a href="visuren.html#propde
 href="#containing-block">containing block</a>.  For relatively
 positioned boxes, the offset is with respect to the left edge of the
 box itself.
-<span class="note">
-Note: For absolutely positioned elements whose containing block is based on a block-level element, this property is an offset from the <em>padding</em> edge of that element.
-</span>
 </p>
 
 <p>The values for the four properties have the following meanings:</p>
@@ -1278,7 +1266,8 @@ <h2>9.5 <a name="floats">Floats</a></h2>
 </p>
 <p>
 The contents of floats are stacked as if floats generated new 
-stacking contexts, except that any elements that actually create new 
+stacking contexts, except that any positioned elements and elements
+that actually create new
 stacking contexts take part in the float's parent's stacking context. 
 A float can overlap other boxes in the normal flow (e.g., when a 
 normal flow box next to a float has negative margins). When this 
@@ -2134,7 +2123,8 @@ <h3>9.9.1 <a name="z-index">Specifying the stack level</a>: the <a href="visuren
 </p>
 <p>
 The contents of inline blocks and inline tables are stacked as if
-they generated new stacking contexts, except that any elements that
+they generated new stacking contexts, except that any positioned
+elements and any elements that
 actually create new stacking contexts take part in the parent
 stacking context. They are then painted atomically in the inline
 stacking level.