Merge Interpretation and Cascading

Author: fantasai

css-style-attr/Overview.html

@@ -130,15 +130,14 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
 
    <li><a href="#grammar"><span class=secno>3. </span>Grammar</a>
 
-   <li><a href="#cascading"><span class=secno>4. </span>Cascading</a>
+   <li><a href="#interpret"><span class=secno>4. </span>Cascading and
+    Interpretation</a>
 
-   <li><a href="#interpret"><span class=secno>5. </span>Interpretation</a>
+   <li><a href="#conformance"><span class=secno>5. </span>Conformance</a>
 
-   <li><a href="#conformance"><span class=secno>6. </span>Conformance</a>
+   <li><a href="#ack"><span class=secno>6. </span>Acknowledgments</a>
 
-   <li><a href="#ack"><span class=secno>7. </span>Acknowledgments</a>
-
-   <li><a href="#references"><span class=secno>8. </span>References </a>
+   <li><a href="#references"><span class=secno>7. </span>References </a>
     <ul class=toc>
      <li class=no-num><a href="#normative-references">Normative
       references</a>
@@ -197,21 +196,19 @@ <h2 id=grammar><span class=secno>3. </span>Grammar</h2>
    rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a> for the definition of the
    symbols not defined here.
 
-  <h2 id=cascading><span class=secno>4. </span>Cascading</h2>
+  <h2 id=interpret><span class=secno>4. </span>Cascading and Interpretation</h2>
 
   <p>The declarations in a style attribute apply to the element to which the
    attribute belongs. CSS2.1 <a
    href="/TR/CSS21/cascade.html#specificity">defines</a> how style sheets and
    "style" attributes are cascaded together. <a href="#CSS21"
    rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
 
-  <h2 id=interpret><span class=secno>5. </span>Interpretation</h2>
-
   <p>Aside from the differences in cascading, the declarations in a style
    attribute must be interpreted exactly as if they were given in a CSS style
    rule applied to the element.
 
-  <h2 id=conformance><span class=secno>6. </span>Conformance</h2>
+  <h2 id=conformance><span class=secno>5. </span>Conformance</h2>
 
   <p>The conformance requirements are expressed with a combination of
    descriptive assertions and RFC 2119 terminology. The key words "MUST",
@@ -236,12 +233,12 @@ <h2 id=conformance><span class=secno>6. </span>Conformance</h2>
 
   <p class=note>Note, this is an informative note.
 
-  <h2 id=ack><span class=secno>7. </span>Acknowledgments</h2>
+  <h2 id=ack><span class=secno>6. </span>Acknowledgments</h2>
 
   <p>Thanks to feedback from Daniel Glazman, Ian Hickson, Eric A. Meyer,
    Bj&ouml;rn H&ouml;hrmann.
 
-  <h2 id=references><span class=secno>8. </span>References</h2>
+  <h2 id=references><span class=secno>7. </span>References</h2>
 
   <h3 class=no-num id=normative-references>Normative references</h3>
   <!--begin-normative-->

css-style-attr/Overview.src.html

@@ -94,14 +94,12 @@ <h2 id="grammar">Grammar</h2>
 of the CSS2.1 specification</a> [[!CSS21]] for the definition of the symbols
 not defined here.
 
-<h2 id="cascading">Cascading</h2>
+<h2 id="interpret">Cascading and Interpretation</h2>
 
 <p>The declarations in a style attribute apply to the element to which
 the attribute belongs. CSS2.1 <a href="/TR/CSS21/cascade.html#specificity">defines</a>
 how style sheets and "style" attributes are cascaded together. [[!CSS21]]
 
-<h2 id="interpret">Interpretation</h2>
-
 <p>Aside from the differences in cascading, the declarations in a style
 attribute must be interpreted exactly as if they were given in a CSS
 style rule applied to the element.