html5/spec Overview.html,1.1155,1.1156

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv23022

Modified Files:
	Overview.html 
Log Message:
Fix the content models to handle <a> containing flow elements without breaking the definition of paragraph, and remove redundant requirements for ins and del along the same lines. (whatwg r1964)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.1155
retrieving revision 1.1156
diff -u -d -r1.1155 -r1.1156
--- Overview.html	30 Jul 2008 21:56:09 -0000	1.1155
+++ Overview.html	30 Jul 2008 22:15:09 -0000	1.1156
@@ -12559,10 +12559,13 @@
   <dl class=element>
    <dt>Categories
 
-   <dd><a href="#phrasing0">Phrasing content</a>.
-
    <dd><a href="#interactive1">Interactive content</a>.
 
+   <dd>When the element only contains <a href="#phrasing0">phrasing
+    content</a>: <a href="#phrasing0">phrasing content</a>.
+
+   <dd>Otherwise: <a href="#flow-content0">flow content</a>.
+
    <dt>Contexts in which this element may be used:
 
    <dd>Where <a href="#phrasing0">phrasing content</a> is expected.
@@ -15040,11 +15043,7 @@
 
    <dt>Contexts in which this element may be used:
 
-   <dd>When the element only contains <a href="#phrasing0">phrasing
-    content</a>: where <a href="#phrasing0">phrasing content</a> is expected.
-
-   <dd>Otherwise: where <a href="#flow-content0">flow content</a> is
-    expected.
+   <dd>Where <a href="#phrasing0">phrasing content</a> is expected.
 
    <dt>Content model:
 
@@ -15139,11 +15138,7 @@
 
    <dt>Contexts in which this element may be used:
 
-   <dd>When the element only contains <a href="#phrasing0">phrasing
-    content</a>: where <a href="#phrasing0">phrasing content</a> is expected.
-
-   <dd>Otherwise: where <a href="#flow-content0">flow content</a> is
-    expected.
+   <dd>Where <a href="#phrasing0">phrasing content</a> is expected.
 
    <dt>Content model:
 

Received on Wednesday, 30 July 2008 22:20:38 UTC