hixie: simplify the CDATA syntax description (whatwg r5926)

hixie: simplify the CDATA syntax description (whatwg r5926)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.4766&r2=1.4767&f=h
http://html5.org/tools/web-apps-tracker?from=5925&to=5926

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4766
retrieving revision 1.4767
diff -u -d -r1.4766 -r1.4767
--- Overview.html 2 Mar 2011 01:06:31 -0000 1.4766
+++ Overview.html 3 Mar 2011 22:55:08 -0000 1.4767
@@ -343,7 +343,7 @@
 
    <h1>HTML5</h1>
    <h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
-   <h2 class="no-num no-toc" id="editor-s-draft-2-march-2011">Editor's Draft 2 March 2011</h2>
+   <h2 class="no-num no-toc" id="editor-s-draft-3-march-2011">Editor's Draft 3 March 2011</h2>
    <dl><dt>Latest Published Version:</dt>
     <dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
     <dt>Latest Editor's Draft:</dt>
@@ -485,7 +485,7 @@
   Group</a> is the W3C working group responsible for this
   specification's progress along the W3C Recommendation
   track.
-  This specification is the 2 March 2011 Editor's Draft.
+  This specification is the 3 March 2011 Editor's Draft.
   </p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- relationship to other work (required) --><p>Work on this specification is also done at the <a href="http://www.whatwg.org/">WHATWG</a>. The W3C HTML working group
   actively pursues convergence with the WHATWG, as required by the <a href="http://www.w3.org/2007/03/HTML-WG-charter">W3C HTML working
   group charter</a>.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- required patent boilerplate --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
@@ -18393,7 +18393,7 @@
  &lt;li&gt;&lt;ins&gt;Purple&lt;/ins&gt;&lt;/li&gt;
 &lt;/ul&gt;</pre>
 
-  </div><h3 id="embedded-content-1"><span class="secno">4.8 </span>Embedded content</h3><h4 id="the-img-element"><span class="secno">4.8.1 </span>The <dfn><code>img</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
+  </div><h3 id="embedded-content-1"><span class="secno">4.8 </span>Embedded content</h3><h4 id="the-img-element"><span class="secno">4.8.1 </span>The <dfn><code>img</code></dfn> element</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/30">ISSUE-30</a> (longdesc) blocks progress to Last Call</span><dl class="element"><dt>Categories</dt>
    <dd><a href="#flow-content">Flow content</a>.</dd>
    <dd><a href="#phrasing-content">Phrasing content</a>.</dd>
    <dd><a href="#embedded-content">Embedded content</a>.</dd>
@@ -54190,7 +54190,7 @@
   omitted, browsers tend to use a different rendering mode that is
   incompatible with some specifications. Including the DOCTYPE in a
   document ensures that the browser makes a best-effort attempt at
-  following the relevant specifications.<p>A DOCTYPE must consist of the following characters, in this
+  following the relevant specifications.<p>A DOCTYPE must consist of the following components, in this
   order:<ol class="brief"><li>A string that is an <a href="#ascii-case-insensitive">ASCII case-insensitive</a> match for the string "<code title="">&lt;!DOCTYPE</code>".</li>
    <li>One or more <a href="#space-character" title="space character">space characters</a>.</li>
    <li>A string that is an <a href="#ascii-case-insensitive">ASCII case-insensitive</a> match for the string "<code title="">html</code>".</li>
@@ -54751,19 +54751,16 @@
   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.<h4 id="cdata-sections"><span class="secno">8.1.5 </span>CDATA sections</h4><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
-  LATIN CAPITAL LETTER T, U+0041 LATIN CAPITAL LETTER A, U+005B LEFT
-  SQUARE BRACKET (<code title="">&lt;![CDATA[</code>). Following this
-  sequence, the CDATA section may have <a href="#syntax-text" title="syntax-text">text</a>, with the additional restriction
-  that the text must not contain the three character sequence U+005D
-  RIGHT SQUARE BRACKET, U+005D RIGHT SQUARE BRACKET, U+003E
-  GREATER-THAN SIGN (<code title="">]]&gt;</code>). Finally, the CDATA
-  section must be ended by the three character sequence U+005D RIGHT
-  SQUARE BRACKET, U+005D RIGHT SQUARE BRACKET, U+003E GREATER-THAN
-  SIGN (<code title="">]]&gt;</code>).<div class="example">
+  the <a href="#named-character-references">named character references</a> section.<h4 id="cdata-sections"><span class="secno">8.1.5 </span>CDATA sections</h4><p><dfn id="syntax-cdata" title="syntax-cdata">CDATA sections</dfn> must consist of
+  the following components, in this order:<ol><li>The string "<code title="">&lt;![CDATA[</code>".</li>
+
+   <li>Optionally, <a href="#syntax-text" title="syntax-text">text</a>, with the
+   additional restriction that the text must not contain the string
+   "<code title="">]]&gt;</code>".</li>
+
+   <li>The string "<code title="">]]&gt;</code>".</li>
+
+  </ol><div class="example">
 
    <p>CDATA sections can only be used in foreign content (MathML or
    SVG). In this example, a CDATA section is used to escape the

Received on Thursday, 3 March 2011 22:56:23 UTC