html5/spec Overview.html,1.2467,1.2468

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv30516

Modified Files:
	Overview.html 
Log Message:
Define the 'Text' content model more clearly. (whatwg r3328)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.2467
retrieving revision 1.2468
diff -u -d -r1.2467 -r1.2468
--- Overview.html	26 Jun 2009 09:08:19 -0000	1.2467
+++ Overview.html	26 Jun 2009 09:15:59 -0000	1.2468
@@ -7156,9 +7156,12 @@
   counted as contributing to the ancestors of the <code><a href="#the-del-element">del</a></code>
   element.<p class="note">Most elements that are categorized as phrasing
   content can only contain elements that are themselves categorized as
-  phrasing content, not any flow content.<p><a href="#text-node" title="text node">Text nodes</a> that are not
-  <a href="#inter-element-whitespace">inter-element whitespace</a> are <a href="#phrasing-content-0">phrasing
-  content</a>.<h5 id="embedded-content"><span class="secno">3.4.1.6 </span>Embedded content</h5><p><dfn id="embedded-content-2">Embedded content</dfn> is content that imports another
+  phrasing content, not any flow content.<p><dfn id="text-content" title="text content">Text</dfn>, in the context of content
+  models, means <a href="#text-node" title="text node">text nodes</a>. <a href="#text-content" title="text content">Text</a> is sometimes used as a content
+  model on its own, but is also <a href="#phrasing-content-0">phrasing content</a>, and can
+  be <a href="#inter-element-whitespace">inter-element whitespace</a> (if the <a href="#text-node" title="text
+  node">text nodes</a> are empty or contain just <a href="#space-character" title="space
+  character">space characters</a>).<h5 id="embedded-content"><span class="secno">3.4.1.6 </span>Embedded content</h5><p><dfn id="embedded-content-2">Embedded content</dfn> is content that imports another
   resource into the document, or content from another vocabulary that
   is inserted into the document.<p>Elements that are from namespaces other than the <a href="#html-namespace-0">HTML
   namespace</a> and that convey content but not metadata, are
@@ -8297,7 +8300,7 @@
    <dt>Contexts in which this element may be used:</dt>
    <dd>In a <code><a href="#the-head-element">head</a></code> element containing no other <code><a href="#the-title-element">title</a></code> elements.</dd>
    <dt>Content model:</dt>
-   <dd>Text.</dd>
+   <dd><a href="#text-content" title="text content">Text</a>.</dd>
    <dt>Content attributes:</dt>
    <dd><a href="#global-attributes">Global attributes</a></dd>
    <dt>DOM interface:</dt>
@@ -29706,7 +29709,7 @@
    <dd>As a child of a <code><a href="#the-datalist-element">datalist</a></code> element.</dd>
    <dd>As a child of an <code><a href="#the-optgroup-element">optgroup</a></code> element.</dd>
    <dt>Content model:</dt>
-   <dd>Text.</dd>
+   <dd><a href="#text-content" title="text content">Text</a>.</dd>
    <dt>Content attributes:</dt>
    <dd><a href="#global-attributes">Global attributes</a></dd>
    <dd><code title="attr-option-disabled"><a href="#attr-option-disabled">disabled</a></code></dd>
@@ -29874,7 +29877,7 @@
    <dt>Contexts in which this element may be used:</dt>
    <dd>Where <a href="#phrasing-content-0">phrasing content</a> is expected.</dd>
    <dt>Content model:</dt>
-   <dd>Text.</dd>
+   <dd><a href="#text-content" title="text content">Text</a>.</dd>
    <dt>Content attributes:</dt>
    <dd><a href="#global-attributes">Global attributes</a></dd>
    <dd><code title="attr-fe-autofocus"><a href="#attr-fe-autofocus">autofocus</a></code></dd>

Received on Friday, 26 June 2009 09:16:10 UTC