Add conformance section, rename tokens in grammar to be mroe clear

Author: fantasai

css-style-attr/Overview.html

@@ -130,11 +130,15 @@ <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 order</a>
+   <li><a href="#cascading"><span class=secno>4. </span>Cascading</a>
 
-   <li><a href="#ack"><span class=secno>5. </span>Acknowledgments</a>
+   <li><a href="#interpret"><span class=secno>5. </span>Interpretation</a>
 
-   <li><a href="#references"><span class=secno>6. </span>References </a>
+   <li><a href="#conformance"><span class=secno>6. </span>Conformance</a>
+
+   <li><a href="#ack"><span class=secno>7. </span>Acknowledgments</a>
+
+   <li><a href="#references"><span class=secno>8. </span>References </a>
     <ul class=toc>
      <li class=no-num><a href="#normative-references">Normative
       references</a>
@@ -180,10 +184,10 @@ <h2 id=grammar><span class=secno>3. </span>Grammar</h2>
 
   <pre>
 inline-stylesheet
-  : S* declaration-block
+  : S* declaration-list
   ;
 
-declaration-block
+declaration-list
   : declaration [ ';' S* declaration ]*
   ;
 </pre>
@@ -193,20 +197,52 @@ <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 order</h2>
+  <h2 id=cascading><span class=secno>4. </span>Cascading</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=ack><span class=secno>5. </span>Acknowledgments</h2>
+  <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 style
+   rule that selected the associated element in a CSS style sheet associated
+   with the document.
+
+  <h2 id=conformance><span class=secno>6. </span>Conformance</h2>
+
+  <p>The conformance requirements are expressed with a combination of
+   descriptive assertions and RFC 2119 terminology. The key words "MUST",
+   "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT",
+   "RECOMMENDED", "MAY", and "OPTIONAL" in the normative parts of this
+   document are to be interpreted as described in RFC 2119. However, for
+   readability, these words do not appear in all uppercase letters in this
+   specification. All of the text of this specification is normative except
+   sections explicitly marked as non-normative, examples, and notes. <a
+   href="#RFC2119" rel=biblioentry>[RFC2119]<!--{{!RFC2119}}--></a>
+
+  <p>Examples in this specification are introduced with the words "for
+   example" or are set apart from the normative text with
+   <code>class="example"</code>, like this:
+
+  <div class=example>
+   <p>This is an example of an informative example.</p>
+  </div>
+
+  <p>Informative notes begin with the word "Note" and are set apart from the
+   normative text with <code>class="note"</code>, like this:
+
+  <p class=note>Note, this is an informative note.
+
+  <h2 id=ack><span class=secno>7. </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>6. </span>References</h2>
+  <h2 id=references><span class=secno>8. </span>References</h2>
 
   <h3 class=no-num id=normative-references>Normative references</h3>
   <!--begin-normative-->
@@ -225,6 +261,15 @@ <h3 class=no-num id=normative-references>Normative references</h3>
     href="http://www.w3.org/TR/2009/CR-CSS2-20090908">http://www.w3.org/TR/2009/CR-CSS2-20090908</a>
     </dd>
    <!---->
+
+   <dt id=RFC2119>[RFC2119]
+
+   <dd>S. Bradner. <a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>Key
+    words for use in RFCs to Indicate Requirement Levels.</cite></a> Internet
+    RFC 2119. URL: <a
+    href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a>
+    </dd>
+   <!---->
   </dl>
   <!--end-normative-->
 

css-style-attr/Overview.src.html

@@ -82,10 +82,10 @@ <h2 id="grammar">Grammar</h2>
 
 <pre>
 inline-stylesheet
-  : S* declaration-block
+  : S* declaration-list
   ;
 
-declaration-block
+declaration-list
   : declaration [ ';' S* declaration ]*
   ;
 </pre>
@@ -94,12 +94,44 @@ <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 order</h2>
+<h2 id="cascading">Cascading</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 style
+rule that selected the associated element in a CSS style sheet associated
+with the document.
+
+<h2 id="conformance">Conformance</h2>
+
+<p>The conformance requirements are expressed with a combination of
+  descriptive assertions and RFC 2119 terminology. The key words "MUST",
+  "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT",
+  "RECOMMENDED", "MAY", and "OPTIONAL" in the normative parts of this
+  document are to be interpreted as described in RFC 2119.
+  However, for readability, these words do not appear in all uppercase
+  letters in this specification. All of the text of this specification is
+  normative except sections explicitly marked as non-normative, examples,
+  and notes. [[!RFC2119]]</p>
+
+<p>Examples in this specification are introduced with the words "for example"
+  or are set apart from the normative text with <code>class="example"</code>,
+  like this:
+
+<div class="example">
+  <p>This is an example of an informative example.</p>
+</div>
+
+<p>Informative notes begin with the word "Note" and are set apart from the
+  normative text with <code>class="note"</code>, like this:
+
+<p class="note">Note, this is an informative note.</p>
+
 <h2 id="ack">Acknowledgments</h2>
 
 <p>Thanks to feedback from Daniel Glazman, Ian Hickson, Eric A. Meyer,