- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 02 Apr 2010 23:27:29 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec-author-view
In directory hutz:/tmp/cvs-serv4511
Modified Files:
Overview.html introduction.html spec.html syntax.html
Log Message:
Allow a few more unescaped &s. (whatwg r4960)
[updated by splitter]
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/Overview.html,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -d -r1.826 -r1.827
--- Overview.html 2 Apr 2010 22:47:54 -0000 1.826
+++ Overview.html 2 Apr 2010 23:27:26 -0000 1.827
@@ -308,7 +308,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.3982.
+This is revision 1.3983.
</p>
<p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
© 2010 <a href="http://www.w3.org/"><abbr title="World Wide
Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/spec.html,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -d -r1.834 -r1.835
--- spec.html 2 Apr 2010 22:47:54 -0000 1.834
+++ spec.html 2 Apr 2010 23:27:26 -0000 1.835
@@ -306,7 +306,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.3982.
+This is revision 1.3983.
</p>
<p class=copyright><a href=http://www.w3.org/Consortium/Legal/ipr-notice#Copyright>Copyright</a>
© 2010 <a href=http://www.w3.org/><abbr title="World Wide
@@ -1441,14 +1441,14 @@
<pre class=bad><a href="?original=1&copy=2">Compare</a></pre>
<p>To avoid this problem, all named character references are
- required to end with a semicolon, and any ampersands followed by
- letters are required to be escaped.</p>
+ required to end with a semicolon, and uses of named character
+ references without a semicolon are flagged as errors.</p>
<p>Thus, the correct way to express the above cases is as
follows:</p>
- <pre><a href="?hello=1&amp;world=2">Demo</a></pre>
- <pre><a href="?original=1&amp;copy=2">Compare</a></pre>
+ <pre><a href="?hello=1&world=2">Demo</a> <!-- &world is ok, since it's not a named character reference --></pre>
+ <pre><a href="?original=1&amp;copy=2">Compare</a> <!-- the & has to be escaped, since &copy <em>is</em> a named character reference --></pre>
</div>
@@ -25838,9 +25838,12 @@
control characters other than <a href=#space-character title="space character">space
characters</a>.</p><p>An <dfn id=syntax-ambiguous-ampersand title=syntax-ambiguous-ampersand>ambiguous
ampersand</dfn> is a U+0026 AMPERSAND character (&) that is
- followed by some <a href=#syntax-text title=syntax-text>text</a> other than a
- <a href=#space-character>space character</a>, a U+003C LESS-THAN SIGN character
- (<), or another U+0026 AMPERSAND character (&).</p><h4 id=cdata-sections><span class=secno>8.1.5 </span>CDATA sections</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p><dfn id=syntax-cdata title=syntax-cdata>CDATA sections</dfn> must start with
+ followed by one or more characters in the range U+0030 DIGIT ZERO
+ (0) to U+0039 DIGIT NINE (9), U+0061 LATIN SMALL LETTER A to U+007A
+ LATIN SMALL LETTER Z, and U+0041 LATIN CAPITAL LETTER A to U+005A
+ LATIN CAPITAL LETTER Z, followed by a U+003B SEMICOLON character
+ (;), where these characters do not match any of the names given in
+ the <a href=#named-character-references>named character references</a> section.</p><h4 id=cdata-sections><span class=secno>8.1.5 </span>CDATA sections</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p><dfn id=syntax-cdata title=syntax-cdata>CDATA sections</dfn> must start with
the character sequence U+003C LESS-THAN SIGN, U+0021 EXCLAMATION
MARK, U+005B LEFT SQUARE BRACKET, U+0043 LATIN CAPITAL LETTER C,
U+0044 LATIN CAPITAL LETTER D, U+0041 LATIN CAPITAL LETTER A, U+0054
Index: introduction.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/introduction.html,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -d -r1.580 -r1.581
--- introduction.html 2 Apr 2010 21:51:45 -0000 1.580
+++ introduction.html 2 Apr 2010 23:27:26 -0000 1.581
@@ -795,14 +795,14 @@
<pre class="bad"><a href="?original=1&copy=2">Compare</a></pre>
<p>To avoid this problem, all named character references are
- required to end with a semicolon, and any ampersands followed by
- letters are required to be escaped.</p>
+ required to end with a semicolon, and uses of named character
+ references without a semicolon are flagged as errors.</p>
<p>Thus, the correct way to express the above cases is as
follows:</p>
- <pre><a href="?hello=1&amp;world=2">Demo</a></pre>
- <pre><a href="?original=1&amp;copy=2">Compare</a></pre>
+ <pre><a href="?hello=1&world=2">Demo</a> <!-- &world is ok, since it's not a named character reference --></pre>
+ <pre><a href="?original=1&amp;copy=2">Compare</a> <!-- the & has to be escaped, since &copy <em>is</em> a named character reference --></pre>
</div>
Index: syntax.html
===================================================================
RCS file: /sources/public/html5/spec-author-view/syntax.html,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -d -r1.585 -r1.586
--- syntax.html 2 Apr 2010 21:51:46 -0000 1.585
+++ syntax.html 2 Apr 2010 23:27:27 -0000 1.586
@@ -901,9 +901,12 @@
control characters other than <a href="#space-character" title="space character">space
characters</a>.</p><p>An <dfn id="syntax-ambiguous-ampersand" title="syntax-ambiguous-ampersand">ambiguous
ampersand</dfn> is a U+0026 AMPERSAND character (&) that is
- followed by some <a href="#syntax-text" title="syntax-text">text</a> other than a
- <a href="#space-character">space character</a>, a U+003C LESS-THAN SIGN character
- (<), or another U+0026 AMPERSAND character (&).</p><h4 id="cdata-sections"><span class="secno">8.1.5 </span>CDATA sections</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p><dfn id="syntax-cdata" title="syntax-cdata">CDATA sections</dfn> must start with
+ followed by one or more characters in the range U+0030 DIGIT ZERO
+ (0) to U+0039 DIGIT NINE (9), U+0061 LATIN SMALL LETTER A to U+007A
+ LATIN SMALL LETTER Z, and U+0041 LATIN CAPITAL LETTER A to U+005A
+ LATIN CAPITAL LETTER Z, followed by a U+003B SEMICOLON character
+ (;), where these characters do not match any of the names given in
+ the <a href="named-character-references.html#named-character-references">named character references</a> section.</p><h4 id="cdata-sections"><span class="secno">8.1.5 </span>CDATA sections</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i></p><p><dfn id="syntax-cdata" title="syntax-cdata">CDATA sections</dfn> must start with
the character sequence U+003C LESS-THAN SIGN, U+0021 EXCLAMATION
MARK, U+005B LEFT SQUARE BRACKET, U+0043 LATIN CAPITAL LETTER C,
U+0044 LATIN CAPITAL LETTER D, U+0041 LATIN CAPITAL LETTER A, U+0054
Received on Friday, 2 April 2010 23:27:30 UTC