- From: poot <cvsmail@w3.org>
- Date: Sun, 3 May 2009 23:07:48 +0900 (JST)
- To: public-html-diffs@w3.org
h:tml; added links to single/multi-page versions
Diffs for this change per section:
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#latestED
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#abstract
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#this_sections
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#sub-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#unexpanded-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#audio-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#head-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#header-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#appendices
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#hr-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#tocjump
http://people.w3.org/mike/diffs/html5/markup/Overview.1.299.html#html-toc
http://people.w3.org/mike/diffs/html5/markup/Overview.diff.html
http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.298&r2=1.299&f=h
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -d -r1.298 -r1.299
--- Overview.html 3 May 2009 09:26:41 -0000 1.298
+++ Overview.html 3 May 2009 14:07:15 -0000 1.299
@@ -19,6 +19,10 @@
<dd>
<a href="http://people.w3.org/mike">Michael(tm) Smith</a>, W3C <<a href="mailto:mike@w3.org">mike@w3.org</a>></dd>
</dl>
+<p>The content of this document is also available as
+ <a href="spec.html">a single HTML file</a> with some
+ additional cross-reference features.
+ </p>
</div>
<hr>
<div id="tocjump" class="skip-link" style="text-align: center"><a href="Overview.html#toc">Skip to Table of Contents</a></div>
@@ -342,9 +346,6 @@
<li id="header-toc">
<a href="header.html#header"><span class="element">header</span> – <span class="shortdesc">header</span></a>
</li>
-<li id="hgroup-toc">
-<a href="hgroup.html#hgroup"><span class="element">hgroup</span> – <span class="shortdesc">heading group</span></a>
-</li>
<li id="hr-toc">
<a href="hr.html#hr"><span class="element">hr</span> – <span class="shortdesc">thematic break</span></a>
</li>
Index: nav.html
===================================================================
RCS file: /sources/public/html5/markup/nav.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nav.html 2 May 2009 09:24:21 -0000 1.4
+++ nav.html 3 May 2009 14:07:16 -0000 1.5
@@ -39,6 +39,9 @@
<ul class="assertions">
<li><span>
The sectioning element “nav” must not
+ appear as a descendant of the “header” element.
+ </span></li><li><span>
+ The sectioning element “nav” must not
appear as a descendant of the “footer” element.
</span></li><li><span>
The sectioning element “nav” must not
Index: footer.html
===================================================================
RCS file: /sources/public/html5/markup/footer.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- footer.html 2 May 2009 09:24:19 -0000 1.4
+++ footer.html 3 May 2009 14:07:16 -0000 1.5
@@ -36,13 +36,13 @@
<h2 class="element-subhead">Assertions <a class="hash" href="#footer-assertions">#</a></h2>
<ul class="assertions">
<li><span>
- The element “footer” must not
+ The sectioning element “footer” must not
appear as a descendant of the “header” element.
</span></li><li><span>
- The element “footer” must not
+ The sectioning element “footer” must not
appear as a descendant of the “footer” element.
</span></li><li><span>
- The element “footer” must not
+ The sectioning element “footer” must not
appear as a descendant of the “address” element.
</span></li>
</ul>
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- schema.html 1 May 2009 09:39:54 -0000 1.89
+++ schema.html 3 May 2009 14:07:16 -0000 1.90
@@ -213,7 +213,6 @@
| <a class='ref' href='#h4.elem'>h4.elem</a>
| <a class='ref' href='#h5.elem'>h5.elem</a>
| <a class='ref' href='#h6.elem'>h6.elem</a>
- | <a class='ref' href='#hgroup.elem'>hgroup.elem</a>
| <a class='ref' href='#address.elem'>address.elem</a>
| <a class='ref' href='#blockquote.elem'>blockquote.elem</a>
| <a class='ref' href='#object.elem.flow'>object.elem.flow</a>
@@ -1927,31 +1926,6 @@
<div class='patternname' id='the-h6.inner'><a href='#the-h6.inner'>h6.inner</a> =</div>
<span class='pattern' id='h6.inner'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
</div>
-<div class='define' id='hgroup.elem-define'>
-
-<span class='comment'>## Heading Group: <hgroup></span>
- <div class='patternname' id='the-hgroup.elem'><a href='#the-hgroup.elem'>hgroup.elem</a> =</div>
- <span class='pattern' id='hgroup.elem'><span class='type'>element </span>
- <span class='name'>hgroup</span>
- {<span class='model'>
- <a class='ref' href='#hgroup.inner'>hgroup.inner</a>
- & <a class='ref' href='#hgroup.attrs'>hgroup.attrs</a>
- </span>}
- </span>
-</div>
-<div class='define' id='hgroup.attrs-define'>
- <div class='patternname' id='the-hgroup.attrs'><a href='#the-hgroup.attrs'>hgroup.attrs</a> =</div>
- <span class='pattern' id='hgroup.attrs'><a class='ref' href='#common.attrs'>common.attrs</a></span>
-</div>
-<div class='define' id='hgroup.inner-define'>
- <div class='patternname' id='the-hgroup.inner'><a href='#the-hgroup.inner'>hgroup.inner</a> =</div>
- <span class='pattern' id='hgroup.inner'>(<a class='ref' href='#h1.elem'>h1.elem</a>
- | <a class='ref' href='#h2.elem'>h2.elem</a>
- | <a class='ref' href='#h3.elem'>h3.elem</a>
- | <a class='ref' href='#h4.elem'>h4.elem</a>
- | <a class='ref' href='#h5.elem'>h5.elem</a>
- | <a class='ref' href='#h6.elem'>h6.elem</a>)+</span>
-</div>
<div class='define' id='address.elem-define'>
<span class='comment'># #####################################################################</span>
Index: aside.html
===================================================================
RCS file: /sources/public/html5/markup/aside.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- aside.html 2 May 2009 09:24:18 -0000 1.4
+++ aside.html 3 May 2009 14:07:16 -0000 1.5
@@ -41,6 +41,9 @@
<ul class="assertions">
<li><span>
The sectioning element “aside” must not
+ appear as a descendant of the “header” element.
+ </span></li><li><span>
+ The sectioning element “aside” must not
appear as a descendant of the “footer” element.
</span></li><li><span>
The sectioning element “aside” must not
Index: section.html
===================================================================
RCS file: /sources/public/html5/markup/section.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- section.html 2 May 2009 09:24:21 -0000 1.4
+++ section.html 3 May 2009 14:07:16 -0000 1.5
@@ -39,6 +39,9 @@
<ul class="assertions">
<li><span>
The sectioning element “section” must not
+ appear as a descendant of the “header” element.
+ </span></li><li><span>
+ The sectioning element “section” must not
appear as a descendant of the “footer” element.
</span></li><li><span>
The sectioning element “section” must not
Index: h6.html
===================================================================
RCS file: /sources/public/html5/markup/h6.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- h6.html 2 May 2009 09:24:19 -0000 1.4
+++ h6.html 3 May 2009 14:07:16 -0000 1.5
@@ -57,13 +57,7 @@
<div class="no-number no-toc" id="h6-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h6-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
- | <a class="ref" href="h2.html#h2">h2</a>
- | <a class="ref" href="h3.html#h3">h3</a>
- | <a class="ref" href="h4.html#h4">h4</a>
- | <a class="ref" href="h5.html#h5">h5</a>
- | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h6-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h6-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: h4.html
===================================================================
RCS file: /sources/public/html5/markup/h4.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- h4.html 2 May 2009 09:24:19 -0000 1.4
+++ h4.html 3 May 2009 14:07:16 -0000 1.5
@@ -57,13 +57,7 @@
<div class="no-number no-toc" id="h4-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h4-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
- | <a class="ref" href="h2.html#h2">h2</a>
- | <a class="ref" href="h3.html#h3">h3</a>
- | <a class="ref" href="h4.html#h4">h4</a>
- | <a class="ref" href="h5.html#h5">h5</a>
- | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h4-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h4-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: header.html
===================================================================
RCS file: /sources/public/html5/markup/header.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- header.html 2 May 2009 09:24:19 -0000 1.4
+++ header.html 3 May 2009 14:07:16 -0000 1.5
@@ -9,7 +9,7 @@
<h2 class="chunkpagetitle"><a href="Overview.html">HTML5: The Markup Language</a></h2>
<div class="nav">
<span class="nav-prev"><a href="head.html">« head</a></span>
-<span class="nav-next"><a href="hgroup.html">hgroup »</a></span>
+<span class="nav-next"><a href="hr.html">hr »</a></span>
</div>
<div id="header" class="section">
<h2 class="element-head"><span class="element">header</span> – <span class="shortdesc">header</span> <a class="hash" href="#header">#</a> <a class="toc-bak" href="Overview.html#header-toc">T</a></h2>
@@ -44,6 +44,9 @@
</span></li><li><span>
The “header” element must not appear as a
descendant of the “header” element.
+ </span></li><li><span>
+ The “header” element must have at least one
+ “h1”–“h6” descendant.
</span></li>
</ul>
</div>
@@ -65,7 +68,7 @@
<hr class="footerbreak"></hr>
<div class="nav">
<span class="nav-prev"><a href="head.html">« head</a></span>
-<span class="nav-next"><a href="hgroup.html">hgroup »</a></span>
+<span class="nav-next"><a href="hr.html">hr »</a></span>
</div>
</body>
Index: common-models.html
===================================================================
RCS file: /sources/public/html5/markup/common-models.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- common-models.html 2 May 2009 09:24:19 -0000 1.4
+++ common-models.html 3 May 2009 14:07:16 -0000 1.5
@@ -50,7 +50,6 @@
| <a class="ref" href="h4.html#h4">h4</a>
| <a class="ref" href="h5.html#h5">h5</a>
| <a class="ref" href="h6.html#h6">h6</a>
- | <a class="ref" href="hgroup.html#hgroup">hgroup</a>
| <a class="ref" href="address.html#address">address</a>
| <a class="ref" href="blockquote.html#blockquote">blockquote</a>
| <a class="ref" href="object.html#object.elem.flow">object.elem.flow</a>
Index: h2.html
===================================================================
RCS file: /sources/public/html5/markup/h2.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- h2.html 2 May 2009 09:24:19 -0000 1.4
+++ h2.html 3 May 2009 14:07:16 -0000 1.5
@@ -57,13 +57,7 @@
<div class="no-number no-toc" id="h2-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h2-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
- | <a class="ref" href="h2.html#h2">h2</a>
- | <a class="ref" href="h3.html#h3">h3</a>
- | <a class="ref" href="h4.html#h4">h4</a>
- | <a class="ref" href="h5.html#h5">h5</a>
- | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h2-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h2-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- schema.rnc 1 May 2009 09:39:54 -0000 1.76
+++ schema.rnc 3 May 2009 14:07:16 -0000 1.77
@@ -105,7 +105,6 @@
| h4.elem
| h5.elem
| h6.elem
- | hgroup.elem
| address.elem
| blockquote.elem
| object.elem.flow
@@ -681,12 +680,6 @@
h6.elem = element h6 { h6.inner & h6.attrs }
h6.attrs = common.attrs
h6.inner = common.inner.phrasing
-
- ## Heading Group: <hgroup>
- hgroup.elem = element hgroup { hgroup.inner & hgroup.attrs }
- hgroup.attrs = common.attrs
- hgroup.inner =
- (h1.elem | h2.elem | h3.elem | h4.elem | h5.elem | h6.elem)+
# #####################################################################
## Section Meta
Index: hr.html
===================================================================
RCS file: /sources/public/html5/markup/hr.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hr.html 2 May 2009 09:24:19 -0000 1.3
+++ hr.html 3 May 2009 14:07:16 -0000 1.4
@@ -8,7 +8,7 @@
<body>
<h2 class="chunkpagetitle"><a href="Overview.html">HTML5: The Markup Language</a></h2>
<div class="nav">
-<span class="nav-prev"><a href="hgroup.html">« hgroup</a></span>
+<span class="nav-prev"><a href="header.html">« header</a></span>
<span class="nav-next"><a href="html.html">html »</a></span>
</div>
<div id="hr" class="section">
@@ -51,7 +51,7 @@
</div><div class="properties"><div class="css-property"><span class="prop-name">display</span>: <span class="prop-value">block</span>;</div><div class="css-property"><span class="prop-name">margin</span>: <span class="prop-value">0.5em auto</span>;</div><div class="css-property"><span class="prop-name">border-style</span>: <span class="prop-value">inset</span>;</div><div class="css-property"><span class="prop-name">border-width</span>: <span class="prop-value">1px</span>; }</div></div></div></div></div>
<hr class="footerbreak"></hr>
<div class="nav">
-<span class="nav-prev"><a href="hgroup.html">« hgroup</a></span>
+<span class="nav-prev"><a href="header.html">« header</a></span>
<span class="nav-next"><a href="html.html">html »</a></span>
</div>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- spec.html 3 May 2009 09:26:41 -0000 1.6
+++ spec.html 3 May 2009 14:07:16 -0000 1.7
@@ -19,6 +19,9 @@
<dd>
<a href="http://people.w3.org/mike">Michael(tm) Smith</a>, W3C <<a href="mailto:mike@w3.org">mike@w3.org</a>></dd>
</dl>
+<p>The content of this document is also available as
+ <a href="Overview.html">multiple HTML files</a>.
+ </p>
</div>
<hr>
<div id="tocjump" class="skip-link" style="text-align: center"><a href="spec.html#toc">Skip to Table of Contents</a></div>
@@ -342,9 +345,6 @@
<li id="header-toc">
<a href="#header"><span class="element">header</span> – <span class="shortdesc">header</span></a>
</li>
-<li id="hgroup-toc">
-<a href="#hgroup"><span class="element">hgroup</span> – <span class="shortdesc">heading group</span></a>
-</li>
<li id="hr-toc">
<a href="#hr"><span class="element">hr</span> – <span class="shortdesc">thematic break</span></a>
</li>
@@ -1827,9 +1827,6 @@
<li id="header-toc">
<a href="#header"><span class="element">header</span> – <span class="shortdesc">header</span></a>
</li>
-<li id="hgroup-toc">
-<a href="#hgroup"><span class="element">hgroup</span> – <span class="shortdesc">heading group</span></a>
-</li>
<li id="hr-toc">
<a href="#hr"><span class="element">hr</span> – <span class="shortdesc">thematic break</span></a>
</li>
@@ -2469,6 +2466,10 @@
<ul class="assertions">
<li><span>
The sectioning element “article” must not
+ appear as a descendant of the “header” element.
+ </span></li>
+<li><span>
+ The sectioning element “article” must not
appear as a descendant of the “footer” element.
</span></li>
<li><span>
@@ -2533,6 +2534,10 @@
<ul class="assertions">
<li><span>
The sectioning element “aside” must not
+ appear as a descendant of the “header” element.
+ </span></li>
+<li><span>
+ The sectioning element “aside” must not
appear as a descendant of the “footer” element.
</span></li>
<li><span>
@@ -5168,15 +5173,15 @@
</h2>
<ul class="assertions">
<li><span>
- The element “footer” must not
+ The sectioning element “footer” must not
appear as a descendant of the “header” element.
</span></li>
<li><span>
- The element “footer” must not
+ The sectioning element “footer” must not
appear as a descendant of the “footer” element.
</span></li>
<li><span>
- The element “footer” must not
+ The sectioning element “footer” must not
appear as a descendant of the “address” element.
</span></li>
</ul>
@@ -5379,16 +5384,7 @@
<div class="no-number no-toc" id="h1-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h1-context">#</a>
</h2>
- <ul>
-<li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl">
-<a href="#hgroup-mdl">hgroup</a> = (<a class="ref" href="#h1">h1</a>
- | <a class="ref" href="#h2">h2</a>
- | <a class="ref" href="#h3">h3</a>
- | <a class="ref" href="#h4">h4</a>
- | <a class="ref" href="#h5">h5</a>
- | <a class="ref" href="#h6">h6</a>)+</li>
-</ul>
+ <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h1-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h1-display">#</a>
@@ -5468,16 +5464,7 @@
<div class="no-number no-toc" id="h2-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h2-context">#</a>
</h2>
- <ul>
-<li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl">
-<a href="#hgroup-mdl">hgroup</a> = (<a class="ref" href="#h1">h1</a>
- | <a class="ref" href="#h2">h2</a>
- | <a class="ref" href="#h3">h3</a>
- | <a class="ref" href="#h4">h4</a>
- | <a class="ref" href="#h5">h5</a>
- | <a class="ref" href="#h6">h6</a>)+</li>
-</ul>
+ <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h2-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h2-display">#</a>
@@ -5557,16 +5544,7 @@
<div class="no-number no-toc" id="h3-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h3-context">#</a>
</h2>
- <ul>
-<li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl">
-<a href="#hgroup-mdl">hgroup</a> = (<a class="ref" href="#h1">h1</a>
- | <a class="ref" href="#h2">h2</a>
- | <a class="ref" href="#h3">h3</a>
- | <a class="ref" href="#h4">h4</a>
- | <a class="ref" href="#h5">h5</a>
- | <a class="ref" href="#h6">h6</a>)+</li>
-</ul>
+ <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h3-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h3-display">#</a>
@@ -5646,16 +5624,7 @@
<div class="no-number no-toc" id="h4-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h4-context">#</a>
</h2>
- <ul>
-<li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl">
-<a href="#hgroup-mdl">hgroup</a> = (<a class="ref" href="#h1">h1</a>
- | <a class="ref" href="#h2">h2</a>
- | <a class="ref" href="#h3">h3</a>
- | <a class="ref" href="#h4">h4</a>
- | <a class="ref" href="#h5">h5</a>
- | <a class="ref" href="#h6">h6</a>)+</li>
-</ul>
+ <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h4-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h4-display">#</a>
@@ -5733,16 +5702,7 @@
<div class="no-number no-toc" id="h5-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h5-context">#</a>
</h2>
- <ul>
-<li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl">
-<a href="#hgroup-mdl">hgroup</a> = (<a class="ref" href="#h1">h1</a>
- | <a class="ref" href="#h2">h2</a>
- | <a class="ref" href="#h3">h3</a>
- | <a class="ref" href="#h4">h4</a>
- | <a class="ref" href="#h5">h5</a>
- | <a class="ref" href="#h6">h6</a>)+</li>
-</ul>
+ <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h5-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h5-display">#</a>
@@ -5822,16 +5782,7 @@
<div class="no-number no-toc" id="h6-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h6-context">#</a>
</h2>
- <ul>
-<li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl">
-<a href="#hgroup-mdl">hgroup</a> = (<a class="ref" href="#h1">h1</a>
- | <a class="ref" href="#h2">h2</a>
- | <a class="ref" href="#h3">h3</a>
- | <a class="ref" href="#h4">h4</a>
- | <a class="ref" href="#h5">h5</a>
- | <a class="ref" href="#h6">h6</a>)+</li>
-</ul>
+ <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h6-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h6-display">#</a>
@@ -5967,6 +5918,10 @@
The “header” element must not appear as a
descendant of the “header” element.
</span></li>
+<li><span>
+ The “header” element must have at least one
+ “h1”–“h6” descendant.
+ </span></li>
</ul>
</div>
<div class="no-number no-toc" id="header-tags">
@@ -5987,53 +5942,6 @@
</div>
</div>
- <div id="hgroup" class="section">
- <h2 class="element-head">
-<span class="element">hgroup</span> – <span class="shortdesc">heading group</span> <a class="hash" href="#hgroup">#</a> <a class="toc-bak" href="#hgroup-toc">T</a>
-</h2>
- <div id="hgroup-longdesc" class="longdesc"><p><i class="TK">(element description to come)</i></p></div>
- <div class="no-number no-toc" id="hgroup-content">
- <h2 class="element-subhead">Content model <a class="hash" href="#hgroup-content">#</a>
-</h2>
- <div class="content-models" id="hgroup-mdls">
- <p class="elem-mdl"><span class="element-pattern-name"><a id="hgroup-mdl" href="#hgroup-mdl" class="element">hgroup</a> = </span><span>
- (<a class="ref" href="#h1">h1</a>
- | <a class="ref" href="#h2">h2</a>
- | <a class="ref" href="#h3">h3</a>
- | <a class="ref" href="#h4">h4</a>
- | <a class="ref" href="#h5">h5</a>
- | <a class="ref" href="#h6">h6</a>)+
- & <a class="ref" href="#hgroup.attrs">hgroup.attrs</a>
- </span></p>
- </div>
- </div>
-<div class="no-number no-toc" id="hgroup-attr-mdl">
- <h2 class="element-subhead">Attribute model <a class="hash" href="#hgroup-attr-mdl">#</a>
-</h2>
- <div class="attr-content-models">
- <p><a href="#hgroup.attrs">hgroup.attrs</a> = <span class="pattern" id="hgroup.attrs"><a class="ref" href="#common.attrs">common.attrs</a></span></p>
-</div>
-</div>
-
-
- <div class="no-number no-toc" id="hgroup-tags">
- <h2 class="element-subhead">Tag omission <a class="hash" href="#hgroup-tags">#</a>
-</h2>
- <p>A <a href="#hgroup">hgroup</a>
- element must have both a
- <span title="syntax-start-tag">start tag</span>
- and an
- <span title="syntax-end-tag">end tag</span>.</p>
- </div>
-
-
- <div class="no-number no-toc" id="hgroup-context">
- <h2 class="element-subhead">Permitted contexts <a class="hash" href="#hgroup-context">#</a>
-</h2>
- <ul><li class="context-mdl"><a href="#common.elem.flow">common.elem.flow</a></li></ul>
-</div>
-</div>
-
<div id="hr" class="section">
<h2 class="element-head">
<span class="element">hr</span> – <span class="shortdesc">thematic break</span> <a class="hash" href="#hr">#</a> <a class="toc-bak" href="#hr-toc">T</a>
@@ -10511,6 +10419,10 @@
<ul class="assertions">
<li><span>
The sectioning element “nav” must not
+ appear as a descendant of the “header” element.
+ </span></li>
+<li><span>
+ The sectioning element “nav” must not
appear as a descendant of the “footer” element.
</span></li>
<li><span>
@@ -11837,6 +11749,10 @@
<ul class="assertions">
<li><span>
The sectioning element “section” must not
+ appear as a descendant of the “header” element.
+ </span></li>
+<li><span>
+ The sectioning element “section” must not
appear as a descendant of the “footer” element.
</span></li>
<li><span>
@@ -13627,7 +13543,6 @@
| <a class="ref" href="#h4">h4</a>
| <a class="ref" href="#h5">h5</a>
| <a class="ref" href="#h6">h6</a>
- | <a class="ref" href="#hgroup">hgroup</a>
| <a class="ref" href="#address">address</a>
| <a class="ref" href="#blockquote">blockquote</a>
| <a class="ref" href="#object.elem.flow">object.elem.flow</a>
Index: h1.html
===================================================================
RCS file: /sources/public/html5/markup/h1.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- h1.html 2 May 2009 09:24:19 -0000 1.4
+++ h1.html 3 May 2009 14:07:16 -0000 1.5
@@ -57,13 +57,7 @@
<div class="no-number no-toc" id="h1-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h1-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
- | <a class="ref" href="h2.html#h2">h2</a>
- | <a class="ref" href="h3.html#h3">h3</a>
- | <a class="ref" href="h4.html#h4">h4</a>
- | <a class="ref" href="h5.html#h5">h5</a>
- | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h1-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h1-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: h3.html
===================================================================
RCS file: /sources/public/html5/markup/h3.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- h3.html 2 May 2009 09:24:19 -0000 1.4
+++ h3.html 3 May 2009 14:07:16 -0000 1.5
@@ -57,13 +57,7 @@
<div class="no-number no-toc" id="h3-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h3-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
- | <a class="ref" href="h2.html#h2">h2</a>
- | <a class="ref" href="h3.html#h3">h3</a>
- | <a class="ref" href="h4.html#h4">h4</a>
- | <a class="ref" href="h5.html#h5">h5</a>
- | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h3-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h3-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Index: article.html
===================================================================
RCS file: /sources/public/html5/markup/article.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- article.html 2 May 2009 09:24:18 -0000 1.4
+++ article.html 3 May 2009 14:07:16 -0000 1.5
@@ -40,6 +40,9 @@
<ul class="assertions">
<li><span>
The sectioning element “article” must not
+ appear as a descendant of the “header” element.
+ </span></li><li><span>
+ The sectioning element “article” must not
appear as a descendant of the “footer” element.
</span></li><li><span>
The sectioning element “article” must not
Index: elements.html
===================================================================
RCS file: /sources/public/html5/markup/elements.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- elements.html 3 May 2009 04:20:35 -0000 1.5
+++ elements.html 3 May 2009 14:07:16 -0000 1.6
@@ -119,8 +119,6 @@
</li>
<li id="header-toc"><a href="header.html#header"><span class="element">header</span> – <span class="shortdesc">header</span></a>
</li>
-<li id="hgroup-toc"><a href="hgroup.html#hgroup"><span class="element">hgroup</span> – <span class="shortdesc">heading group</span></a>
-</li>
<li id="hr-toc"><a href="hr.html#hr"><span class="element">hr</span> – <span class="shortdesc">thematic break</span></a>
</li>
<li id="html-toc"><a href="html.html#html"><span class="element">html</span> – <span class="shortdesc">root element</span></a>
@@ -559,8 +557,6 @@
-
-
</div>
<hr class="footerbreak"></hr>
<div class="nav">
Index: h5.html
===================================================================
RCS file: /sources/public/html5/markup/h5.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- h5.html 2 May 2009 09:24:19 -0000 1.4
+++ h5.html 3 May 2009 14:07:16 -0000 1.5
@@ -57,13 +57,7 @@
<div class="no-number no-toc" id="h5-context">
<h2 class="element-subhead">Permitted contexts <a class="hash" href="#h5-context">#</a></h2>
<ul>
- <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li>
- <li class="context-mdl"><a href="hgroup.html#hgroup-mdl">hgroup</a> = (<a class="ref" href="h1.html#h1">h1</a>
- | <a class="ref" href="h2.html#h2">h2</a>
- | <a class="ref" href="h3.html#h3">h3</a>
- | <a class="ref" href="h4.html#h4">h4</a>
- | <a class="ref" href="h5.html#h5">h5</a>
- | <a class="ref" href="h6.html#h6">h6</a>)+</li></ul>
+ <li class="context-mdl"><a href="common-models.html#common.elem.flow">common.elem.flow</a></li></ul>
</div>
<div class="no-number no-toc" id="h5-display">
<h2 class="element-subhead">Typical default display properties <a class="hash" href="#h5-display">#</a></h2><p class="non-norm">This section is non-normative.</p>
Received on Sunday, 3 May 2009 14:08:26 UTC