- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 22 Sep 2009 09:57:10 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec-author-view
In directory hutz:/tmp/cvs-serv17601
Modified Files:
Overview.html acknowledgements.html browsers.html comms.html
dom.html editing.html embedded-content-0.html forms.html
history.html iana-considerations.html index.html
infrastructure.html interactive-elements.html
introduction.html microdata.html
named-character-references.html no.html obsolete.html
offline.html references.html semantics.html spec.html
syntax.html tabular-data.html text-level-semantics.html
the-canvas-element.html the-xhtml-syntax.html video.html
Log Message:
Tidy up the content models section. (whatwg r3958)
[updated by splitter]
Index: infrastructure.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/infrastructure.html,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- infrastructure.html 22 Sep 2009 09:37:00 -0000 1.213
+++ infrastructure.html 22 Sep 2009 09:57:06 -0000 1.214
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="introduction.html">← 1 Introduction</a> –
<a href="Overview.html#contents">Table of contents</a> –
@@ -267,9 +267,9 @@
Types" of RFC 2616. <a href="references.html#refsHTTP">[HTTP]</a></p><h4 id="xml"><span class="secno">2.1.2 </span>XML</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p id="html-namespace">To ease migration from HTML to XHTML, UAs
conforming to this specification will place elements in HTML in the
<code>http://www.w3.org/1999/xhtml</code> namespace, at least for
- the purposes of the DOM and CSS. The term "<dfn id="elements-in-the-html-namespace">elements in the HTML
- namespace</dfn>", or "<dfn id="html-elements">HTML elements</dfn>" for short, when used
- in this specification, thus refers to both HTML and XHTML
+ the purposes of the DOM and CSS. The term "<dfn id="html-elements">HTML
+ elements</dfn>", when used in this specification, refers to any
+ element in that namespace, and thus refers to both HTML and XHTML
elements.</p><p>Unless otherwise stated, all elements defined or mentioned in
this specification are in the
<code>http://www.w3.org/1999/xhtml</code> namespace, and all
Index: text-level-semantics.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/text-level-semantics.html,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- text-level-semantics.html 22 Sep 2009 09:37:01 -0000 1.211
+++ text-level-semantics.html 22 Sep 2009 09:57:07 -0000 1.212
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="semantics.html">← 4 The elements of HTML</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: history.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/history.html,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- history.html 22 Sep 2009 09:37:00 -0000 1.213
+++ history.html 22 Sep 2009 09:57:06 -0000 1.214
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="offline.html">← 6.7 Offline Web applications</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: tabular-data.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/tabular-data.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- tabular-data.html 22 Sep 2009 09:37:01 -0000 1.212
+++ tabular-data.html 22 Sep 2009 09:57:07 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="the-canvas-element.html">← 4.8.11 The canvas element</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: microdata.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/microdata.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- microdata.html 22 Sep 2009 09:37:00 -0000 1.212
+++ microdata.html 22 Sep 2009 09:57:07 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="interactive-elements.html">← 4.11 Interactive elements</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/Overview.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- Overview.html 22 Sep 2009 09:36:59 -0000 1.212
+++ Overview.html 22 Sep 2009 09:57:06 -0000 1.213
@@ -240,7 +240,7 @@
</dl><p>This specification is available in the following formats:
<a href="spec.html">single page HTML</a>,
<a href="Overview.html">multipage HTML</a>.
-This is revision 1.3119.
+This is revision 1.3120.
</p>
<p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
© 2009 <a href="http://www.w3.org/"><abbr title="World Wide
Index: embedded-content-0.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/embedded-content-0.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- embedded-content-0.html 22 Sep 2009 09:37:00 -0000 1.212
+++ embedded-content-0.html 22 Sep 2009 09:57:06 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="dom.html">← 3 Semantics, structure, and APIs of HTML documents</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: dom.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/dom.html,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- dom.html 22 Sep 2009 09:37:00 -0000 1.213
+++ dom.html 22 Sep 2009 09:57:06 -0000 1.214
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="infrastructure.html">← 2 Common infrastructure</a> –
<a href="Overview.html#contents">Table of contents</a> –
@@ -1075,10 +1075,10 @@
</dl><p>This is then followed by a description of what the element
<a href="#represents">represents</a>, along with any additional normative
conformance criteria that may apply to authors. Examples are sometimes
- also included.</p><h4 id="content-models"><span class="secno">3.2.5 </span><dfn>Content models</dfn></h4><p>All the elements in this specification have a defined content
- model, which describes what nodes are allowed inside the elements,
- and thus what the structure of an HTML document or fragment must
- look like.</p><p class="note">As noted in the conformance and terminology
+ also included.</p><h4 id="content-models"><span class="secno">3.2.5 </span><dfn>Content models</dfn></h4><p>Each element defined in this specification has a content model: a
+ description of the element's expected contents. An <a href="infrastructure.html#html-elements" title="HTML
+ elements">HTML element</a> must have contents that match the
+ requirements described in the element's content model.</p><p class="note">As noted in the conformance and terminology
sections, for the purposes of determining if an element matches its
content model or not, <a href="infrastructure.html#text-node" title="text
node"><code>CDATASection</code> nodes in the DOM are treated as
@@ -1091,23 +1091,23 @@
those characters are considered <dfn id="inter-element-whitespace">inter-element
whitespace</dfn>.</p><p><a href="#inter-element-whitespace">Inter-element whitespace</a>, comment nodes, and
processing instruction nodes must be ignored when establishing
- whether an element matches its content model or not, and must be
- ignored when following algorithms that define document and element
- semantics.</p><p>An element <var title="">A</var> is said to be <dfn id="preceded-or-followed">preceded or
+ whether an element's contents match the element's content model or
+ not, and must be ignored when following algorithms that define
+ document and element semantics.</p><p>An element <var title="">A</var> is said to be <dfn id="preceded-or-followed">preceded or
followed</dfn> by a second element <var title="">B</var> if <var title="">A</var> and <var title="">B</var> have the same parent node
and there are no other element nodes or text nodes (other than
- <a href="#inter-element-whitespace">inter-element whitespace</a>) between them.</p><p>Authors must not use <a href="infrastructure.html#elements-in-the-html-namespace">elements in the HTML namespace</a>
- anywhere except where they are explicitly allowed, as defined for
- each element, or as explicitly required by other specifications. For
- XML compound documents, these contexts could be inside elements from
- other namespaces, if those elements are defined as providing the
- relevant contexts.</p><div class="example">
+ <a href="#inter-element-whitespace">inter-element whitespace</a>) between them.</p><p>Authors must not use <a href="infrastructure.html#html-elements">HTML elements</a> anywhere except
+ where they are explicitly allowed, as defined for each element, or
+ as explicitly required by other specifications. For XML compound
+ documents, these contexts could be inside elements from other
+ namespaces, if those elements are defined as providing the relevant
+ contexts.</p><div class="example">
<p>The Atom specification defines the Atom <code title="">content</code> element, when its <code title="">type</code> attribute has the value <code title="">xhtml</code>, as requiring that it contains a single HTML
<code><a href="semantics.html#the-div-element">div</a></code> element. Thus, a <code><a href="semantics.html#the-div-element">div</a></code> element is
allowed in that context, even though this is not explicitly
normatively stated by this specification. <a href="references.html#refsATOM">[ATOM]</a></p>
- </div><p>In addition, <a href="infrastructure.html#elements-in-the-html-namespace">elements in the HTML namespace</a> may be
- orphan nodes (i.e. without a parent node).</p><div class="example">
+ </div><p>In addition, <a href="infrastructure.html#html-elements">HTML elements</a> may be orphan nodes
+ (i.e. without a parent node).</p><div class="example">
<p>For example, creating a <code><a href="tabular-data.html#the-td-element">td</a></code> element and storing it
in a global variable in a script is conforming, even though
Index: acknowledgements.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/acknowledgements.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- acknowledgements.html 22 Sep 2009 09:37:00 -0000 1.212
+++ acknowledgements.html 22 Sep 2009 09:57:06 -0000 1.213
@@ -217,7 +217,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="references.html">← References</a> –
<a href="Overview.html#contents">Table of contents</a>
Index: the-canvas-element.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/the-canvas-element.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- the-canvas-element.html 22 Sep 2009 09:37:01 -0000 1.212
+++ the-canvas-element.html 22 Sep 2009 09:57:07 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="video.html">← 4.8.7 The video element</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: iana-considerations.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/iana-considerations.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- iana-considerations.html 22 Sep 2009 09:37:00 -0000 1.212
+++ iana-considerations.html 22 Sep 2009 09:57:06 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="no.html">← 12 Things that you can't do with this specification because they are better handled using other technologies that are further described herein</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: forms.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/forms.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- forms.html 22 Sep 2009 09:37:00 -0000 1.212
+++ forms.html 22 Sep 2009 09:57:06 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="tabular-data.html">← 4.9 Tabular data</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: interactive-elements.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/interactive-elements.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- interactive-elements.html 22 Sep 2009 09:37:00 -0000 1.212
+++ interactive-elements.html 22 Sep 2009 09:57:06 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="forms.html">← 4.10 Forms</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: editing.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/editing.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- editing.html 22 Sep 2009 09:37:00 -0000 1.212
+++ editing.html 22 Sep 2009 09:57:06 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="history.html">← 6.8 Session history and navigation</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: video.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/video.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- video.html 22 Sep 2009 09:37:01 -0000 1.212
+++ video.html 22 Sep 2009 09:57:07 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="text-level-semantics.html">← 4.6 Text-level semantics</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: browsers.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/browsers.html,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- browsers.html 22 Sep 2009 09:37:00 -0000 1.213
+++ browsers.html 22 Sep 2009 09:57:06 -0000 1.214
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="microdata.html">← 5 Microdata</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: the-xhtml-syntax.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/the-xhtml-syntax.html,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- the-xhtml-syntax.html 22 Sep 2009 09:37:01 -0000 1.211
+++ the-xhtml-syntax.html 22 Sep 2009 09:57:07 -0000 1.212
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="named-character-references.html">← 9.2 Named character references</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: offline.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/offline.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- offline.html 22 Sep 2009 09:37:00 -0000 1.212
+++ offline.html 22 Sep 2009 09:57:07 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="browsers.html">← 6 Web browsers</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: syntax.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/syntax.html,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- syntax.html 22 Sep 2009 09:37:00 -0000 1.213
+++ syntax.html 22 Sep 2009 09:57:07 -0000 1.214
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="comms.html">← 8 Communication</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: obsolete.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/obsolete.html,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- obsolete.html 22 Sep 2009 09:37:00 -0000 1.213
+++ obsolete.html 22 Sep 2009 09:57:07 -0000 1.214
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="the-xhtml-syntax.html">← 10 The XHTML syntax</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: named-character-references.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/named-character-references.html,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- named-character-references.html 22 Sep 2009 09:37:00 -0000 1.213
+++ named-character-references.html 22 Sep 2009 09:57:07 -0000 1.214
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="syntax.html">← 9 The HTML syntax</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: references.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/references.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- references.html 22 Sep 2009 09:37:00 -0000 1.212
+++ references.html 22 Sep 2009 09:57:07 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="index.html">← Index</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: semantics.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/semantics.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- semantics.html 22 Sep 2009 09:37:00 -0000 1.212
+++ semantics.html 22 Sep 2009 09:57:07 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="embedded-content-0.html">← 3.2.5.1.6 Embedded content</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: index.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/index.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- index.html 22 Sep 2009 09:37:00 -0000 1.212
+++ index.html 22 Sep 2009 09:57:06 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="iana-considerations.html">← IANA considerations</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: comms.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/comms.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- comms.html 22 Sep 2009 09:37:00 -0000 1.212
+++ comms.html 22 Sep 2009 09:57:06 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="editing.html">← 7 User Interaction</a> –
<a href="Overview.html#contents">Table of contents</a> –
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/spec.html,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- spec.html 22 Sep 2009 09:37:00 -0000 1.213
+++ spec.html 22 Sep 2009 09:57:07 -0000 1.214
@@ -238,7 +238,7 @@
</dl><p>This specification is available in the following formats:
<a href=spec.html>single page HTML</a>,
<a href=Overview.html>multipage HTML</a>.
-This is revision 1.3119.
+This is revision 1.3120.
</p>
<p class=copyright><a href=http://www.w3.org/Consortium/Legal/ipr-notice#Copyright>Copyright</a>
© 2009 <a href=http://www.w3.org/><abbr title="World Wide
@@ -1318,9 +1318,9 @@
Types" of RFC 2616. <a href=#refsHTTP>[HTTP]</a></p><h4 id=xml><span class=secno>2.1.2 </span>XML</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p id=html-namespace>To ease migration from HTML to XHTML, UAs
conforming to this specification will place elements in HTML in the
<code>http://www.w3.org/1999/xhtml</code> namespace, at least for
- the purposes of the DOM and CSS. The term "<dfn id=elements-in-the-html-namespace>elements in the HTML
- namespace</dfn>", or "<dfn id=html-elements>HTML elements</dfn>" for short, when used
- in this specification, thus refers to both HTML and XHTML
+ the purposes of the DOM and CSS. The term "<dfn id=html-elements>HTML
+ elements</dfn>", when used in this specification, refers to any
+ element in that namespace, and thus refers to both HTML and XHTML
elements.</p><p>Unless otherwise stated, all elements defined or mentioned in
this specification are in the
<code>http://www.w3.org/1999/xhtml</code> namespace, and all
@@ -3133,10 +3133,10 @@
</dl><p>This is then followed by a description of what the element
<a href=#represents>represents</a>, along with any additional normative
conformance criteria that may apply to authors. Examples are sometimes
- also included.</p><h4 id=content-models><span class=secno>3.2.5 </span><dfn>Content models</dfn></h4><p>All the elements in this specification have a defined content
- model, which describes what nodes are allowed inside the elements,
- and thus what the structure of an HTML document or fragment must
- look like.</p><p class=note>As noted in the conformance and terminology
+ also included.</p><h4 id=content-models><span class=secno>3.2.5 </span><dfn>Content models</dfn></h4><p>Each element defined in this specification has a content model: a
+ description of the element's expected contents. An <a href=#html-elements title="HTML
+ elements">HTML element</a> must have contents that match the
+ requirements described in the element's content model.</p><p class=note>As noted in the conformance and terminology
sections, for the purposes of determining if an element matches its
content model or not, <a href=#text-node title="text
node"><code>CDATASection</code> nodes in the DOM are treated as
@@ -3149,23 +3149,23 @@
those characters are considered <dfn id=inter-element-whitespace>inter-element
whitespace</dfn>.</p><p><a href=#inter-element-whitespace>Inter-element whitespace</a>, comment nodes, and
processing instruction nodes must be ignored when establishing
- whether an element matches its content model or not, and must be
- ignored when following algorithms that define document and element
- semantics.</p><p>An element <var title="">A</var> is said to be <dfn id=preceded-or-followed>preceded or
+ whether an element's contents match the element's content model or
+ not, and must be ignored when following algorithms that define
+ document and element semantics.</p><p>An element <var title="">A</var> is said to be <dfn id=preceded-or-followed>preceded or
followed</dfn> by a second element <var title="">B</var> if <var title="">A</var> and <var title="">B</var> have the same parent node
and there are no other element nodes or text nodes (other than
- <a href=#inter-element-whitespace>inter-element whitespace</a>) between them.</p><p>Authors must not use <a href=#elements-in-the-html-namespace>elements in the HTML namespace</a>
- anywhere except where they are explicitly allowed, as defined for
- each element, or as explicitly required by other specifications. For
- XML compound documents, these contexts could be inside elements from
- other namespaces, if those elements are defined as providing the
- relevant contexts.</p><div class=example>
+ <a href=#inter-element-whitespace>inter-element whitespace</a>) between them.</p><p>Authors must not use <a href=#html-elements>HTML elements</a> anywhere except
+ where they are explicitly allowed, as defined for each element, or
+ as explicitly required by other specifications. For XML compound
+ documents, these contexts could be inside elements from other
+ namespaces, if those elements are defined as providing the relevant
+ contexts.</p><div class=example>
<p>The Atom specification defines the Atom <code title="">content</code> element, when its <code title="">type</code> attribute has the value <code title="">xhtml</code>, as requiring that it contains a single HTML
<code><a href=#the-div-element>div</a></code> element. Thus, a <code><a href=#the-div-element>div</a></code> element is
allowed in that context, even though this is not explicitly
normatively stated by this specification. <a href=#refsATOM>[ATOM]</a></p>
- </div><p>In addition, <a href=#elements-in-the-html-namespace>elements in the HTML namespace</a> may be
- orphan nodes (i.e. without a parent node).</p><div class=example>
+ </div><p>In addition, <a href=#html-elements>HTML elements</a> may be orphan nodes
+ (i.e. without a parent node).</p><div class=example>
<p>For example, creating a <code><a href=#the-td-element>td</a></code> element and storing it
in a global variable in a script is conforming, even though
Index: introduction.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/introduction.html,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- introduction.html 22 Sep 2009 09:37:00 -0000 1.213
+++ introduction.html 22 Sep 2009 09:57:06 -0000 1.214
@@ -217,7 +217,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="Overview.html#contents">Table of contents</a> –
<a href="infrastructure.html">2 Common infrastructure →</a>
Index: no.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/no.html,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- no.html 22 Sep 2009 09:37:00 -0000 1.212
+++ no.html 22 Sep 2009 09:57:07 -0000 1.213
@@ -218,7 +218,7 @@
<p><a href="http://www.w3.org/"><img alt="W3C" height="48" src="http://www.w3.org/Icons/w3c_home" width="72"></a></p>
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-<p>This is revision 1.3119.</p>
+<p>This is revision 1.3120.</p>
</div><div>
<a href="obsolete.html">← 11 Obsolete features</a> –
<a href="Overview.html#contents">Table of contents</a> –
Received on Tuesday, 22 September 2009 09:57:21 UTC