[html5] r1018 - /

whatwg at whatwg.org whatwg at whatwg.org
Fri Aug 24 15:56:36 PDT 2007


Author: ianh
Date: 2007-08-24 15:56:35 -0700 (Fri, 24 Aug 2007)
New Revision: 1018

Modified:
   index
   source
Log:
[e] (0) fix the way metadata elements are referred to

Modified: index
===================================================================
--- index	2007-08-22 09:07:43 UTC (rev 1017)
+++ index	2007-08-24 22:56:35 UTC (rev 1018)
@@ -22,7 +22,7 @@
 
    <h1 id=html-5>HTML 5</h1>
 
-   <h2 class="no-num no-toc" id=working>Working Draft — 22 August 2007</h2>
+   <h2 class="no-num no-toc" id=working>Working Draft — 24 August 2007</h2>
 
    <p>You can take part in this work. <a
     href="http://www.whatwg.org/mailing-list">Join the working group's
@@ -6998,7 +6998,7 @@
   <dl class=element>
    <dt>Contexts in which this element may be used:
 
-   <dd>In a <code><a href="#head">head</a></code> element.
+   <dd>Where <a href="#metadata">metadata elements</a> are expected.
 
    <dd>In a <code><a href="#noscript">noscript</a></code> element that is a
     child of a <code><a href="#head">head</a></code> element.
@@ -7249,13 +7249,23 @@
   <dl class=element>
    <dt>Contexts in which this element may be used:
 
-   <dd>In a <code><a href="#head">head</a></code> element.
+   <dd>If the <code title=attr-meta-charset><a
+    href="#charset0">charset</a></code> attribute is present: as the first
+    element in a <code><a href="#head">head</a></code> element.
 
    <dd>If the <code title=attr-meta-http-equiv><a
     href="#http-equiv0">http-equiv</a></code> attribute is present: in a
+    <code><a href="#head">head</a></code> element.
+
+   <dd>If the <code title=attr-meta-http-equiv><a
+    href="#http-equiv0">http-equiv</a></code> attribute is present: in a
     <code><a href="#noscript">noscript</a></code> element that is a child of
     a <code><a href="#head">head</a></code> element.
 
+   <dd>If the <code title=attr-meta-name><a href="#name">name</a></code>
+    attribute is present: where <a href="#metadata">metadata elements</a> are
+    expected.
+
    <dt>Content model:
 
    <dd>Empty.
@@ -7745,8 +7755,8 @@
    <dt>Contexts in which this element may be used:
 
    <dd>If the <code title=attr-style-scoped><a
-    href="#scoped">scoped</a></code> attribute is absent: in a <code><a
-    href="#head">head</a></code> element.
+    href="#scoped">scoped</a></code> attribute is absent: where
+    <span>metadata</span> elements are expected.
 
    <dd>If the <code title=attr-style-scoped><a
     href="#scoped">scoped</a></code> attribute is absent: in a <code><a
@@ -19166,7 +19176,7 @@
   <dl class=element>
    <dt>Contexts in which this element may be used:
 
-   <dd>In a <code><a href="#head">head</a></code> element.
+   <dd>Where <a href="#metadata">metadata elements</a> are expected.
 
    <dd>Where <a href="#block-level0">block-level elements</a> are expected.
 
@@ -19736,7 +19746,7 @@
   <dl class=element>
    <dt>Contexts in which this element may be used:
 
-   <dd>In a <code><a href="#head">head</a></code> element.
+   <dd>Where <a href="#metadata">metadata elements</a> are expected.
 
    <dd>Where <a href="#block-level0">block-level elements</a> are expected.
 
@@ -21952,7 +21962,7 @@
   <dl class=element>
    <dt>Contexts in which this element may be used:
 
-   <dd>In a <code><a href="#head">head</a></code> element.
+   <dd>Where <a href="#metadata">metadata elements</a> are expected.
 
    <dd>Where <a href="#strictly">strictly inline-level content</a> is
     allowed.

Modified: source
===================================================================
--- source	2007-08-22 09:07:43 UTC (rev 1017)
+++ source	2007-08-24 22:56:35 UTC (rev 1018)
@@ -5603,7 +5603,7 @@
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
-   <dd>In a <code>head</code> element.</dd>
+   <dd>Where <span>metadata elements</span> are expected.</dd>
    <dd>In a <code>noscript</code> element that is a child of a <code>head</code> element.</dd>
    <dt>Content model:</dt>
    <dd>Empty.</dd>
@@ -5842,8 +5842,10 @@
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
-   <dd>In a <code>head</code> element.</dd>
+   <dd>If the <code title="attr-meta-charset">charset</code> attribute is present: as the first element in a <code>head</code> element.</dd>
+   <dd>If the <code title="attr-meta-http-equiv">http-equiv</code> attribute is present: in a <code>head</code> element.</dd>
    <dd>If the <code title="attr-meta-http-equiv">http-equiv</code> attribute is present: in a <code>noscript</code> element that is a child of a <code>head</code> element.</dd>
+   <dd>If the <code title="attr-meta-name">name</code> attribute is present: where <span>metadata elements</span> are expected.</dd>
    <dt>Content model:</dt>
    <dd>Empty.</dd>
    <dt>Element-specific attributes:</dt>
@@ -6319,7 +6321,7 @@
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
-   <dd>If the <code title="attr-style-scoped">scoped</code> attribute is absent: in a <code>head</code> element.</dd>
+   <dd>If the <code title="attr-style-scoped">scoped</code> attribute is absent: where <span>metadata</span> elements are expected.</dd>
    <dd>If the <code title="attr-style-scoped">scoped</code> attribute is absent: in a <code>noscript</code> element that is a child of a <code>head</code> element.</dd>
    <dd>If the <code title="attr-style-scoped">scoped</code> attribute is present: at the start of <code>article</code>, <code>aside</code>, <code>div</code>, and <code>section</code> elements.</dd>
    <dt>Content model:</dt>
@@ -16953,7 +16955,7 @@
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
-   <dd>In a <code>head</code> element.</dd>
+   <dd>Where <span>metadata elements</span> are expected.</dd>
    <dd>Where <span>block-level elements</span> are expected.</dd>
    <dd>Where <span>inline-level content</span> is expected.</dd>
    <dt>Content model:</dt>
@@ -17556,7 +17558,7 @@
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
-   <dd>In a <code>head</code> element.</dd>
+   <dd>Where <span>metadata elements</span> are expected.</dd>
    <dd>Where <span>block-level elements</span> are expected.</dd>
    <dd>Where <span>inline-level content</span> is expected.</dd>
    <dt>Content model:</dt>
@@ -19660,7 +19662,7 @@
 
   <dl class="element">
    <dt>Contexts in which this element may be used:</dt>
-   <dd>In a <code>head</code> element.</dd>
+   <dd>Where <span>metadata elements</span> are expected.</dd>
    <dd>Where <span>strictly inline-level content</span> is allowed.</dd>
    <dt>Content model:</dt>
    <dd>Empty.</dd>




More information about the Commit-Watchers mailing list