- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 07 Mar 2010 11:57:33 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv22530
Modified Files:
a.html area.html datatypes.html patch-schema schema.html
spec.html webapps.html
Log Message:
h:tml, removed the ping attribute
Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- schema.html 25 Feb 2010 10:30:20 -0000 1.13
+++ schema.html 7 Mar 2010 11:57:31 -0000 1.14
@@ -416,12 +416,6 @@
<span class='pattern' id='common.data.uri'>d:string ""
<span class='postfix or'>or</span> d:iri-ref</span>
</div>
-<div class='define' id='common.data.uris-define'>
- <div class='patternname' id='the-common.data.uris'><a href='#the-common.data.uris'>uris</a> =</div>
- <span class='pattern' id='common.data.uris'>list{
- d:iri-ref<span class='postfix zeroormore' title='ZERO OR MORE'>*</span>
- }</span>
-</div>
<div class='define' id='common.data.uri.absolute-define'>
<div class='patternname' id='the-common.data.uri.absolute'><a href='#the-common.data.uri.absolute'>uri.absolute</a> =</div>
<span class='pattern' id='common.data.uri.absolute'>d:iri</span>
@@ -1081,8 +1075,7 @@
<span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#a.attrs.rel' title='a.attrs.rel'>rel</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
<span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#a.attrs.hreflang' title='a.attrs.hreflang'>hreflang</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
<span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#a.attrs.media' title='a.attrs.media'>media</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
- <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#a.attrs.type' title='a.attrs.type'>type</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
- <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#a.attrs.ping' title='a.attrs.ping'>ping</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> </span>
+ <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#a.attrs.type' title='a.attrs.type'>type</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span> </span>
</div>
<div class='define' id='a.attrs.name-define'>
<div class='patternname' id='the-a.attrs.name'><a href='#the-a.attrs.name'>name</a> =</div>
@@ -1147,16 +1140,6 @@
</span>}
</span>
</div>
-<div class='define' id='a.attrs.ping-define'>
- <div class='patternname' id='the-a.attrs.ping'><a href='#the-a.attrs.ping'>ping</a> =</div>
- <span class='pattern' id='a.attrs.ping'><span class='type'>attribute </span>
- <span class='name'>ping</span>
- {<span class='model'>
- <a class='ref' href='#common.data.uris' title='common.data.uris'>uris</a>
- </span>}
-
- <span class='postfix intermixed'>intermixed with</span> empty</span>
-</div>
<div class='define' id='a.inner.phrasing-define'>
<div class='patternname' id='the-a.inner.phrasing'><a href='#the-a.inner.phrasing'>a.inner.phrasing</a> =</div>
<span class='pattern' id='a.inner.phrasing'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
@@ -2608,7 +2591,6 @@
<span class='postfix intermixed'>intermixed with</span> <span class='agroupof'><a class='ref' href='#area.attrs.alt' title='area.attrs.alt'>alt</a>
<span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#area.attrs.href' title='area.attrs.href'>href</a></span><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
<span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#area.attrs.target' title='area.attrs.target'>target</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
- <span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#area.attrs.ping' title='area.attrs.ping'>ping</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
<span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#area.attrs.rel' title='area.attrs.rel'>rel</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
<span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#area.attrs.media' title='area.attrs.media'>media</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
<span class='postfix intermixed'>intermixed with</span> <a class='ref' href='#area.attrs.hreflang' title='area.attrs.hreflang'>hreflang</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
@@ -2678,16 +2660,6 @@
</span>}
</span>
</div>
-<div class='define' id='area.attrs.ping-define'>
- <div class='patternname' id='the-area.attrs.ping'><a href='#the-area.attrs.ping'>ping</a> =</div>
- <span class='pattern' id='area.attrs.ping'><span class='type'>attribute </span>
- <span class='name'>ping</span>
- {<span class='model'>
- <a class='ref' href='#common.data.uris' title='common.data.uris'>uris</a>
- </span>}
-
- <span class='postfix intermixed'>intermixed with</span> empty</span>
-</div>
<div class='define' id='area.attrs.shape-define'>
<div class='patternname' id='the-area.attrs.shape'><a href='#the-area.attrs.shape'>shape</a> =</div>
<span class='pattern' id='area.attrs.shape'> <span class='agroupof'><a class='ref' href='#area.attrs.shape.rect' title='area.attrs.shape.rect'>shape.rect</a><span class='postfix optional' title='OPTIONAL (ZERO OR ONE)'>?</span>
Index: area.html
===================================================================
RCS file: /sources/public/html5/markup/area.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- area.html 7 Mar 2010 11:29:03 -0000 1.52
+++ area.html 7 Mar 2010 11:57:31 -0000 1.53
@@ -41,7 +41,6 @@
<span class="postfix intermixed">&</span> <span class="agroupof"><a class="ref" href="area.html#area.attrs.alt" title="area.attrs.alt">alt</a><span class="postfix required" title="REQUIRED">★</span>
<span class="postfix intermixed">&</span> <a class="ref" href="area.html#area.attrs.href" title="area.attrs.href">href</a><span class="postfix required" title="REQUIRED">★</span></span>
<span class="postfix intermixed">&</span> <a class="ref" href="area.html#area.attrs.target" title="area.attrs.target">target</a>
- <span class="postfix intermixed">&</span> <a class="ref" href="area.html#area.attrs.ping" title="area.attrs.ping">ping</a>
<span class="postfix intermixed">&</span> <a class="ref" href="area.html#area.attrs.rel" title="area.attrs.rel">rel</a>
<span class="postfix intermixed">&</span> <a class="ref" href="area.html#area.attrs.media" title="area.attrs.media">media</a>
<span class="postfix intermixed">&</span> <a class="ref" href="area.html#area.attrs.hreflang" title="area.attrs.hreflang">hreflang</a>
@@ -84,15 +83,6 @@
<a href="area.html#area" class="element">area</a>.</dd>
<dt>
-<a class="attribute-name" id="area.attrs.ping" title="area.attrs.ping" href="area.html#area.attrs.ping">ping</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.uris">list of URIs</a>
- </span> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span>
-</dt>
- <dd>A list of URLs to notify if a user follows the hyperlink
- for this
- <a href="area.html#area" class="element">area</a>.</dd>
-
- <dt>
<a class="attribute-name" id="area.attrs.rel" title="area.attrs.rel" href="area.html#area.attrs.rel">rel</a> = <span class="attr-values">
<a class="ref" href="datatypes.html#common.data.tokens" title="common.data.tokens">tokens</a>
</span> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span>
Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/a.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- a.html 7 Mar 2010 11:29:02 -0000 1.57
+++ a.html 7 Mar 2010 11:57:31 -0000 1.58
@@ -45,8 +45,7 @@
<span class="postfix intermixed">&</span> <a class="ref" href="a.html#a.attrs.rel" title="a.attrs.rel">rel</a>
<span class="postfix intermixed">&</span> <a class="ref" href="a.html#a.attrs.hreflang" title="a.attrs.hreflang">hreflang</a>
<span class="postfix intermixed">&</span> <a class="ref" href="a.html#a.attrs.media" title="a.attrs.media">media</a>
- <span class="postfix intermixed">&</span> <a class="ref" href="a.html#a.attrs.type" title="a.attrs.type">type</a>
- <span class="postfix intermixed">&</span> <a class="ref" href="a.html#a.attrs.ping" title="a.attrs.ping">ping</a> </span></p>
+ <span class="postfix intermixed">&</span> <a class="ref" href="a.html#a.attrs.type" title="a.attrs.type">type</a> </span></p>
</div>
</div>
<div class="no-number no-toc" id="a-attributes">
@@ -121,14 +120,6 @@
</span> </dt>
<dd>The MIME type of the destination of the hyperlink.</dd>
- <dt>
-<a class="attribute-name" id="a.attrs.ping" title="a.attrs.ping" href="a.html#a.attrs.ping">ping</a> = <span class="attr-values">
- <a href="datatypes.html#common.data.uris">list of URIs</a>
- </span> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span>
-</dt>
- <dd>A list of URLs to notify if a user follows the
- hyperlink.</dd>
-
</dl>
</div>
Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- datatypes.html 7 Mar 2010 11:29:03 -0000 1.42
+++ datatypes.html 7 Mar 2010 11:57:31 -0000 1.43
@@ -364,18 +364,8 @@
</div>
</div>
</div>
- <div id="common.data.uris-def" class="section">
- <h2 class="common-subhead">9.20. <dfn id="common.data.uris">List of URIs</dfn> <a class="hash" href="#common.data.uris-def">#</a>
-</h2>
- <div class="content-models">
-
- <div class="datatype-desc">A
- <a href="terminology.html#space">space</a>-separated list of zero or more
- <a href="datatypes.html#data.iri-ref">IRI-reference</a> instances.</div>
- </div>
- </div>
<div id="common.data.uri.absolute-def" class="section">
- <h2 class="common-subhead">9.21. <dfn id="common.data.uri.absolute">Absolute URI</dfn> <a class="hash" href="#common.data.uri.absolute-def">#</a>
+ <h2 class="common-subhead">9.20. <dfn id="common.data.uri.absolute">Absolute URI</dfn> <a class="hash" href="#common.data.uri.absolute-def">#</a>
</h2>
<div class="content-models">
@@ -393,7 +383,7 @@
</div>
</div>
<div id="common.data.sizes-def" class="section">
- <h2 class="common-subhead">9.22. <dfn id="common.data.sizes">Sizes</dfn> <a class="hash" href="#common.data.sizes-def">#</a>
+ <h2 class="common-subhead">9.21. <dfn id="common.data.sizes">Sizes</dfn> <a class="hash" href="#common.data.sizes-def">#</a>
</h2>
<div class="content-models">
@@ -415,7 +405,7 @@
</div>
</div>
<div id="common.data.mimetype-def" class="section">
- <h2 class="common-subhead">9.23. <dfn id="common.data.mimetype">MIME type</dfn> <a class="hash" href="#common.data.mimetype-def">#</a>
+ <h2 class="common-subhead">9.22. <dfn id="common.data.mimetype">MIME type</dfn> <a class="hash" href="#common.data.mimetype-def">#</a>
</h2>
<div class="content-models">
@@ -425,7 +415,7 @@
<a href="references.html#refsRFC2046">[RFC2046]</a>.</div> </div>
</div>
<div id="common.data.charset-def" class="section">
- <h2 class="common-subhead">9.24. <dfn id="common.data.charset">Character encoding name</dfn> <a class="hash" href="#common.data.charset-def">#</a>
+ <h2 class="common-subhead">9.23. <dfn id="common.data.charset">Character encoding name</dfn> <a class="hash" href="#common.data.charset-def">#</a>
</h2>
<div class="content-models">
@@ -453,7 +443,7 @@
</div>
</div>
<div id="common.data.meta-charset-def" class="section">
- <h2 class="common-subhead">9.25. <dfn id="common.data.meta-charset">Meta-charset string</dfn> <a class="hash" href="#common.data.meta-charset-def">#</a>
+ <h2 class="common-subhead">9.24. <dfn id="common.data.meta-charset">Meta-charset string</dfn> <a class="hash" href="#common.data.meta-charset-def">#</a>
</h2>
<div class="content-models">
@@ -473,7 +463,7 @@
</div>
</div>
<div id="common.data.refresh-def" class="section">
- <h2 class="common-subhead">9.26. <dfn id="common.data.refresh">Refresh value</dfn> <a class="hash" href="#common.data.refresh-def">#</a>
+ <h2 class="common-subhead">9.25. <dfn id="common.data.refresh">Refresh value</dfn> <a class="hash" href="#common.data.refresh-def">#</a>
</h2>
<div class="content-models">
@@ -503,7 +493,7 @@
</div>
</div>
<div id="common.data.default-style-def" class="section">
- <h2 class="common-subhead">9.27. <dfn id="common.data.default-style">Default-style name</dfn> <a class="hash" href="#common.data.default-style-def">#</a>
+ <h2 class="common-subhead">9.26. <dfn id="common.data.default-style">Default-style name</dfn> <a class="hash" href="#common.data.default-style-def">#</a>
</h2>
<div class="content-models">
@@ -512,7 +502,7 @@
</div>
</div>
<div id="common.data.mediaquery-def" class="section">
- <h2 class="common-subhead">9.28. <dfn id="common.data.mediaquery">Media-query list</dfn> <a class="hash" href="#common.data.mediaquery-def">#</a>
+ <h2 class="common-subhead">9.27. <dfn id="common.data.mediaquery">Media-query list</dfn> <a class="hash" href="#common.data.mediaquery-def">#</a>
</h2>
<div class="content-models">
@@ -523,7 +513,7 @@
</div>
</div>
<div id="common.data.langcode-def" class="section">
- <h2 class="common-subhead">9.29. <dfn id="common.data.langcode">Language tag</dfn> <a class="hash" href="#common.data.langcode-def">#</a>
+ <h2 class="common-subhead">9.28. <dfn id="common.data.langcode">Language tag</dfn> <a class="hash" href="#common.data.langcode-def">#</a>
</h2>
<div class="content-models">
@@ -534,7 +524,7 @@
</div>
</div>
<div id="common.data.keylabellist-def" class="section">
- <h2 class="common-subhead">9.30. <dfn id="common.data.keylabellist">Key-label list</dfn> <a class="hash" href="#common.data.keylabellist-def">#</a>
+ <h2 class="common-subhead">9.29. <dfn id="common.data.keylabellist">Key-label list</dfn> <a class="hash" href="#common.data.keylabellist-def">#</a>
</h2>
<div class="content-models">
@@ -545,7 +535,7 @@
</div>
</div>
<div id="common.data.zero-def" class="section">
- <h2 class="common-subhead">9.31. <dfn id="common.data.zero">Zero</dfn> <a class="hash" href="#common.data.zero-def">#</a>
+ <h2 class="common-subhead">9.30. <dfn id="common.data.zero">Zero</dfn> <a class="hash" href="#common.data.zero-def">#</a>
</h2>
<div class="content-models">
@@ -554,7 +544,7 @@
</div>
</div>
<div id="common.data.rectangle-def" class="section">
- <h2 class="common-subhead">9.32. <dfn id="common.data.rectangle">Rectangle</dfn> <a class="hash" href="#common.data.rectangle-def">#</a>
+ <h2 class="common-subhead">9.31. <dfn id="common.data.rectangle">Rectangle</dfn> <a class="hash" href="#common.data.rectangle-def">#</a>
</h2>
<div class="content-models">
@@ -585,7 +575,7 @@
</div>
</div>
<div id="common.data.circle-def" class="section">
- <h2 class="common-subhead">9.33. <dfn id="common.data.circle">Circle</dfn> <a class="hash" href="#common.data.circle-def">#</a>
+ <h2 class="common-subhead">9.32. <dfn id="common.data.circle">Circle</dfn> <a class="hash" href="#common.data.circle-def">#</a>
</h2>
<div class="content-models">
@@ -609,7 +599,7 @@
</div>
</div>
<div id="common.data.polygon-def" class="section">
- <h2 class="common-subhead">9.34. <dfn id="common.data.polygon">Polygon</dfn> <a class="hash" href="#common.data.polygon-def">#</a>
+ <h2 class="common-subhead">9.33. <dfn id="common.data.polygon">Polygon</dfn> <a class="hash" href="#common.data.polygon-def">#</a>
</h2>
<div class="content-models">
@@ -625,7 +615,7 @@
</div>
</div>
<div id="common.data.sandbox-allow-list-def" class="section">
- <h2 class="common-subhead">9.35. <dfn id="common.data.sandbox-allow-list">Sandbox allow list</dfn> <a class="hash" href="#common.data.sandbox-allow-list-def">#</a>
+ <h2 class="common-subhead">9.34. <dfn id="common.data.sandbox-allow-list">Sandbox allow list</dfn> <a class="hash" href="#common.data.sandbox-allow-list-def">#</a>
</h2>
<div class="content-models">
@@ -642,7 +632,7 @@
</div>
</div>
<div id="form.data.mimetypelist-def" class="section">
- <h2 class="common-subhead">9.36. <dfn id="form.data.mimetypelist">MIME-type list</dfn> <a class="hash" href="#form.data.mimetypelist-def">#</a>
+ <h2 class="common-subhead">9.35. <dfn id="form.data.mimetypelist">MIME-type list</dfn> <a class="hash" href="#form.data.mimetypelist-def">#</a>
</h2>
<div class="content-models">
@@ -652,7 +642,7 @@
</div>
</div>
<div id="form.data.charsetlist-def" class="section">
- <h2 class="common-subhead">9.37. <dfn id="form.data.charsetlist">Character-encoding name list</dfn> <a class="hash" href="#form.data.charsetlist-def">#</a>
+ <h2 class="common-subhead">9.36. <dfn id="form.data.charsetlist">Character-encoding name list</dfn> <a class="hash" href="#form.data.charsetlist-def">#</a>
</h2>
<div class="content-models">
@@ -663,7 +653,7 @@
</div>
</div>
<div id="form.data.pattern-def" class="section">
- <h2 class="common-subhead">9.38. <dfn id="form.data.pattern">Pattern</dfn> <a class="hash" href="#form.data.pattern-def">#</a>
+ <h2 class="common-subhead">9.37. <dfn id="form.data.pattern">Pattern</dfn> <a class="hash" href="#form.data.pattern-def">#</a>
</h2>
<div class="content-models">
@@ -672,7 +662,7 @@
</div>
</div>
<div id="form.data.datetime-local-def" class="section">
- <h2 class="common-subhead">9.39. <dfn id="form.data.datetime-local">Local date-time</dfn> <a class="hash" href="#form.data.datetime-local-def">#</a>
+ <h2 class="common-subhead">9.38. <dfn id="form.data.datetime-local">Local date-time</dfn> <a class="hash" href="#form.data.datetime-local-def">#</a>
</h2>
<div class="content-models">
@@ -693,7 +683,7 @@
</div>
</div>
<div id="form.data.date-def" class="section">
- <h2 class="common-subhead">9.40. <dfn id="form.data.date">Date</dfn> <a class="hash" href="#form.data.date-def">#</a>
+ <h2 class="common-subhead">9.39. <dfn id="form.data.date">Date</dfn> <a class="hash" href="#form.data.date-def">#</a>
</h2>
<div class="content-models">
@@ -712,7 +702,7 @@
</div>
</div>
<div id="form.data.month-def" class="section">
- <h2 class="common-subhead">9.41. <dfn id="form.data.month">Month</dfn> <a class="hash" href="#form.data.month-def">#</a>
+ <h2 class="common-subhead">9.40. <dfn id="form.data.month">Month</dfn> <a class="hash" href="#form.data.month-def">#</a>
</h2>
<div class="content-models">
@@ -734,7 +724,7 @@
</div>
</div>
<div id="form.data.week-def" class="section">
- <h2 class="common-subhead">9.42. <dfn id="form.data.week">Week</dfn> <a class="hash" href="#form.data.week-def">#</a>
+ <h2 class="common-subhead">9.41. <dfn id="form.data.week">Week</dfn> <a class="hash" href="#form.data.week-def">#</a>
</h2>
<div class="content-models">
@@ -759,7 +749,7 @@
</div>
</div>
<div id="form.data.time-def" class="section">
- <h2 class="common-subhead">9.43. <dfn id="form.data.time">Time</dfn> <a class="hash" href="#form.data.time-def">#</a>
+ <h2 class="common-subhead">9.42. <dfn id="form.data.time">Time</dfn> <a class="hash" href="#form.data.time-def">#</a>
</h2>
<div class="content-models">
@@ -776,7 +766,7 @@
</div>
</div>
<div id="form.data.emailaddress-def" class="section">
- <h2 class="common-subhead">9.44. <dfn id="form.data.emailaddress">E-mail address</dfn> <a class="hash" href="#form.data.emailaddress-def">#</a>
+ <h2 class="common-subhead">9.43. <dfn id="form.data.emailaddress">E-mail address</dfn> <a class="hash" href="#form.data.emailaddress-def">#</a>
</h2>
<div class="content-models">
@@ -801,7 +791,7 @@
</div>
</div>
<div id="form.data.emailaddresslist-def" class="section">
- <h2 class="common-subhead">9.45. <dfn id="form.data.emailaddresslist">E-mail address list</dfn> <a class="hash" href="#form.data.emailaddresslist-def">#</a>
+ <h2 class="common-subhead">9.44. <dfn id="form.data.emailaddresslist">E-mail address list</dfn> <a class="hash" href="#form.data.emailaddresslist-def">#</a>
</h2>
<div class="content-models">
@@ -810,7 +800,7 @@
</div>
</div>
<div id="form.data.color-def" class="section">
- <h2 class="common-subhead">9.46. <dfn id="form.data.color">Color</dfn> <a class="hash" href="#form.data.color-def">#</a>
+ <h2 class="common-subhead">9.45. <dfn id="form.data.color">Color</dfn> <a class="hash" href="#form.data.color-def">#</a>
</h2>
<div class="content-models">
Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- patch-schema 25 Feb 2010 14:37:46 -0000 1.87
+++ patch-schema 7 Mar 2010 11:57:31 -0000 1.88
@@ -1,6 +1,6 @@
Index: schema/revision.rnc
===================================================================
---- schema/revision.rnc (revision 533)
+--- schema/revision.rnc (revision 538)
+++ schema/revision.rnc (working copy)
@@ -2,17 +2,6 @@
## RELAX NG Schema for HTML 5: Revision Annotations #
@@ -62,7 +62,7 @@
del.inner.phrasing =
Index: schema/web-forms.rnc
===================================================================
---- schema/web-forms.rnc (revision 533)
+--- schema/web-forms.rnc (revision 538)
+++ schema/web-forms.rnc (working copy)
@@ -9,6 +9,7 @@
common-form.attrs =
@@ -170,7 +170,7 @@
Index: schema/tables.rnc
===================================================================
---- schema/tables.rnc (revision 533)
+--- schema/tables.rnc (revision 538)
+++ schema/tables.rnc (working copy)
@@ -157,38 +157,6 @@
tr.inner =
@@ -276,7 +276,7 @@
( common.inner.flow )
Index: schema/embed.rnc
===================================================================
---- schema/embed.rnc (revision 533)
+--- schema/embed.rnc (revision 538)
+++ schema/embed.rnc (working copy)
@@ -248,7 +248,7 @@
}
@@ -319,7 +319,7 @@
iframe.inner =
( text )
-@@ -388,20 +391,49 @@
+@@ -388,20 +391,44 @@
area.attrs =
( common.attrs
& ( area.attrs.alt
@@ -333,7 +333,6 @@
- & shared-hyperlink.attrs.hreflang?
- & shared-hyperlink.attrs.type?
+ & area.attrs.target?
-+ & area.attrs.ping?
+ & area.attrs.rel?
+ & area.attrs.media?
+ & area.attrs.hreflang?
@@ -368,15 +367,11 @@
+ attribute type {
+ common.data.mimetype
+ }
-+ area.attrs.ping =
-+ attribute ping {
-+ common.data.uris
-+ } & v5only
+
area.attrs.shape =
( ( area.attrs.shape.rect? & area.attrs.coords.rect )
| ( area.attrs.shape.circle & area.attrs.coords.circle )
-@@ -414,7 +446,7 @@
+@@ -414,7 +441,7 @@
}
area.attrs.coords.rect =
attribute coords {
@@ -385,7 +380,7 @@
# xsd:token {
# pattern = "-?[0-9]+,-?[0-9]+,-?[0-9]+,-?[0-9]+"
# }
-@@ -425,7 +457,7 @@
+@@ -425,7 +452,7 @@
}
area.attrs.coords.circle =
attribute coords {
@@ -394,7 +389,7 @@
# xsd:token {
# pattern = "-?[0-9]+,-?[0-9]+,[0-9]+"
# }
-@@ -436,7 +468,7 @@
+@@ -436,7 +463,7 @@
}
area.attrs.coords.poly =
attribute coords {
@@ -405,7 +400,7 @@
# }
Index: schema/media.rnc
===================================================================
---- schema/media.rnc (revision 533)
+--- schema/media.rnc (revision 538)
+++ schema/media.rnc (working copy)
@@ -4,32 +4,6 @@
## RELAX NG Schema for HTML 5: Advanced Embedded Content #
@@ -561,9 +556,9 @@
Index: schema/phrase.rnc
===================================================================
---- schema/phrase.rnc (revision 533)
+--- schema/phrase.rnc (revision 538)
+++ schema/phrase.rnc (working copy)
-@@ -13,13 +13,13 @@
+@@ -13,13 +13,12 @@
a.attrs =
( common.attrs
& a.attrs.name?
@@ -580,11 +575,10 @@
+ & a.attrs.hreflang?
+ & a.attrs.media?
+ & a.attrs.type?
-+ & a.attrs.ping?
& ( common.attrs.aria
| common.attrs.aria.implicit.link
)?
-@@ -28,6 +28,35 @@
+@@ -28,6 +27,31 @@
attribute name {
common.data.id # XXX not what the spec says
}
@@ -612,15 +606,11 @@
+ attribute type {
+ common.data.mimetype
+ }
-+ a.attrs.ping =
-+ attribute ping {
-+ common.data.uris
-+ } & v5only
+
a.inner.phrasing =
( common.inner.phrasing )
a.inner.flow =
-@@ -36,37 +65,6 @@
+@@ -36,37 +60,6 @@
common.elem.phrasing |= a.elem.phrasing
common.elem.flow |= a.elem.flow
@@ -660,7 +650,7 @@
em.elem =
Index: schema/web-forms2.rnc
===================================================================
---- schema/web-forms2.rnc (revision 533)
+--- schema/web-forms2.rnc (revision 538)
+++ schema/web-forms2.rnc (working copy)
@@ -6,9 +6,6 @@
@@ -712,7 +702,7 @@
attribute autocomplete {
Index: schema/meta.rnc
===================================================================
---- schema/meta.rnc (revision 533)
+--- schema/meta.rnc (revision 538)
+++ schema/meta.rnc (working copy)
@@ -101,7 +101,7 @@
title.attrs =
@@ -890,7 +880,7 @@
+ common.elem.metadata |= meta.http-equiv.content-type.elem
Index: schema/applications.rnc
===================================================================
---- schema/applications.rnc (revision 533)
+--- schema/applications.rnc (revision 538)
+++ schema/applications.rnc (working copy)
@@ -4,18 +4,6 @@
## RELAX NG Schema for HTML 5: Web Application Features #
@@ -1019,7 +1009,7 @@
## Menu: <menu>
Index: schema/core-scripting.rnc
===================================================================
---- schema/core-scripting.rnc (revision 533)
+--- schema/core-scripting.rnc (revision 538)
+++ schema/core-scripting.rnc (working copy)
@@ -52,9 +52,9 @@
string
@@ -1057,7 +1047,7 @@
attribute onabort { string }
Index: schema/common.rnc
===================================================================
---- schema/common.rnc (revision 533)
+--- schema/common.rnc (revision 538)
+++ schema/common.rnc (working copy)
@@ -38,16 +38,16 @@
common.attr.anything =
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- spec.html 7 Mar 2010 11:29:07 -0000 1.196
+++ spec.html 7 Mar 2010 11:57:31 -0000 1.197
@@ -2570,8 +2570,7 @@
<span class="postfix intermixed">&</span> <a class="ref" href="#a.attrs.rel" title="a.attrs.rel">rel</a>
<span class="postfix intermixed">&</span> <a class="ref" href="#a.attrs.hreflang" title="a.attrs.hreflang">hreflang</a>
<span class="postfix intermixed">&</span> <a class="ref" href="#a.attrs.media" title="a.attrs.media">media</a>
- <span class="postfix intermixed">&</span> <a class="ref" href="#a.attrs.type" title="a.attrs.type">type</a>
- <span class="postfix intermixed">&</span> <a class="ref" href="#a.attrs.ping" title="a.attrs.ping">ping</a> </span></p>
+ <span class="postfix intermixed">&</span> <a class="ref" href="#a.attrs.type" title="a.attrs.type">type</a> </span></p>
</div>
</div>
<div class="no-number no-toc" id="a-attributes">
@@ -2646,14 +2645,6 @@
</span> </dt>
<dd>The MIME type of the destination of the hyperlink.</dd>
- <dt>
-<a class="attribute-name" id="a.attrs.ping" title="a.attrs.ping" href="#a.attrs.ping">ping</a> = <span class="attr-values">
- <a href="#common.data.uris">list of URIs</a>
- </span> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span>
-</dt>
- <dd>A list of URLs to notify if a user follows the
- hyperlink.</dd>
-
</dl>
</div>
@@ -2969,7 +2960,6 @@
<span class="postfix intermixed">&</span> <span class="agroupof"><a class="ref" href="#area.attrs.alt" title="area.attrs.alt">alt</a><span class="postfix required" title="REQUIRED">★</span>
<span class="postfix intermixed">&</span> <a class="ref" href="#area.attrs.href" title="area.attrs.href">href</a><span class="postfix required" title="REQUIRED">★</span></span>
<span class="postfix intermixed">&</span> <a class="ref" href="#area.attrs.target" title="area.attrs.target">target</a>
- <span class="postfix intermixed">&</span> <a class="ref" href="#area.attrs.ping" title="area.attrs.ping">ping</a>
<span class="postfix intermixed">&</span> <a class="ref" href="#area.attrs.rel" title="area.attrs.rel">rel</a>
<span class="postfix intermixed">&</span> <a class="ref" href="#area.attrs.media" title="area.attrs.media">media</a>
<span class="postfix intermixed">&</span> <a class="ref" href="#area.attrs.hreflang" title="area.attrs.hreflang">hreflang</a>
@@ -3012,15 +3002,6 @@
<a href="#area" class="element">area</a>.</dd>
<dt>
-<a class="attribute-name" id="area.attrs.ping" title="area.attrs.ping" href="#area.attrs.ping">ping</a> = <span class="attr-values">
- <a href="#common.data.uris">list of URIs</a>
- </span> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span>
-</dt>
- <dd>A list of URLs to notify if a user follows the hyperlink
- for this
- <a href="#area" class="element">area</a>.</dd>
-
- <dt>
<a class="attribute-name" id="area.attrs.rel" title="area.attrs.rel" href="#area.attrs.rel">rel</a> = <span class="attr-values">
<a class="ref" href="#common.data.tokens" title="common.data.tokens">tokens</a>
</span> <span class="new-feature" title="This markup feature is newly added in HTML5.">NEW</span>
@@ -18930,18 +18911,8 @@
</div>
</div>
</div>
- <div id="common.data.uris-def" class="section">
- <h2 class="common-subhead">9.20. <dfn id="common.data.uris">List of URIs</dfn> <a class="hash" href="#common.data.uris-def">#</a>
-</h2>
- <div class="content-models">
-
- <div class="datatype-desc">A
- <a href="#space">space</a>-separated list of zero or more
- <a href="#data.iri-ref">IRI-reference</a> instances.</div>
- </div>
- </div>
<div id="common.data.uri.absolute-def" class="section">
- <h2 class="common-subhead">9.21. <dfn id="common.data.uri.absolute">Absolute URI</dfn> <a class="hash" href="#common.data.uri.absolute-def">#</a>
+ <h2 class="common-subhead">9.20. <dfn id="common.data.uri.absolute">Absolute URI</dfn> <a class="hash" href="#common.data.uri.absolute-def">#</a>
</h2>
<div class="content-models">
@@ -18959,7 +18930,7 @@
</div>
</div>
<div id="common.data.sizes-def" class="section">
- <h2 class="common-subhead">9.22. <dfn id="common.data.sizes">Sizes</dfn> <a class="hash" href="#common.data.sizes-def">#</a>
+ <h2 class="common-subhead">9.21. <dfn id="common.data.sizes">Sizes</dfn> <a class="hash" href="#common.data.sizes-def">#</a>
</h2>
<div class="content-models">
@@ -18981,7 +18952,7 @@
</div>
</div>
<div id="common.data.mimetype-def" class="section">
- <h2 class="common-subhead">9.23. <dfn id="common.data.mimetype">MIME type</dfn> <a class="hash" href="#common.data.mimetype-def">#</a>
+ <h2 class="common-subhead">9.22. <dfn id="common.data.mimetype">MIME type</dfn> <a class="hash" href="#common.data.mimetype-def">#</a>
</h2>
<div class="content-models">
@@ -18991,7 +18962,7 @@
<a href="#refsRFC2046">[RFC2046]</a>.</div> </div>
</div>
<div id="common.data.charset-def" class="section">
- <h2 class="common-subhead">9.24. <dfn id="common.data.charset">Character encoding name</dfn> <a class="hash" href="#common.data.charset-def">#</a>
+ <h2 class="common-subhead">9.23. <dfn id="common.data.charset">Character encoding name</dfn> <a class="hash" href="#common.data.charset-def">#</a>
</h2>
<div class="content-models">
@@ -19019,7 +18990,7 @@
</div>
</div>
<div id="common.data.meta-charset-def" class="section">
- <h2 class="common-subhead">9.25. <dfn id="common.data.meta-charset">Meta-charset string</dfn> <a class="hash" href="#common.data.meta-charset-def">#</a>
+ <h2 class="common-subhead">9.24. <dfn id="common.data.meta-charset">Meta-charset string</dfn> <a class="hash" href="#common.data.meta-charset-def">#</a>
</h2>
<div class="content-models">
@@ -19039,7 +19010,7 @@
</div>
</div>
<div id="common.data.refresh-def" class="section">
- <h2 class="common-subhead">9.26. <dfn id="common.data.refresh">Refresh value</dfn> <a class="hash" href="#common.data.refresh-def">#</a>
+ <h2 class="common-subhead">9.25. <dfn id="common.data.refresh">Refresh value</dfn> <a class="hash" href="#common.data.refresh-def">#</a>
</h2>
<div class="content-models">
@@ -19069,7 +19040,7 @@
</div>
</div>
<div id="common.data.default-style-def" class="section">
- <h2 class="common-subhead">9.27. <dfn id="common.data.default-style">Default-style name</dfn> <a class="hash" href="#common.data.default-style-def">#</a>
+ <h2 class="common-subhead">9.26. <dfn id="common.data.default-style">Default-style name</dfn> <a class="hash" href="#common.data.default-style-def">#</a>
</h2>
<div class="content-models">
@@ -19078,7 +19049,7 @@
</div>
</div>
<div id="common.data.mediaquery-def" class="section">
- <h2 class="common-subhead">9.28. <dfn id="common.data.mediaquery">Media-query list</dfn> <a class="hash" href="#common.data.mediaquery-def">#</a>
+ <h2 class="common-subhead">9.27. <dfn id="common.data.mediaquery">Media-query list</dfn> <a class="hash" href="#common.data.mediaquery-def">#</a>
</h2>
<div class="content-models">
@@ -19089,7 +19060,7 @@
</div>
</div>
<div id="common.data.langcode-def" class="section">
- <h2 class="common-subhead">9.29. <dfn id="common.data.langcode">Language tag</dfn> <a class="hash" href="#common.data.langcode-def">#</a>
+ <h2 class="common-subhead">9.28. <dfn id="common.data.langcode">Language tag</dfn> <a class="hash" href="#common.data.langcode-def">#</a>
</h2>
<div class="content-models">
@@ -19100,7 +19071,7 @@
</div>
</div>
<div id="common.data.keylabellist-def" class="section">
- <h2 class="common-subhead">9.30. <dfn id="common.data.keylabellist">Key-label list</dfn> <a class="hash" href="#common.data.keylabellist-def">#</a>
+ <h2 class="common-subhead">9.29. <dfn id="common.data.keylabellist">Key-label list</dfn> <a class="hash" href="#common.data.keylabellist-def">#</a>
</h2>
<div class="content-models">
@@ -19111,7 +19082,7 @@
</div>
</div>
<div id="common.data.zero-def" class="section">
- <h2 class="common-subhead">9.31. <dfn id="common.data.zero">Zero</dfn> <a class="hash" href="#common.data.zero-def">#</a>
+ <h2 class="common-subhead">9.30. <dfn id="common.data.zero">Zero</dfn> <a class="hash" href="#common.data.zero-def">#</a>
</h2>
<div class="content-models">
@@ -19120,7 +19091,7 @@
</div>
</div>
<div id="common.data.rectangle-def" class="section">
- <h2 class="common-subhead">9.32. <dfn id="common.data.rectangle">Rectangle</dfn> <a class="hash" href="#common.data.rectangle-def">#</a>
+ <h2 class="common-subhead">9.31. <dfn id="common.data.rectangle">Rectangle</dfn> <a class="hash" href="#common.data.rectangle-def">#</a>
</h2>
<div class="content-models">
@@ -19151,7 +19122,7 @@
</div>
</div>
<div id="common.data.circle-def" class="section">
- <h2 class="common-subhead">9.33. <dfn id="common.data.circle">Circle</dfn> <a class="hash" href="#common.data.circle-def">#</a>
+ <h2 class="common-subhead">9.32. <dfn id="common.data.circle">Circle</dfn> <a class="hash" href="#common.data.circle-def">#</a>
</h2>
<div class="content-models">
@@ -19175,7 +19146,7 @@
</div>
</div>
<div id="common.data.polygon-def" class="section">
- <h2 class="common-subhead">9.34. <dfn id="common.data.polygon">Polygon</dfn> <a class="hash" href="#common.data.polygon-def">#</a>
+ <h2 class="common-subhead">9.33. <dfn id="common.data.polygon">Polygon</dfn> <a class="hash" href="#common.data.polygon-def">#</a>
</h2>
<div class="content-models">
@@ -19191,7 +19162,7 @@
</div>
</div>
<div id="common.data.sandbox-allow-list-def" class="section">
- <h2 class="common-subhead">9.35. <dfn id="common.data.sandbox-allow-list">Sandbox allow list</dfn> <a class="hash" href="#common.data.sandbox-allow-list-def">#</a>
+ <h2 class="common-subhead">9.34. <dfn id="common.data.sandbox-allow-list">Sandbox allow list</dfn> <a class="hash" href="#common.data.sandbox-allow-list-def">#</a>
</h2>
<div class="content-models">
@@ -19208,7 +19179,7 @@
</div>
</div>
<div id="form.data.mimetypelist-def" class="section">
- <h2 class="common-subhead">9.36. <dfn id="form.data.mimetypelist">MIME-type list</dfn> <a class="hash" href="#form.data.mimetypelist-def">#</a>
+ <h2 class="common-subhead">9.35. <dfn id="form.data.mimetypelist">MIME-type list</dfn> <a class="hash" href="#form.data.mimetypelist-def">#</a>
</h2>
<div class="content-models">
@@ -19218,7 +19189,7 @@
</div>
</div>
<div id="form.data.charsetlist-def" class="section">
- <h2 class="common-subhead">9.37. <dfn id="form.data.charsetlist">Character-encoding name list</dfn> <a class="hash" href="#form.data.charsetlist-def">#</a>
+ <h2 class="common-subhead">9.36. <dfn id="form.data.charsetlist">Character-encoding name list</dfn> <a class="hash" href="#form.data.charsetlist-def">#</a>
</h2>
<div class="content-models">
@@ -19229,7 +19200,7 @@
</div>
</div>
<div id="form.data.pattern-def" class="section">
- <h2 class="common-subhead">9.38. <dfn id="form.data.pattern">Pattern</dfn> <a class="hash" href="#form.data.pattern-def">#</a>
+ <h2 class="common-subhead">9.37. <dfn id="form.data.pattern">Pattern</dfn> <a class="hash" href="#form.data.pattern-def">#</a>
</h2>
<div class="content-models">
@@ -19238,7 +19209,7 @@
</div>
</div>
<div id="form.data.datetime-local-def" class="section">
- <h2 class="common-subhead">9.39. <dfn id="form.data.datetime-local">Local date-time</dfn> <a class="hash" href="#form.data.datetime-local-def">#</a>
+ <h2 class="common-subhead">9.38. <dfn id="form.data.datetime-local">Local date-time</dfn> <a class="hash" href="#form.data.datetime-local-def">#</a>
</h2>
<div class="content-models">
@@ -19259,7 +19230,7 @@
</div>
</div>
<div id="form.data.date-def" class="section">
- <h2 class="common-subhead">9.40. <dfn id="form.data.date">Date</dfn> <a class="hash" href="#form.data.date-def">#</a>
+ <h2 class="common-subhead">9.39. <dfn id="form.data.date">Date</dfn> <a class="hash" href="#form.data.date-def">#</a>
</h2>
<div class="content-models">
@@ -19278,7 +19249,7 @@
</div>
</div>
<div id="form.data.month-def" class="section">
- <h2 class="common-subhead">9.41. <dfn id="form.data.month">Month</dfn> <a class="hash" href="#form.data.month-def">#</a>
+ <h2 class="common-subhead">9.40. <dfn id="form.data.month">Month</dfn> <a class="hash" href="#form.data.month-def">#</a>
</h2>
<div class="content-models">
@@ -19300,7 +19271,7 @@
</div>
</div>
<div id="form.data.week-def" class="section">
- <h2 class="common-subhead">9.42. <dfn id="form.data.week">Week</dfn> <a class="hash" href="#form.data.week-def">#</a>
+ <h2 class="common-subhead">9.41. <dfn id="form.data.week">Week</dfn> <a class="hash" href="#form.data.week-def">#</a>
</h2>
<div class="content-models">
@@ -19325,7 +19296,7 @@
</div>
</div>
<div id="form.data.time-def" class="section">
- <h2 class="common-subhead">9.43. <dfn id="form.data.time">Time</dfn> <a class="hash" href="#form.data.time-def">#</a>
+ <h2 class="common-subhead">9.42. <dfn id="form.data.time">Time</dfn> <a class="hash" href="#form.data.time-def">#</a>
</h2>
<div class="content-models">
@@ -19342,7 +19313,7 @@
</div>
</div>
<div id="form.data.emailaddress-def" class="section">
- <h2 class="common-subhead">9.44. <dfn id="form.data.emailaddress">E-mail address</dfn> <a class="hash" href="#form.data.emailaddress-def">#</a>
+ <h2 class="common-subhead">9.43. <dfn id="form.data.emailaddress">E-mail address</dfn> <a class="hash" href="#form.data.emailaddress-def">#</a>
</h2>
<div class="content-models">
@@ -19367,7 +19338,7 @@
</div>
</div>
<div id="form.data.emailaddresslist-def" class="section">
- <h2 class="common-subhead">9.45. <dfn id="form.data.emailaddresslist">E-mail address list</dfn> <a class="hash" href="#form.data.emailaddresslist-def">#</a>
+ <h2 class="common-subhead">9.44. <dfn id="form.data.emailaddresslist">E-mail address list</dfn> <a class="hash" href="#form.data.emailaddresslist-def">#</a>
</h2>
<div class="content-models">
@@ -19376,7 +19347,7 @@
</div>
</div>
<div id="form.data.color-def" class="section">
- <h2 class="common-subhead">9.46. <dfn id="form.data.color">Color</dfn> <a class="hash" href="#form.data.color-def">#</a>
+ <h2 class="common-subhead">9.45. <dfn id="form.data.color">Color</dfn> <a class="hash" href="#form.data.color-def">#</a>
</h2>
<div class="content-models">
Received on Sunday, 7 March 2010 11:58:05 UTC