spec/Overview.html 1.1588 2416 Change the content model of <menu> to be

Change the content model of <menu> to be simpler. (whatwg r2416)

4.11.5 The menu element
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1588.html#menus
4.5.9 The li element
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1588.html#the-li-element
4.11.5.2 Building menus and tool bars
http://people.w3.org/mike/diffs/html5/spec/Overview.1.1588.html#building-menus-and-tool-bars

http://people.w3.org/mike/diffs/html5/spec/Overview.diff.html
http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.1587&r2=1.1588&f=h
http://html5.org/tools/web-apps-tracker?from=2415&to=2416

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.1587
retrieving revision 1.1588
diff -u -d -r1.1587 -r1.1588
--- Overview.html 18 Nov 2008 07:16:39 -0000 1.1587
+++ Overview.html 18 Nov 2008 07:38:12 -0000 1.1588
@@ -9331,11 +9331,8 @@
    <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>When the element is a child of a <code><a href=#menus>menu</a></code> element: <a href=#phrasing-content-0>phrasing content</a>.</dd>
-<!--XXXSPAN
-   <dd>When 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><!--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>
    <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>
@@ -25139,13 +25136,11 @@
   </div><h4 id=menus><span class=secno>4.11.5 </span>The <dfn><code>menu</code></dfn> element</h4><dl class=element><dt>Categories</dt>
    <dd><a href=#flow-content-0>Flow content</a>.</dd>
    <dd>If the element's <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#tool-bar-state title="tool bar state">tool bar</a> state: <a href=#interactive-content-0>Interactive content</a>.</dd>
-   <dd>If there is a <code><a href=#menus>menu</a></code> element ancestor: <a href=#phrasing-content-0>phrasing 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>
-   <dd>If there is a <code><a href=#menus>menu</a></code> element ancestor: where <a href=#phrasing-content-0>phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
    <dd>Either: Zero or more <code><a href=#the-li-element>li</a></code> elements.</dd>
-   <dd>Or: <a href=#phrasing-content-0>Phrasing content</a>.</dd>
+   <dd>Or: <a href=#flow-content-0>Flow content</a>.</dd>
    <dt>Element-specific attributes:</dt>
    <dd><code title=attr-menu-type><a href=#attr-menu-type>type</a></code></dd>
    <dd><code title=attr-menu-label><a href=#attr-menu-label>label</a></code></dd>
@@ -25272,6 +25267,9 @@
  </menu>
 </form>
 
+
+explain that only direct children of the <menu> matter
+
 --><h5 id=building-menus-and-tool-bars><span class=secno>4.11.5.2 </span><dfn>Building menus and tool bars</dfn></h5><p>A menu (or tool bar) consists of a list of zero or more of the
   following components:<ul class=brief><li><a href=#concept-command title=concept-command>Commands</a>, which can be marked as default commands</li>
    <li>Separators</li>

Received on Tuesday, 18 November 2008 07:41:25 UTC