Merge Interpretation and Cascading

Wed, 09 Dec 2009 22:42:14 +0000

author
Elika Etemad <fantasai.cvs@inkedblade.net>
date
Wed, 09 Dec 2009 22:42:14 +0000
changeset 1567
df52831c60eb
parent 1566
7f9b71390e9e
child 1568
bd346a406663

Merge Interpretation and Cascading

css-style-attr/Overview.html file | annotate | diff | comparison | revisions
css-style-attr/Overview.src.html file | annotate | diff | comparison | revisions
     1.1 --- a/css-style-attr/Overview.html	Wed Dec 09 22:39:56 2009 +0000
     1.2 +++ b/css-style-attr/Overview.html	Wed Dec 09 22:42:14 2009 +0000
     1.3 @@ -130,15 +130,14 @@
     1.4  
     1.5     <li><a href="#grammar"><span class=secno>3. </span>Grammar</a>
     1.6  
     1.7 -   <li><a href="#cascading"><span class=secno>4. </span>Cascading</a>
     1.8 +   <li><a href="#interpret"><span class=secno>4. </span>Cascading and
     1.9 +    Interpretation</a>
    1.10  
    1.11 -   <li><a href="#interpret"><span class=secno>5. </span>Interpretation</a>
    1.12 +   <li><a href="#conformance"><span class=secno>5. </span>Conformance</a>
    1.13  
    1.14 -   <li><a href="#conformance"><span class=secno>6. </span>Conformance</a>
    1.15 +   <li><a href="#ack"><span class=secno>6. </span>Acknowledgments</a>
    1.16  
    1.17 -   <li><a href="#ack"><span class=secno>7. </span>Acknowledgments</a>
    1.18 -
    1.19 -   <li><a href="#references"><span class=secno>8. </span>References </a>
    1.20 +   <li><a href="#references"><span class=secno>7. </span>References </a>
    1.21      <ul class=toc>
    1.22       <li class=no-num><a href="#normative-references">Normative
    1.23        references</a>
    1.24 @@ -197,7 +196,7 @@
    1.25     rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> for the definition of the
    1.26     symbols not defined here.
    1.27  
    1.28 -  <h2 id=cascading><span class=secno>4. </span>Cascading</h2>
    1.29 +  <h2 id=interpret><span class=secno>4. </span>Cascading and Interpretation</h2>
    1.30  
    1.31    <p>The declarations in a style attribute apply to the element to which the
    1.32     attribute belongs. CSS2.1 <a
    1.33 @@ -205,13 +204,11 @@
    1.34     "style" attributes are cascaded together. <a href="#CSS21"
    1.35     rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
    1.36  
    1.37 -  <h2 id=interpret><span class=secno>5. </span>Interpretation</h2>
    1.38 -
    1.39    <p>Aside from the differences in cascading, the declarations in a style
    1.40     attribute must be interpreted exactly as if they were given in a CSS style
    1.41     rule applied to the element.
    1.42  
    1.43 -  <h2 id=conformance><span class=secno>6. </span>Conformance</h2>
    1.44 +  <h2 id=conformance><span class=secno>5. </span>Conformance</h2>
    1.45  
    1.46    <p>The conformance requirements are expressed with a combination of
    1.47     descriptive assertions and RFC 2119 terminology. The key words "MUST",
    1.48 @@ -236,12 +233,12 @@
    1.49  
    1.50    <p class=note>Note, this is an informative note.
    1.51  
    1.52 -  <h2 id=ack><span class=secno>7. </span>Acknowledgments</h2>
    1.53 +  <h2 id=ack><span class=secno>6. </span>Acknowledgments</h2>
    1.54  
    1.55    <p>Thanks to feedback from Daniel Glazman, Ian Hickson, Eric A. Meyer,
    1.56     Bj&ouml;rn H&ouml;hrmann.
    1.57  
    1.58 -  <h2 id=references><span class=secno>8. </span>References</h2>
    1.59 +  <h2 id=references><span class=secno>7. </span>References</h2>
    1.60  
    1.61    <h3 class=no-num id=normative-references>Normative references</h3>
    1.62    <!--begin-normative-->
     2.1 --- a/css-style-attr/Overview.src.html	Wed Dec 09 22:39:56 2009 +0000
     2.2 +++ b/css-style-attr/Overview.src.html	Wed Dec 09 22:42:14 2009 +0000
     2.3 @@ -94,14 +94,12 @@
     2.4  of the CSS2.1 specification</a> [[!CSS21]] for the definition of the symbols
     2.5  not defined here.
     2.6  
     2.7 -<h2 id="cascading">Cascading</h2>
     2.8 +<h2 id="interpret">Cascading and Interpretation</h2>
     2.9  
    2.10  <p>The declarations in a style attribute apply to the element to which
    2.11  the attribute belongs. CSS2.1 <a href="/TR/CSS21/cascade.html#specificity">defines</a>
    2.12  how style sheets and "style" attributes are cascaded together. [[!CSS21]]
    2.13  
    2.14 -<h2 id="interpret">Interpretation</h2>
    2.15 -
    2.16  <p>Aside from the differences in cascading, the declarations in a style
    2.17  attribute must be interpreted exactly as if they were given in a CSS
    2.18  style rule applied to the element.

mercurial