[css2] Generated. Do not edit!

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

Author: bert-github

css2/colors.html

@@ -112,16 +112,16 @@ <h2>14.2 <a name="background">The background</a></h2>
 
 <p>For HTML documents, however, we recommend that authors specify the
 background for the BODY element rather than the HTML element.
-For HTML documents whose root HTML element has computed values of
-'transparent' for <a href="colors.html#propdef-background-color" class="noxref"><span
+For documents whose root element is an HTML "HTML" element or an XHTML
+"html" element that has computed values of 'transparent' for <a href="colors.html#propdef-background-color" class="noxref"><span
 class="propinst-background-color">'background-color'</span></a> and 'none'
 for <a href="colors.html#propdef-background-image" class="noxref"><span class="propinst-background-image">'background-image'</span></a>,
 user agents must instead use the computed value of those properties
-from that HTML element's first BODY element child when painting
-backgrounds for the canvas, and must not paint a background for that
-BODY element. Such backgrounds must also be anchored at the same point
-as they would be if they were painted only for the root element.
-This does not apply to XHTML documents.
+from that element's first HTML "BODY" element or XHTML "body" element
+child when painting backgrounds for the canvas, and must not paint a
+background for that child element. Such backgrounds must also be
+anchored at the same point as they would be if they were painted only
+for the root element.
 </p>
 <div class="html-example"><p>
 According to these rules, the canvas underlying the following 

css2/diffs-rec/box.html

@@ -411,7 +411,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 <li><ins>Otherwise,</ins> <ins>either</ins> <ins>the</ins> <ins>element's</ins> <ins>parent</ins> <ins>is</ins> <ins>not</ins> <ins>taking</ins> <ins>part</ins> <ins>in</ins> <ins>the</ins>
 <ins>margin</ins> <ins>collapsing,</ins> <ins>or</ins> <ins>only</ins> <ins>the</ins> <ins>parent's</ins> <ins>bottom</ins> <ins>margin</ins> <ins>is</ins> <ins>involved.</ins> <ins>The</ins>
 <ins>position</ins> <ins>of</ins> <ins>the</ins> <ins>element's</ins> <ins>top</ins> <ins>border</ins> <ins>edge</ins> <ins>is</ins> <ins>the</ins> <ins>same</ins> <ins>as</ins> <ins>it</ins> <ins>would</ins> <ins>have</ins>
-<ins>been</ins> <ins>if</ins> <ins>the</ins> <ins>element</ins> <ins>had</ins> <ins>a</ins> <ins>non-zero</ins> <ins>top</ins> <ins>border.</ins></li></ul>
+<ins>been</ins> <ins>if</ins> <ins>the</ins> <ins>element</ins> <ins>had</ins> <ins>a</ins> <ins>non-zero</ins> <ins>bottom</ins> <ins>border.</ins></li></ul>
 
 <p><ins>An</ins> <ins>element</ins> <ins>that</ins> <ins>has</ins> <ins>had</ins> <a
 href="visuren.html#clearance"><ins>clearance</ins></a> <ins>applied</ins> <ins>to</ins> <ins>it</ins> <ins>never</ins>
@@ -440,13 +440,17 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 <ins>top</ins> <ins>border,</ins> <ins>no</ins> <ins>top</ins> <ins>padding,</ins> <ins>and</ins> <ins>the</ins> <ins>child</ins> <ins>has</ins> <ins>no</ins> <a
 href="visuren.html#clearance"><ins>clearance.</ins></a></p>
 
-<p><ins>The</ins> <ins>bottom</ins> <ins>margin</ins> <ins>of</ins> <ins>an</ins> <ins>in-flow</ins> <ins>block-level</ins> <ins>element</ins> <ins>with</ins> <ins>a</ins> <a href="visudet.html#propdef-height" class="noxref"><span
-class="propinst-height"><ins>'height'</ins></span></a> <ins>of</ins> <ins>'auto'</ins> <ins>and</ins> <a href="visudet.html#propdef-min-height" class="noxref"><span
-class="propinst-min-height"><ins>'min-height'</ins></span></a> <ins>less</ins> <ins>than</ins> <ins>the</ins>
-<ins>element's</ins> <ins>used</ins> <ins>height</ins> <ins>and</ins> <a href="visudet.html#propdef-max-height" class="noxref"><span
-class="propinst-max-height"><ins>'max-height'</ins></span></a> <ins>greater</ins> <ins>than</ins> <ins>the</ins>
-<ins>element's</ins> <ins>used</ins> <ins>height</ins> <ins>is</ins> <ins>adjoining</ins> <ins>to</ins> <ins>its</ins> <ins>last</ins> <ins>in-flow</ins> <ins>block-level</ins>
-<ins>child's</ins> <ins>bottom</ins> <ins>margin</ins> <ins>if</ins> <ins>the</ins> <ins>element</ins> <ins>has</ins> <ins>no</ins> <ins>bottom</ins> <ins>padding</ins> <ins>or</ins> <ins>border.</ins>
+<p><ins>The</ins> <ins>bottom</ins> <ins>margin</ins> <ins>of</ins> <ins>an</ins> <ins>in-flow</ins> <ins>block-level</ins> <ins>element</ins> <ins>is</ins> <ins>adjoining</ins> <ins>to</ins>
+<ins>its</ins> <ins>last</ins> <ins>in-flow</ins> <ins>block-level</ins> <ins>child's</ins> <ins>bottom</ins> <ins>margin</ins> <ins>when:</ins>
+<ul>
+<li><ins>the</ins> <ins>element's</ins> <ins>specified</ins> <ins>'height'</ins> <ins>is</ins> <ins>'auto',</ins>
+
+<li><ins>the</ins> <ins>element's</ins> <ins>used</ins> <ins>height</ins> <ins>is</ins> <ins>the</ins> <ins>same</ins> <ins>as</ins> <ins>it</ins> <ins>would</ins> <ins>have</ins> <ins>been</ins> <ins>if</ins> <ins>the</ins>
+<ins>specified</ins> <ins>values</ins> <ins>of</ins> <ins>'min-height'</ins> <ins>and</ins> <ins>'max-height'</ins> <ins>were</ins> <ins>their</ins> <ins>initial</ins>
+<ins>values</ins>
+
+<li><ins>the</ins> <ins>element</ins> <ins>has</ins> <ins>no</ins> <ins>bottom</ins> <ins>padding</ins> <ins>or</ins> <ins>border.</ins>
+</ul>
 
 <p><ins>An</ins> <ins>element's</ins> <ins>own</ins> <ins>margins</ins> <ins>are</ins> <ins>adjoining</ins> <ins>if</ins> <ins>the</ins> <a href="visudet.html#propdef-min-height" class="noxref"><span
 class="propinst-min-height"><ins>'min-height'</ins></span></a> <ins>property</ins> <ins>is</ins> <ins>zero,</ins> <ins>and</ins>

css2/diffs-rec/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  <del>rule</del> <del>sets</del> <del>in</del> <del>a</del> <del>style</del> <del>sheet.</del><ins>other</ins> <ins>rules</ins> <ins>(except</ins> <ins>the</ins> <ins>@charset</ins> <ins>rule,</ins> <ins>if</ins> <ins>present).</ins> The
+import style rules from other style sheets. <ins>In</ins> <ins>CSS&nbsp;2.1,</ins> any
+@import rules must precede all  <del>rule</del> <del>sets</del> <del>in</del> <del>a</del> <del>style</del> <del>sheet.</del><ins>other</ins> <ins>rules</ins> <ins>(except</ins> <ins>the</ins> <ins>@charset</ins> <ins>rule,</ins>
+<ins>if</ins> <ins>present).</ins> <ins>See</ins> <ins>the</ins> <a href="syndata.html#at-rules"><ins>section</ins> <ins>on</ins>
+<ins>parsing</ins></a> <ins>for</ins> <ins>when</ins> <ins>user</ins> <ins>agents</ins> <ins>must</ins> <ins>ignore</ins> <ins>@import</ins> <ins>rules.</ins> 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.
@@ -283,8 +285,8 @@ <H2>6.4 <a name="cascade">The cascade</a></h2>
 font). See <a href="sample.html"> <del>"A</del><ins>A</ins> sample style sheet for HTML
 </a>  <del>4.0"</del>for a recommended default style sheet for HTML  <del>4.0</del>documents.
 
-<p class="note">Note that the  <del>default</del> <del>style</del> <del>sheet</del><ins>user</ins> may  <del>change</del> <del>if</del><ins>modify</ins> system settings  <del>are</del> <del>modified</del> <del>by</del> <del>the</del> <del>user</del> <del>(e.g.,</del><ins>(e.g.</ins> 
-system  <del>colors).</del><ins>colors)</ins> <ins>that</ins> <ins>affect</ins> <ins>the</ins> <ins>default</ins> <ins>style</ins> <ins>sheet.</ins> However,  <del>due</del> <del>to</del> <del>limitations</del> <del>in</del> <del>a</del><ins>some</ins> user 
+<p class="note"> <del>Note</del> <del>that</del> <del>the</del> <del>default</del> <del>style</del> <del>sheet</del> <del>may</del> <del>change</del> <del>if</del> <del>system</del> <del>settings</del> <del>are</del> <del>modified</del> <del>by</del><ins>Note</ins> <ins>that</ins> the user  <del>(e.g.,</del><ins>may</ins> <ins>modify</ins> system  <del>colors).</del><ins>settings</ins> <ins>(e.g.</ins> 
+<ins>system</ins> <ins>colors)</ins> <ins>that</ins> <ins>affect</ins> <ins>the</ins> <ins>default</ins> <ins>style</ins> <ins>sheet.</ins> However,  <del>due</del> <del>to</del> <del>limitations</del> <del>in</del> <del>a</del><ins>some</ins> user 
  <del>agent's</del> <del>internal</del> <del>implementation,</del><ins>agent</ins> <ins>implementations</ins> <ins>make</ins> it  <del>may</del> <del>be</del>impossible to change the values in the 
 default style sheet.
 </ul>