[html5] r1602 - /

[whatwg at whatwg.org]

Author: ianh
Date: 2008-05-13 03:55:47 -0700 (Tue, 13 May 2008)
New Revision: 1602

Modified:
   index
   source
Log:
[e] (0) Mention that <div> is allowed in Atom as well.

Modified: index
===================================================================
--- index	2008-05-13 10:40:11 UTC (rev 1601)
+++ index	2008-05-13 10:55:47 UTC (rev 1602)
@@ -6259,9 +6259,10 @@
 
   <p>Authors must not use <a href="#elements1">elements in the HTML
    namespace</a> anywhere except where they are explicitly allowed, as
-   defined for each element. For XML compound documents, these contexts could
-   be inside elements from other namespaces, if those elements are defined as
-   providing the relevant contexts.
+   defined for each element, or as explicitly required by other
+   specifications. For XML compound documents, these contexts could be inside
+   elements from other namespaces, if those elements are defined as providing
+   the relevant contexts.
 
   <div class=example>
    <p>The SVG specification defines the SVG <code>foreignObject</code>
@@ -6272,9 +6273,20 @@
     fragments are allowed in a compound document. Together, these two
     definitions mean that placing an XHTML <code><a
     href="#html">html</a></code> element as a child of an SVG
-    <code>foreignObject</code> element is conforming.</p>
+    <code>foreignObject</code> element is conforming. <a
+    href="#refsSVG">[SVG]</a></p>
   </div>
 
+  <div class=example>
+   <p>The Atom specification defines the Atom <code title="">content</code>
+    element, when its <code title="">type</code> attribute has the value
+    <code title="">xhtml</code>, as requiring that it contains a single HTML
+    <code><a href="#div">div</a></code> element. Thus, a <code><a
+    href="#div">div</a></code> element is allowed in that context, even
+    though this is not explicitly normatively stated by this specification.
+    <a href="#refsATOM">[ATOM]</a></p>
+  </div>
+
   <p>In addition, <a href="#elements1">elements in the HTML namespace</a> may
    be orphan nodes (i.e. without a parent node).
 
@@ -30068,13 +30080,14 @@
      substeps:</p>
 
     <ol>
-     <li><a href="#firing2">Fire a simple event</a> called <code
-      title=event-noupdate>noupdate</code> at the <code><a
-      href="#applicationcache">ApplicationCache</a></code> singleton of each
-      <a href="#top-level">top-level browsing context</a> that is associated
-      with a cache in <var title="">cache group</var>. The default action of
-      this event should be the display of some sort of user interface
-      indicating to the user that the application is up to date.
+     <li>
+      <p><a href="#firing2">Fire a simple event</a> called <code
+       title=event-noupdate>noupdate</code> at the <code><a
+       href="#applicationcache">ApplicationCache</a></code> singleton of each
+       <a href="#top-level">top-level browsing context</a> that is associated
+       with a cache in <var title="">cache group</var>. The default action of
+       this event should be the display of some sort of user interface
+       indicating to the user that the application is up to date.
 
      <li>
       <p>If there are any pending downloads of <span title="implicit

Modified: source
===================================================================
--- source	2008-05-13 10:40:11 UTC (rev 1601)
+++ source	2008-05-13 10:55:47 UTC (rev 1602)
@@ -4753,9 +4753,10 @@
 
   <p>Authors must not use <span>elements in the HTML namespace</span>
   anywhere except where they are explicitly allowed, as defined for
-  each element. For XML compound documents, these contexts could be
-  inside elements from other namespaces, if those elements are defined
-  as providing the relevant contexts.</p>
+  each element, or as explicitly required by other specifications. For
+  XML compound documents, these contexts could be inside elements from
+  other namespaces, if those elements are defined as providing the
+  relevant contexts.</p>
 
   <div class="example">
    <p>The SVG specification defines the SVG <code>foreignObject</code>
@@ -4766,9 +4767,20 @@
    fragments are allowed in a compound document. Together, these two
    definitions mean that placing an XHTML <code>html</code> element as
    a child of an SVG <code>foreignObject</code> element is
-   conforming.</p>
+   conforming. <a href="#refsSVG">[SVG]</a></p>
   </div>
 
+  <div class="example">
+   <p>The Atom specification defines the Atom <code
+   title="">content</code> element, when its <code
+   title="">type</code> attribute has the value <code
+   title="">xhtml</code>, as requiring that it contains a single HTML
+   <code>div</code> element. Thus, a <code>div</code> element is
+   allowed in that context, even though this is not explicitly
+   normatively stated by this specification. <a
+   href="#refsATOM">[ATOM]</a></p>
+  </div>
+
   <p>In addition, <span>elements in the HTML namespace</span> may be
   orphan nodes (i.e. without a parent node).</p>
 
@@ -27929,7 +27941,7 @@
 
     <ol>
 
-     <li><span>Fire a simple event</span> called <code
+     <li><p><span>Fire a simple event</span> called <code
      title="event-noupdate">noupdate</code> at the
      <code>ApplicationCache</code> singleton of each <span>top-level
      browsing context</span> that is associated with a cache in <var