[e] (0) Remove the traces of the <span><ul>...</ul></span> idea.

git-svn-id: http://svn.whatwg.org/webapps@2598 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Dec 28, 2008 · dca7d91 · dca7d91
1 parent 242b7dd
commit dca7d91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 48 deletions.
diff --git a/index b/index
@@ -11459,9 +11459,6 @@ a friend lost to the
    <dd><a href=#flow-content-0>Flow content</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#flow-content-0>flow content</a> is expected.</dd>
-<!--XXXSPAN
-   <dd>As the only child of a <code>span</code> element.</dd>
--->
    <dt>Content model:</dt>
    <dd>Zero or more <code><a href=#the-li-element>li</a></code> elements.</dd>
    <dt>Element-specific attributes:</dt>
@@ -11559,9 +11556,6 @@ I first lived there):&lt;/p&gt;
    <dd><a href=#flow-content-0>Flow content</a>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#flow-content-0>flow content</a> is expected.</dd>
-<!--XXXSPAN
-   <dd>As the only child of a <code>span</code> element.</dd>
--->
    <dt>Content model:</dt>
    <dd>Zero or more <code><a href=#the-li-element>li</a></code> elements.</dd>
    <dt>Element-specific attributes:</dt>
@@ -11618,8 +11612,7 @@ I first lived there):&lt;/p&gt;
    <dd>Inside <code><a href=#the-ul-element>ul</a></code> elements.</dd>
    <dd>Inside <code><a href=#menus>menu</a></code> elements.</dd>
    <dt>Content model:</dt>
-   <dd><!--XXXSPANWhen the element is a child of an <code>ol</code> or <code>ul/code> element that is itself the child of a <code>span</code> element: <span>phrasing content</span>.</dd>
-   <dd>Otherwise: --><a href=#flow-content-0>Flow content</a>.</dd>
+   <dd><a href=#flow-content-0>Flow content</a>.</dd>
    <dt>Element-specific attributes:</dt>
    <dd>If the element is a child of an <code><a href=#the-ol-element>ol</a></code> element: <code title=attr-li-value><a href=#attr-li-value>value</a></code></dd>
    <dd>If the element is not the child of an <code><a href=#the-ol-element>ol</a></code> element: None.</dd>
@@ -13831,8 +13824,7 @@ For example, the 10th point has coordinate
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href=#phrasing-content-0>phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><!--XXXSPAN Either: --><a href=#phrasing-content-0>Phrasing content</a>.</dd>
-<!--XXXSPAN   <dd>Or: A single <code>ol</code> or <code>ul</code> element.</dd>-->
+   <dd><a href=#phrasing-content-0>Phrasing content</a>.</dd>
    <dt>Element-specific attributes:</dt>
    <dd>None.</dd>
    <dt>DOM interface:</dt>
@@ -13841,20 +13833,6 @@ For example, the 10th point has coordinate
   but can be useful when used together with other attributes,
   e.g. <code title=attr-class><a href=#classes>class</a></code>, <code title=attr-lang><a href=#the-lang-and-xml:lang-attributes>lang</a></code>, or <code title=attr-dir><a href=#the-dir-attribute>dir</a></code>.</p>
 
-<!--XXXSPAN
-  <p>The <code>span</code> element may be used to include a list
-  inline in a paragraph. (When used in this way, the list can only
-  itself contain <span>phrasing content</span>.)</p>
-
-  <div class="example">
-
-   <p>In this example, the list is part of the paragraph:</p>
-
-   ...
-
-  </div>
--->
-
 
   <h4 id=the-i-element><span class=secno>4.6.19 </span>The <dfn><code>i</code></dfn> element</h4>
 

diff --git a/source b/source
@@ -12187,9 +12187,6 @@ a friend lost to the
    <dd><span>Flow content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>flow content</span> is expected.</dd>
-<!--XXXSPAN
-   <dd>As the only child of a <code>span</code> element.</dd>
--->
    <dt>Content model:</dt>
    <dd>Zero or more <code>li</code> elements.</dd>
    <dt>Element-specific attributes:</dt>
@@ -12294,9 +12291,6 @@ I first lived there):&lt;/p>
    <dd><span>Flow content</span>.</dd>
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>flow content</span> is expected.</dd>
-<!--XXXSPAN
-   <dd>As the only child of a <code>span</code> element.</dd>
--->
    <dt>Content model:</dt>
    <dd>Zero or more <code>li</code> elements.</dd>
    <dt>Element-specific attributes:</dt>
@@ -12356,8 +12350,7 @@ I first lived there):&lt;/p>
    <dd>Inside <code>ul</code> elements.</dd>
    <dd>Inside <code>menu</code> elements.</dd>
    <dt>Content model:</dt>
-   <dd><!--XXXSPANWhen the element is a child of an <code>ol</code> or <code>ul/code> element that is itself the child of a <code>span</code> element: <span>phrasing content</span>.</dd>
-   <dd>Otherwise: --><span>Flow content</span>.</dd>
+   <dd><span>Flow content</span>.</dd>
    <dt>Element-specific attributes:</dt>
    <dd>If the element is a child of an <code>ol</code> element: <code title="attr-li-value">value</code></dd>
    <dd>If the element is not the child of an <code>ol</code> element: None.</dd>
@@ -14776,8 +14769,7 @@ For example, the 10th point has coordinate
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <span>phrasing content</span> is expected.</dd>
    <dt>Content model:</dt>
-   <dd><!--XXXSPAN Either: --><span>Phrasing content</span>.</dd>
-<!--XXXSPAN   <dd>Or: A single <code>ol</code> or <code>ul</code> element.</dd>-->
+   <dd><span>Phrasing content</span>.</dd>
    <dt>Element-specific attributes:</dt>
    <dd>None.</dd>
    <dt>DOM interface:</dt>
@@ -14790,20 +14782,6 @@ For example, the 10th point has coordinate
   title="attr-lang">lang</code>, or <code
   title="attr-dir">dir</code>.</p>
 
-<!--XXXSPAN
-  <p>The <code>span</code> element may be used to include a list
-  inline in a paragraph. (When used in this way, the list can only
-  itself contain <span>phrasing content</span>.)</p>
-
-  <div class="example">
-
-   <p>In this example, the list is part of the paragraph:</p>
-
-   ...
-
-  </div>
--->
-
 
   <h4>The <dfn><code>i</code></dfn> element</h4>