[html5] r954 - /
whatwg at whatwg.org
whatwg at whatwg.org
Fri Jun 22 02:48:34 PDT 2007
Author: ianh
Date: 2007-06-22 02:45:50 -0700 (Fri, 22 Jun 2007)
New Revision: 954
Modified:
index
source
Log:
[e] (0) Make the <meta> rules clearer; fix typos and consistency with the 'escaping text span' stuff
Modified: index
===================================================================
--- index 2007-06-22 06:29:25 UTC (rev 953)
+++ index 2007-06-22 09:45:50 UTC (rev 954)
@@ -7311,8 +7311,11 @@
attribute specified, it must be either in a <code><a
href="#head">head</a></code> element or in a <code><a
href="#noscript">noscript</a></code> element that itself is in a <code><a
- href="#head">head</a></code> element. Otherwise, it must be in a <code><a
- href="#head">head</a></code> element.
+ href="#head">head</a></code> element. If a <code><a
+ href="#meta0">meta</a></code> element does not have the <code
+ title=attr-meta-http-equiv><a href="#http-equiv0">http-equiv</a></code>
+ attribute specified, it must be in a <code><a href="#head">head</a></code>
+ element.
<p>The DOM attributes <dfn id=name0
title=dom-meta-name><code>name</code></dfn> and <dfn id=content1
@@ -32719,38 +32722,39 @@
the tag name of the element followed by one of U+0009 CHARACTER
TABULATION, U+000A LINE FEED (LF), U+000B LINE TABULATION, U+000C FORM
FEED (FF), U+0020 SPACE, U+003E GREATER-THAN SIGN (>), or U+002F SOLIDUS
- (/), unless that string is part of an <a href="#escaped"
- title=syntax-escape>escaped text span</a>.
+ (/), unless that string is part of an <a href="#escaping"
+ title=syntax-escape>escaping text span</a>.
- <p>An <dfn id=escaped title=syntax-escape>escaped text span</dfn> is a span
- of <a href="#text1" title=syntax-text>text</a> (in CDATA and RCDATA
+ <p>An <dfn id=escaping title=syntax-escape>escaping text span</dfn> is a
+ span of <a href="#text1" title=syntax-text>text</a> (in CDATA and RCDATA
elements) and <a href="#character0" title=syntax-entities>character entity
references</a> (in RCDATA elements) that starts with an <a
- href="#escaping" title=syntax-escape-start>escaping text span start</a>
- that is not itself in an <a href="#escaped" title=syntax-escape>escaped
- text span</a>, and ends at the next <a href="#escaping0"
+ href="#escaping0" title=syntax-escape-start>escaping text span start</a>
+ that is not itself in an <a href="#escaping" title=syntax-escape>escaping
+ text span</a>, and ends at the next <a href="#escaping1"
title=syntax-escape-end>escaping text span end</a>.
- <p>An <dfn id=escaping title=syntax-escape-start>escaping text span start
- is a part of <span title=syntax-text>text</span> that consists of the four
- character sequence "<code title=""><!--</code>" (U+003C LESS-THAN SIGN,
- U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS).</dfn>
+ <p>An <dfn id=escaping0 title=syntax-escape-start>escaping text span
+ start</dfn> is a part of <a href="#text1" title=syntax-text>text</a> that
+ consists of the four character sequence "<code title=""><!--</code>"
+ (U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS,
+ U+002D HYPHEN-MINUS).
- <p>An <dfn id=escaping0 title=syntax-escape-end>escaping text span end is a
- part of <span title=syntax-text>text</span> that consists of the three
- character sequence "<code title="">--></code>" (U+002D HYPHEN-MINUS,
- U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN) whose U+003E GREATER-THAN
- SIGN (>).</dfn>
+ <p>An <dfn id=escaping1 title=syntax-escape-end>escaping text span
+ end</dfn> is a part of <a href="#text1" title=syntax-text>text</a> that
+ consists of the three character sequence "<code title="">--></code>"
+ (U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN) whose
+ U+003E GREATER-THAN SIGN (>).
- <p>An <a href="#escaping" title=syntax-escape-start>escaping text span
+ <p>An <a href="#escaping0" title=syntax-escape-start>escaping text span
start</a> may share its U+002D HYPHEN-MINUS characters with its
- corresponding <a href="#escaping0" title=syntax-escape-end>escaping text
+ corresponding <a href="#escaping1" title=syntax-escape-end>escaping text
span end</a>.
<p>The text in CDATA and RCDATA elements must not have an <a
- href="#escaping" title=syntax-escape-start>escaping comment start</a> that
- is not followed by an <a href="#escaping0"
- title=syntax-escape-end>escaping comment end</a>.
+ href="#escaping0" title=syntax-escape-start>escaping text span start</a>
+ that is not followed by an <a href="#escaping1"
+ title=syntax-escape-end>escaping text span end</a>.
<h4 id=text><span class=secno>8.1.3. </span>Text</h4>
Modified: source
===================================================================
--- source 2007-06-22 06:29:25 UTC (rev 953)
+++ source 2007-06-22 09:45:50 UTC (rev 954)
@@ -5904,7 +5904,9 @@
title="attr-meta-http-equiv">http-equiv</code> attribute specified,
it must be either in a <code>head</code> element or in a
<code>noscript</code> element that itself is in a <code>head</code>
- element. Otherwise, it must be in a <code>head</code> element.</p>
+ element. If a <code>meta</code> element does not have the <code
+ title="attr-meta-http-equiv">http-equiv</code> attribute specified,
+ it must be in a <code>head</code> element.</p>
<p>The DOM attributes <dfn
title="dom-meta-name"><code>name</code></dfn> and <dfn
@@ -30186,27 +30188,27 @@
followed by one of U+0009 CHARACTER TABULATION, U+000A LINE FEED
(LF), U+000B LINE TABULATION, U+000C FORM FEED (FF), U+0020 SPACE,
U+003E GREATER-THAN SIGN (>), or U+002F SOLIDUS (/), unless that
- string is part of an <span title="syntax-escape">escaped text
+ string is part of an <span title="syntax-escape">escaping text
span</span>.</p>
- <p>An <dfn title="syntax-escape">escaped text span</dfn> is a span
+ <p>An <dfn title="syntax-escape">escaping text span</dfn> is a span
of <span title="syntax-text">text</span> (in CDATA and RCDATA
elements) and <span title="syntax-entities">character entity
references</span> (in RCDATA elements) that starts with an <span
title="syntax-escape-start">escaping text span start</span> that is
- not itself in an <span title="syntax-escape">escaped text
+ not itself in an <span title="syntax-escape">escaping text
span</span>, and ends at the next <span
title="syntax-escape-end">escaping text span end</span>.</p>
<p>An <dfn title="syntax-escape-start">escaping text span
- start</span> is a part of <span title="syntax-text">text</span> that
+ start</dfn> is a part of <span title="syntax-text">text</span> that
consists of the four character sequence "<code
title=""><!--</code>" (U+003C LESS-THAN SIGN, U+0021 EXCLAMATION
MARK, U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS).</p>
- <p>An <dfn title="syntax-escape-end">escaping text span end</span>
- is a part of <span title="syntax-text">text</span> that consists of
- the three character sequence "<code title="">--></code>" (U+002D
+ <p>An <dfn title="syntax-escape-end">escaping text span end</dfn> is
+ a part of <span title="syntax-text">text</span> that consists of the
+ three character sequence "<code title="">--></code>" (U+002D
HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN) whose
U+003E GREATER-THAN SIGN (>).</p>
@@ -30216,9 +30218,9 @@
end</span>.</p>
<p>The text in CDATA and RCDATA elements must not have an <span
- title="syntax-escape-start">escaping comment start</span> that is
- not followed by an <span title="syntax-escape-end">escaping comment
- end</span>.</p>
+ title="syntax-escape-start">escaping text span start</span> that is
+ not followed by an <span title="syntax-escape-end">escaping text
+ span end</span>.</p>
<h4>Text</h4>
More information about the Commit-Watchers
mailing list