- From: poot <cvsmail@w3.org>
- Date: Mon, 4 May 2009 01:00:13 +0900 (JST)
- To: public-html-diffs@w3.org
h:tml; unwind muff-up I accidentally introduced in previous checkin Diffs for this change per section: http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#structure-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#i-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#dfn-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#latestED http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#abstract http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#this_sections http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#character-encoding-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#unexpanded-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#hgroup-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#audio-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#head-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#header-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#appendices http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#a-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#hr-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#del-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#tocjump http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#conformance-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#elements-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.html#terminology-toc http://people.w3.org/mike/diffs/html5/markup/Overview.1.300.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.299&r2=1.300&f=h =================================================================== RCS file: /sources/public/html5/markup/body.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- body.html 2 May 2009 09:24:18 -0000 1.3 +++ body.html 3 May 2009 15:59:40 -0000 1.4 @@ -65,6 +65,5 @@ <span class="nav-prev"><a href="blockquote.html">« blockquote</a></span> <span class="nav-next"><a href="br.html">br »</a></span> </div> - </body> </html> Index: legend.html =================================================================== RCS file: /sources/public/html5/markup/legend.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- legend.html 2 May 2009 09:24:20 -0000 1.3 +++ legend.html 3 May 2009 15:59:42 -0000 1.4 @@ -69,6 +69,5 @@ <span class="nav-prev"><a href="label.html">« label</a></span> <span class="nav-next"><a href="li.html">li »</a></span> </div> - </body> </html> Index: address.html =================================================================== RCS file: /sources/public/html5/markup/address.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- address.html 2 May 2009 09:24:18 -0000 1.3 +++ address.html 3 May 2009 15:59:39 -0000 1.4 @@ -70,6 +70,5 @@ <span class="nav-prev"><a href="abbr.html">« abbr</a></span> <span class="nav-next"><a href="area.html">area »</a></span> </div> - </body> </html> Index: button.html =================================================================== RCS file: /sources/public/html5/markup/button.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- button.html 2 May 2009 09:24:18 -0000 1.3 +++ button.html 3 May 2009 15:59:40 -0000 1.4 @@ -28,6 +28,5 @@ <span class="nav-prev"><a href="br.html">« br</a></span> <span class="nav-next"><a href="button.submit.html">button.submit »</a></span> </div> - </body> </html> Index: th.html =================================================================== RCS file: /sources/public/html5/markup/th.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- th.html 2 May 2009 09:24:22 -0000 1.3 +++ th.html 3 May 2009 15:59:43 -0000 1.4 @@ -93,6 +93,5 @@ <span class="nav-prev"><a href="tfoot.html">« tfoot</a></span> <span class="nav-next"><a href="thead.html">thead »</a></span> </div> - </body> </html> Index: bb.html =================================================================== RCS file: /sources/public/html5/markup/bb.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bb.html 2 May 2009 09:24:18 -0000 1.3 +++ bb.html 3 May 2009 15:59:40 -0000 1.4 @@ -78,6 +78,5 @@ <span class="nav-prev"><a href="base.html">« base</a></span> <span class="nav-next"><a href="bdo.html">bdo »</a></span> </div> - </body> </html> Index: mark.html =================================================================== RCS file: /sources/public/html5/markup/mark.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mark.html 2 May 2009 09:24:20 -0000 1.3 +++ mark.html 3 May 2009 15:59:42 -0000 1.4 @@ -54,6 +54,5 @@ <span class="nav-prev"><a href="map.html">« map</a></span> <span class="nav-next"><a href="menu.html">menu »</a></span> </div> - </body> </html> Index: Overview.html =================================================================== RCS file: /sources/public/html5/markup/Overview.html,v retrieving revision 1.299 retrieving revision 1.300 diff -u -d -r1.299 -r1.300 --- Overview.html 3 May 2009 14:07:15 -0000 1.299 +++ Overview.html 3 May 2009 15:59:39 -0000 1.300 @@ -346,6 +346,9 @@ <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: br.html =================================================================== RCS file: /sources/public/html5/markup/br.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- br.html 2 May 2009 09:24:18 -0000 1.3 +++ br.html 3 May 2009 15:59:40 -0000 1.4 @@ -50,6 +50,5 @@ <span class="nav-prev"><a href="body.html">« body</a></span> <span class="nav-next"><a href="button.html">button »</a></span> </div> - </body> </html> Index: input.email.html =================================================================== RCS file: /sources/public/html5/markup/input.email.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.email.html 2 May 2009 09:24:20 -0000 1.3 +++ input.email.html 3 May 2009 15:59:41 -0000 1.4 @@ -109,6 +109,5 @@ <span class="nav-prev"><a href="input.range.html">« input.range</a></span> <span class="nav-next"><a href="input.url.html">input.url »</a></span> </div> - </body> </html> Index: tr.html =================================================================== RCS file: /sources/public/html5/markup/tr.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tr.html 2 May 2009 09:24:22 -0000 1.3 +++ tr.html 3 May 2009 15:59:43 -0000 1.4 @@ -70,6 +70,5 @@ <span class="nav-prev"><a href="title.html">« title</a></span> <span class="nav-next"><a href="ul.html">ul »</a></span> </div> - </body> </html> Index: input.month.html =================================================================== RCS file: /sources/public/html5/markup/input.month.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.month.html 2 May 2009 09:24:20 -0000 1.3 +++ input.month.html 3 May 2009 15:59:41 -0000 1.4 @@ -113,6 +113,5 @@ <span class="nav-prev"><a href="input.date.html">« input.date</a></span> <span class="nav-next"><a href="input.time.html">input.time »</a></span> </div> - </body> </html> Index: iframe.html =================================================================== RCS file: /sources/public/html5/markup/iframe.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- iframe.html 2 May 2009 09:24:19 -0000 1.3 +++ iframe.html 3 May 2009 15:59:41 -0000 1.4 @@ -127,6 +127,5 @@ <span class="nav-prev"><a href="i.html">« i</a></span> <span class="nav-next"><a href="img.html">img »</a></span> </div> - </body> </html> Index: datagrid.html =================================================================== RCS file: /sources/public/html5/markup/datagrid.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- datagrid.html 2 May 2009 09:24:19 -0000 1.3 +++ datagrid.html 3 May 2009 15:59:40 -0000 1.4 @@ -83,6 +83,5 @@ <span class="nav-prev"><a href="command.checkbox.html">« command.checkbox</a></span> <span class="nav-next"><a href="datalist.html">datalist »</a></span> </div> - </body> </html> Index: ins.html =================================================================== RCS file: /sources/public/html5/markup/ins.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ins.html 2 May 2009 09:24:20 -0000 1.3 +++ ins.html 3 May 2009 15:59:42 -0000 1.4 @@ -72,6 +72,5 @@ <span class="nav-prev"><a href="input.color.html">« input.color</a></span> <span class="nav-next"><a href="kbd.html">kbd »</a></span> </div> - </body> </html> Index: abbr.html =================================================================== RCS file: /sources/public/html5/markup/abbr.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- abbr.html 2 May 2009 09:24:18 -0000 1.3 +++ abbr.html 3 May 2009 15:59:39 -0000 1.4 @@ -56,6 +56,5 @@ <span class="nav-prev"><a href="a.html">« a</a></span> <span class="nav-next"><a href="address.html">address »</a></span> </div> - </body> </html> Index: div.html =================================================================== RCS file: /sources/public/html5/markup/div.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- div.html 2 May 2009 09:24:19 -0000 1.3 +++ div.html 3 May 2009 15:59:40 -0000 1.4 @@ -64,6 +64,5 @@ <span class="nav-prev"><a href="dialog.html">« dialog</a></span> <span class="nav-next"><a href="dl.html">dl »</a></span> </div> - </body> </html> Index: meta.name.html =================================================================== RCS file: /sources/public/html5/markup/meta.name.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- meta.name.html 2 May 2009 09:24:21 -0000 1.3 +++ meta.name.html 3 May 2009 15:59:42 -0000 1.4 @@ -110,6 +110,5 @@ <span class="nav-prev"><a href="meta.html">« meta</a></span> <span class="nav-next"><a href="meta.http-equiv.refresh.html">meta.http-equiv.refresh »</a></span> </div> - </body> </html> Index: dt.html =================================================================== RCS file: /sources/public/html5/markup/dt.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dt.html 2 May 2009 09:24:19 -0000 1.3 +++ dt.html 3 May 2009 15:59:40 -0000 1.4 @@ -70,6 +70,5 @@ <span class="nav-prev"><a href="dl.html">« dl</a></span> <span class="nav-next"><a href="em.html">em »</a></span> </div> - </body> </html> Index: table.html =================================================================== RCS file: /sources/public/html5/markup/table.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- table.html 2 May 2009 09:24:22 -0000 1.3 +++ table.html 3 May 2009 15:59:43 -0000 1.4 @@ -73,6 +73,5 @@ <span class="nav-prev"><a href="sup.html">« sup</a></span> <span class="nav-next"><a href="tbody.html">tbody »</a></span> </div> - </body> </html> Index: nav.html =================================================================== RCS file: /sources/public/html5/markup/nav.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- nav.html 3 May 2009 14:07:16 -0000 1.5 +++ nav.html 3 May 2009 15:59:42 -0000 1.6 @@ -39,9 +39,6 @@ <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 @@ -69,6 +66,5 @@ <span class="nav-prev"><a href="meter.html">« meter</a></span> <span class="nav-next"><a href="noscript.html">noscript »</a></span> </div> - </body> </html> Index: html.html =================================================================== RCS file: /sources/public/html5/markup/html.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- html.html 2 May 2009 09:24:19 -0000 1.3 +++ html.html 3 May 2009 15:59:41 -0000 1.4 @@ -69,6 +69,5 @@ <span class="nav-prev"><a href="hr.html">« hr</a></span> <span class="nav-next"><a href="i.html">i »</a></span> </div> - </body> </html> Index: meta.http-equiv.content-type.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- meta.http-equiv.content-type.html 2 May 2009 09:24:20 -0000 1.3 +++ meta.http-equiv.content-type.html 3 May 2009 15:59:42 -0000 1.4 @@ -101,6 +101,5 @@ <span class="nav-prev"><a href="meta.charset.html">« meta.charset</a></span> <span class="nav-next"><a href="meter.html">meter »</a></span> </div> - </body> </html> Index: footer.html =================================================================== RCS file: /sources/public/html5/markup/footer.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- footer.html 3 May 2009 14:07:16 -0000 1.5 +++ footer.html 3 May 2009 15:59:41 -0000 1.6 @@ -36,13 +36,13 @@ <h2 class="element-subhead">Assertions <a class="hash" href="#footer-assertions">#</a></h2> <ul class="assertions"> <li><span> - The sectioning element “footer” must not + The element “footer” must not appear as a descendant of the “header” element. </span></li><li><span> - The sectioning element “footer” must not + The element “footer” must not appear as a descendant of the “footer” element. </span></li><li><span> - The sectioning element “footer” must not + The element “footer” must not appear as a descendant of the “address” element. </span></li> </ul> @@ -67,6 +67,5 @@ <span class="nav-prev"><a href="figure.html">« figure</a></span> <span class="nav-next"><a href="form.html">form »</a></span> </div> - </body> </html> Index: script.html =================================================================== RCS file: /sources/public/html5/markup/script.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- script.html 2 May 2009 09:24:21 -0000 1.3 +++ script.html 3 May 2009 15:59:43 -0000 1.4 @@ -111,6 +111,5 @@ <span class="nav-prev"><a href="samp.html">« samp</a></span> <span class="nav-next"><a href="section.html">section »</a></span> </div> - </body> </html> Index: input.range.html =================================================================== RCS file: /sources/public/html5/markup/input.range.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.range.html 2 May 2009 09:24:20 -0000 1.3 +++ input.range.html 3 May 2009 15:59:41 -0000 1.4 @@ -111,6 +111,5 @@ <span class="nav-prev"><a href="input.number.html">« input.number</a></span> <span class="nav-next"><a href="input.email.html">input.email »</a></span> </div> - </body> </html> Index: audio.html =================================================================== RCS file: /sources/public/html5/markup/audio.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- audio.html 2 May 2009 09:24:18 -0000 1.3 +++ audio.html 3 May 2009 15:59:39 -0000 1.4 @@ -85,6 +85,5 @@ <span class="nav-prev"><a href="aside.html">« aside</a></span> <span class="nav-next"><a href="b.html">b »</a></span> </div> - </body> </html> Index: time.html =================================================================== RCS file: /sources/public/html5/markup/time.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- time.html 2 May 2009 09:24:22 -0000 1.3 +++ time.html 3 May 2009 15:59:43 -0000 1.4 @@ -61,6 +61,5 @@ <span class="nav-prev"><a href="thead.html">« thead</a></span> <span class="nav-next"><a href="title.html">title »</a></span> </div> - </body> </html> Index: meta.http-equiv.default-style.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- meta.http-equiv.default-style.html 2 May 2009 09:24:20 -0000 1.3 +++ meta.http-equiv.default-style.html 3 May 2009 15:59:42 -0000 1.4 @@ -91,6 +91,5 @@ <span class="nav-prev"><a href="meta.http-equiv.refresh.html">« meta.http-equiv.refresh</a></span> <span class="nav-next"><a href="meta.charset.html">meta.charset »</a></span> </div> - </body> </html> Index: input.html =================================================================== RCS file: /sources/public/html5/markup/input.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.html 2 May 2009 09:24:20 -0000 1.3 +++ input.html 3 May 2009 15:59:41 -0000 1.4 @@ -45,6 +45,5 @@ <span class="nav-prev"><a href="img.html">« img</a></span> <span class="nav-next"><a href="input.text.html">input.text »</a></span> </div> - </body> </html> Index: command.html =================================================================== RCS file: /sources/public/html5/markup/command.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- command.html 2 May 2009 09:24:18 -0000 1.3 +++ command.html 3 May 2009 15:59:40 -0000 1.4 @@ -26,6 +26,5 @@ <span class="nav-prev"><a href="colgroup.html">« colgroup</a></span> <span class="nav-next"><a href="command.command.html">command.command »</a></span> </div> - </body> </html> Index: keygen.html =================================================================== RCS file: /sources/public/html5/markup/keygen.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- keygen.html 2 May 2009 09:24:20 -0000 1.3 +++ keygen.html 3 May 2009 15:59:42 -0000 1.4 @@ -79,6 +79,5 @@ <span class="nav-prev"><a href="kbd.html">« kbd</a></span> <span class="nav-next"><a href="label.html">label »</a></span> </div> - </body> </html> Index: command.command.html =================================================================== RCS file: /sources/public/html5/markup/command.command.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- command.command.html 2 May 2009 09:24:18 -0000 1.3 +++ command.command.html 3 May 2009 15:59:40 -0000 1.4 @@ -72,6 +72,5 @@ <span class="nav-prev"><a href="command.html">« command</a></span> <span class="nav-next"><a href="command.radio.html">command.radio »</a></span> </div> - </body> </html> Index: progress.html =================================================================== RCS file: /sources/public/html5/markup/progress.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- progress.html 2 May 2009 09:24:21 -0000 1.3 +++ progress.html 3 May 2009 15:59:42 -0000 1.4 @@ -82,6 +82,5 @@ <span class="nav-prev"><a href="pre.html">« pre</a></span> <span class="nav-next"><a href="q.html">q »</a></span> </div> - </body> </html> Index: dfn.html =================================================================== RCS file: /sources/public/html5/markup/dfn.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dfn.html 2 May 2009 09:24:19 -0000 1.3 +++ dfn.html 3 May 2009 15:59:40 -0000 1.4 @@ -61,6 +61,5 @@ <span class="nav-prev"><a href="details.html">« details</a></span> <span class="nav-next"><a href="dialog.html">dialog »</a></span> </div> - </body> </html> Index: intro.html =================================================================== RCS file: /sources/public/html5/markup/intro.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- intro.html 2 May 2009 09:24:20 -0000 1.3 +++ intro.html 3 May 2009 15:59:42 -0000 1.4 @@ -69,6 +69,5 @@ <span class="nav-next"><a href="conformance.html">conformance »</a></span> </div> - </body> </html> Index: schema.html =================================================================== RCS file: /sources/public/html5/markup/schema.html,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- schema.html 3 May 2009 14:07:16 -0000 1.90 +++ schema.html 3 May 2009 15:59:43 -0000 1.91 @@ -213,6 +213,7 @@ | <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> @@ -1926,6 +1927,31 @@ <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: textarea.html =================================================================== RCS file: /sources/public/html5/markup/textarea.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- textarea.html 2 May 2009 09:24:22 -0000 1.3 +++ textarea.html 3 May 2009 15:59:43 -0000 1.4 @@ -106,6 +106,5 @@ <span class="nav-prev"><a href="td.html">« td</a></span> <span class="nav-next"><a href="tfoot.html">tfoot »</a></span> </div> - </body> </html> Index: cite.html =================================================================== RCS file: /sources/public/html5/markup/cite.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- cite.html 2 May 2009 09:24:18 -0000 1.3 +++ cite.html 3 May 2009 15:59:40 -0000 1.4 @@ -58,6 +58,5 @@ <span class="nav-prev"><a href="caption.html">« caption</a></span> <span class="nav-next"><a href="code.html">code »</a></span> </div> - </body> </html> Index: meter.html =================================================================== RCS file: /sources/public/html5/markup/meter.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- meter.html 2 May 2009 09:24:21 -0000 1.3 +++ meter.html 3 May 2009 15:59:42 -0000 1.4 @@ -192,6 +192,5 @@ <span class="nav-prev"><a href="meta.http-equiv.content-type.html">« meta.http-equiv.content-type</a></span> <span class="nav-next"><a href="nav.html">nav »</a></span> </div> - </body> </html> Index: input.button.html =================================================================== RCS file: /sources/public/html5/markup/input.button.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.button.html 2 May 2009 09:24:19 -0000 1.3 +++ input.button.html 3 May 2009 15:59:41 -0000 1.4 @@ -90,6 +90,5 @@ <span class="nav-prev"><a href="input.radio.html">« input.radio</a></span> <span class="nav-next"><a href="input.submit.html">input.submit »</a></span> </div> - </body> </html> Index: aside.html =================================================================== RCS file: /sources/public/html5/markup/aside.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- aside.html 3 May 2009 14:07:16 -0000 1.5 +++ aside.html 3 May 2009 15:59:39 -0000 1.6 @@ -41,9 +41,6 @@ <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 @@ -71,6 +68,5 @@ <span class="nav-prev"><a href="article.html">« article</a></span> <span class="nav-next"><a href="audio.html">audio »</a></span> </div> - </body> </html> Index: syntax.html =================================================================== RCS file: /sources/public/html5/markup/syntax.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- syntax.html 3 May 2009 04:20:35 -0000 1.4 +++ syntax.html 3 May 2009 15:59:43 -0000 1.5 @@ -876,6 +876,5 @@ <span class="nav-prev"><a href="terminology.html">« terminology</a></span> <span class="nav-next"><a href="elements.html">elements »</a></span> </div> - </body> </html> Index: section.html =================================================================== RCS file: /sources/public/html5/markup/section.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- section.html 3 May 2009 14:07:16 -0000 1.5 +++ section.html 3 May 2009 15:59:43 -0000 1.6 @@ -39,9 +39,6 @@ <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 @@ -69,6 +66,5 @@ <span class="nav-prev"><a href="script.html">« script</a></span> <span class="nav-next"><a href="select.html">select »</a></span> </div> - </body> </html> Index: link.html =================================================================== RCS file: /sources/public/html5/markup/link.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- link.html 2 May 2009 09:24:20 -0000 1.3 +++ link.html 3 May 2009 15:59:42 -0000 1.4 @@ -82,6 +82,5 @@ <span class="nav-prev"><a href="li.html">« li</a></span> <span class="nav-next"><a href="map.html">map »</a></span> </div> - </body> </html> Index: meta.http-equiv.refresh.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.refresh.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- meta.http-equiv.refresh.html 2 May 2009 09:24:20 -0000 1.3 +++ meta.http-equiv.refresh.html 3 May 2009 15:59:42 -0000 1.4 @@ -96,6 +96,5 @@ <span class="nav-prev"><a href="meta.name.html">« meta.name</a></span> <span class="nav-next"><a href="meta.http-equiv.default-style.html">meta.http-equiv.default-style »</a></span> </div> - </body> </html> Index: area.html =================================================================== RCS file: /sources/public/html5/markup/area.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- area.html 2 May 2009 09:24:18 -0000 1.3 +++ area.html 3 May 2009 15:59:39 -0000 1.4 @@ -105,6 +105,5 @@ <span class="nav-prev"><a href="address.html">« address</a></span> <span class="nav-next"><a href="article.html">article »</a></span> </div> - </body> </html> Index: input.text.html =================================================================== RCS file: /sources/public/html5/markup/input.text.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.text.html 2 May 2009 09:24:20 -0000 1.3 +++ input.text.html 3 May 2009 15:59:42 -0000 1.4 @@ -98,6 +98,5 @@ <span class="nav-prev"><a href="input.html">« input</a></span> <span class="nav-next"><a href="input.password.html">input.password »</a></span> </div> - </body> </html> Index: samp.html =================================================================== RCS file: /sources/public/html5/markup/samp.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- samp.html 2 May 2009 09:24:21 -0000 1.3 +++ samp.html 3 May 2009 15:59:43 -0000 1.4 @@ -57,6 +57,5 @@ <span class="nav-prev"><a href="ruby.html">« ruby</a></span> <span class="nav-next"><a href="script.html">script »</a></span> </div> - </body> </html> Index: h6.html =================================================================== RCS file: /sources/public/html5/markup/h6.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- h6.html 3 May 2009 14:07:16 -0000 1.5 +++ h6.html 3 May 2009 15:59:41 -0000 1.6 @@ -57,7 +57,13 @@ <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></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> </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> @@ -68,6 +74,5 @@ <span class="nav-prev"><a href="h5.html">« h5</a></span> <span class="nav-next"><a href="head.html">head »</a></span> </div> - </body> </html> Index: input.checkbox.html =================================================================== RCS file: /sources/public/html5/markup/input.checkbox.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.checkbox.html 2 May 2009 09:24:19 -0000 1.3 +++ input.checkbox.html 3 May 2009 15:59:41 -0000 1.4 @@ -92,6 +92,5 @@ <span class="nav-prev"><a href="input.password.html">« input.password</a></span> <span class="nav-next"><a href="input.radio.html">input.radio »</a></span> </div> - </body> </html> Index: a.html =================================================================== RCS file: /sources/public/html5/markup/a.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- a.html 2 May 2009 09:24:18 -0000 1.3 +++ a.html 3 May 2009 15:59:39 -0000 1.4 @@ -86,6 +86,5 @@ <span class="nav-prev"><a href="elements.html">« elements</a></span> <span class="nav-next"><a href="abbr.html">abbr »</a></span> </div> - </body> </html> Index: object.html =================================================================== RCS file: /sources/public/html5/markup/object.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- object.html 2 May 2009 09:24:21 -0000 1.3 +++ object.html 3 May 2009 15:59:42 -0000 1.4 @@ -111,6 +111,5 @@ <span class="nav-prev"><a href="noscript.html">« noscript</a></span> <span class="nav-next"><a href="ol.html">ol »</a></span> </div> - </body> </html> Index: terminology.html =================================================================== RCS file: /sources/public/html5/markup/terminology.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- terminology.html 2 May 2009 09:24:22 -0000 1.3 +++ terminology.html 3 May 2009 15:59:43 -0000 1.4 @@ -67,6 +67,5 @@ <span class="nav-prev"><a href="structure.html">« structure</a></span> <span class="nav-next"><a href="syntax.html">syntax »</a></span> </div> - </body> </html> Index: h4.html =================================================================== RCS file: /sources/public/html5/markup/h4.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- h4.html 3 May 2009 14:07:16 -0000 1.5 +++ h4.html 3 May 2009 15:59:41 -0000 1.6 @@ -57,7 +57,13 @@ <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></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> </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> @@ -68,6 +74,5 @@ <span class="nav-prev"><a href="h3.html">« h3</a></span> <span class="nav-next"><a href="h5.html">h5 »</a></span> </div> - </body> </html> Index: header.html =================================================================== RCS file: /sources/public/html5/markup/header.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- header.html 3 May 2009 14:07:16 -0000 1.5 +++ header.html 3 May 2009 15:59:41 -0000 1.6 @@ -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="hr.html">hr »</a></span> +<span class="nav-next"><a href="hgroup.html">hgroup »</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,9 +44,6 @@ </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> @@ -68,8 +65,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="hr.html">hr »</a></span> +<span class="nav-next"><a href="hgroup.html">hgroup »</a></span> </div> - </body> </html> Index: b.html =================================================================== RCS file: /sources/public/html5/markup/b.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- b.html 2 May 2009 09:24:18 -0000 1.3 +++ b.html 3 May 2009 15:59:39 -0000 1.4 @@ -59,6 +59,5 @@ <span class="nav-prev"><a href="audio.html">« audio</a></span> <span class="nav-next"><a href="base.html">base »</a></span> </div> - </body> </html> Index: img.html =================================================================== RCS file: /sources/public/html5/markup/img.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- img.html 2 May 2009 09:24:19 -0000 1.3 +++ img.html 3 May 2009 15:59:41 -0000 1.4 @@ -146,6 +146,5 @@ <span class="nav-prev"><a href="iframe.html">« iframe</a></span> <span class="nav-next"><a href="input.html">input »</a></span> </div> - </body> </html> Index: bdo.html =================================================================== RCS file: /sources/public/html5/markup/bdo.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bdo.html 2 May 2009 09:24:18 -0000 1.3 +++ bdo.html 3 May 2009 15:59:40 -0000 1.4 @@ -62,6 +62,5 @@ <span class="nav-prev"><a href="bb.html">« bb</a></span> <span class="nav-next"><a href="blockquote.html">blockquote »</a></span> </div> - </body> </html> Index: input.number.html =================================================================== RCS file: /sources/public/html5/markup/input.number.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.number.html 2 May 2009 09:24:20 -0000 1.3 +++ input.number.html 3 May 2009 15:59:41 -0000 1.4 @@ -113,6 +113,5 @@ <span class="nav-prev"><a href="input.week.html">« input.week</a></span> <span class="nav-next"><a href="input.range.html">input.range »</a></span> </div> - </body> </html> Index: col.html =================================================================== RCS file: /sources/public/html5/markup/col.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- col.html 2 May 2009 09:24:18 -0000 1.3 +++ col.html 3 May 2009 15:59:40 -0000 1.4 @@ -69,6 +69,5 @@ <span class="nav-prev"><a href="code.html">« code</a></span> <span class="nav-next"><a href="colgroup.html">colgroup »</a></span> </div> - </body> </html> Index: datatypes.html =================================================================== RCS file: /sources/public/html5/markup/datatypes.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- datatypes.html 2 May 2009 09:24:19 -0000 1.3 +++ datatypes.html 3 May 2009 15:59:40 -0000 1.4 @@ -360,6 +360,5 @@ <span class="nav-prev"><a href="shared-attributes.html">« shared-attributes</a></span> <span class="nav-next"><a href="references.html">references »</a></span> </div> - </body> </html> Index: command.radio.html =================================================================== RCS file: /sources/public/html5/markup/command.radio.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- command.radio.html 2 May 2009 09:24:18 -0000 1.3 +++ command.radio.html 3 May 2009 15:59:40 -0000 1.4 @@ -81,6 +81,5 @@ <span class="nav-prev"><a href="command.command.html">« command.command</a></span> <span class="nav-next"><a href="command.checkbox.html">command.checkbox »</a></span> </div> - </body> </html> Index: input.datetime.html =================================================================== RCS file: /sources/public/html5/markup/input.datetime.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.datetime.html 2 May 2009 09:24:20 -0000 1.3 +++ input.datetime.html 3 May 2009 15:59:41 -0000 1.4 @@ -114,6 +114,5 @@ <span class="nav-prev"><a href="input.image.html">« input.image</a></span> <span class="nav-next"><a href="input.datetime-local.html">input.datetime-local »</a></span> </div> - </body> </html> Index: input.password.html =================================================================== RCS file: /sources/public/html5/markup/input.password.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.password.html 2 May 2009 09:24:20 -0000 1.3 +++ input.password.html 3 May 2009 15:59:41 -0000 1.4 @@ -98,6 +98,5 @@ <span class="nav-prev"><a href="input.text.html">« input.text</a></span> <span class="nav-next"><a href="input.checkbox.html">input.checkbox »</a></span> </div> - </body> </html> Index: embed.html =================================================================== RCS file: /sources/public/html5/markup/embed.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- embed.html 2 May 2009 09:24:19 -0000 1.3 +++ embed.html 3 May 2009 15:59:40 -0000 1.4 @@ -167,6 +167,5 @@ <span class="nav-prev"><a href="em.html">« em</a></span> <span class="nav-next"><a href="fieldset.html">fieldset »</a></span> </div> - </body> </html> Index: dd.html =================================================================== RCS file: /sources/public/html5/markup/dd.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dd.html 2 May 2009 09:24:19 -0000 1.3 +++ dd.html 3 May 2009 15:59:40 -0000 1.4 @@ -71,6 +71,5 @@ <span class="nav-prev"><a href="datalist.html">« datalist</a></span> <span class="nav-next"><a href="del.html">del »</a></span> </div> - </body> </html> Index: common-models.html =================================================================== RCS file: /sources/public/html5/markup/common-models.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- common-models.html 3 May 2009 14:07:16 -0000 1.5 +++ common-models.html 3 May 2009 15:59:40 -0000 1.6 @@ -50,6 +50,7 @@ | <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> @@ -151,6 +152,5 @@ <span class="nav-prev"><a href="elements.html">« elements</a></span> <span class="nav-next"><a href="common-attributes.html">common-attributes »</a></span> </div> - </body> </html> Index: ul.html =================================================================== RCS file: /sources/public/html5/markup/ul.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ul.html 2 May 2009 09:24:22 -0000 1.3 +++ ul.html 3 May 2009 15:59:43 -0000 1.4 @@ -57,6 +57,5 @@ <span class="nav-prev"><a href="tr.html">« tr</a></span> <span class="nav-next"><a href="var.html">var »</a></span> </div> - </body> </html> Index: input.time.html =================================================================== RCS file: /sources/public/html5/markup/input.time.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.time.html 2 May 2009 09:24:20 -0000 1.3 +++ input.time.html 3 May 2009 15:59:42 -0000 1.4 @@ -114,6 +114,5 @@ <span class="nav-prev"><a href="input.month.html">« input.month</a></span> <span class="nav-next"><a href="input.week.html">input.week »</a></span> </div> - </body> </html> Index: structure.html =================================================================== RCS file: /sources/public/html5/markup/structure.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- structure.html 2 May 2009 09:24:21 -0000 1.3 +++ structure.html 3 May 2009 15:59:43 -0000 1.4 @@ -20,6 +20,5 @@ <span class="nav-prev"><a href="conformance.html">« conformance</a></span> <span class="nav-next"><a href="terminology.html">terminology »</a></span> </div> - </body> </html> Index: strong.html =================================================================== RCS file: /sources/public/html5/markup/strong.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- strong.html 2 May 2009 09:24:21 -0000 1.3 +++ strong.html 3 May 2009 15:59:43 -0000 1.4 @@ -56,6 +56,5 @@ <span class="nav-prev"><a href="span.html">« span</a></span> <span class="nav-next"><a href="style.html">style »</a></span> </div> - </body> </html> Index: acknowledgments.html =================================================================== RCS file: /sources/public/html5/markup/acknowledgments.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- acknowledgments.html 2 May 2009 09:24:18 -0000 1.3 +++ acknowledgments.html 3 May 2009 15:59:39 -0000 1.4 @@ -76,6 +76,5 @@ <div class="nav"> <span class="nav-prev"><a href="references.html">« references</a></span> </div> - </body> </html> Index: q.html =================================================================== RCS file: /sources/public/html5/markup/q.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- q.html 2 May 2009 09:24:21 -0000 1.3 +++ q.html 3 May 2009 15:59:42 -0000 1.4 @@ -68,6 +68,5 @@ <span class="nav-prev"><a href="progress.html">« progress</a></span> <span class="nav-next"><a href="rp.html">rp »</a></span> </div> - </body> </html> Index: li.html =================================================================== RCS file: /sources/public/html5/markup/li.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- li.html 2 May 2009 09:24:20 -0000 1.3 +++ li.html 3 May 2009 15:59:42 -0000 1.4 @@ -84,6 +84,5 @@ <span class="nav-prev"><a href="legend.html">« legend</a></span> <span class="nav-next"><a href="link.html">link »</a></span> </div> - </body> </html> Index: style.html =================================================================== RCS file: /sources/public/html5/markup/style.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- style.html 2 May 2009 09:24:21 -0000 1.3 +++ style.html 3 May 2009 15:59:43 -0000 1.4 @@ -115,6 +115,5 @@ <span class="nav-prev"><a href="strong.html">« strong</a></span> <span class="nav-next"><a href="sub.html">sub »</a></span> </div> - </body> </html> Index: caption.html =================================================================== RCS file: /sources/public/html5/markup/caption.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- caption.html 2 May 2009 09:24:18 -0000 1.3 +++ caption.html 3 May 2009 15:59:40 -0000 1.4 @@ -64,6 +64,5 @@ <span class="nav-prev"><a href="canvas.html">« canvas</a></span> <span class="nav-next"><a href="cite.html">cite »</a></span> </div> - </body> </html> Index: del.html =================================================================== RCS file: /sources/public/html5/markup/del.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- del.html 2 May 2009 09:24:19 -0000 1.3 +++ del.html 3 May 2009 15:59:40 -0000 1.4 @@ -72,6 +72,5 @@ <span class="nav-prev"><a href="dd.html">« dd</a></span> <span class="nav-next"><a href="details.html">details »</a></span> </div> - </body> </html> Index: menu.html =================================================================== RCS file: /sources/public/html5/markup/menu.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- menu.html 2 May 2009 09:24:20 -0000 1.3 +++ menu.html 3 May 2009 15:59:42 -0000 1.4 @@ -96,6 +96,5 @@ <span class="nav-prev"><a href="mark.html">« mark</a></span> <span class="nav-next"><a href="meta.html">meta »</a></span> </div> - </body> </html> Index: input.image.html =================================================================== RCS file: /sources/public/html5/markup/input.image.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.image.html 2 May 2009 09:24:20 -0000 1.3 +++ input.image.html 3 May 2009 15:59:41 -0000 1.4 @@ -122,6 +122,5 @@ <span class="nav-prev"><a href="input.hidden.html">« input.hidden</a></span> <span class="nav-next"><a href="input.datetime.html">input.datetime »</a></span> </div> - </body> </html> Index: code.html =================================================================== RCS file: /sources/public/html5/markup/code.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- code.html 2 May 2009 09:24:18 -0000 1.3 +++ code.html 3 May 2009 15:59:40 -0000 1.4 @@ -56,6 +56,5 @@ <span class="nav-prev"><a href="cite.html">« cite</a></span> <span class="nav-next"><a href="col.html">col »</a></span> </div> - </body> </html> Index: h2.html =================================================================== RCS file: /sources/public/html5/markup/h2.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- h2.html 3 May 2009 14:07:16 -0000 1.5 +++ h2.html 3 May 2009 15:59:41 -0000 1.6 @@ -57,7 +57,13 @@ <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></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> </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> @@ -68,6 +74,5 @@ <span class="nav-prev"><a href="h1.html">« h1</a></span> <span class="nav-next"><a href="h3.html">h3 »</a></span> </div> - </body> </html> Index: head.html =================================================================== RCS file: /sources/public/html5/markup/head.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- head.html 2 May 2009 09:24:19 -0000 1.3 +++ head.html 3 May 2009 15:59:41 -0000 1.4 @@ -64,6 +64,5 @@ <span class="nav-prev"><a href="h6.html">« h6</a></span> <span class="nav-next"><a href="header.html">header »</a></span> </div> - </body> </html> Index: p.html =================================================================== RCS file: /sources/public/html5/markup/p.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- p.html 2 May 2009 09:24:21 -0000 1.3 +++ p.html 3 May 2009 15:59:42 -0000 1.4 @@ -88,6 +88,5 @@ <span class="nav-prev"><a href="output.html">« output</a></span> <span class="nav-next"><a href="param.html">param »</a></span> </div> - </body> </html> Index: map.html =================================================================== RCS file: /sources/public/html5/markup/map.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- map.html 2 May 2009 09:24:20 -0000 1.3 +++ map.html 3 May 2009 15:59:42 -0000 1.4 @@ -75,6 +75,5 @@ <span class="nav-prev"><a href="link.html">« link</a></span> <span class="nav-next"><a href="mark.html">mark »</a></span> </div> - </body> </html> Index: input.file.html =================================================================== RCS file: /sources/public/html5/markup/input.file.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.file.html 2 May 2009 09:24:20 -0000 1.3 +++ input.file.html 3 May 2009 15:59:41 -0000 1.4 @@ -97,6 +97,5 @@ <span class="nav-prev"><a href="input.reset.html">« input.reset</a></span> <span class="nav-next"><a href="input.hidden.html">input.hidden »</a></span> </div> - </body> </html> Index: input.radio.html =================================================================== RCS file: /sources/public/html5/markup/input.radio.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.radio.html 2 May 2009 09:24:20 -0000 1.3 +++ input.radio.html 3 May 2009 15:59:41 -0000 1.4 @@ -93,6 +93,5 @@ <span class="nav-prev"><a href="input.checkbox.html">« input.checkbox</a></span> <span class="nav-next"><a href="input.button.html">input.button »</a></span> </div> - </body> </html> Index: command.checkbox.html =================================================================== RCS file: /sources/public/html5/markup/command.checkbox.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- command.checkbox.html 2 May 2009 09:24:18 -0000 1.3 +++ command.checkbox.html 3 May 2009 15:59:40 -0000 1.4 @@ -76,6 +76,5 @@ <span class="nav-prev"><a href="command.radio.html">« command.radio</a></span> <span class="nav-next"><a href="datagrid.html">datagrid »</a></span> </div> - </body> </html> Index: param.html =================================================================== RCS file: /sources/public/html5/markup/param.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- param.html 2 May 2009 09:24:21 -0000 1.3 +++ param.html 3 May 2009 15:59:42 -0000 1.4 @@ -70,6 +70,5 @@ <span class="nav-prev"><a href="p.html">« p</a></span> <span class="nav-next"><a href="pre.html">pre »</a></span> </div> - </body> </html> Index: span.html =================================================================== RCS file: /sources/public/html5/markup/span.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- span.html 2 May 2009 09:24:21 -0000 1.3 +++ span.html 3 May 2009 15:59:43 -0000 1.4 @@ -59,6 +59,5 @@ <span class="nav-prev"><a href="source.html">« source</a></span> <span class="nav-next"><a href="strong.html">strong »</a></span> </div> - </body> </html> Index: input.reset.html =================================================================== RCS file: /sources/public/html5/markup/input.reset.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.reset.html 2 May 2009 09:24:20 -0000 1.3 +++ input.reset.html 3 May 2009 15:59:41 -0000 1.4 @@ -90,6 +90,5 @@ <span class="nav-prev"><a href="input.submit.html">« input.submit</a></span> <span class="nav-next"><a href="input.file.html">input.file »</a></span> </div> - </body> </html> Index: input.datetime-local.html =================================================================== RCS file: /sources/public/html5/markup/input.datetime-local.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.datetime-local.html 2 May 2009 09:24:20 -0000 1.3 +++ input.datetime-local.html 3 May 2009 15:59:41 -0000 1.4 @@ -114,6 +114,5 @@ <span class="nav-prev"><a href="input.datetime.html">« input.datetime</a></span> <span class="nav-next"><a href="input.date.html">input.date »</a></span> </div> - </body> </html> Index: schema.rnc =================================================================== RCS file: /sources/public/html5/markup/schema.rnc,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- schema.rnc 3 May 2009 14:07:16 -0000 1.77 +++ schema.rnc 3 May 2009 15:59:43 -0000 1.78 @@ -105,6 +105,7 @@ | h4.elem | h5.elem | h6.elem + | hgroup.elem | address.elem | blockquote.elem | object.elem.flow @@ -680,6 +681,12 @@ 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: meta.html =================================================================== RCS file: /sources/public/html5/markup/meta.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- meta.html 2 May 2009 09:24:20 -0000 1.3 +++ meta.html 3 May 2009 15:59:42 -0000 1.4 @@ -28,6 +28,5 @@ <span class="nav-prev"><a href="menu.html">« menu</a></span> <span class="nav-next"><a href="meta.name.html">meta.name »</a></span> </div> - </body> </html> Index: input.color.html =================================================================== RCS file: /sources/public/html5/markup/input.color.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.color.html 2 May 2009 09:24:19 -0000 1.3 +++ input.color.html 3 May 2009 15:59:41 -0000 1.4 @@ -96,6 +96,5 @@ <span class="nav-prev"><a href="input.search.html">« input.search</a></span> <span class="nav-next"><a href="ins.html">ins »</a></span> </div> - </body> </html> Index: conformance.html =================================================================== RCS file: /sources/public/html5/markup/conformance.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- conformance.html 2 May 2009 09:24:19 -0000 1.3 +++ conformance.html 3 May 2009 15:59:40 -0000 1.4 @@ -20,6 +20,5 @@ <span class="nav-prev"><a href="intro.html">« intro</a></span> <span class="nav-next"><a href="structure.html">structure »</a></span> </div> - </body> </html> Index: common-attributes.html =================================================================== RCS file: /sources/public/html5/markup/common-attributes.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- common-attributes.html 2 May 2009 09:24:18 -0000 1.1 +++ common-attributes.html 3 May 2009 15:59:40 -0000 1.2 @@ -287,6 +287,5 @@ <span class="nav-prev"><a href="common-models.html">« common-models</a></span> <span class="nav-next"><a href="shared-attributes.html">shared-attributes »</a></span> </div> - </body> </html> Index: option.html =================================================================== RCS file: /sources/public/html5/markup/option.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- option.html 2 May 2009 09:24:21 -0000 1.3 +++ option.html 3 May 2009 15:59:42 -0000 1.4 @@ -77,6 +77,5 @@ <span class="nav-prev"><a href="optgroup.html">« optgroup</a></span> <span class="nav-next"><a href="output.html">output »</a></span> </div> - </body> </html> Index: label.html =================================================================== RCS file: /sources/public/html5/markup/label.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- label.html 2 May 2009 09:24:20 -0000 1.3 +++ label.html 3 May 2009 15:59:42 -0000 1.4 @@ -84,6 +84,5 @@ <span class="nav-prev"><a href="keygen.html">« keygen</a></span> <span class="nav-next"><a href="legend.html">legend »</a></span> </div> - </body> </html> Index: select.html =================================================================== RCS file: /sources/public/html5/markup/select.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- select.html 2 May 2009 09:24:21 -0000 1.3 +++ select.html 3 May 2009 15:59:43 -0000 1.4 @@ -103,6 +103,5 @@ <span class="nav-prev"><a href="section.html">« section</a></span> <span class="nav-next"><a href="small.html">small »</a></span> </div> - </body> </html> Index: noscript.html =================================================================== RCS file: /sources/public/html5/markup/noscript.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- noscript.html 2 May 2009 09:24:21 -0000 1.3 +++ noscript.html 3 May 2009 15:59:42 -0000 1.4 @@ -92,6 +92,5 @@ <span class="nav-prev"><a href="nav.html">« nav</a></span> <span class="nav-next"><a href="object.html">object »</a></span> </div> - </body> </html> Index: blockquote.html =================================================================== RCS file: /sources/public/html5/markup/blockquote.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- blockquote.html 2 May 2009 09:24:18 -0000 1.3 +++ blockquote.html 3 May 2009 15:59:40 -0000 1.4 @@ -68,6 +68,5 @@ <span class="nav-prev"><a href="bdo.html">« bdo</a></span> <span class="nav-next"><a href="body.html">body »</a></span> </div> - </body> </html> Index: hr.html =================================================================== RCS file: /sources/public/html5/markup/hr.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- hr.html 3 May 2009 14:07:16 -0000 1.4 +++ hr.html 3 May 2009 15:59:41 -0000 1.5 @@ -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="header.html">« header</a></span> +<span class="nav-prev"><a href="hgroup.html">« hgroup</a></span> <span class="nav-next"><a href="html.html">html »</a></span> </div> <div id="hr" class="section"> @@ -51,9 +51,8 @@ </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="header.html">« header</a></span> +<span class="nav-prev"><a href="hgroup.html">« hgroup</a></span> <span class="nav-next"><a href="html.html">html »</a></span> </div> - </body> </html> Index: td.html =================================================================== RCS file: /sources/public/html5/markup/td.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- td.html 2 May 2009 09:24:22 -0000 1.3 +++ td.html 3 May 2009 15:59:43 -0000 1.4 @@ -81,6 +81,5 @@ <span class="nav-prev"><a href="tbody.html">« tbody</a></span> <span class="nav-next"><a href="textarea.html">textarea »</a></span> </div> - </body> </html> Index: em.html =================================================================== RCS file: /sources/public/html5/markup/em.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- em.html 2 May 2009 09:24:19 -0000 1.3 +++ em.html 3 May 2009 15:59:40 -0000 1.4 @@ -56,6 +56,5 @@ <span class="nav-prev"><a href="dt.html">« dt</a></span> <span class="nav-next"><a href="embed.html">embed »</a></span> </div> - </body> </html> Index: figure.html =================================================================== RCS file: /sources/public/html5/markup/figure.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- figure.html 2 May 2009 09:24:19 -0000 1.3 +++ figure.html 3 May 2009 15:59:41 -0000 1.4 @@ -58,6 +58,5 @@ <span class="nav-prev"><a href="fieldset.html">« fieldset</a></span> <span class="nav-next"><a href="footer.html">footer »</a></span> </div> - </body> </html> Index: input.hidden.html =================================================================== RCS file: /sources/public/html5/markup/input.hidden.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.hidden.html 2 May 2009 09:24:20 -0000 1.3 +++ input.hidden.html 3 May 2009 15:59:41 -0000 1.4 @@ -91,6 +91,5 @@ <span class="nav-prev"><a href="input.file.html">« input.file</a></span> <span class="nav-next"><a href="input.image.html">input.image »</a></span> </div> - </body> </html> Index: kbd.html =================================================================== RCS file: /sources/public/html5/markup/kbd.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- kbd.html 2 May 2009 09:24:20 -0000 1.3 +++ kbd.html 3 May 2009 15:59:42 -0000 1.4 @@ -58,6 +58,5 @@ <span class="nav-prev"><a href="ins.html">« ins</a></span> <span class="nav-next"><a href="keygen.html">keygen »</a></span> </div> - </body> </html> Index: references.html =================================================================== RCS file: /sources/public/html5/markup/references.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- references.html 2 May 2009 09:24:21 -0000 1.3 +++ references.html 3 May 2009 15:59:42 -0000 1.4 @@ -62,6 +62,5 @@ <span class="nav-prev"><a href="datatypes.html">« datatypes</a></span> <span class="nav-next"><a href="acknowledgments.html">acknowledgments »</a></span> </div> - </body> </html> Index: base.html =================================================================== RCS file: /sources/public/html5/markup/base.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- base.html 2 May 2009 09:24:18 -0000 1.3 +++ base.html 3 May 2009 15:59:40 -0000 1.4 @@ -72,6 +72,5 @@ <span class="nav-prev"><a href="b.html">« b</a></span> <span class="nav-next"><a href="bb.html">bb »</a></span> </div> - </body> </html> Index: canvas.html =================================================================== RCS file: /sources/public/html5/markup/canvas.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- canvas.html 2 May 2009 09:24:18 -0000 1.3 +++ canvas.html 3 May 2009 15:59:40 -0000 1.4 @@ -77,6 +77,5 @@ <span class="nav-prev"><a href="button.button.html">« button.button</a></span> <span class="nav-next"><a href="caption.html">caption »</a></span> </div> - </body> </html> Index: input.search.html =================================================================== RCS file: /sources/public/html5/markup/input.search.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.search.html 2 May 2009 09:24:20 -0000 1.3 +++ input.search.html 3 May 2009 15:59:41 -0000 1.4 @@ -100,6 +100,5 @@ <span class="nav-prev"><a href="input.url.html">« input.url</a></span> <span class="nav-next"><a href="input.color.html">input.color »</a></span> </div> - </body> </html> Index: tfoot.html =================================================================== RCS file: /sources/public/html5/markup/tfoot.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tfoot.html 2 May 2009 09:24:22 -0000 1.3 +++ tfoot.html 3 May 2009 15:59:43 -0000 1.4 @@ -67,6 +67,5 @@ <span class="nav-prev"><a href="textarea.html">« textarea</a></span> <span class="nav-next"><a href="th.html">th »</a></span> </div> - </body> </html> Index: rt.html =================================================================== RCS file: /sources/public/html5/markup/rt.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- rt.html 2 May 2009 09:24:21 -0000 1.3 +++ rt.html 3 May 2009 15:59:42 -0000 1.4 @@ -60,6 +60,5 @@ <span class="nav-prev"><a href="rp.html">« rp</a></span> <span class="nav-next"><a href="ruby.html">ruby »</a></span> </div> - </body> </html> Index: fieldset.html =================================================================== RCS file: /sources/public/html5/markup/fieldset.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- fieldset.html 2 May 2009 09:24:19 -0000 1.3 +++ fieldset.html 3 May 2009 15:59:40 -0000 1.4 @@ -58,6 +58,5 @@ <span class="nav-prev"><a href="embed.html">« embed</a></span> <span class="nav-next"><a href="figure.html">figure »</a></span> </div> - </body> </html> Index: spec.html =================================================================== RCS file: /sources/public/html5/markup/spec.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- spec.html 3 May 2009 14:07:16 -0000 1.7 +++ spec.html 3 May 2009 15:59:43 -0000 1.8 @@ -345,6 +345,9 @@ <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> @@ -1669,7 +1672,7 @@ <div id="elements" class="section"> [...1590 lines suppressed...] <span class="element">video</span> – <span class="shortdesc">video</span> <a class="hash" href="#video">#</a> <a class="toc-bak" href="#video-toc">T</a> </h2> @@ -13493,8 +13448,7 @@ </ul> </div> </div> - - </div> +</div> <div id="common-models" class="section"> <h2>7. Common content models <a class="hash" href="#common-models">#</a> <a class="toc-bak" href="#common-models-toc">T</a> </h2> @@ -13543,6 +13497,7 @@ | <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: datalist.html =================================================================== RCS file: /sources/public/html5/markup/datalist.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- datalist.html 2 May 2009 09:24:19 -0000 1.3 +++ datalist.html 3 May 2009 15:59:40 -0000 1.4 @@ -71,6 +71,5 @@ <span class="nav-prev"><a href="datagrid.html">« datagrid</a></span> <span class="nav-next"><a href="dd.html">dd »</a></span> </div> - </body> </html> Index: h1.html =================================================================== RCS file: /sources/public/html5/markup/h1.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- h1.html 3 May 2009 14:07:16 -0000 1.5 +++ h1.html 3 May 2009 15:59:41 -0000 1.6 @@ -57,7 +57,13 @@ <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></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> </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> @@ -68,6 +74,5 @@ <span class="nav-prev"><a href="form.html">« form</a></span> <span class="nav-next"><a href="h2.html">h2 »</a></span> </div> - </body> </html> Index: h3.html =================================================================== RCS file: /sources/public/html5/markup/h3.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- h3.html 3 May 2009 14:07:16 -0000 1.5 +++ h3.html 3 May 2009 15:59:41 -0000 1.6 @@ -57,7 +57,13 @@ <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></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> </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> @@ -68,6 +74,5 @@ <span class="nav-prev"><a href="h2.html">« h2</a></span> <span class="nav-next"><a href="h4.html">h4 »</a></span> </div> - </body> </html> Index: optgroup.html =================================================================== RCS file: /sources/public/html5/markup/optgroup.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- optgroup.html 2 May 2009 09:24:21 -0000 1.3 +++ optgroup.html 3 May 2009 15:59:42 -0000 1.4 @@ -66,6 +66,5 @@ <span class="nav-prev"><a href="ol.html">« ol</a></span> <span class="nav-next"><a href="option.html">option »</a></span> </div> - </body> </html> Index: input.week.html =================================================================== RCS file: /sources/public/html5/markup/input.week.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.week.html 2 May 2009 09:24:20 -0000 1.3 +++ input.week.html 3 May 2009 15:59:42 -0000 1.4 @@ -113,6 +113,5 @@ <span class="nav-prev"><a href="input.time.html">« input.time</a></span> <span class="nav-next"><a href="input.number.html">input.number »</a></span> </div> - </body> </html> Index: button.button.html =================================================================== RCS file: /sources/public/html5/markup/button.button.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- button.button.html 2 May 2009 09:24:18 -0000 1.3 +++ button.button.html 3 May 2009 15:59:40 -0000 1.4 @@ -84,6 +84,5 @@ <span class="nav-prev"><a href="button.reset.html">« button.reset</a></span> <span class="nav-next"><a href="canvas.html">canvas »</a></span> </div> - </body> </html> Index: form.html =================================================================== RCS file: /sources/public/html5/markup/form.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- form.html 2 May 2009 09:24:19 -0000 1.3 +++ form.html 3 May 2009 15:59:41 -0000 1.4 @@ -108,6 +108,5 @@ <span class="nav-prev"><a href="footer.html">« footer</a></span> <span class="nav-next"><a href="h1.html">h1 »</a></span> </div> - </body> </html> Index: small.html =================================================================== RCS file: /sources/public/html5/markup/small.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- small.html 2 May 2009 09:24:21 -0000 1.3 +++ small.html 3 May 2009 15:59:43 -0000 1.4 @@ -57,6 +57,5 @@ <span class="nav-prev"><a href="select.html">« select</a></span> <span class="nav-next"><a href="source.html">source »</a></span> </div> - </body> </html> Index: ruby.html =================================================================== RCS file: /sources/public/html5/markup/ruby.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ruby.html 2 May 2009 09:24:21 -0000 1.3 +++ ruby.html 3 May 2009 15:59:42 -0000 1.4 @@ -57,6 +57,5 @@ <span class="nav-prev"><a href="rt.html">« rt</a></span> <span class="nav-next"><a href="samp.html">samp »</a></span> </div> - </body> </html> Index: ol.html =================================================================== RCS file: /sources/public/html5/markup/ol.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ol.html 2 May 2009 09:24:21 -0000 1.3 +++ ol.html 3 May 2009 15:59:42 -0000 1.4 @@ -72,6 +72,5 @@ <span class="nav-prev"><a href="object.html">« object</a></span> <span class="nav-next"><a href="optgroup.html">optgroup »</a></span> </div> - </body> </html> Index: article.html =================================================================== RCS file: /sources/public/html5/markup/article.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- article.html 3 May 2009 14:07:16 -0000 1.5 +++ article.html 3 May 2009 15:59:39 -0000 1.6 @@ -40,9 +40,6 @@ <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 @@ -70,6 +67,5 @@ <span class="nav-prev"><a href="area.html">« area</a></span> <span class="nav-next"><a href="aside.html">aside »</a></span> </div> - </body> </html> Index: dialog.html =================================================================== RCS file: /sources/public/html5/markup/dialog.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dialog.html 2 May 2009 09:24:19 -0000 1.3 +++ dialog.html 3 May 2009 15:59:40 -0000 1.4 @@ -56,6 +56,5 @@ <span class="nav-prev"><a href="dfn.html">« dfn</a></span> <span class="nav-next"><a href="div.html">div »</a></span> </div> - </body> </html> Index: elements.html =================================================================== RCS file: /sources/public/html5/markup/elements.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- elements.html 3 May 2009 14:07:16 -0000 1.6 +++ elements.html 3 May 2009 15:59:40 -0000 1.7 @@ -12,8 +12,7 @@ <span class="nav-next"><a href="common-models.html">common-models »</a></span> </div> <div id="elements" class="section"> - <h2>6. HTML elements <a class="hash" href="#elements">#</a> <a class="toc-bak" href="Overview.html#elements-toc">T</a></h2> - <div class="toc"> + <h2>6. HTML elements <a class="hash" href="#elements">#</a> <a class="toc-bak" href="Overview.html#elements-toc">T</a></h2><div class="toc"> <ul> <li id="a-toc"><a href="a.html#a"><span class="element">a</span> – <span class="shortdesc">hyperlink</span></a> </li> @@ -119,6 +118,8 @@ </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> @@ -292,277 +293,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - </div> + </div> <hr class="footerbreak"></hr> <div class="nav"> <span class="nav-prev"><a href="syntax.html">« syntax</a></span> <span class="nav-next"><a href="common-models.html">common-models »</a></span> </div> - </body> </html> Index: colgroup.html =================================================================== RCS file: /sources/public/html5/markup/colgroup.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- colgroup.html 2 May 2009 09:24:18 -0000 1.3 +++ colgroup.html 3 May 2009 15:59:40 -0000 1.4 @@ -77,6 +77,5 @@ <span class="nav-prev"><a href="col.html">« col</a></span> <span class="nav-next"><a href="command.html">command »</a></span> </div> - </body> </html> Index: dl.html =================================================================== RCS file: /sources/public/html5/markup/dl.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- dl.html 2 May 2009 09:24:19 -0000 1.3 +++ dl.html 3 May 2009 15:59:40 -0000 1.4 @@ -62,6 +62,5 @@ <span class="nav-prev"><a href="div.html">« div</a></span> <span class="nav-next"><a href="dt.html">dt »</a></span> </div> - </body> </html> Index: thead.html =================================================================== RCS file: /sources/public/html5/markup/thead.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- thead.html 2 May 2009 09:24:22 -0000 1.3 +++ thead.html 3 May 2009 15:59:43 -0000 1.4 @@ -67,6 +67,5 @@ <span class="nav-prev"><a href="th.html">« th</a></span> <span class="nav-next"><a href="time.html">time »</a></span> </div> - </body> </html> Index: tbody.html =================================================================== RCS file: /sources/public/html5/markup/tbody.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tbody.html 2 May 2009 09:24:22 -0000 1.3 +++ tbody.html 3 May 2009 15:59:43 -0000 1.4 @@ -71,6 +71,5 @@ <span class="nav-prev"><a href="table.html">« table</a></span> <span class="nav-next"><a href="td.html">td »</a></span> </div> - </body> </html> Index: video.html =================================================================== RCS file: /sources/public/html5/markup/video.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- video.html 2 May 2009 09:24:22 -0000 1.3 +++ video.html 3 May 2009 15:59:43 -0000 1.4 @@ -107,6 +107,5 @@ <span class="nav-prev"><a href="var.html">« var</a></span> <span class="nav-next"><a href="common-models.html">common-models »</a></span> </div> - </body> </html> Index: source.html =================================================================== RCS file: /sources/public/html5/markup/source.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- source.html 2 May 2009 09:24:21 -0000 1.3 +++ source.html 3 May 2009 15:59:43 -0000 1.4 @@ -108,6 +108,5 @@ <span class="nav-prev"><a href="small.html">« small</a></span> <span class="nav-next"><a href="span.html">span »</a></span> </div> - </body> </html> Index: button.reset.html =================================================================== RCS file: /sources/public/html5/markup/button.reset.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- button.reset.html 2 May 2009 09:24:18 -0000 1.3 +++ button.reset.html 3 May 2009 15:59:40 -0000 1.4 @@ -84,6 +84,5 @@ <span class="nav-prev"><a href="button.submit.html">« button.submit</a></span> <span class="nav-next"><a href="button.button.html">button.button »</a></span> </div> - </body> </html> Index: meta.charset.html =================================================================== RCS file: /sources/public/html5/markup/meta.charset.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- meta.charset.html 2 May 2009 09:24:20 -0000 1.3 +++ meta.charset.html 3 May 2009 15:59:42 -0000 1.4 @@ -92,6 +92,5 @@ <span class="nav-prev"><a href="meta.http-equiv.default-style.html">« meta.http-equiv.default-style</a></span> <span class="nav-next"><a href="meta.http-equiv.content-type.html">meta.http-equiv.content-type »</a></span> </div> - </body> </html> Index: output.html =================================================================== RCS file: /sources/public/html5/markup/output.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- output.html 2 May 2009 09:24:21 -0000 1.3 +++ output.html 3 May 2009 15:59:42 -0000 1.4 @@ -64,6 +64,5 @@ <span class="nav-prev"><a href="option.html">« option</a></span> <span class="nav-next"><a href="p.html">p »</a></span> </div> - </body> </html> Index: i.html =================================================================== RCS file: /sources/public/html5/markup/i.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- i.html 2 May 2009 09:24:19 -0000 1.3 +++ i.html 3 May 2009 15:59:41 -0000 1.4 @@ -58,6 +58,5 @@ <span class="nav-prev"><a href="html.html">« html</a></span> <span class="nav-next"><a href="iframe.html">iframe »</a></span> </div> - </body> </html> Index: input.submit.html =================================================================== RCS file: /sources/public/html5/markup/input.submit.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.submit.html 2 May 2009 09:24:20 -0000 1.3 +++ input.submit.html 3 May 2009 15:59:42 -0000 1.4 @@ -95,6 +95,5 @@ <span class="nav-prev"><a href="input.button.html">« input.button</a></span> <span class="nav-next"><a href="input.reset.html">input.reset »</a></span> </div> - </body> </html> Index: input.date.html =================================================================== RCS file: /sources/public/html5/markup/input.date.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.date.html 2 May 2009 09:24:19 -0000 1.3 +++ input.date.html 3 May 2009 15:59:41 -0000 1.4 @@ -113,6 +113,5 @@ <span class="nav-prev"><a href="input.datetime-local.html">« input.datetime-local</a></span> <span class="nav-next"><a href="input.month.html">input.month »</a></span> </div> - </body> </html> Index: var.html =================================================================== RCS file: /sources/public/html5/markup/var.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- var.html 2 May 2009 09:24:22 -0000 1.3 +++ var.html 3 May 2009 15:59:43 -0000 1.4 @@ -58,6 +58,5 @@ <span class="nav-prev"><a href="ul.html">« ul</a></span> <span class="nav-next"><a href="video.html">video »</a></span> </div> - </body> </html> Index: sub.html =================================================================== RCS file: /sources/public/html5/markup/sub.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sub.html 2 May 2009 09:24:21 -0000 1.3 +++ sub.html 3 May 2009 15:59:43 -0000 1.4 @@ -56,6 +56,5 @@ <span class="nav-prev"><a href="style.html">« style</a></span> <span class="nav-next"><a href="sup.html">sup »</a></span> </div> - </body> </html> Index: title.html =================================================================== RCS file: /sources/public/html5/markup/title.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- title.html 2 May 2009 09:24:22 -0000 1.3 +++ title.html 3 May 2009 15:59:43 -0000 1.4 @@ -56,6 +56,5 @@ <span class="nav-prev"><a href="time.html">« time</a></span> <span class="nav-next"><a href="tr.html">tr »</a></span> </div> - </body> </html> Index: pre.html =================================================================== RCS file: /sources/public/html5/markup/pre.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pre.html 2 May 2009 09:24:21 -0000 1.3 +++ pre.html 3 May 2009 15:59:42 -0000 1.4 @@ -58,6 +58,5 @@ <span class="nav-prev"><a href="param.html">« param</a></span> <span class="nav-next"><a href="progress.html">progress »</a></span> </div> - </body> </html> Index: button.submit.html =================================================================== RCS file: /sources/public/html5/markup/button.submit.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- button.submit.html 2 May 2009 09:24:18 -0000 1.3 +++ button.submit.html 3 May 2009 15:59:40 -0000 1.4 @@ -89,6 +89,5 @@ <span class="nav-prev"><a href="button.html">« button</a></span> <span class="nav-next"><a href="button.reset.html">button.reset »</a></span> </div> - </body> </html> Index: rp.html =================================================================== RCS file: /sources/public/html5/markup/rp.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- rp.html 2 May 2009 09:24:21 -0000 1.3 +++ rp.html 3 May 2009 15:59:42 -0000 1.4 @@ -67,6 +67,5 @@ <span class="nav-prev"><a href="q.html">« q</a></span> <span class="nav-next"><a href="rt.html">rt »</a></span> </div> - </body> </html> Index: sup.html =================================================================== RCS file: /sources/public/html5/markup/sup.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sup.html 2 May 2009 09:24:21 -0000 1.3 +++ sup.html 3 May 2009 15:59:43 -0000 1.4 @@ -56,6 +56,5 @@ <span class="nav-prev"><a href="sub.html">« sub</a></span> <span class="nav-next"><a href="table.html">table »</a></span> </div> - </body> </html> Index: details.html =================================================================== RCS file: /sources/public/html5/markup/details.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- details.html 2 May 2009 09:24:19 -0000 1.3 +++ details.html 3 May 2009 15:59:40 -0000 1.4 @@ -78,6 +78,5 @@ <span class="nav-prev"><a href="del.html">« del</a></span> <span class="nav-next"><a href="dfn.html">dfn »</a></span> </div> - </body> </html> Index: input.url.html =================================================================== RCS file: /sources/public/html5/markup/input.url.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- input.url.html 2 May 2009 09:24:20 -0000 1.3 +++ input.url.html 3 May 2009 15:59:42 -0000 1.4 @@ -103,6 +103,5 @@ <span class="nav-prev"><a href="input.email.html">« input.email</a></span> <span class="nav-next"><a href="input.search.html">input.search »</a></span> </div> - </body> </html> Index: shared-attributes.html =================================================================== RCS file: /sources/public/html5/markup/shared-attributes.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- shared-attributes.html 2 May 2009 09:24:21 -0000 1.1 +++ shared-attributes.html 3 May 2009 15:59:43 -0000 1.2 @@ -151,6 +151,5 @@ <span class="nav-prev"><a href="common-attributes.html">« common-attributes</a></span> <span class="nav-next"><a href="datatypes.html">datatypes »</a></span> </div> - </body> </html> Index: hgroup.html =================================================================== RCS file: /sources/public/html5/markup/hgroup.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- hgroup.html 2 May 2009 09:24:19 -0000 1.3 +++ hgroup.html 3 May 2009 15:59:41 -0000 1.4 @@ -53,6 +53,5 @@ <span class="nav-prev"><a href="header.html">« header</a></span> <span class="nav-next"><a href="hr.html">hr »</a></span> </div> - </body> </html> Index: h5.html =================================================================== RCS file: /sources/public/html5/markup/h5.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- h5.html 3 May 2009 14:07:16 -0000 1.5 +++ h5.html 3 May 2009 15:59:41 -0000 1.6 @@ -57,7 +57,13 @@ <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></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> </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> @@ -68,6 +74,5 @@ <span class="nav-prev"><a href="h4.html">« h4</a></span> <span class="nav-next"><a href="h6.html">h6 »</a></span> </div> - </body> </html>
Received on Sunday, 3 May 2009 16:00:54 UTC