[e] (0) Correct and clarify terminology around the http-equiv attribu…

…te and its states.

git-svn-id: http://svn.whatwg.org/webapps@3521 340c8d12-0b0e-0410-8428-c7bf67bfef74

index

@@ -10298,9 +10298,9 @@ http://software.hixie.ch/utilities/js/live-dom-viewer/?%3C%21DOCTYPE%20HTML%3E%0
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#flow-content-0>flow content</a>.</dd>
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: <a href=#phrasing-content-0>phrasing content</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
-   <dd>If the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute is present, or if the element is in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-head-element>head</a></code> element.</dd>
-   <dd>If the <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is present, and the element is not in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-head-element>head</a></code> element.</dd>
-   <dd>If the <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is present, and the element is not in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-noscript-element>noscript</a></code> element that is a child of a <code><a href=#the-head-element>head</a></code> element.</dd>
+   <dd>If the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute is present, or if the element's <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-head-element>head</a></code> element.</dd>
+   <dd>If the <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is present and in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-head-element>head</a></code> element.</dd>
+   <dd>If the <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute is present but not in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</a>: in a <code><a href=#the-noscript-element>noscript</a></code> element that is a child of a <code><a href=#the-head-element>head</a></code> element.</dd>
    <dd>If the <code title=attr-meta-name><a href=#attr-meta-name>name</a></code> attribute is present: where <a href=#metadata-content-0>metadata content</a> is expected.</dd>
    <dd>If the <code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code> attribute is present: where <a href=#phrasing-content-0>phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
@@ -10594,7 +10594,7 @@ people expect to have work and what is necessary.
 
   </div>
 
-  <dl><dt class=impl><dfn id=attr-meta-http-equiv-content-language title=attr-meta-http-equiv-content-language>Content language</dfn>
+  <dl><dt class=impl><dfn id=attr-meta-http-equiv-content-language title=attr-meta-http-equiv-content-language>Content language state</dfn> (<code title="">http-equiv="content-language"</code>)
 
    <dd class=impl>
 
@@ -10604,10 +10604,12 @@ people expect to have work and what is necessary.
 
     <div class=impl>
 
-    <ol><li><p>If another <code><a href=#meta>meta</a></code> element in the <a href=#attr-meta-http-equiv-content-language title=attr-meta-http-equiv-content-language>Content Language
-     state</a> has already been successfully processed (i.e. when
-     it was inserted the user agent processed it and reached the last
-     step of this list of steps), then abort these steps.</li>
+    <ol><li><p>If another <code><a href=#meta>meta</a></code> element with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the
+     <a href=#attr-meta-http-equiv-content-language title=attr-meta-http-equiv-content-language>Content
+     Language state</a> has already been successfully processed
+     (i.e. when it was inserted the user agent processed it and
+     reached the last step of this list of steps), then abort these
+     steps.</li>
 
      <li><p>If the <code><a href=#meta>meta</a></code> element has no <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute, or if that
      attribute's value is the empty string, then abort these
@@ -10632,18 +10634,18 @@ people expect to have work and what is necessary.
 
     </ol></div>
 
-    <p>For <code><a href=#meta>meta</a></code> elements in the <a href=#attr-meta-http-equiv-content-language title=attr-meta-http-equiv-content-language>Content Language
-    state</a>, the <code title=attr-meta-content><a href=#attr-meta-content>content</a></code>
-    attribute must have a value consisting of a valid RFC 3066
-    language code. <a href=#refsRFC3066>[RFC3066]</a></p>
+    <p>For <code><a href=#meta>meta</a></code> elements with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the
+    <a href=#attr-meta-http-equiv-content-language title=attr-meta-http-equiv-content-language>Content
+    Language state</a>, the <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute must have a
+    value consisting of a valid RFC 3066 language code. <a href=#refsRFC3066>[RFC3066]</a></p>
 
     <p class=note>This pragma is not exactly equivalent to the HTTP
     <code>Content-Language</code> header, for instance it only
     supports one language. <a href=#refsHTTP>[HTTP]</a></p>
 
    </dd>
 
-   <dt><dfn id=attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</dfn>
+   <dt><dfn id=attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration state</dfn> (<code title="">http-equiv="content-type"</code>)
 
    <dd>
 
@@ -10653,28 +10655,30 @@ people expect to have work and what is necessary.
     <a href=#character-encoding-declaration>character encoding declaration</a>. <span class=impl>This state's user agent requirements are all handled
     by the parsing section of the specification.</span></p>
 
-    <p>For <code><a href=#meta>meta</a></code> elements in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration
-    state</a>, the <code title=attr-meta-content><a href=#attr-meta-content>content</a></code>
-    attribute must have a value that is an <a href=#ascii-case-insensitive>ASCII
-    case-insensitive</a> match for a string that consists of: the
-    literal string "<code title="">text/html;</code>", optionally
-    followed by any number of <a href=#space-character title="space character">space
-    characters</a>, followed by the literal string "<code title="">charset=</code>", followed by the character encoding name
-    of the <a href=#character-encoding-declaration>character encoding declaration</a>.</p>
-
-    <p>If the document contains a <code><a href=#meta>meta</a></code> element in the
+    <p>For <code><a href=#meta>meta</a></code> elements with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the
     <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding
+    declaration state</a>, the <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute must have a
+    value that is an <a href=#ascii-case-insensitive>ASCII case-insensitive</a> match for a
+    string that consists of: the literal string "<code title="">text/html;</code>", optionally followed by any number of
+    <a href=#space-character title="space character">space characters</a>, followed by
+    the literal string "<code title="">charset=</code>", followed by
+    the character encoding name of the <a href=#character-encoding-declaration>character encoding
+    declaration</a>.</p>
+
+    <p>If the document contains a <code><a href=#meta>meta</a></code> element with an
+    <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in
+    the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding
     declaration state</a>, then the document must not contain a
     <code><a href=#meta>meta</a></code> element with the <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute present.</p>
 
     <p>The <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding
     declaration state</a> may be used in <a href=#html-documents>HTML
-    documents</a>, but elements in that state must not be used in
-    <a href=#xml-documents>XML documents</a>.</p>
+    documents</a>, but elements with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in that
+    state must not be used in <a href=#xml-documents>XML documents</a>.</p>
 
    </dd>
 
-   <dt><dfn id=attr-meta-http-equiv-default-style title=attr-meta-http-equiv-default-style>Default style state</dfn>
+   <dt><dfn id=attr-meta-http-equiv-default-style title=attr-meta-http-equiv-default-style>Default style state</dfn> (<code title="">http-equiv="default-style"</code>)
 
    <dd>
 
@@ -10694,18 +10698,19 @@ people expect to have work and what is necessary.
 
    </dd>
 
-   <dt><dfn id=attr-meta-http-equiv-refresh title=attr-meta-http-equiv-refresh>Refresh state</dfn>
+   <dt><dfn id=attr-meta-http-equiv-refresh title=attr-meta-http-equiv-refresh>Refresh state</dfn> (<code title="">http-equiv="refresh"</code>)
 
    <dd>
 
     <p>This pragma acts as timed redirect.</p>
 
     <div class=impl>
 
-    <ol><!-- TESTS: http://www.hixie.ch/tests/adhoc/html/meta/refresh/ --><li><p>If another <code><a href=#meta>meta</a></code> element in the <a href=#attr-meta-http-equiv-refresh title=attr-meta-http-equiv-refresh>Refresh state</a> has
-     already been successfully processed (i.e. when it was inserted
-     the user agent processed it and reached the last step of this
-     list of steps), then abort these steps.</li>
+    <ol><!-- TESTS: http://www.hixie.ch/tests/adhoc/html/meta/refresh/ --><li><p>If another <code><a href=#meta>meta</a></code> element with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the
+     <a href=#attr-meta-http-equiv-refresh title=attr-meta-http-equiv-refresh>Refresh state</a>
+     has already been successfully processed (i.e. when it was
+     inserted the user agent processed it and reached the last step of
+     this list of steps), then abort these steps.</li>
 
      <li><p>If the <code><a href=#meta>meta</a></code> element has no <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute, or if that
      attribute's value is the empty string, then abort these
@@ -10816,9 +10821,10 @@ people expect to have work and what is necessary.
 
     </ol></div>
 
-    <p>For <code><a href=#meta>meta</a></code> elements in the <a href=#attr-meta-http-equiv-refresh title=attr-meta-http-equiv-refresh>Refresh state</a>, the
-    <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute must have
-    a value consisting either of:
+    <p>For <code><a href=#meta>meta</a></code> elements with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the
+    <a href=#attr-meta-http-equiv-refresh title=attr-meta-http-equiv-refresh>Refresh state</a>,
+    the <code title=attr-meta-content><a href=#attr-meta-content>content</a></code> attribute must
+    have a value consisting either of:</p>
 
     <ul><li> just a <a href=#valid-non-negative-integer>valid non-negative integer</a>, or</li>
 
@@ -10932,12 +10938,14 @@ people expect to have work and what is necessary.
   encoding</a>, and, in addition, if that encoding isn't US-ASCII
   itself, then the encoding must be specified using a
   <code><a href=#meta>meta</a></code> element with a <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute or a
-  <code><a href=#meta>meta</a></code> element in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration
+  <code><a href=#meta>meta</a></code> element with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the
+  <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration
   state</a>.</p>
 
   <p>If an <a href=#html-documents title="HTML documents">HTML document</a> contains
   a <code><a href=#meta>meta</a></code> element with a <code title=attr-meta-charset><a href=#attr-meta-charset>charset</a></code> attribute or a
-  <code><a href=#meta>meta</a></code> element in the <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration
+  <code><a href=#meta>meta</a></code> element with an <code title=attr-meta-http-equiv><a href=#attr-meta-http-equiv>http-equiv</a></code> attribute in the
+  <a href=#attr-meta-http-equiv-content-type title=attr-meta-http-equiv-content-type>Encoding declaration
   state</a>, then the character encoding used must be an
   <a href=#ascii-compatible-character-encoding>ASCII-compatible character encoding</a>.</p>