W3C home > Mailing lists > Public > public-html-commits@w3.org > August 2009

html5/spec Overview.html,1.2718,1.2719

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Sat, 01 Aug 2009 10:18:30 +0000
To: public-html-commits@w3.org
Message-Id: <E1MXBfa-0001XC-GH@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv5870

Modified Files:
	Overview.html 
Log Message:
Correct and clarify terminology around the http-equiv attribute and its states. (whatwg r3521)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2718
retrieving revision 1.2719
diff -u -d -r1.2718 -r1.2719
--- Overview.html	1 Aug 2009 09:50:27 -0000	1.2718
+++ Overview.html	1 Aug 2009 10:18:27 -0000	1.2719
@@ -9128,9 +9128,9 @@
    <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>
@@ -9377,7 +9377,7 @@
   must run the algorithm appropriate for that state, as described in
   the following list:</p>
 
-  </div><dl><dt class="impl"><dfn id="attr-meta-http-equiv-content-language" title="attr-meta-http-equiv-content-language">Content language</dfn>
+  </div><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">
 
@@ -9387,10 +9387,12 @@
 
     <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
@@ -9415,10 +9417,10 @@
 
     </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="#references">[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="#references">[RFC3066]</a></p>
 
     <p class="note">This pragma is not exactly equivalent to the HTTP
     <code>Content-Language</code> header, for instance it only
@@ -9426,7 +9428,7 @@
 
    </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>
 
@@ -9436,28 +9438,30 @@
     <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>
 
@@ -9477,7 +9481,7 @@
 
    </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>
 
@@ -9485,10 +9489,11 @@
 
     <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
@@ -9599,9 +9604,10 @@
 
     </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>
 
@@ -9693,10 +9699,12 @@
   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>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>Authors should not use JIS-X-0208 <!-- x-JIS0208 -->
   (JIS_C6226-1983), JIS-X-0212 (JIS_X0212-1990), encodings based on
Received on Saturday, 1 August 2009 10:18:40 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 1 August 2009 10:18:40 GMT