Skip to content

Commit

Permalink
[e] (0) Move away from the term 'RCDATA' in the syntax section. (I ha…
Browse files Browse the repository at this point in the history 
…ven't changed the parser section, so that people who have implemented it don't get really confused.)

Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=21572
Affected topics: HTML Syntax and Parsing, Video Text Tracks

git-svn-id: http://svn.whatwg.org/webapps@7953 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Jun 11, 2013
1 parent 3c21ae2 commit 5e3ae9e
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 37 deletions.
26 changes: 13 additions & 13 deletions complete.html
View file
Expand Up @@ -252,11 +252,11 @@
}
}, false);

</script><body onload=init()>
</script><script async defer src="//survey.g.doubleclick.net/async_survey?site=5kr27scvp3mng"></script><body onload=init()>

<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 10 June 2013</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 11 June 2013</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>
Expand Down Expand Up @@ -1161,7 +1161,7 @@ <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 10 June 2013</h2>
<li><a href=#attributes-0><span class=secno>12.1.2.3 </span>Attributes</a></li>
<li><a href=#optional-tags><span class=secno>12.1.2.4 </span>Optional tags</a></li>
<li><a href=#element-restrictions><span class=secno>12.1.2.5 </span>Restrictions on content models</a></li>
<li><a href=#cdata-rcdata-restrictions><span class=secno>12.1.2.6 </span>Restrictions on the contents of raw text and RCDATA elements</a></ol></li>
<li><a href=#cdata-rcdata-restrictions><span class=secno>12.1.2.6 </span>Restrictions on the contents of raw text and escapable raw text elements</a></ol></li>
<li><a href=#text-0><span class=secno>12.1.3 </span>Text</a>
<ol>
<li><a href=#newlines><span class=secno>12.1.3.1 </span>Newlines</a></ol></li>
Expand Down Expand Up @@ -30749,9 +30749,9 @@ <h6 id=text-track-model><span class=secno>4.8.10.12.1 </span>Text track model</h
<p>Indicates that the text track is active. If no attempt has yet been made to obtain the
track's cues, the user agent will perform such an attempt momentarily. The user agent is
maintaining a list of which cues are active, and events are being fired accordingly. In
addition, for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-mediatrack-kind-subtitles>subtitles</code> or <code title=dom-mediatrack-kind-captions>captions</code>, the cues are being overlaid on the video
as appropriate; for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-mediatrack-kind-descriptions>descriptions</code>, the user agent is making the
cues available to the user in a non-visual fashion; and for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-mediatrack-kind-chapters>chapters</code>, the user agent is making available to
addition, for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-TextTrack-kind-subtitles><a href=#dom-texttrack-kind-subtitles>subtitles</a></code> or <code title=dom-TextTrack-kind-captions><a href=#dom-texttrack-kind-captions>captions</a></code>, the cues are being overlaid on the video
as appropriate; for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-TextTrack-kind-descriptions><a href=#dom-texttrack-kind-descriptions>descriptions</a></code>, the user agent is making the
cues available to the user in a non-visual fashion; and for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-TextTrack-kind-chapters><a href=#dom-texttrack-kind-chapters>chapters</a></code>, the user agent is making available to
the user a mechanism by which the user can navigate to any point in the <a href=#media-resource>media
resource</a> by selecting a cue.</p>

Expand Down Expand Up @@ -83666,7 +83666,7 @@ <h4 id=the-doctype><span class=secno>12.1.1 </span>The DOCTYPE</h4>
<h4 id=elements-0><span class=secno>12.1.2 </span>Elements</h4>

<p>There are five different kinds of <dfn id=syntax-elements title=syntax-elements>elements</dfn>: <a href=#void-elements>void elements</a>,
<a href=#raw-text-elements>raw text elements</a>, <a href=#rcdata-elements>RCDATA elements</a>,
<a href=#raw-text-elements>raw text elements</a>, <a href=#escapable-raw-text-elements>escapable raw text elements</a>,
<a href=#foreign-elements>foreign elements</a>, and <a href=#normal-elements>normal elements</a>.</p>

<dl><dt><dfn id=void-elements>Void elements</dfn></dt>
Expand All @@ -83682,7 +83682,7 @@ <h4 id=elements-0><span class=secno>12.1.2 </span>Elements</h4>
<dd><code><a href=#the-script-element>script</a></code>, <code><a href=#the-style-element>style</a></code></dd> <!-- iframe and
noscript don't count as raw text for syntax purposes -->

<dt><dfn id=rcdata-elements>RCDATA elements</dfn></dt>
<dt><dfn id=escapable-raw-text-elements>escapable raw text elements</dfn></dt>

<dd><code><a href=#the-textarea-element>textarea</a></code>, <code><a href=#the-title-element>title</a></code></dd>

Expand All @@ -83698,8 +83698,8 @@ <h4 id=elements-0><span class=secno>12.1.2 </span>Elements</h4>

</dl><!--CLEANUP--><p><dfn id=syntax-tags title=syntax-tags>Tags</dfn> are used to delimit the start
and end of elements in the markup. <a href=#raw-text-elements title="raw text
elements">Raw text</a>, <a href=#rcdata-elements title="RCDATA
elements">RCDATA</a>, and <a href=#normal-elements title="normal
elements">Raw text</a>, <a href=#escapable-raw-text-elements title="escapable raw text
elements">escapable raw text</a>, and <a href=#normal-elements title="normal
elements">normal</a> elements have a <a href=#syntax-start-tag title=syntax-start-tag>start tag</a> to indicate where they
begin, and an <a href=#syntax-end-tag title=syntax-end-tag>end tag</a> to
indicate where they end. The start and end tags of certain
Expand Down Expand Up @@ -83729,7 +83729,7 @@ <h4 id=elements-0><span class=secno>12.1.2 </span>Elements</h4>
<p><a href=#raw-text-elements>Raw text elements</a> can have <a href=#syntax-text title=syntax-text>text</a>, though it has <a href=#cdata-rcdata-restrictions>restrictions</a> described
below.</p>

<p><a href=#rcdata-elements>RCDATA elements</a> can have <a href=#syntax-text title=syntax-text>text</a> and <a href=#syntax-charref title=syntax-charref>character references</a>, but the text
<p><a href=#escapable-raw-text-elements>escapable raw text elements</a> can have <a href=#syntax-text title=syntax-text>text</a> and <a href=#syntax-charref title=syntax-charref>character references</a>, but the text
must not contain an <a href=#syntax-ambiguous-ampersand title=syntax-ambiguous-ampersand>ambiguous ampersand</a>.
There are also <a href=#cdata-rcdata-restrictions>further
restrictions</a> described below.</p>
Expand Down Expand Up @@ -84238,10 +84238,10 @@ <h5 id=element-restrictions><span class=secno>12.1.2.5 </span>Restrictions on co
</div>


<h5 id=cdata-rcdata-restrictions><span class=secno>12.1.2.6 </span>Restrictions on the contents of raw text and RCDATA elements</h5>
<h5 id=cdata-rcdata-restrictions><span class=secno>12.1.2.6 </span>Restrictions on the contents of raw text and escapable raw text elements</h5>

<p>The text in <a href=#raw-text-elements title="raw text elements">raw text</a> and
<a href=#rcdata-elements>RCDATA elements</a> must not contain any occurrences of the
<a href=#escapable-raw-text-elements>escapable raw text elements</a> must not contain any occurrences of the
string "<code title="">&lt;/</code>" (U+003C LESS-THAN SIGN, U+002F
SOLIDUS) followed by characters that case-insensitively match the
tag name of the element followed by one of U+0009 CHARACTER
Expand Down
26 changes: 13 additions & 13 deletions index
View file
Expand Up @@ -252,11 +252,11 @@
}
}, false);

</script><body onload=init()>
</script><script async defer src="//survey.g.doubleclick.net/async_survey?site=5kr27scvp3mng"></script><body onload=init()>

<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 10 June 2013</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 11 June 2013</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>
Expand Down Expand Up @@ -1161,7 +1161,7 @@
<li><a href=#attributes-0><span class=secno>12.1.2.3 </span>Attributes</a></li>
<li><a href=#optional-tags><span class=secno>12.1.2.4 </span>Optional tags</a></li>
<li><a href=#element-restrictions><span class=secno>12.1.2.5 </span>Restrictions on content models</a></li>
<li><a href=#cdata-rcdata-restrictions><span class=secno>12.1.2.6 </span>Restrictions on the contents of raw text and RCDATA elements</a></ol></li>
<li><a href=#cdata-rcdata-restrictions><span class=secno>12.1.2.6 </span>Restrictions on the contents of raw text and escapable raw text elements</a></ol></li>
<li><a href=#text-0><span class=secno>12.1.3 </span>Text</a>
<ol>
<li><a href=#newlines><span class=secno>12.1.3.1 </span>Newlines</a></ol></li>
Expand Down Expand Up @@ -30749,9 +30749,9 @@ interface <dfn id=mediacontroller>MediaController</dfn> : <a href=#eventtarget>E
<p>Indicates that the text track is active. If no attempt has yet been made to obtain the
track's cues, the user agent will perform such an attempt momentarily. The user agent is
maintaining a list of which cues are active, and events are being fired accordingly. In
addition, for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-mediatrack-kind-subtitles>subtitles</code> or <code title=dom-mediatrack-kind-captions>captions</code>, the cues are being overlaid on the video
as appropriate; for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-mediatrack-kind-descriptions>descriptions</code>, the user agent is making the
cues available to the user in a non-visual fashion; and for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-mediatrack-kind-chapters>chapters</code>, the user agent is making available to
addition, for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-TextTrack-kind-subtitles><a href=#dom-texttrack-kind-subtitles>subtitles</a></code> or <code title=dom-TextTrack-kind-captions><a href=#dom-texttrack-kind-captions>captions</a></code>, the cues are being overlaid on the video
as appropriate; for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-TextTrack-kind-descriptions><a href=#dom-texttrack-kind-descriptions>descriptions</a></code>, the user agent is making the
cues available to the user in a non-visual fashion; and for text tracks whose <a href=#text-track-kind title="text track kind">kind</a> is <code title=dom-TextTrack-kind-chapters><a href=#dom-texttrack-kind-chapters>chapters</a></code>, the user agent is making available to
the user a mechanism by which the user can navigate to any point in the <a href=#media-resource>media
resource</a> by selecting a cue.</p>

Expand Down Expand Up @@ -83666,7 +83666,7 @@ dictionary <dfn id=storageeventinit>StorageEventInit</dfn> : <a href=#eventinit>
<h4 id=elements-0><span class=secno>12.1.2 </span>Elements</h4>

<p>There are five different kinds of <dfn id=syntax-elements title=syntax-elements>elements</dfn>: <a href=#void-elements>void elements</a>,
<a href=#raw-text-elements>raw text elements</a>, <a href=#rcdata-elements>RCDATA elements</a>,
<a href=#raw-text-elements>raw text elements</a>, <a href=#escapable-raw-text-elements>escapable raw text elements</a>,
<a href=#foreign-elements>foreign elements</a>, and <a href=#normal-elements>normal elements</a>.</p>

<dl><dt><dfn id=void-elements>Void elements</dfn></dt>
Expand All @@ -83682,7 +83682,7 @@ dictionary <dfn id=storageeventinit>StorageEventInit</dfn> : <a href=#eventinit>
<dd><code><a href=#the-script-element>script</a></code>, <code><a href=#the-style-element>style</a></code></dd> <!-- iframe and
noscript don't count as raw text for syntax purposes -->

<dt><dfn id=rcdata-elements>RCDATA elements</dfn></dt>
<dt><dfn id=escapable-raw-text-elements>escapable raw text elements</dfn></dt>

<dd><code><a href=#the-textarea-element>textarea</a></code>, <code><a href=#the-title-element>title</a></code></dd>

Expand All @@ -83698,8 +83698,8 @@ dictionary <dfn id=storageeventinit>StorageEventInit</dfn> : <a href=#eventinit>

</dl><!--CLEANUP--><p><dfn id=syntax-tags title=syntax-tags>Tags</dfn> are used to delimit the start
and end of elements in the markup. <a href=#raw-text-elements title="raw text
elements">Raw text</a>, <a href=#rcdata-elements title="RCDATA
elements">RCDATA</a>, and <a href=#normal-elements title="normal
elements">Raw text</a>, <a href=#escapable-raw-text-elements title="escapable raw text
elements">escapable raw text</a>, and <a href=#normal-elements title="normal
elements">normal</a> elements have a <a href=#syntax-start-tag title=syntax-start-tag>start tag</a> to indicate where they
begin, and an <a href=#syntax-end-tag title=syntax-end-tag>end tag</a> to
indicate where they end. The start and end tags of certain
Expand Down Expand Up @@ -83729,7 +83729,7 @@ dictionary <dfn id=storageeventinit>StorageEventInit</dfn> : <a href=#eventinit>
<p><a href=#raw-text-elements>Raw text elements</a> can have <a href=#syntax-text title=syntax-text>text</a>, though it has <a href=#cdata-rcdata-restrictions>restrictions</a> described
below.</p>

<p><a href=#rcdata-elements>RCDATA elements</a> can have <a href=#syntax-text title=syntax-text>text</a> and <a href=#syntax-charref title=syntax-charref>character references</a>, but the text
<p><a href=#escapable-raw-text-elements>escapable raw text elements</a> can have <a href=#syntax-text title=syntax-text>text</a> and <a href=#syntax-charref title=syntax-charref>character references</a>, but the text
must not contain an <a href=#syntax-ambiguous-ampersand title=syntax-ambiguous-ampersand>ambiguous ampersand</a>.
There are also <a href=#cdata-rcdata-restrictions>further
restrictions</a> described below.</p>
Expand Down Expand Up @@ -84238,10 +84238,10 @@ dictionary <dfn id=storageeventinit>StorageEventInit</dfn> : <a href=#eventinit>
</div>


<h5 id=cdata-rcdata-restrictions><span class=secno>12.1.2.6 </span>Restrictions on the contents of raw text and RCDATA elements</h5>
<h5 id=cdata-rcdata-restrictions><span class=secno>12.1.2.6 </span>Restrictions on the contents of raw text and escapable raw text elements</h5>

<p>The text in <a href=#raw-text-elements title="raw text elements">raw text</a> and
<a href=#rcdata-elements>RCDATA elements</a> must not contain any occurrences of the
<a href=#escapable-raw-text-elements>escapable raw text elements</a> must not contain any occurrences of the
string "<code title="">&lt;/</code>" (U+003C LESS-THAN SIGN, U+002F
SOLIDUS) followed by characters that case-insensitively match the
tag name of the element followed by one of U+0009 CHARACTER
Expand Down
22 changes: 11 additions & 11 deletions source
View file
Expand Up @@ -32944,13 +32944,13 @@ interface <dfn>MediaController</dfn> : <span>EventTarget</span> {
track's cues, the user agent will perform such an attempt momentarily. The user agent is
maintaining a list of which cues are active, and events are being fired accordingly. In
addition, for text tracks whose <span title="text track kind">kind</span> is <code
title="dom-mediatrack-kind-subtitles">subtitles</code> or <code
title="dom-mediatrack-kind-captions">captions</code>, the cues are being overlaid on the video
title="dom-TextTrack-kind-subtitles">subtitles</code> or <code
title="dom-TextTrack-kind-captions">captions</code>, the cues are being overlaid on the video
as appropriate; for text tracks whose <span title="text track kind">kind</span> is <code
title="dom-mediatrack-kind-descriptions">descriptions</code>, the user agent is making the
title="dom-TextTrack-kind-descriptions">descriptions</code>, the user agent is making the
cues available to the user in a non-visual fashion; and for text tracks whose <span
title="text track kind">kind</span> is <code
title="dom-mediatrack-kind-chapters">chapters</code>, the user agent is making available to
title="dom-TextTrack-kind-chapters">chapters</code>, the user agent is making available to
the user a mechanism by which the user can navigate to any point in the <span>media
resource</span> by selecting a cue.</p>

Expand Down Expand Up @@ -93354,7 +93354,7 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {

<p>There are five different kinds of <dfn
title="syntax-elements">elements</dfn>: <span>void elements</span>,
<span>raw text elements</span>, <span>RCDATA elements</span>,
<span>raw text elements</span>, <span>escapable raw text elements</span>,
<span>foreign elements</span>, and <span>normal elements</span>.</p>

<dl>
Expand All @@ -93372,7 +93372,7 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
<dd><code>script</code>, <code>style</code></dd> <!-- iframe and
noscript don't count as raw text for syntax purposes -->

<dt><dfn>RCDATA elements</dfn></dt>
<dt><dfn>escapable raw text elements</dfn></dt>

<dd><code>textarea</code>, <code>title</code></dd>

Expand All @@ -93391,8 +93391,8 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
<!--CLEANUP-->
<p><dfn title="syntax-tags">Tags</dfn> are used to delimit the start
and end of elements in the markup. <span title="raw text
elements">Raw text</span>, <span title="RCDATA
elements">RCDATA</span>, and <span title="normal
elements">Raw text</span>, <span title="escapable raw text
elements">escapable raw text</span>, and <span title="normal
elements">normal</span> elements have a <span
title="syntax-start-tag">start tag</span> to indicate where they
begin, and an <span title="syntax-end-tag">end tag</span> to
Expand Down Expand Up @@ -93426,7 +93426,7 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
href="#cdata-rcdata-restrictions">restrictions</a> described
below.</p>

<p><span>RCDATA elements</span> can have <span
<p><span>escapable raw text elements</span> can have <span
title="syntax-text">text</span> and <span
title="syntax-charref">character references</span>, but the text
must not contain an <span
Expand Down Expand Up @@ -94003,10 +94003,10 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
</div>


<h5 id="cdata-rcdata-restrictions">Restrictions on the contents of raw text and RCDATA elements</h5>
<h5 id="cdata-rcdata-restrictions">Restrictions on the contents of raw text and escapable raw text elements</h5>

<p>The text in <span title="raw text elements">raw text</span> and
<span>RCDATA elements</span> must not contain any occurrences of the
<span>escapable raw text elements</span> must not contain any occurrences of the
string "<code title="">&lt;/</code>" (U+003C LESS-THAN SIGN, U+002F
SOLIDUS) followed by characters that case-insensitively match the
tag name of the element followed by one of U+0009 CHARACTER
Expand Down

0 comments on commit 5e3ae9e

Please sign in to comment.