- From: poot <cvsmail@w3.org>
- Date: Sat, 30 Apr 2011 11:54:35 -0400
- To: public-html-diffs@w3.org
mike: Make meta Content-Language non-conforming. http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.312&r2=1.313&f=h =================================================================== RCS file: /sources/public/html5/markup/Overview.html,v retrieving revision 1.483 retrieving revision 1.484 diff -u -d -r1.483 -r1.484 --- Overview.html 30 Apr 2011 12:33:21 -0000 1.483 +++ Overview.html 30 Apr 2011 15:48:49 -0000 1.484 @@ -15,7 +15,7 @@ <div><img src="HTML5_Badge_128.png" alt="5"></div> <h1>HTML: The Markup Language</h1> <h3 id="subtitle">An HTML language reference and front-end for the HTML specification</h3> -<h2>Unofficial Editor’s Draft <em>30 April 2011</em> +<h2>Unofficial Editor’s Draft <em>1 May 2011</em> </h2> <dl> <dt>Editors:</dt> @@ -70,7 +70,7 @@ <h2>Status of this Document </h2> <p> - This document is the 30 April 2011 Editor’s Draft of + This document is the 1 May 2011 Editor’s Draft of <cite>HTML: The Markup Language</cite>. If you’d like to comment on this document, the preferred @@ -475,9 +475,6 @@ <li id="meta.http-equiv.default-style-toc"> <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-http-equiv-default-style">ⓘ</a></span> <a href="meta.http-equiv.default-style.html#meta.http-equiv.default-style"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> – <span class="shortdesc">“preferred stylesheet” pragma directive</span></span></a> </li> -<li id="meta.http-equiv.content-language-toc"> -<span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec/semantics.html#attr-meta-http-equiv-content-language">ⓘ</a></span> <a href="meta.http-equiv.content-language.html#meta.http-equiv.content-language"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> – <span class="shortdesc">“default language” pragma directive</span></span></a> <span class="obsoleted-feature" title="This markup feature has been obsoleted in HTML5.">OBSOLETE</span> -</li> <li id="meta.charset-toc"> <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-charset">ⓘ</a></span> <a href="meta.charset.html#meta.charset"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> – <span class="shortdesc">document character-encoding declaration</span></span></a> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span> </li> Index: table.html =================================================================== RCS file: /sources/public/html5/markup/table.html,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- table.html 30 Apr 2011 14:00:26 -0000 1.90 +++ table.html 30 Apr 2011 15:48:50 -0000 1.91 @@ -91,7 +91,7 @@ in a <span class="element">caption</span> element or in a <span class="element">figure</span> element containing the <span class="element">table</span> element; or, simplify - the structue of the table so that so that no + the structue of the table so that no description is needed. </span></li> <li><span> Index: meta.http-equiv.content-type.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.content-type.html,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- meta.http-equiv.content-type.html 30 Apr 2011 11:35:38 -0000 1.94 +++ meta.http-equiv.content-type.html 30 Apr 2011 15:48:50 -0000 1.95 @@ -36,7 +36,7 @@ <div class="content-models"> <div id="meta.http-equiv.content-type-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref85">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref83">void element</a></span>)</span> </p> </div> </div> @@ -110,7 +110,7 @@ </h2> <p>The <span class="element">meta</span> - element is a <a href="syntax.html#void-element" id="void-element_xref86">void element</a>. + element is a <a href="syntax.html#void-element" id="void-element_xref84">void element</a>. A <span class="element">meta</span> element must have a <span title="syntax-start-tag">start tag</span> Index: global-attributes.html =================================================================== RCS file: /sources/public/html5/markup/global-attributes.html,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- global-attributes.html 30 Apr 2011 14:00:25 -0000 1.47 +++ global-attributes.html 30 Apr 2011 15:48:49 -0000 1.48 @@ -248,7 +248,7 @@ <dt id="common.attrs.lang" title="common.attrs.lang"> <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/elements.html#attr-lang">ⓘ</a> <span class="attribute-name">lang</span> = <span class="attr-values"> - <a href="datatypes.html#common.data.langcode" id="common.data.langcode_xref6">language tag</a> + <a href="datatypes.html#common.data.langcode" id="common.data.langcode_xref5">language tag</a> </span> <a class="hash" href="global-attributes.html#common.attrs.lang">#</a> </dt> @@ -260,7 +260,7 @@ <dd><div class="datatype-desc">A valid <var class="defined-elsewhere">language tag</var> as defined in - <a href="references.html#refsBCP47" id="refsBCP47_xref6">[BCP 47]</a>.</div></dd> + <a href="references.html#refsBCP47" id="refsBCP47_xref5">[BCP 47]</a>.</div></dd> <dt id="common.attrs.spellcheck" title="common.attrs.spellcheck"> <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/editing.html#attr-spellcheck">ⓘ</a> <span class="attribute-name">spellcheck</span> = <span class="attr-values"> @@ -1102,7 +1102,7 @@ <dt id="common.attrs.xmllang" title="common.attrs.xmllang"> <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/elements.html#attr-xml-lang">ⓘ</a> <span class="attribute-name">xml:lang</span> = <span class="attr-values"> - <a href="datatypes.html#common.data.langcode" id="common.data.langcode_xref7">language tag</a> + <a href="datatypes.html#common.data.langcode" id="common.data.langcode_xref6">language tag</a> </span> <a class="hash" href="global-attributes.html#common.attrs.xmllang">#</a> </dt> @@ -1112,7 +1112,7 @@ <dd><div class="datatype-desc">A valid <var class="defined-elsewhere">language tag</var> as defined in - <a href="references.html#refsBCP47" id="refsBCP47_xref7">[BCP 47]</a>.</div></dd> + <a href="references.html#refsBCP47" id="refsBCP47_xref6">[BCP 47]</a>.</div></dd> <dt id="common.attrs.xmlspace" title="common.attrs.xmlspace"> <span class="attribute-name">xml:space</span> = <span class="attr-values"> "preserve" Index: meta.http-equiv.default-style.html =================================================================== RCS file: /sources/public/html5/markup/meta.http-equiv.default-style.html,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- meta.http-equiv.default-style.html 30 Apr 2011 11:35:38 -0000 1.89 +++ meta.http-equiv.default-style.html 30 Apr 2011 15:48:50 -0000 1.90 @@ -6,7 +6,7 @@ <title> meta http-equiv=default-style – “preferred stylesheet” pragma directive - HTML5</title> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="prev" href="meta.http-equiv.refresh.html" title="meta http-equiv=refresh"> -<link rel="next" href="meta.http-equiv.content-language.html" title="meta http-equiv=content-language"> +<link rel="next" href="meta.charset.html" title="meta charset"> <link rel="up" href="Overview.html"> <link rel="contents" href="Overview.html#toc"> <link rel="index" href="index-of-terms.html"> @@ -16,7 +16,7 @@ <h2 class="chunkpagetitle"><a href="Overview.html#toc">HTML: The Markup Language</a></h2> <div class="nav"> <span class="nav-prev"><a href="meta.http-equiv.refresh.html">« meta http-equiv=refresh</a></span> -<span class="nav-next"><a href="meta.http-equiv.content-language.html">meta http-equiv=content-language »</a></span> +<span class="nav-next"><a href="meta.charset.html">meta charset »</a></span> </div> <div class="no-number elementpage section"> <h2 class="element-head"> @@ -121,7 +121,7 @@ <hr class="footerbreak"> <div class="nav"> <span class="nav-prev"><a href="meta.http-equiv.refresh.html">« meta http-equiv=refresh</a></span> -<span class="nav-next"><a href="meta.http-equiv.content-language.html">meta http-equiv=content-language »</a></span> +<span class="nav-next"><a href="meta.charset.html">meta charset »</a></span> </div> <script src="js/jump-indexes.js" type="text/javascript"></script><script src="js/dfn.js" type="text/javascript"></script> </body> Index: schema.html =================================================================== RCS file: /sources/public/html5/markup/schema.html,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- schema.html 30 Apr 2011 14:00:26 -0000 1.37 +++ schema.html 30 Apr 2011 15:48:50 -0000 1.38 @@ -108,7 +108,6 @@ <span class='postfix or'>or</span> <a class='ref' href='#meta.name'>meta.name</a> <span class='postfix or'>or</span> <a class='ref' href='#meta.http-equiv.refresh'>meta.http-equiv.refresh</a> <span class='postfix or'>or</span> <a class='ref' href='#meta.http-equiv.default-style'>meta.http-equiv.default-style</a> - <span class='postfix or'>or</span> <a class='ref' href='#meta.http-equiv.content-language'>meta.http-equiv.content-language</a> <span class='postfix or'>or</span> <a class='ref' href='#meta.charset'>meta.charset</a> <span class='postfix or'>or</span> <a class='ref' href='#meta.http-equiv.content-type'>meta.http-equiv.content-type</a> <span class='postfix or'>or</span> <a class='ref' href='#script'>script</a> @@ -1036,38 +1035,6 @@ </span>} </span> </div> -<div class='define' id='meta.http-equiv.content-language-define'> - <div class='patternname' id='the-meta.http-equiv.content-language'><a href='#the-meta.http-equiv.content-language'>meta.http-equiv.content-language</a> =</div> - <span class='pattern' id='meta.http-equiv.content-language'><span class='type'>element </span> - <span class='name'>meta</span> - {<span class='model'> - empty - <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#meta.http-equiv.content-language.attrs'>meta.http-equiv.content-language.attrs</a> - </span>} - </span> -</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'>common.attrs</a> - <span class='postfix intermixed'>intermixed with</span> <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> - <span class='postfix intermixed'>intermixed with</span> <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> -<div class='define' id='meta.http-equiv.attrs.http-equiv.content-language-define'> - <div class='patternname' id='the-meta.http-equiv.attrs.http-equiv.content-language'><a href='#the-meta.http-equiv.attrs.http-equiv.content-language'>http-equiv.content-language</a> =</div> - <span class='pattern' id='meta.http-equiv.attrs.http-equiv.content-language'><span class='type'>attribute </span> - <span class='name'>http-equiv</span> - {<span class='model'> d:string "content-language" </span>} - </span> -</div> -<div class='define' id='meta.http-equiv.attrs.content.content-language-define'> - <div class='patternname' id='the-meta.http-equiv.attrs.content.content-language'><a href='#the-meta.http-equiv.attrs.content.content-language'>content.content-language</a> =</div> - <span class='pattern' id='meta.http-equiv.attrs.content.content-language'><span class='type'>attribute </span> - <span class='name'>content</span> - {<span class='model'> - <a class='ref' href='#common.data.langcode' title='common.data.langcode'>langcode</a> - </span>} - </span> -</div> <div class='define' id='meta.charset-define'> <div class='patternname' id='the-meta.charset'><a href='#the-meta.charset'>meta.charset</a> =</div> <span class='pattern' id='meta.charset'><span class='type'>element </span> Index: track.html =================================================================== RCS file: /sources/public/html5/markup/track.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- track.html 30 Apr 2011 14:00:26 -0000 1.9 +++ track.html 30 Apr 2011 15:48:50 -0000 1.10 @@ -38,7 +38,7 @@ <div class="content-models"> <div id="track-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref91">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref89">void element</a></span>)</span> </p> </div> </div> @@ -111,7 +111,7 @@ <dt id="track.attrs.srclang" title="track.attrs.srclang"> <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/video.html#attr-track-srclang">ⓘ</a> <span class="attribute-name">srclang</span> = <span class="attr-values"> - <a href="datatypes.html#common.data.langcode" id="common.data.langcode_xref5">language tag</a> + <a href="datatypes.html#common.data.langcode" id="common.data.langcode_xref4">language tag</a> </span> <a class="hash" href="track.html#track.attrs.srclang">#</a> </dt> @@ -120,7 +120,7 @@ <dd><div class="datatype-desc">A valid <var class="defined-elsewhere">language tag</var> as defined in - <a href="references.html#refsBCP47" id="refsBCP47_xref5">[BCP 47]</a>.</div></dd> + <a href="references.html#refsBCP47" id="refsBCP47_xref4">[BCP 47]</a>.</div></dd> <dt id="track.attrs.label" title="track.attrs.label"> <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/video.html#attr-track-label">ⓘ</a> <span class="attribute-name">label</span> = <span class="attr-values"><a href="datatypes.html#data-string" id="data-string_xref80">string</a></span> Index: wbr.html =================================================================== RCS file: /sources/public/html5/markup/wbr.html,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- wbr.html 30 Apr 2011 11:35:41 -0000 1.38 +++ wbr.html 30 Apr 2011 15:48:51 -0000 1.39 @@ -34,7 +34,7 @@ <div class="content-models"> <div id="wbr-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref92">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref90">void element</a></span>)</span> </p> </div> </div> @@ -57,7 +57,7 @@ </h2> <p>The <span class="element">wbr</span> - element is a <a href="syntax.html#void-element" id="void-element_xref93">void element</a>. + element is a <a href="syntax.html#void-element" id="void-element_xref91">void element</a>. A <span class="element">wbr</span> element must have a <span title="syntax-start-tag">start tag</span> Index: datatypes.html =================================================================== RCS file: /sources/public/html5/markup/datatypes.html,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- datatypes.html 30 Apr 2011 14:00:25 -0000 1.95 +++ datatypes.html 30 Apr 2011 15:48:49 -0000 1.96 @@ -661,7 +661,7 @@ <div class="datatype-desc">A valid <var class="defined-elsewhere">language tag</var> as defined in - <a href="references.html#refsBCP47" id="refsBCP47_xref8">[BCP 47]</a>.</div> + <a href="references.html#refsBCP47" id="refsBCP47_xref7">[BCP 47]</a>.</div> </div> Index: common-models.html =================================================================== RCS file: /sources/public/html5/markup/common-models.html,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- common-models.html 30 Apr 2011 12:33:21 -0000 1.64 +++ common-models.html 30 Apr 2011 15:48:49 -0000 1.65 @@ -82,7 +82,6 @@ <span class="postfix or">or</span> <a class="ref" href="meta.name.html#meta.name">meta name</a> <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.refresh.html#meta.http-equiv.refresh">meta http-equiv=refresh</a> <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta http-equiv=default-style</a> - <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-language.html#meta.http-equiv.content-language">meta http-equiv=content-language</a> <span class="postfix or">or</span> <a class="ref" href="meta.charset.html#meta.charset">meta charset</a> <span class="postfix or">or</span> <a class="ref" href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta http-equiv=content-type</a> <span class="postfix or">or</span> <a class="ref" href="script.html#script">script</a> Index: param.html =================================================================== RCS file: /sources/public/html5/markup/param.html,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- param.html 30 Apr 2011 11:35:39 -0000 1.86 +++ param.html 30 Apr 2011 15:48:50 -0000 1.87 @@ -34,7 +34,7 @@ <div class="content-models"> <div id="param-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref87">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref85">void element</a></span>)</span> </p> </div> </div> @@ -90,7 +90,7 @@ </h2> <p>The <span class="element">param</span> - element is a <a href="syntax.html#void-element" id="void-element_xref88">void element</a>. + element is a <a href="syntax.html#void-element" id="void-element_xref86">void element</a>. A <span class="element">param</span> element must have a <span title="syntax-start-tag">start tag</span> Index: meta.html =================================================================== RCS file: /sources/public/html5/markup/meta.html,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- meta.html 30 Apr 2011 12:33:22 -0000 1.48 +++ meta.html 30 Apr 2011 15:48:50 -0000 1.49 @@ -43,9 +43,6 @@ <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-http-equiv-default-style">ⓘ</a></span> <span> </span><a href="meta.http-equiv.default-style.html#meta.http-equiv.default-style">meta http-equiv=default-style</a> </li> <li> -<span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec/semantics.html#attr-meta-http-equiv-content-language">ⓘ</a></span> <span> </span><a href="meta.http-equiv.content-type.html#meta.http-equiv.content-type">meta http-equiv=content-language</a><span> </span><span class="obsoleted-feature" title="This markup feature has been obsoleted in HTML5.">OBSOLETE</span> -</li> - <li> <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-charset">ⓘ</a></span> <span> </span><a href="meta.charset.html#meta.charset">meta charset</a><span> </span><span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span> </li> <li> @@ -61,6 +58,10 @@ The <span class="attribute">scheme</span> attribute on the <span class="element">meta</span> element is obsolete. Use only one scheme per field, or make the scheme declaration part of the value. </span></li> +<li><span> + Using the <span class="element">meta</span> element to specify the document-wide default language is obsolete. + Consider specifying the language on the root element instead. + </span></li> </ul> </div> <div class="no-number no-toc" id="meta-changes"> Index: index-of-terms.xhtml =================================================================== RCS file: /sources/public/html5/markup/index-of-terms.xhtml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- index-of-terms.xhtml 30 Apr 2011 14:00:25 -0000 1.21 +++ index-of-terms.xhtml 30 Apr 2011 15:48:49 -0000 1.22 @@ -91,11 +91,10 @@ </ul><ul id="refsBCP47_index_items"><li><a href="a.html#refsBCP47_xref1"><span class="element">a</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="area.html#refsBCP47_xref2"><span class="element">area</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="link.html#refsBCP47_xref3"><span class="element">link</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> -<li><a href="meta.http-equiv.content-language.html#refsBCP47_xref4"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <span class="attribute-name">content</span> attribute</a></li> -<li><a href="track.html#refsBCP47_xref5"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> -<li><a href="global-attributes.html#refsBCP47_xref6"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> -<li><a href="global-attributes.html#refsBCP47_xref7"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> -<li><a href="datatypes.html#refsBCP47_xref8"><cite class="index">language tag</cite> data type</a></li> +<li><a href="track.html#refsBCP47_xref4"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> +<li><a href="global-attributes.html#refsBCP47_xref5"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> +<li><a href="global-attributes.html#refsBCP47_xref6"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> +<li><a href="datatypes.html#refsBCP47_xref7"><cite class="index">language tag</cite> data type</a></li> </ul> </div> <div class="index-entry" id="refsBIDI_index"> @@ -1078,10 +1077,9 @@ </ul><ul id="common.data.langcode_index_items"><li><a href="a.html#common.data.langcode_xref1"><span class="element">a</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="area.html#common.data.langcode_xref2"><span class="element">area</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="link.html#common.data.langcode_xref3"><span class="element">link</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> -<li><a href="meta.http-equiv.content-language.html#common.data.langcode_xref4"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <span class="attribute-name">content</span> attribute</a></li> -<li><a href="track.html#common.data.langcode_xref5"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> -<li><a href="global-attributes.html#common.data.langcode_xref6"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> -<li><a href="global-attributes.html#common.data.langcode_xref7"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> +<li><a href="track.html#common.data.langcode_xref4"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> +<li><a href="global-attributes.html#common.data.langcode_xref5"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> +<li><a href="global-attributes.html#common.data.langcode_xref6"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> </ul> </div> <div class="index-entry" id="legacy-tool-compatible-doctype_index"> @@ -2126,19 +2124,17 @@ <li><a href="meta.http-equiv.refresh.html#void-element_xref78"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">refresh</span></span> element: <cite class="index">Tag omission</cite></a></li> <li><a href="meta.http-equiv.default-style.html#void-element_xref79"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> element: <cite class="index">Permitted contents</cite></a></li> <li><a href="meta.http-equiv.default-style.html#void-element_xref80"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="meta.http-equiv.content-language.html#void-element_xref81"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="meta.http-equiv.content-language.html#void-element_xref82"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="meta.charset.html#void-element_xref83"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="meta.charset.html#void-element_xref84"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="meta.http-equiv.content-type.html#void-element_xref85"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="meta.http-equiv.content-type.html#void-element_xref86"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="param.html#void-element_xref87"><span class="element">param</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="param.html#void-element_xref88"><span class="element">param</span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="source.html#void-element_xref89"><span class="element">source</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="source.html#void-element_xref90"><span class="element">source</span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="track.html#void-element_xref91"><span class="element">track</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="wbr.html#void-element_xref92"><span class="element">wbr</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="wbr.html#void-element_xref93"><span class="element">wbr</span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="meta.charset.html#void-element_xref81"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="meta.charset.html#void-element_xref82"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="meta.http-equiv.content-type.html#void-element_xref83"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="meta.http-equiv.content-type.html#void-element_xref84"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="param.html#void-element_xref85"><span class="element">param</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="param.html#void-element_xref86"><span class="element">param</span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="source.html#void-element_xref87"><span class="element">source</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="source.html#void-element_xref88"><span class="element">source</span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="track.html#void-element_xref89"><span class="element">track</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="wbr.html#void-element_xref90"><span class="element">wbr</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="wbr.html#void-element_xref91"><span class="element">wbr</span> element: <cite class="index">Tag omission</cite></a></li> </ul> </div> <div class="index-entry" id="void-elements_index"> Index: patch-schema =================================================================== RCS file: /sources/public/html5/markup/patch-schema,v retrieving revision 1.104 retrieving revision 1.105 diff -u -d -r1.104 -r1.105 --- patch-schema 30 Apr 2011 14:00:25 -0000 1.104 +++ patch-schema 30 Apr 2011 15:48:50 -0000 1.105 @@ -1,6 +1,6 @@ -diff -r 595599410bd8 relaxng/applications.rnc ---- a/relaxng/applications.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/applications.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/applications.rnc +--- a/relaxng/applications.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/applications.rnc Sun May 01 00:44:37 2011 +0900 @@ -4,19 +4,6 @@ ## RELAX NG Schema for HTML 5: Web Application Features # # ##################################################################### @@ -150,9 +150,9 @@ common.elem.phrasing |= command.elem ## Menu: <menu> -diff -r 595599410bd8 relaxng/block.rnc ---- a/relaxng/block.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/block.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/block.rnc +--- a/relaxng/block.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/block.rnc Sun May 01 00:44:37 2011 +0900 @@ -114,12 +114,12 @@ element li { oli.inner & oli.attrs } oli.attrs = @@ -168,9 +168,9 @@ attribute value { common.data.integer } -diff -r 595599410bd8 relaxng/common.rnc ---- a/relaxng/common.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/common.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/common.rnc +--- a/relaxng/common.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/common.rnc Sun May 01 00:44:37 2011 +0900 @@ -38,16 +38,16 @@ common.attr.anything = attribute * { text }* @@ -333,9 +333,9 @@ common.attrs.aria = ( notAllowed ) common.attrs.aria.implicit.button = ( notAllowed ) common.attrs.aria.implicit.input = ( notAllowed ) -diff -r 595599410bd8 relaxng/core-scripting.rnc ---- a/relaxng/core-scripting.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/core-scripting.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/core-scripting.rnc +--- a/relaxng/core-scripting.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/core-scripting.rnc Sun May 01 00:44:37 2011 +0900 @@ -52,9 +52,9 @@ string } @@ -370,9 +370,9 @@ scripting.attr.onabort = attribute onabort { common.data.functionbody } -diff -r 595599410bd8 relaxng/embed.rnc ---- a/relaxng/embed.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/embed.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/embed.rnc +--- a/relaxng/embed.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/embed.rnc Sun May 01 00:44:37 2011 +0900 @@ -250,7 +250,7 @@ } object.attrs.name = @@ -493,9 +493,9 @@ # xsd:token { # pattern = "-?[0-9]+,-?[0-9]+,-?[0-9]+,-?[0-9]+,-?[0-9]+,-?[0-9]+(,-?[0-9]+,-?[0-9]+)*" # } -diff -r 595599410bd8 relaxng/media.rnc ---- a/relaxng/media.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/media.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/media.rnc +--- a/relaxng/media.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/media.rnc Sun May 01 00:44:37 2011 +0900 @@ -4,32 +4,6 @@ ## RELAX NG Schema for HTML 5: Advanced Embedded Content # # ##################################################################### @@ -651,9 +651,9 @@ , track.elem* , common.inner.phrasing ) -diff -r 595599410bd8 relaxng/meta.rnc ---- a/relaxng/meta.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/meta.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/meta.rnc +--- a/relaxng/meta.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/meta.rnc Sun May 01 00:44:37 2011 +0900 @@ -53,7 +53,11 @@ & body.attrs.onafterprint? & body.attrs.onbeforeprint? @@ -784,19 +784,7 @@ & meta.http-equiv.attrs.http-equiv.default-style & meta.http-equiv.attrs.content.default-style ) -@@ -271,10 +290,7 @@ - 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 - & meta.http-equiv.attrs.http-equiv.content-language - & meta.http-equiv.attrs.content.content-language - ) -@@ -296,19 +312,13 @@ +@@ -271,19 +290,13 @@ meta.charset.elem = element meta { meta.inner & meta.charset.attrs } meta.charset.attrs = @@ -819,7 +807,7 @@ ## Inline Character Encoding Statement for HTML: <meta http-equiv='content-type'> -@@ -316,10 +326,7 @@ +@@ -291,10 +304,7 @@ element meta { meta.inner & meta.http-equiv.content-type.attrs } & HTMLonly meta.http-equiv.content-type.attrs = @@ -831,16 +819,16 @@ & meta.http-equiv.attrs.http-equiv.content-type & meta.http-equiv.attrs.content.content-type ) -@@ -332,4 +339,5 @@ +@@ -307,4 +317,5 @@ common.data.meta-charset } - common.elem.metadata |= ( meta.charset.elem | meta.http-equiv.content-type.elem ) + common.elem.metadata |= meta.charset.elem + common.elem.metadata |= meta.http-equiv.content-type.elem -diff -r 595599410bd8 relaxng/phrase.rnc ---- a/relaxng/phrase.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/phrase.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/phrase.rnc +--- a/relaxng/phrase.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/phrase.rnc Sun May 01 00:44:37 2011 +0900 @@ -13,13 +13,12 @@ a.attrs = ( common.attrs @@ -931,9 +919,9 @@ ## Emphatic Stress: <em> em.elem = -diff -r 595599410bd8 relaxng/revision.rnc ---- a/relaxng/revision.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/revision.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/revision.rnc +--- a/relaxng/revision.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/revision.rnc Sun May 01 00:44:37 2011 +0900 @@ -2,17 +2,6 @@ ## RELAX NG Schema for HTML 5: Revision Annotations # # ##################################################################### @@ -992,9 +980,9 @@ del.inner.flow = ( common.inner.flow ) del.inner.phrasing = -diff -r 595599410bd8 relaxng/tables.rnc ---- a/relaxng/tables.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/tables.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/tables.rnc +--- a/relaxng/tables.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/tables.rnc Sun May 01 00:44:37 2011 +0900 @@ -157,38 +157,6 @@ tr.inner = ( ( td.elem | th.elem )* ) @@ -1097,9 +1085,9 @@ + } th.inner = ( common.inner.phrasing ) -diff -r 595599410bd8 relaxng/web-forms.rnc ---- a/relaxng/web-forms.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/web-forms.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/web-forms.rnc +--- a/relaxng/web-forms.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/web-forms.rnc Sun May 01 00:44:37 2011 +0900 @@ -9,6 +9,7 @@ common-form.attrs = ( common-form.attrs.name? @@ -1204,9 +1192,9 @@ button.elem |= button.button.elem -diff -r 595599410bd8 relaxng/web-forms2.rnc ---- a/relaxng/web-forms2.rnc Sat Apr 30 22:40:03 2011 +0900 -+++ b/relaxng/web-forms2.rnc Sat Apr 30 22:49:33 2011 +0900 +diff -r 3d50b06eb3d0 relaxng/web-forms2.rnc +--- a/relaxng/web-forms2.rnc Sun May 01 00:38:02 2011 +0900 ++++ b/relaxng/web-forms2.rnc Sun May 01 00:44:37 2011 +0900 @@ -6,9 +6,6 @@ ## Shared attributes for form controls Index: index.html =================================================================== RCS file: /sources/public/html5/markup/index.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- index.html 30 Apr 2011 12:33:22 -0000 1.29 +++ index.html 30 Apr 2011 15:48:49 -0000 1.30 @@ -15,7 +15,7 @@ <div><img src="HTML5_Badge_128.png" alt="5"></div> <h1>HTML: The Markup Language</h1> <h3 id="subtitle">An HTML language reference and front-end for the HTML specification</h3> -<h2>Unofficial Editor’s Draft <em>30 April 2011</em> +<h2>Unofficial Editor’s Draft <em>1 May 2011</em> </h2> <dl> <dt>Editors:</dt> @@ -70,7 +70,7 @@ <h2>Status of this Document </h2> <p> - This document is the 30 April 2011 Editor’s Draft of + This document is the 1 May 2011 Editor’s Draft of <cite>HTML: The Markup Language</cite>. If you’d like to comment on this document, the preferred @@ -475,9 +475,6 @@ <li id="meta.http-equiv.default-style-toc"> <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-http-equiv-default-style">ⓘ</a></span> <a href="meta.http-equiv.default-style.html#meta.http-equiv.default-style"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> – <span class="shortdesc">“preferred stylesheet” pragma directive</span></span></a> </li> -<li id="meta.http-equiv.content-language-toc"> -<span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec/semantics.html#attr-meta-http-equiv-content-language">ⓘ</a></span> <a href="meta.http-equiv.content-language.html#meta.http-equiv.content-language"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> – <span class="shortdesc">“default language” pragma directive</span></span></a> <span class="obsoleted-feature" title="This markup feature has been obsoleted in HTML5.">OBSOLETE</span> -</li> <li id="meta.charset-toc"> <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-charset">ⓘ</a></span> <a href="meta.charset.html#meta.charset"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> – <span class="shortdesc">document character-encoding declaration</span></span></a> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span> </li> Index: spec.html =================================================================== RCS file: /sources/public/html5/markup/spec.html,v retrieving revision 1.312 retrieving revision 1.313 diff -u -d -r1.312 -r1.313 --- spec.html 30 Apr 2011 14:00:26 -0000 1.312 +++ spec.html 30 Apr 2011 15:48:50 -0000 1.313 @@ -12,7 +12,7 @@ <div><img src="HTML5_Badge_128.png" alt="5"></div> <h1>HTML: The Markup Language</h1> <h3 id="subtitle">An HTML language reference and front-end for the HTML specification</h3> -<h2>Unofficial Editor’s Draft <em>30 April 2011</em> +<h2>Unofficial Editor’s Draft <em>1 May 2011</em> </h2> <dl> <dt>Editors:</dt> @@ -67,7 +67,7 @@ <h2>Status of this Document </h2> <p> - This document is the 30 April 2011 Editor’s Draft of + This document is the 1 May 2011 Editor’s Draft of <cite>HTML: The Markup Language</cite>. If you’d like to comment on this document, the preferred @@ -472,9 +472,6 @@ <li id="meta.http-equiv.default-style-toc"> <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-http-equiv-default-style">ⓘ</a></span> <a href="#meta.http-equiv.default-style"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> – <span class="shortdesc">“preferred stylesheet” pragma directive</span></span></a> </li> -<li id="meta.http-equiv.content-language-toc"> -<span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec/semantics.html#attr-meta-http-equiv-content-language">ⓘ</a></span> <a href="#meta.http-equiv.content-language"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> – <span class="shortdesc">“default language” pragma directive</span></span></a> <span class="obsoleted-feature" title="This markup feature has been obsoleted in HTML5.">OBSOLETE</span> -</li> <li id="meta.charset-toc"> <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-charset">ⓘ</a></span> <a href="#meta.charset"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> – <span class="shortdesc">document character-encoding declaration</span></span></a> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span> </li> @@ -3030,9 +3027,6 @@ <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-http-equiv-default-style">ⓘ</a></span> <a href="#meta.http-equiv.default-style"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> – <span class="shortdesc">“preferred stylesheet” pragma directive</span></span></a> </li> <li> -<span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec/semantics.html#attr-meta-http-equiv-content-language">ⓘ</a></span> <a href="#meta.http-equiv.content-language"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> – <span class="shortdesc">“default language” pragma directive</span></span></a> <span class="obsoleted-feature" title="This markup feature has been obsoleted in HTML5.">OBSOLETE</span> -</li> -<li> <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-charset">ⓘ</a></span> <a href="#meta.charset"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> – <span class="shortdesc">document character-encoding declaration</span></span></a> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span> </li> <li> @@ -18497,9 +18491,6 @@ <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-http-equiv-default-style">ⓘ</a></span> <span> </span><a href="#meta.http-equiv.default-style">meta http-equiv=default-style</a> </li> <li> -<span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec/semantics.html#attr-meta-http-equiv-content-language">ⓘ</a></span> <span> </span><a href="#meta.http-equiv.content-type">meta http-equiv=content-language</a><span> </span><span class="obsoleted-feature" title="This markup feature has been obsoleted in HTML5.">OBSOLETE</span> -</li> - <li> <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-charset">ⓘ</a></span> <span> </span><a href="#meta.charset">meta charset</a><span> </span><span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span> </li> <li> @@ -18515,6 +18506,10 @@ The <span class="attribute">scheme</span> attribute on the <span class="element">meta</span> element is obsolete. Use only one scheme per field, or make the scheme declaration part of the value. </span></li> +<li><span> + Using the <span class="element">meta</span> element to specify the document-wide default language is obsolete. + Consider specifying the language on the root element instead. + </span></li> </ul> </div> <div class="no-number no-toc" id="meta-changes"> @@ -18932,104 +18927,6 @@ };</pre> </div> </div> -<div id="meta.http-equiv.content-language" class="no-number elementpage section"> - <h2 class="element-head"> -<span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec/semantics.html#attr-meta-http-equiv-content-language">ⓘ</a></span> <span class="element">meta</span> <span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> – <span class="shortdesc">“default language” pragma directive</span> <span class="obsoleted-feature" title="This markup feature has been obsoleted in HTML5.">OBSOLETE</span> <a class="hash" href="#meta.http-equiv.content-language">#</a> <a class="toc-bak" href="#meta.http-equiv.content-language-toc">T</a> -</h2> - <div id="meta.http-equiv.content-language-longdesc" class="longdesc"> - <p>The - <span class="element">meta</span> - element - with a <span class="attribute">http-equiv</span> attribute - whose value is "<code>content-language</code>" represents a pragma - directive that specifies a document-wide default language.</p> - <p class="warning">Using the - <span class="element">meta</span> - element to specify the document-wide default language is - obsolete. Consider specifying the language on the root element - instead.</p> - </div> - <div class="no-number no-toc" id="meta.http-equiv.content-language-content-model"> - <h2 class="element-subhead">Permitted contents <a class="hash" href="#meta.http-equiv.content-language-content-model">#</a> -</h2> -<div class="content-models"> - - <div id="meta.http-equiv.content-language-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref81">void element</a></span>)</span> - </p> - </div> - </div> -</div> -<div class="no-number no-toc" id="meta.http-equiv.content-language-attributes"> - <h2 class="element-subhead">Permitted attributes <a class="hash" href="#meta.http-equiv.content-language-attributes">#</a> -</h2> - <div class="attr-content-models"> - <p><a href="#global-attributes">global attributes</a> - <span class="postfix intermixed">&</span> <a class="ref" href="#meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language">http-equiv</a>=<span class="attr-values">"content-language"</span><span class="postfix required" title="REQUIRED">★</span> - <span class="postfix intermixed">&</span> <a class="ref" href="#meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language">content</a><span class="postfix required" title="REQUIRED">★</span></p> -</div> - <dl class="attr-defs"> -<dt> -<a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/elements.html#global-attributes">ⓘ</a> -<a class="attribute-name" title="global-attributes" href="#global-attributes">global attributes</a> -</dt> - <dd>Any attributes permitted globally.</dd> - - <dt id="meta.http-equiv.attrs.http-equiv.content-language" title="meta.http-equiv.attrs.http-equiv.content-language"> -<a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-http-equiv">ⓘ</a> -<span class="attribute-name">http-equiv</span> = <span class="attr-values"> "content-language" </span> -<a class="hash" href="#meta.http-equiv.attrs.http-equiv.content-language">#</a> -</dt> - <dd>Indicates that the - <span class="element">meta</span> - element is a pragma directive - that specifies a document-wide default language.</dd> - - <dt id="meta.http-equiv.attrs.content.content-language" title="meta.http-equiv.attrs.content.content-language"> -<a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-content">ⓘ</a> -<span class="attribute-name">content</span> = <span class="attr-values"> - <a href="#common.data.langcode" id="common.data.langcode_xref4">language tag</a> - </span> -<a class="hash" href="#meta.http-equiv.attrs.content.content-language">#</a> -</dt> - <dd>Specifies a language to use as the document-wide default - language.</dd> - -<dd><div class="datatype-desc">A valid - <var class="defined-elsewhere">language tag</var> - as defined in - <a href="#refsBCP47" id="refsBCP47_xref4">[BCP 47]</a>.</div></dd> - </dl> -</div> - - <div class="no-number no-toc tag-omission" id="meta.http-equiv.content-language-tags"> - <h2 class="element-subhead">Tag omission <a class="hash" href="#meta.http-equiv.content-language-tags">#</a> -</h2> - <p>The - <span class="element">meta</span> - element is a <a href="#void-element" id="void-element_xref82">void element</a>. - A <span class="element">meta</span> - element must have a - <span title="syntax-start-tag">start tag</span> - but must not have an - <span title="syntax-end-tag">end tag</span>.</p> - </div> - <div class="no-number no-toc" id="meta.http-equiv.content-language-context"> - <h2 class="element-subhead">Permitted parent elements <a class="hash" href="#meta.http-equiv.content-language-context">#</a> -</h2> - <p class="permitted-parents"><span class="context-mdl"><span>any element that can contain - <a href="#common.elem.metadata">metadata elements</a></span></span></p> - </div> - <div class="no-number no-toc interface" id="meta.http-equiv.content-language-interface"> - <h2 class="element-subhead">DOM interface <a class="hash" href="#meta.http-equiv.content-language-interface">#</a> -</h2> -<pre class="idl">interface <b>HTMLMetaElement</b> : <a href="http://dev.w3.org/html5/spec/elements.html#htmlelement" title="">HTMLElement</a> { - attribute DOMString <a href="http://dev.w3.org/html5/spec/semantics.html#dom-meta-name" title="dom-meta-name">name</a>; - attribute DOMString <a href="http://dev.w3.org/html5/spec/semantics.html#dom-meta-httpequiv" title="dom-meta-httpEquiv">httpEquiv</a>; - attribute DOMString <a href="http://dev.w3.org/html5/spec/semantics.html#dom-meta-content" title="dom-meta-content">content</a>; -};</pre> -</div> -</div> <div id="meta.charset" class="no-number elementpage section"> <h2 class="element-head"> <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-charset">ⓘ</a></span> <span class="element">meta</span> <span class="elem-qualifier"> <span class="attribute-name">charset</span></span> – <span class="shortdesc">document character-encoding declaration</span> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span> <a class="hash" href="#meta.charset">#</a> <a class="toc-bak" href="#meta.charset-toc">T</a> @@ -19048,7 +18945,7 @@ <div class="content-models"> <div id="meta.charset-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref83">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref81">void element</a></span>)</span> </p> </div> </div> @@ -19101,7 +18998,7 @@ </h2> <p>The <span class="element">meta</span> - element is a <a href="#void-element" id="void-element_xref84">void element</a>. + element is a <a href="#void-element" id="void-element_xref82">void element</a>. A <span class="element">meta</span> element must have a <span title="syntax-start-tag">start tag</span> @@ -19142,7 +19039,7 @@ <div class="content-models"> <div id="meta.http-equiv.content-type-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref85">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref83">void element</a></span>)</span> </p> </div> </div> @@ -19216,7 +19113,7 @@ </h2> <p>The <span class="element">meta</span> - element is a <a href="#void-element" id="void-element_xref86">void element</a>. + element is a <a href="#void-element" id="void-element_xref84">void element</a>. A <span class="element">meta</span> element must have a <span title="syntax-start-tag">start tag</span> @@ -20624,7 +20521,7 @@ <div class="content-models"> <div id="param-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref87">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref85">void element</a></span>)</span> </p> </div> </div> @@ -20680,7 +20577,7 @@ </h2> <p>The <span class="element">param</span> - element is a <a href="#void-element" id="void-element_xref88">void element</a>. + element is a <a href="#void-element" id="void-element_xref86">void element</a>. A <span class="element">param</span> element must have a <span title="syntax-start-tag">start tag</span> @@ -21993,7 +21890,7 @@ <div class="content-models"> <div id="source-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref89">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref87">void element</a></span>)</span> </p> </div> </div> @@ -22063,7 +21960,7 @@ </h2> <p>The <span class="element">source</span> - element is a <a href="#void-element" id="void-element_xref90">void element</a>. + element is a <a href="#void-element" id="void-element_xref88">void element</a>. A <span class="element">source</span> element must have a <span title="syntax-start-tag">start tag</span> @@ -22671,7 +22568,7 @@ in a <span class="element">caption</span> element or in a <span class="element">figure</span> element containing the <span class="element">table</span> element; or, simplify - the structue of the table so that so that no + the structue of the table so that no description is needed. </span></li> <li><span> @@ -24138,7 +24035,7 @@ <div class="content-models"> <div id="track-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref91">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref89">void element</a></span>)</span> </p> </div> </div> @@ -24211,7 +24108,7 @@ <dt id="track.attrs.srclang" title="track.attrs.srclang"> <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/video.html#attr-track-srclang">ⓘ</a> <span class="attribute-name">srclang</span> = <span class="attr-values"> - <a href="#common.data.langcode" id="common.data.langcode_xref5">language tag</a> + <a href="#common.data.langcode" id="common.data.langcode_xref4">language tag</a> </span> <a class="hash" href="#track.attrs.srclang">#</a> </dt> @@ -24220,7 +24117,7 @@ <dd><div class="datatype-desc">A valid <var class="defined-elsewhere">language tag</var> as defined in - <a href="#refsBCP47" id="refsBCP47_xref5">[BCP 47]</a>.</div></dd> + <a href="#refsBCP47" id="refsBCP47_xref4">[BCP 47]</a>.</div></dd> <dt id="track.attrs.label" title="track.attrs.label"> <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/video.html#attr-track-label">ⓘ</a> <span class="attribute-name">label</span> = <span class="attr-values"><a href="#data-string" id="data-string_xref80">string</a></span> @@ -24769,7 +24666,7 @@ <div class="content-models"> <div id="wbr-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref92">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="#void-element" id="void-element_xref90">void element</a></span>)</span> </p> </div> </div> @@ -24792,7 +24689,7 @@ </h2> <p>The <span class="element">wbr</span> - element is a <a href="#void-element" id="void-element_xref93">void element</a>. + element is a <a href="#void-element" id="void-element_xref91">void element</a>. A <span class="element">wbr</span> element must have a <span title="syntax-start-tag">start tag</span> @@ -24878,7 +24775,6 @@ <span class="postfix or">or</span> <a class="ref" href="#meta.name">meta name</a> <span class="postfix or">or</span> <a class="ref" href="#meta.http-equiv.refresh">meta http-equiv=refresh</a> <span class="postfix or">or</span> <a class="ref" href="#meta.http-equiv.default-style">meta http-equiv=default-style</a> - <span class="postfix or">or</span> <a class="ref" href="#meta.http-equiv.content-language">meta http-equiv=content-language</a> <span class="postfix or">or</span> <a class="ref" href="#meta.charset">meta charset</a> <span class="postfix or">or</span> <a class="ref" href="#meta.http-equiv.content-type">meta http-equiv=content-type</a> <span class="postfix or">or</span> <a class="ref" href="#script">script</a> @@ -25175,7 +25071,7 @@ <dt id="common.attrs.lang" title="common.attrs.lang"> <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/elements.html#attr-lang">ⓘ</a> <span class="attribute-name">lang</span> = <span class="attr-values"> - <a href="#common.data.langcode" id="common.data.langcode_xref6">language tag</a> + <a href="#common.data.langcode" id="common.data.langcode_xref5">language tag</a> </span> <a class="hash" href="#common.attrs.lang">#</a> </dt> @@ -25187,7 +25083,7 @@ <dd><div class="datatype-desc">A valid <var class="defined-elsewhere">language tag</var> as defined in - <a href="#refsBCP47" id="refsBCP47_xref6">[BCP 47]</a>.</div></dd> + <a href="#refsBCP47" id="refsBCP47_xref5">[BCP 47]</a>.</div></dd> <dt id="common.attrs.spellcheck" title="common.attrs.spellcheck"> <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/editing.html#attr-spellcheck">ⓘ</a> <span class="attribute-name">spellcheck</span> = <span class="attr-values"> @@ -26029,7 +25925,7 @@ <dt id="common.attrs.xmllang" title="common.attrs.xmllang"> <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/elements.html#attr-xml-lang">ⓘ</a> <span class="attribute-name">xml:lang</span> = <span class="attr-values"> - <a href="#common.data.langcode" id="common.data.langcode_xref7">language tag</a> + <a href="#common.data.langcode" id="common.data.langcode_xref6">language tag</a> </span> <a class="hash" href="#common.attrs.xmllang">#</a> </dt> @@ -26039,7 +25935,7 @@ <dd><div class="datatype-desc">A valid <var class="defined-elsewhere">language tag</var> as defined in - <a href="#refsBCP47" id="refsBCP47_xref7">[BCP 47]</a>.</div></dd> + <a href="#refsBCP47" id="refsBCP47_xref6">[BCP 47]</a>.</div></dd> <dt id="common.attrs.xmlspace" title="common.attrs.xmlspace"> <span class="attribute-name">xml:space</span> = <span class="attr-values"> "preserve" @@ -26721,7 +26617,7 @@ <div class="datatype-desc">A valid <var class="defined-elsewhere">language tag</var> as defined in - <a href="#refsBCP47" id="refsBCP47_xref8">[BCP 47]</a>.</div> + <a href="#refsBCP47" id="refsBCP47_xref7">[BCP 47]</a>.</div> </div> @@ -27418,11 +27314,10 @@ <li><a href="#refsBCP47_xref1"><span class="element">a</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="#refsBCP47_xref2"><span class="element">area</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="#refsBCP47_xref3"><span class="element">link</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> -<li><a href="#refsBCP47_xref4"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <span class="attribute-name">content</span> attribute</a></li> -<li><a href="#refsBCP47_xref5"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> -<li><a href="#refsBCP47_xref6"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> -<li><a href="#refsBCP47_xref7"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> -<li><a href="#refsBCP47_xref8"><cite class="index">language tag</cite> data type</a></li> +<li><a href="#refsBCP47_xref4"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> +<li><a href="#refsBCP47_xref5"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> +<li><a href="#refsBCP47_xref6"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> +<li><a href="#refsBCP47_xref7"><cite class="index">language tag</cite> data type</a></li> </ul> </div> <div class="index-entry" id="refsBIDI_index"> @@ -28725,10 +28620,9 @@ <li><a href="#common.data.langcode_xref1"><span class="element">a</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="#common.data.langcode_xref2"><span class="element">area</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="#common.data.langcode_xref3"><span class="element">link</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> -<li><a href="#common.data.langcode_xref4"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <span class="attribute-name">content</span> attribute</a></li> -<li><a href="#common.data.langcode_xref5"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> -<li><a href="#common.data.langcode_xref6"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> -<li><a href="#common.data.langcode_xref7"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> +<li><a href="#common.data.langcode_xref4"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> +<li><a href="#common.data.langcode_xref5"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> +<li><a href="#common.data.langcode_xref6"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> </ul> </div> <div class="index-entry" id="legacy-tool-compatible-doctype_index"> @@ -30171,19 +30065,17 @@ <li><a href="#void-element_xref78"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">refresh</span></span> element: <cite class="index">Tag omission</cite></a></li> <li><a href="#void-element_xref79"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> element: <cite class="index">Permitted contents</cite></a></li> <li><a href="#void-element_xref80"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="#void-element_xref81"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="#void-element_xref82"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="#void-element_xref83"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="#void-element_xref84"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="#void-element_xref85"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="#void-element_xref86"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="#void-element_xref87"><span class="element">param</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="#void-element_xref88"><span class="element">param</span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="#void-element_xref89"><span class="element">source</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="#void-element_xref90"><span class="element">source</span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="#void-element_xref91"><span class="element">track</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="#void-element_xref92"><span class="element">wbr</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="#void-element_xref93"><span class="element">wbr</span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="#void-element_xref81"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="#void-element_xref82"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="#void-element_xref83"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="#void-element_xref84"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="#void-element_xref85"><span class="element">param</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="#void-element_xref86"><span class="element">param</span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="#void-element_xref87"><span class="element">source</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="#void-element_xref88"><span class="element">source</span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="#void-element_xref89"><span class="element">track</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="#void-element_xref90"><span class="element">wbr</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="#void-element_xref91"><span class="element">wbr</span> element: <cite class="index">Tag omission</cite></a></li> </ul> </div> <div class="index-entry" id="void-elements_index"> Index: index-of-terms.html =================================================================== RCS file: /sources/public/html5/markup/index-of-terms.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- index-of-terms.html 30 Apr 2011 14:00:25 -0000 1.21 +++ index-of-terms.html 30 Apr 2011 15:48:49 -0000 1.22 @@ -133,11 +133,10 @@ <li><a href="a.html#refsBCP47_xref1"><span class="element">a</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="area.html#refsBCP47_xref2"><span class="element">area</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="link.html#refsBCP47_xref3"><span class="element">link</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> -<li><a href="meta.http-equiv.content-language.html#refsBCP47_xref4"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <span class="attribute-name">content</span> attribute</a></li> -<li><a href="track.html#refsBCP47_xref5"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> -<li><a href="global-attributes.html#refsBCP47_xref6"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> -<li><a href="global-attributes.html#refsBCP47_xref7"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> -<li><a href="datatypes.html#refsBCP47_xref8"><cite class="index">language tag</cite> data type</a></li> +<li><a href="track.html#refsBCP47_xref4"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> +<li><a href="global-attributes.html#refsBCP47_xref5"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> +<li><a href="global-attributes.html#refsBCP47_xref6"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> +<li><a href="datatypes.html#refsBCP47_xref7"><cite class="index">language tag</cite> data type</a></li> </ul> </div> <div class="index-entry" id="refsBIDI_index"> @@ -1440,10 +1439,9 @@ <li><a href="a.html#common.data.langcode_xref1"><span class="element">a</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="area.html#common.data.langcode_xref2"><span class="element">area</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> <li><a href="link.html#common.data.langcode_xref3"><span class="element">link</span> element: <span class="attribute-name">hreflang</span> attribute</a></li> -<li><a href="meta.http-equiv.content-language.html#common.data.langcode_xref4"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <span class="attribute-name">content</span> attribute</a></li> -<li><a href="track.html#common.data.langcode_xref5"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> -<li><a href="global-attributes.html#common.data.langcode_xref6"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> -<li><a href="global-attributes.html#common.data.langcode_xref7"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> +<li><a href="track.html#common.data.langcode_xref4"><span class="element">track</span> element: <span class="attribute-name">srclang</span> attribute</a></li> +<li><a href="global-attributes.html#common.data.langcode_xref5"><cite class="index">Core attributes</cite> section: <span class="attribute-name">lang</span> attribute</a></li> +<li><a href="global-attributes.html#common.data.langcode_xref6"><cite class="index">XML attributes</cite> section: <span class="attribute-name">xml:lang</span> attribute</a></li> </ul> </div> <div class="index-entry" id="legacy-tool-compatible-doctype_index"> @@ -2886,19 +2884,17 @@ <li><a href="meta.http-equiv.refresh.html#void-element_xref78"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">refresh</span></span> element: <cite class="index">Tag omission</cite></a></li> <li><a href="meta.http-equiv.default-style.html#void-element_xref79"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> element: <cite class="index">Permitted contents</cite></a></li> <li><a href="meta.http-equiv.default-style.html#void-element_xref80"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="meta.http-equiv.content-language.html#void-element_xref81"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="meta.http-equiv.content-language.html#void-element_xref82"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="meta.charset.html#void-element_xref83"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="meta.charset.html#void-element_xref84"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="meta.http-equiv.content-type.html#void-element_xref85"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="meta.http-equiv.content-type.html#void-element_xref86"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="param.html#void-element_xref87"><span class="element">param</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="param.html#void-element_xref88"><span class="element">param</span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="source.html#void-element_xref89"><span class="element">source</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="source.html#void-element_xref90"><span class="element">source</span> element: <cite class="index">Tag omission</cite></a></li> -<li><a href="track.html#void-element_xref91"><span class="element">track</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="wbr.html#void-element_xref92"><span class="element">wbr</span> element: <cite class="index">Permitted contents</cite></a></li> -<li><a href="wbr.html#void-element_xref93"><span class="element">wbr</span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="meta.charset.html#void-element_xref81"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="meta.charset.html#void-element_xref82"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="meta.http-equiv.content-type.html#void-element_xref83"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="meta.http-equiv.content-type.html#void-element_xref84"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-type</span></span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="param.html#void-element_xref85"><span class="element">param</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="param.html#void-element_xref86"><span class="element">param</span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="source.html#void-element_xref87"><span class="element">source</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="source.html#void-element_xref88"><span class="element">source</span> element: <cite class="index">Tag omission</cite></a></li> +<li><a href="track.html#void-element_xref89"><span class="element">track</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="wbr.html#void-element_xref90"><span class="element">wbr</span> element: <cite class="index">Permitted contents</cite></a></li> +<li><a href="wbr.html#void-element_xref91"><span class="element">wbr</span> element: <cite class="index">Tag omission</cite></a></li> </ul> </div> <div class="index-entry" id="void-elements_index"> Index: elements.html =================================================================== RCS file: /sources/public/html5/markup/elements.html,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- elements.html 30 Apr 2011 12:33:21 -0000 1.78 +++ elements.html 30 Apr 2011 15:48:49 -0000 1.79 @@ -313,9 +313,6 @@ <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-http-equiv-default-style">ⓘ</a></span> <a href="meta.http-equiv.default-style.html#meta.http-equiv.default-style"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">default-style</span></span> – <span class="shortdesc">“preferred stylesheet” pragma directive</span></span></a> </li> <li> -<span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec/semantics.html#attr-meta-http-equiv-content-language">ⓘ</a></span> <a href="meta.http-equiv.content-language.html#meta.http-equiv.content-language"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">http-equiv</span>=<span class="equals-value">content-language</span></span> – <span class="shortdesc">“default language” pragma directive</span></span></a> <span class="obsoleted-feature" title="This markup feature has been obsoleted in HTML5.">OBSOLETE</span> -</li> -<li> <span class="spec-link"><a title="Read about the meta element in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/semantics.html#attr-meta-charset">ⓘ</a></span> <a href="meta.charset.html#meta.charset"><span class="toc-section-number"></span><span class="toc-section-name"><span class="element">meta</span><span class="elem-qualifier"> <span class="attribute-name">charset</span></span> – <span class="shortdesc">document character-encoding declaration</span></span></a> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span> </li> <li> Index: source.html =================================================================== RCS file: /sources/public/html5/markup/source.html,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- source.html 30 Apr 2011 11:35:40 -0000 1.98 +++ source.html 30 Apr 2011 15:48:50 -0000 1.99 @@ -39,7 +39,7 @@ <div class="content-models"> <div id="source-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref89">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref87">void element</a></span>)</span> </p> </div> </div> @@ -109,7 +109,7 @@ </h2> <p>The <span class="element">source</span> - element is a <a href="syntax.html#void-element" id="void-element_xref90">void element</a>. + element is a <a href="syntax.html#void-element" id="void-element_xref88">void element</a>. A <span class="element">source</span> element must have a <span title="syntax-start-tag">start tag</span> Index: meta.charset.html =================================================================== RCS file: /sources/public/html5/markup/meta.charset.html,v retrieving revision 1.96 retrieving revision 1.97 diff -u -d -r1.96 -r1.97 --- meta.charset.html 30 Apr 2011 11:35:38 -0000 1.96 +++ meta.charset.html 30 Apr 2011 15:48:50 -0000 1.97 @@ -5,7 +5,7 @@ <link rel="stylesheet" href="ED.css" type="text/css"> <title> meta charset – document character-encoding declaration (NEW) - HTML5</title> <link rel="stylesheet" href="style.css" type="text/css"> -<link rel="prev" href="meta.http-equiv.content-language.html" title="meta http-equiv=content-language"> +<link rel="prev" href="meta.http-equiv.default-style.html" title="meta http-equiv=default-style"> <link rel="next" href="meta.http-equiv.content-type.html" title="meta http-equiv=content-type"> <link rel="up" href="Overview.html"> <link rel="contents" href="Overview.html#toc"> @@ -15,7 +15,7 @@ <div id="jump-indexes" class="no-number no-toc"><div id="jumpIndexA-button">jump</div></div> <h2 class="chunkpagetitle"><a href="Overview.html#toc">HTML: The Markup Language</a></h2> <div class="nav"> -<span class="nav-prev"><a href="meta.http-equiv.content-language.html">« meta http-equiv=content-language</a></span> +<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> <div class="no-number elementpage section"> @@ -36,7 +36,7 @@ <div class="content-models"> <div id="meta.charset-mdls"> - <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref83">void element</a></span>)</span> + <p class="elem-mdl"><span>empty (<span><a href="syntax.html#void-element" id="void-element_xref81">void element</a></span>)</span> </p> </div> </div> @@ -89,7 +89,7 @@ </h2> <p>The <span class="element">meta</span> - element is a <a href="syntax.html#void-element" id="void-element_xref84">void element</a>. + element is a <a href="syntax.html#void-element" id="void-element_xref82">void element</a>. A <span class="element">meta</span> element must have a <span title="syntax-start-tag">start tag</span> @@ -114,7 +114,7 @@ </div> <hr class="footerbreak"> <div class="nav"> -<span class="nav-prev"><a href="meta.http-equiv.content-language.html">« meta http-equiv=content-language</a></span> +<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> <script src="js/jump-indexes.js" type="text/javascript"></script><script src="js/dfn.js" type="text/javascript"></script>
Received on Saturday, 30 April 2011 15:54:39 UTC