Permalink
Browse files

[c] (0) Be clearer about the content models of <option>, <textarea>, …

…<title>.

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=20472
Affected topics: HTML

git-svn-id: http://svn.whatwg.org/webapps@7622 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information...
Hixie committed Dec 31, 2012
1 parent 1b619cf commit 7cd976bc01bc8c348b2ed9ae23df12471269f56f
Showing with 50 additions and 29 deletions.
  1. +17 −10 complete.html
  2. +17 −10 index
  3. +16 −9 source
@@ -248,7 +248,7 @@
<header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
<hgroup><h1 class=allcaps>HTML</h1>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 30 December 2012</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 31 December 2012</h2>
</hgroup><dl><dt><strong>Web developer edition:</strong></dt>
<dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
<dt>Multiple-page version:</dt>
@@ -12103,13 +12103,11 @@ <h6 id=heading-content-0><span class=secno>3.2.5.1.4 </span>Heading content</h6>
content can only contain elements that are themselves categorized as
phrasing content, not any flow content.</p>
<p><dfn id=text-content title="text content">Text</dfn>, in the context of content
models, means <code><a href=#text>Text</a></code> nodes. <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>phrasing content</a>, and can be
<a href=#inter-element-whitespace>inter-element whitespace</a> (if the <code><a href=#text>Text</a></code>
nodes are empty or contain just <a href=#space-character title="space character">space
characters</a>).</p>
<p><dfn id=text-content title="text content">Text</dfn>, in the context of content models, means either nothing,
or <code><a href=#text>Text</a></code> nodes. <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>phrasing content</a>, and can be <a href=#inter-element-whitespace>inter-element
whitespace</a> (if the <code><a href=#text>Text</a></code> nodes are empty or contain just <a href=#space-character title="space
character">space characters</a>).</p>
<p><code><a href=#text>Text</a></code> nodes and attribute values must consist of
<a href=#unicode-character title="Unicode character">Unicode characters</a>, must not
@@ -13932,6 +13930,12 @@ <h4 id=the-title-element><span class=secno>4.2.2 </span>The <dfn><code>title</co
<p>There must be no more than one <code><a href=#the-title-element>title</a></code> element per
document.</p>
<p>The <code><a href=#the-title-element>title</a></code> element must not be empty.</p>
<p class=note>If it's reasonable for the <code><a href=#document>Document</a></code> to have no title, then the
<code><a href=#the-title-element>title</a></code> element is probably not required. See the <code><a href=#the-head-element>head</a></code> element's content
model for a description of when the element is required.</p>
<!--TOPIC:DOM APIs-->
<dl class=domintro><dt><var title="">title</var> . <code title=dom-title-text><a href=#dom-title-text>text</a></code> [ = <var title="">value</var> ]</dt>
@@ -52823,6 +52827,9 @@ <h4 id=the-option-element><span class=secno>4.10.12 </span>The <dfn><code>option
element is the value of the <code title=attr-option-label><a href=#attr-option-label>label</a></code> content attribute, if there
is one, or, if there is not, the value of the element's <code title=dom-option-text><a href=#dom-option-text>text</a></code> IDL attribute.</p>
<p>The <code title=attr-option-label><a href=#attr-option-label>label</a></code> content attribute, if specified, must not be
empty. If the attribute is not specified, then the element itself must not be empty.</p>
<p>The <dfn id=attr-option-value title=attr-option-value><code>value</code></dfn>
attribute provides a value for element. The <dfn id=concept-option-value title=concept-option-value>value</dfn> of an <code><a href=#the-option-element>option</a></code>
element is the value of the <code title=attr-option-value><a href=#attr-option-value>value</a></code> content attribute, if there
@@ -101705,7 +101712,7 @@ <h3 class=no-num id=elements-1>Elements</h3>
<td><code><a href=#the-select-element>select</a></code>;
<code><a href=#the-datalist-element>datalist</a></code>;
<code><a href=#the-optgroup-element>optgroup</a></code></td>
<td><a href=#text-content title="text content">text</a></td>
<td><a href=#text-content title="text content">text</a>*</td>
<td><a href=#global-attributes title="global attributes">globals</a>;
<code title=attr-option-disabled><a href=#attr-option-disabled>disabled</a></code>;
<code title=attr-option-label><a href=#attr-option-label>label</a></code>;
@@ -102020,7 +102027,7 @@ <h3 class=no-num id=elements-1>Elements</h3>
<td>Document title</td>
<td><a href=#metadata-content title="Metadata content">metadata</a></td>
<td><code><a href=#the-head-element>head</a></code></td>
<td><a href=#text-content title="text content">text</a></td>
<td><a href=#text-content title="text content">text</a>*</td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
<td><code><a href=#htmltitleelement>HTMLTitleElement</a></code></td>
<tr><th><code><a href=#the-tr-element>tr</a></code></th>
27 index
@@ -248,7 +248,7 @@
<header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
<hgroup><h1 class=allcaps>HTML</h1>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 30 December 2012</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 31 December 2012</h2>
</hgroup><dl><dt><strong>Web developer edition:</strong></dt>
<dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
<dt>Multiple-page version:</dt>
@@ -12103,13 +12103,11 @@ background: transparent"&gt;blue&lt;/span&gt;.&lt;/p&gt;</pre>
content can only contain elements that are themselves categorized as
phrasing content, not any flow content.</p>
<p><dfn id=text-content title="text content">Text</dfn>, in the context of content
models, means <code><a href=#text>Text</a></code> nodes. <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>phrasing content</a>, and can be
<a href=#inter-element-whitespace>inter-element whitespace</a> (if the <code><a href=#text>Text</a></code>
nodes are empty or contain just <a href=#space-character title="space character">space
characters</a>).</p>
<p><dfn id=text-content title="text content">Text</dfn>, in the context of content models, means either nothing,
or <code><a href=#text>Text</a></code> nodes. <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>phrasing content</a>, and can be <a href=#inter-element-whitespace>inter-element
whitespace</a> (if the <code><a href=#text>Text</a></code> nodes are empty or contain just <a href=#space-character title="space
character">space characters</a>).</p>
<p><code><a href=#text>Text</a></code> nodes and attribute values must consist of
<a href=#unicode-character title="Unicode character">Unicode characters</a>, must not
@@ -13932,6 +13930,12 @@ gave me some of the songs they wrote. I love sharing my music.&lt;/p&gt;
<p>There must be no more than one <code><a href=#the-title-element>title</a></code> element per
document.</p>
<p>The <code><a href=#the-title-element>title</a></code> element must not be empty.</p>
<p class=note>If it's reasonable for the <code><a href=#document>Document</a></code> to have no title, then the
<code><a href=#the-title-element>title</a></code> element is probably not required. See the <code><a href=#the-head-element>head</a></code> element's content
model for a description of when the element is required.</p>
<!--TOPIC:DOM APIs-->
<dl class=domintro><dt><var title="">title</var> . <code title=dom-title-text><a href=#dom-title-text>text</a></code> [ = <var title="">value</var> ]</dt>
@@ -52823,6 +52827,9 @@ interface <dfn id=htmloptionelement>HTMLOptionElement</dfn> : <a href=#htmleleme
element is the value of the <code title=attr-option-label><a href=#attr-option-label>label</a></code> content attribute, if there
is one, or, if there is not, the value of the element's <code title=dom-option-text><a href=#dom-option-text>text</a></code> IDL attribute.</p>
<p>The <code title=attr-option-label><a href=#attr-option-label>label</a></code> content attribute, if specified, must not be
empty. If the attribute is not specified, then the element itself must not be empty.</p>
<p>The <dfn id=attr-option-value title=attr-option-value><code>value</code></dfn>
attribute provides a value for element. The <dfn id=concept-option-value title=concept-option-value>value</dfn> of an <code><a href=#the-option-element>option</a></code>
element is the value of the <code title=attr-option-value><a href=#attr-option-value>value</a></code> content attribute, if there
@@ -101705,7 +101712,7 @@ if (s = prompt('What is your name?')) {
<td><code><a href=#the-select-element>select</a></code>;
<code><a href=#the-datalist-element>datalist</a></code>;
<code><a href=#the-optgroup-element>optgroup</a></code></td>
<td><a href=#text-content title="text content">text</a></td>
<td><a href=#text-content title="text content">text</a>*</td>
<td><a href=#global-attributes title="global attributes">globals</a>;
<code title=attr-option-disabled><a href=#attr-option-disabled>disabled</a></code>;
<code title=attr-option-label><a href=#attr-option-label>label</a></code>;
@@ -102020,7 +102027,7 @@ if (s = prompt('What is your name?')) {
<td>Document title</td>
<td><a href=#metadata-content title="Metadata content">metadata</a></td>
<td><code><a href=#the-head-element>head</a></code></td>
<td><a href=#text-content title="text content">text</a></td>
<td><a href=#text-content title="text content">text</a>*</td>
<td><a href=#global-attributes title="global attributes">globals</a></td>
<td><code><a href=#htmltitleelement>HTMLTitleElement</a></code></td>
<tr><th><code><a href=#the-tr-element>tr</a></code></th>
25 source
@@ -12389,13 +12389,11 @@ background: transparent">blue&lt;/span>.&lt;/p></pre>
content can only contain elements that are themselves categorized as
phrasing content, not any flow content.</p>
<p><dfn title="text content">Text</dfn>, in the context of content
models, means <code>Text</code> nodes. <span title="text
content">Text</span> is sometimes used as a content model on its
own, but is also <span>phrasing content</span>, and can be
<span>inter-element whitespace</span> (if the <code>Text</code>
nodes are empty or contain just <span title="space character">space
characters</span>).</p>
<p><dfn title="text content">Text</dfn>, in the context of content models, means either nothing,
or <code>Text</code> nodes. <span title="text content">Text</span> is sometimes used as a content
model on its own, but is also <span>phrasing content</span>, and can be <span>inter-element
whitespace</span> (if the <code>Text</code> nodes are empty or contain just <span title="space
character">space characters</span>).</p>
<p><code>Text</code> nodes and attribute values must consist of
<span title="Unicode character">Unicode characters</span>, must not
@@ -14464,6 +14462,12 @@ gave me some of the songs they wrote. I love sharing my music.&lt;/p>
<p>There must be no more than one <code>title</code> element per
document.</p>
<p>The <code>title</code> element must not be empty.</p>
<p class="note">If it's reasonable for the <code>Document</code> to have no title, then the
<code>title</code> element is probably not required. See the <code>head</code> element's content
model for a description of when the element is required.</p>
<!--TOPIC:DOM APIs-->
<dl class="domintro">
@@ -61616,6 +61620,9 @@ interface <dfn>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
is one, or, if there is not, the value of the element's <code
title="dom-option-text">text</code> IDL attribute.</p>
<p>The <code title="attr-option-label">label</code> content attribute, if specified, must not be
empty. If the attribute is not specified, then the element itself must not be empty.</p>
<p>The <dfn title="attr-option-value"><code>value</code></dfn>
attribute provides a value for element. The <dfn
title="concept-option-value">value</dfn> of an <code>option</code>
@@ -118965,7 +118972,7 @@ if (s = prompt('What is your name?')) {
<td><code>select</code>;
<code>datalist</code>;
<code>optgroup</code></td>
<td><span title="text content">text</span></td>
<td><span title="text content">text</span>*</td>
<td><span title="global attributes">globals</span>;
<code title="attr-option-disabled">disabled</code>;
<code title="attr-option-label">label</code>;
@@ -119373,7 +119380,7 @@ if (s = prompt('What is your name?')) {
<td>Document title</td>
<td><span title="Metadata content">metadata</span></td>
<td><code>head</code></td>
<td><span title="text content">text</span></td>
<td><span title="text content">text</span>*</td>
<td><span title="global attributes">globals</span></td>
<td><code>HTMLTitleElement</code></td>
</tr>

0 comments on commit 7cd976b

Please sign in to comment.