[e] (0) simplify the CDATA syntax description

git-svn-id: http://svn.whatwg.org/webapps@5926 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Mar 3, 2011 · d121059 · d121059
1 parent 4f4eb8b
commit d121059
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 47 deletions.
diff --git a/complete.html b/complete.html
@@ -239,7 +239,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 2 March 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 3 March 2011</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -76150,7 +76150,7 @@ <h4 id=the-doctype><span class=secno>12.1.1 </span>The DOCTYPE</h4>
   document ensures that the browser makes a best-effort attempt at
   following the relevant specifications.</p>
 
-  <p>A DOCTYPE must consist of the following characters, in this
+  <p>A DOCTYPE must consist of the following components, in this
   order:</p>
 
   <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>
@@ -76896,21 +76896,18 @@ <h4 id=character-references><span class=secno>12.1.4 </span>Character references
 
   <h4 id=cdata-sections><span class=secno>12.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>).</p>
+  <p><dfn id=syntax-cdata title=syntax-cdata>CDATA sections</dfn> must consist of
+  the following components, in this order:</p>
 
-  <div class=example>
+  <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

diff --git a/index b/index
@@ -243,7 +243,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><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 2 March 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 3 March 2011</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -72121,7 +72121,7 @@ interface <dfn id=messageport>MessagePort</dfn> {
   document ensures that the browser makes a best-effort attempt at
   following the relevant specifications.</p>
 
-  <p>A DOCTYPE must consist of the following characters, in this
+  <p>A DOCTYPE must consist of the following components, in this
   order:</p>
 
   <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>
@@ -72867,21 +72867,18 @@ interface <dfn id=messageport>MessagePort</dfn> {
 
   <h4 id=cdata-sections><span class=secno>10.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>).</p>
+  <p><dfn id=syntax-cdata title=syntax-cdata>CDATA sections</dfn> must consist of
+  the following components, in this order:</p>
 
-  <div class=example>
+  <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

diff --git a/source b/source
@@ -86176,7 +86176,7 @@ interface <span>WindowLocalStorage</span> {
   document ensures that the browser makes a best-effort attempt at
   following the relevant specifications.</p>
 
-  <p>A DOCTYPE must consist of the following characters, in this
+  <p>A DOCTYPE must consist of the following components, in this
   order:</p>
 
   <ol class="brief">
@@ -87033,20 +87033,20 @@ interface <span>WindowLocalStorage</span> {
 
   <h4>CDATA sections</h4>
 
-  <p><dfn 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 <span
-  title="syntax-text">text</span>, 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="">]]></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="">]]></code>).</p>
+  <p><dfn title="syntax-cdata">CDATA sections</dfn> must consist of
+  the following components, in this order:</p>
+
+  <ol>
+
+   <li>The string "<code title="">&lt;![CDATA[</code>".</li>
+
+   <li>Optionally, <span title="syntax-text">text</span>, with the
+   additional restriction that the text must not contain the string
+   "<code title="">]]></code>".</li>
+
+   <li>The string "<code title="">]]></code>".</li>
+
+  </ol>
 
   <div class="example">