- From: poot <cvsmail@w3.org>
- Date: Fri, 29 Jan 2010 07:27:11 +0900 (JST)
- To: public-html-diffs@w3.org
mike: update http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.110&r2=1.111&f=h =================================================================== RCS file: /sources/public/html5/markup/Overview.html,v retrieving revision 1.362 retrieving revision 1.363 diff -u -d -r1.362 -r1.363 --- Overview.html 28 Jan 2010 17:57:24 -0000 1.362 +++ Overview.html 28 Jan 2010 22:26:43 -0000 1.363 @@ -83,21 +83,20 @@ lack complete documentation in the following subsections:</p> <dl class="status-missing"> <dt><span class="section-title-ref">Examples</span></dt> - <dd>The documentation for each element will eventually have + <dd>The documentation for each element ideally have at least one conformant example and at least one non-conformant example.</dd> <dt><span class="section-title-ref">Details</span></dt> <dd>The purpose of this subsection is to provide, where needed, additional details about the semantics of the element and its attributes.</dd> - <dt><span class="section-title-ref">Additional constraints</span></dt> + <dt><span class="section-title-ref">Additional constraints and admonitions</span></dt> <dd>This purpose of this subsection is to provide, where - needed, additional document-conformance constraints for - the element and its attributes (in addition to those - already documented in the + needed, additional document-conformance constraints and + usage admonitions for the element and its attributes (in + addition to those already documented in the <i>Content model</i>, <i>Attribute model</i>, - <i>Assertions</i>, <i>Tag omission</i>, and <i>Permitted contexts</i> Index: meta.name.html =================================================================== RCS file: /sources/public/html5/markup/meta.name.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- meta.name.html 28 Jan 2010 17:11:51 -0000 1.17 +++ meta.name.html 28 Jan 2010 22:26:44 -0000 1.18 @@ -29,10 +29,9 @@ </div><div class="no-number no-toc" id="meta.name-attr-mdl"> <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.name-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><a href="meta.name.html#meta.name.attrs">meta.name.attrs</a> = <span class="pattern" id="meta.name.attrs"><a class="ref" href=".html#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="meta.name.html#meta.name.attrs">meta.name.attrs</a> = <span class="pattern" id="meta.name.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="meta.name.html#meta.name.attrs.name" title="meta.name.attrs.name">name</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="meta.name.html#meta.name.attrs.content" title="meta.name.attrs.content">content</a></span></p></div></div> <div class="no-number no-toc" id="meta.name-attributes"> Index: meta.http-equiv.content-type.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- meta.http-equiv.content-type.html 28 Jan 2010 22:13:51 -0000 1.20 +++ meta.http-equiv.content-type.html 28 Jan 2010 22:26:44 -0000 1.21 @@ -30,10 +30,9 @@ </div><div class="no-number no-toc" id="meta.http-equiv.content-type-attr-mdl"> <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.content-type-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><a href="meta.http-equiv.content-type.html#meta.http-equiv.content-type.attrs">meta.http-equiv.content-type.attrs</a> = <span class="pattern" id="meta.http-equiv.content-type.attrs"><a class="ref" href=".html#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="meta.http-equiv.content-type.html#meta.http-equiv.content-type.attrs">meta.http-equiv.content-type.attrs</a> = <span class="pattern" id="meta.http-equiv.content-type.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.http-equiv.content-type" title="meta.http-equiv.attrs.http-equiv.content-type">http-equiv.content-type</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.attrs.content.content-type" title="meta.http-equiv.attrs.content.content-type">content.content-type</a></span></p></div></div> <div class="no-number no-toc" id="meta.http-equiv.content-type-attributes"> Index: meta.http-equiv.content-language.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.content-language.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- meta.http-equiv.content-language.html 28 Jan 2010 22:13:51 -0000 1.13 +++ meta.http-equiv.content-language.html 28 Jan 2010 22:26:44 -0000 1.14 @@ -30,10 +30,9 @@ </div><div class="no-number no-toc" id="meta.http-equiv.content-language-attr-mdl"> <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.content-language-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><a href="meta.http-equiv.content-language.html#meta.http-equiv.content-language.attrs">meta.http-equiv.content-language.attrs</a> = <span class="pattern" id="meta.http-equiv.content-language.attrs"><a class="ref" href=".html#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="meta.http-equiv.content-language.html#meta.http-equiv.content-language.attrs">meta.http-equiv.content-language.attrs</a> = <span class="pattern" id="meta.http-equiv.content-language.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language">http-equiv.content-language</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language">content.content-language</a></span></p></div></div> <div class="no-number no-toc" id="meta.http-equiv.content-language-attributes"> Index: meta.http-equiv.default-style.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- meta.http-equiv.default-style.html 28 Jan 2010 17:11:50 -0000 1.17 +++ meta.http-equiv.default-style.html 28 Jan 2010 22:26:44 -0000 1.18 @@ -30,10 +30,9 @@ </div><div class="no-number no-toc" id="meta.http-equiv.default-style-attr-mdl"> <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.default-style-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><a href="meta.http-equiv.default-style.html#meta.http-equiv.default-style.attrs">meta.http-equiv.default-style.attrs</a> = <span class="pattern" id="meta.http-equiv.default-style.attrs"><a class="ref" href=".html#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="meta.http-equiv.default-style.html#meta.http-equiv.default-style.attrs">meta.http-equiv.default-style.attrs</a> = <span class="pattern" id="meta.http-equiv.default-style.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.http-equiv.default-style" title="meta.http-equiv.attrs.http-equiv.default-style">http-equiv.default-style</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.attrs.content.default-style" title="meta.http-equiv.attrs.content.default-style">content.default-style</a></span></p></div></div> <div class="no-number no-toc" id="meta.http-equiv.default-style-attributes"> Index: schema.html =================================================================== RCS file: /sources/public/html5/markup/schema.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- schema.html 28 Jan 2010 17:11:51 -0000 1.2 +++ schema.html 28 Jan 2010 22:26:44 -0000 1.3 @@ -847,10 +847,9 @@ </div> <div class='define' id='meta.name.attrs-define'> <div class='patternname' id='the-meta.name.attrs'><a href='#the-meta.name.attrs'>meta.name.attrs</a> =</div> - <span class='pattern' id='meta.name.attrs'><a class='ref' href='#common.attrs.basic' title='common.attrs.basic'>common.attrs.basic</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.i18n' title='common.attrs.i18n'>common.attrs.i18n</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.present' title='common.attrs.present'>common.attrs.present</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> empty + <span class='pattern' id='meta.name.attrs'><a class='ref' href='#common.attrs.core' title='common.attrs.core'>common.attrs.core</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.event-handler' title='common.attrs.event-handler'>common.attrs.event-handler</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.xml' title='common.attrs.xml'>common.attrs.xml</a> <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#meta.name.attrs.name' title='meta.name.attrs.name'>name</a> <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#meta.name.attrs.content' title='meta.name.attrs.content'>content</a></span> </div> @@ -880,10 +879,9 @@ </div> <div class='define' id='meta.http-equiv.refresh.attrs-define'> <div class='patternname' id='the-meta.http-equiv.refresh.attrs'><a href='#the-meta.http-equiv.refresh.attrs'>meta.http-equiv.refresh.attrs</a> =</div> - <span class='pattern' id='meta.http-equiv.refresh.attrs'><a class='ref' href='#common.attrs.basic' title='common.attrs.basic'>common.attrs.basic</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.i18n' title='common.attrs.i18n'>common.attrs.i18n</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.present' title='common.attrs.present'>common.attrs.present</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> empty + <span class='pattern' id='meta.http-equiv.refresh.attrs'><a class='ref' href='#common.attrs.core' title='common.attrs.core'>common.attrs.core</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.event-handler' title='common.attrs.event-handler'>common.attrs.event-handler</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.xml' title='common.attrs.xml'>common.attrs.xml</a> <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#meta.http-equiv.attrs.http-equiv.refresh' title='meta.http-equiv.attrs.http-equiv.refresh'>http-equiv.refresh</a> <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#meta.http-equiv.attrs.content.refresh' title='meta.http-equiv.attrs.content.refresh'>content.refresh</a></span> </div> @@ -915,10 +913,9 @@ </div> <div class='define' id='meta.http-equiv.default-style.attrs-define'> <div class='patternname' id='the-meta.http-equiv.default-style.attrs'><a href='#the-meta.http-equiv.default-style.attrs'>meta.http-equiv.default-style.attrs</a> =</div> - <span class='pattern' id='meta.http-equiv.default-style.attrs'><a class='ref' href='#common.attrs.basic' title='common.attrs.basic'>common.attrs.basic</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.i18n' title='common.attrs.i18n'>common.attrs.i18n</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.present' title='common.attrs.present'>common.attrs.present</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> empty + <span class='pattern' id='meta.http-equiv.default-style.attrs'><a class='ref' href='#common.attrs.core' title='common.attrs.core'>common.attrs.core</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.event-handler' title='common.attrs.event-handler'>common.attrs.event-handler</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.xml' title='common.attrs.xml'>common.attrs.xml</a> <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#meta.http-equiv.attrs.http-equiv.default-style' title='meta.http-equiv.attrs.http-equiv.default-style'>http-equiv.default-style</a> <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#meta.http-equiv.attrs.content.default-style' title='meta.http-equiv.attrs.content.default-style'>content.default-style</a></span> </div> @@ -950,10 +947,9 @@ </div> <div class='define' id='meta.http-equiv.content-language.attrs-define'> <div class='patternname' id='the-meta.http-equiv.content-language.attrs'><a href='#the-meta.http-equiv.content-language.attrs'>meta.http-equiv.content-language.attrs</a> =</div> - <span class='pattern' id='meta.http-equiv.content-language.attrs'><a class='ref' href='#common.attrs.basic' title='common.attrs.basic'>common.attrs.basic</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.i18n' title='common.attrs.i18n'>common.attrs.i18n</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.present' title='common.attrs.present'>common.attrs.present</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> empty + <span class='pattern' id='meta.http-equiv.content-language.attrs'><a class='ref' href='#common.attrs.core' title='common.attrs.core'>common.attrs.core</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.event-handler' title='common.attrs.event-handler'>common.attrs.event-handler</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.xml' title='common.attrs.xml'>common.attrs.xml</a> <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#meta.http-equiv.attrs.http-equiv.content-language' title='meta.http-equiv.attrs.http-equiv.content-language'>http-equiv.content-language</a> <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#meta.http-equiv.attrs.content.content-language' title='meta.http-equiv.attrs.content.content-language'>content.content-language</a></span> </div> @@ -985,10 +981,9 @@ </div> <div class='define' id='meta.charset.attrs-define'> <div class='patternname' id='the-meta.charset.attrs'><a href='#the-meta.charset.attrs'>meta.charset.attrs</a> =</div> - <span class='pattern' id='meta.charset.attrs'><a class='ref' href='#common.attrs.basic' title='common.attrs.basic'>common.attrs.basic</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.i18n' title='common.attrs.i18n'>common.attrs.i18n</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.present' title='common.attrs.present'>common.attrs.present</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> empty + <span class='pattern' id='meta.charset.attrs'><a class='ref' href='#common.attrs.core' title='common.attrs.core'>common.attrs.core</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.event-handler' title='common.attrs.event-handler'>common.attrs.event-handler</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.xml' title='common.attrs.xml'>common.attrs.xml</a> <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#meta.charset.attrs.charset' title='meta.charset.attrs.charset'>charset</a></span> </div> <div class='define' id='meta.charset.attrs.charset-define'> @@ -1013,10 +1008,9 @@ </div> <div class='define' id='meta.http-equiv.content-type.attrs-define'> <div class='patternname' id='the-meta.http-equiv.content-type.attrs'><a href='#the-meta.http-equiv.content-type.attrs'>meta.http-equiv.content-type.attrs</a> =</div> - <span class='pattern' id='meta.http-equiv.content-type.attrs'><a class='ref' href='#common.attrs.basic' title='common.attrs.basic'>common.attrs.basic</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.i18n' title='common.attrs.i18n'>common.attrs.i18n</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.present' title='common.attrs.present'>common.attrs.present</a> - <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> empty + <span class='pattern' id='meta.http-equiv.content-type.attrs'><a class='ref' href='#common.attrs.core' title='common.attrs.core'>common.attrs.core</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.event-handler' title='common.attrs.event-handler'>common.attrs.event-handler</a> + <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#common.attrs.xml' title='common.attrs.xml'>common.attrs.xml</a> <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#meta.http-equiv.attrs.http-equiv.content-type' title='meta.http-equiv.attrs.http-equiv.content-type'>http-equiv.content-type</a> <a href='#interleave' title='INTERLEAVED IN ANY ORDER' class='rnc-symbol'>&</a> <a class='ref' href='#meta.http-equiv.attrs.content.content-type' title='meta.http-equiv.attrs.content.content-type'>content.content-type</a></span> </div> Index: meta.http-equiv.refresh.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.refresh.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- meta.http-equiv.refresh.html 28 Jan 2010 17:11:51 -0000 1.15 +++ meta.http-equiv.refresh.html 28 Jan 2010 22:26:44 -0000 1.16 @@ -34,10 +34,9 @@ </div><div class="no-number no-toc" id="meta.http-equiv.refresh-attr-mdl"> <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.refresh-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><a href="meta.http-equiv.refresh.html#meta.http-equiv.refresh.attrs">meta.http-equiv.refresh.attrs</a> = <span class="pattern" id="meta.http-equiv.refresh.attrs"><a class="ref" href=".html#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="meta.http-equiv.refresh.html#meta.http-equiv.refresh.attrs">meta.http-equiv.refresh.attrs</a> = <span class="pattern" id="meta.http-equiv.refresh.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.http-equiv.refresh" title="meta.http-equiv.attrs.http-equiv.refresh">http-equiv.refresh</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.attrs.content.refresh" title="meta.http-equiv.attrs.content.refresh">content.refresh</a></span></p></div></div> <div class="no-number no-toc" id="meta.http-equiv.refresh-attributes"> Index: patch-schema =================================================================== RCS file: /sources/public/html5/markup/patch-schema,v retrieving revision 1.79 retrieving revision 1.80 diff -u -d -r1.79 -r1.80 --- patch-schema 28 Jan 2010 17:11:51 -0000 1.79 +++ patch-schema 28 Jan 2010 22:26:44 -0000 1.80 @@ -744,7 +744,74 @@ common.elem.metadata |= style.elem -@@ -297,11 +318,8 @@ +@@ -190,10 +211,9 @@ + meta.name.elem = + element meta { meta.inner & meta.name.attrs } + meta.name.attrs = +- ( common.attrs.basic +- & common.attrs.i18n +- & common.attrs.present +- & common.attrs.other ++ ( common.attrs.core ++ & common.attrs.event-handler ++ & common.attrs.xml + & meta.name.attrs.name + & meta.name.attrs.content + ) +@@ -215,10 +235,9 @@ + meta.http-equiv.refresh.elem = + element meta { meta.inner & meta.http-equiv.refresh.attrs } + meta.http-equiv.refresh.attrs = +- ( common.attrs.basic +- & common.attrs.i18n +- & common.attrs.present +- & common.attrs.other ++ ( common.attrs.core ++ & common.attrs.event-handler ++ & common.attrs.xml + & meta.http-equiv.attrs.http-equiv.refresh + & meta.http-equiv.attrs.content.refresh + ) +@@ -239,10 +258,9 @@ + meta.http-equiv.default-style.elem = + element meta { meta.inner & meta.http-equiv.default-style.attrs } + meta.http-equiv.default-style.attrs = +- ( common.attrs.basic +- & common.attrs.i18n +- & common.attrs.present +- & common.attrs.other ++ ( common.attrs.core ++ & common.attrs.event-handler ++ & common.attrs.xml + & meta.http-equiv.attrs.http-equiv.default-style + & meta.http-equiv.attrs.content.default-style + ) +@@ -264,10 +282,9 @@ + meta.http-equiv.content-language.elem = + element meta { meta.inner & meta.http-equiv.content-language.attrs } + meta.http-equiv.content-language.attrs = +- ( common.attrs.basic +- & common.attrs.i18n +- & common.attrs.present +- & common.attrs.other ++ ( common.attrs.core ++ & common.attrs.event-handler ++ & common.attrs.xml + & meta.http-equiv.attrs.http-equiv.content-language + & meta.http-equiv.attrs.content.content-language + ) +@@ -289,19 +306,15 @@ + meta.charset.elem = + element meta { meta.inner & meta.charset.attrs } + meta.charset.attrs = +- ( common.attrs.basic +- & common.attrs.i18n +- & common.attrs.present +- & common.attrs.other ++ ( common.attrs.core ++ & common.attrs.event-handler ++ & common.attrs.xml + & meta.charset.attrs.charset ) meta.charset.attrs.charset = attribute charset { @@ -758,7 +825,21 @@ ## Inline Character Encoding Statement for HTML: <meta http-equiv='content-type'> -@@ -325,4 +343,5 @@ +@@ -309,10 +322,9 @@ + element meta { meta.inner & meta.http-equiv.content-type.attrs } + & HTMLonly + meta.http-equiv.content-type.attrs = +- ( common.attrs.basic +- & common.attrs.i18n +- & common.attrs.present +- & common.attrs.other ++ ( common.attrs.core ++ & common.attrs.event-handler ++ & common.attrs.xml + & meta.http-equiv.attrs.http-equiv.content-type + & meta.http-equiv.attrs.content.content-type + ) +@@ -325,4 +337,5 @@ common.data.meta-charset } Index: spec.html =================================================================== RCS file: /sources/public/html5/markup/spec.html,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- spec.html 28 Jan 2010 22:13:51 -0000 1.110 +++ spec.html 28 Jan 2010 22:26:44 -0000 1.111 @@ -82,21 +82,20 @@ lack complete documentation in the following subsections:</p> <dl class="status-missing"> <dt><span class="section-title-ref">Examples</span></dt> - <dd>The documentation for each element will eventually have + <dd>The documentation for each element ideally have at least one conformant example and at least one non-conformant example.</dd> <dt><span class="section-title-ref">Details</span></dt> <dd>The purpose of this subsection is to provide, where needed, additional details about the semantics of the element and its attributes.</dd> - <dt><span class="section-title-ref">Additional constraints</span></dt> + <dt><span class="section-title-ref">Additional constraints and admonitions</span></dt> <dd>This purpose of this subsection is to provide, where - needed, additional document-conformance constraints for - the element and its attributes (in addition to those - already documented in the + needed, additional document-conformance constraints and + usage admonitions for the element and its attributes (in + addition to those already documented in the <i>Content model</i>, <i>Attribute model</i>, - <i>Assertions</i>, <i>Tag omission</i>, and <i>Permitted contexts</i> @@ -10842,10 +10841,9 @@ <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.name-attr-mdl">#</a> </h2> <div class="attr-content-models"> - <p><a href="#meta.name.attrs">meta.name.attrs</a> = <span class="pattern" id="meta.name.attrs"><a class="ref" href="#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="#meta.name.attrs">meta.name.attrs</a> = <span class="pattern" id="meta.name.attrs"><a class="ref" href="#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#meta.name.attrs.name" title="meta.name.attrs.name">name</a> <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#meta.name.attrs.content" title="meta.name.attrs.content">content</a></span></p> </div> @@ -10955,10 +10953,9 @@ <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.refresh-attr-mdl">#</a> </h2> <div class="attr-content-models"> - <p><a href="#meta.http-equiv.refresh.attrs">meta.http-equiv.refresh.attrs</a> = <span class="pattern" id="meta.http-equiv.refresh.attrs"><a class="ref" href="#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="#meta.http-equiv.refresh.attrs">meta.http-equiv.refresh.attrs</a> = <span class="pattern" id="meta.http-equiv.refresh.attrs"><a class="ref" href="#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#meta.http-equiv.attrs.http-equiv.refresh" title="meta.http-equiv.attrs.http-equiv.refresh">http-equiv.refresh</a> <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#meta.http-equiv.attrs.content.refresh" title="meta.http-equiv.attrs.content.refresh">content.refresh</a></span></p> </div> @@ -11053,10 +11050,9 @@ <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.default-style-attr-mdl">#</a> </h2> <div class="attr-content-models"> - <p><a href="#meta.http-equiv.default-style.attrs">meta.http-equiv.default-style.attrs</a> = <span class="pattern" id="meta.http-equiv.default-style.attrs"><a class="ref" href="#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="#meta.http-equiv.default-style.attrs">meta.http-equiv.default-style.attrs</a> = <span class="pattern" id="meta.http-equiv.default-style.attrs"><a class="ref" href="#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#meta.http-equiv.attrs.http-equiv.default-style" title="meta.http-equiv.attrs.http-equiv.default-style">http-equiv.default-style</a> <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#meta.http-equiv.attrs.content.default-style" title="meta.http-equiv.attrs.content.default-style">content.default-style</a></span></p> </div> @@ -11151,10 +11147,9 @@ <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.content-language-attr-mdl">#</a> </h2> <div class="attr-content-models"> - <p><a href="#meta.http-equiv.content-language.attrs">meta.http-equiv.content-language.attrs</a> = <span class="pattern" id="meta.http-equiv.content-language.attrs"><a class="ref" href="#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="#meta.http-equiv.content-language.attrs">meta.http-equiv.content-language.attrs</a> = <span class="pattern" id="meta.http-equiv.content-language.attrs"><a class="ref" href="#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language">http-equiv.content-language</a> <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language">content.content-language</a></span></p> </div> @@ -11242,10 +11237,9 @@ <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.charset-attr-mdl">#</a> </h2> <div class="attr-content-models"> - <p><a href="#meta.charset.attrs">meta.charset.attrs</a> = <span class="pattern" id="meta.charset.attrs"><a class="ref" href="#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="#meta.charset.attrs">meta.charset.attrs</a> = <span class="pattern" id="meta.charset.attrs"><a class="ref" href="#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#meta.charset.attrs.charset" title="meta.charset.attrs.charset">charset</a></span></p> </div> </div> @@ -11335,10 +11329,9 @@ <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.http-equiv.content-type-attr-mdl">#</a> </h2> <div class="attr-content-models"> - <p><a href="#meta.http-equiv.content-type.attrs">meta.http-equiv.content-type.attrs</a> = <span class="pattern" id="meta.http-equiv.content-type.attrs"><a class="ref" href="#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="#meta.http-equiv.content-type.attrs">meta.http-equiv.content-type.attrs</a> = <span class="pattern" id="meta.http-equiv.content-type.attrs"><a class="ref" href="#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#meta.http-equiv.attrs.http-equiv.content-type" title="meta.http-equiv.attrs.http-equiv.content-type">http-equiv.content-type</a> <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="#meta.http-equiv.attrs.content.content-type" title="meta.http-equiv.attrs.content.content-type">content.content-type</a></span></p> </div> Index: meta.charset.html =================================================================== RCS file: /sources/public/html5/markup/meta.charset.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- meta.charset.html 28 Jan 2010 22:13:51 -0000 1.20 +++ meta.charset.html 28 Jan 2010 22:26:44 -0000 1.21 @@ -30,10 +30,9 @@ </div><div class="no-number no-toc" id="meta.charset-attr-mdl"> <h2 class="element-subhead">Attribute model <a class="hash" href="#meta.charset-attr-mdl">#</a></h2> <div class="attr-content-models"> - <p><a href="meta.charset.html#meta.charset.attrs">meta.charset.attrs</a> = <span class="pattern" id="meta.charset.attrs"><a class="ref" href=".html#common.attrs.basic" title="common.attrs.basic">common.attrs.basic</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.i18n" title="common.attrs.i18n">common.attrs.i18n</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href=".html#common.attrs.present" title="common.attrs.present">common.attrs.present</a> - <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> empty + <p><a href="meta.charset.html#meta.charset.attrs">meta.charset.attrs</a> = <span class="pattern" id="meta.charset.attrs"><a class="ref" href="common-attributes.html#common.attrs.core" title="common.attrs.core">common.attrs.core</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.event-handler" title="common.attrs.event-handler">common.attrs.event-handler</a> + <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="common-attributes.html#common.attrs.xml" title="common.attrs.xml">common.attrs.xml</a> <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&</a> <a class="ref" href="meta.charset.html#meta.charset.attrs.charset" title="meta.charset.attrs.charset">charset</a></span></p></div></div> <div class="no-number no-toc" id="meta.charset-attributes"> <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#meta.charset-attributes">#</a></h2>
Received on Thursday, 28 January 2010 22:27:42 UTC