W3C home > Mailing lists > Public > public-html-commits@w3.org > January 2010

html5/markup Overview.html,1.363,1.364 iframe.html,1.29,1.30 option.html,1.23,1.24 schema.html,1.3,1.4 script.html,1.28,1.29 spec.html,1.116,1.117 syntax.html,1.30,1.31

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 29 Jan 2010 00:09:13 +0000
To: public-html-commits@w3.org
Message-Id: <E1NaeQD-0007zI-Sy@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv30584

Modified Files:
	Overview.html iframe.html option.html schema.html script.html 
	spec.html syntax.html 
Log Message:
update syntax

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -d -r1.363 -r1.364
--- Overview.html	28 Jan 2010 22:26:43 -0000	1.363
+++ Overview.html	29 Jan 2010 00:09:11 -0000	1.364
@@ -214,14 +214,11 @@
 <li id="comments-toc">
 <span class="toc-section-number"></span><a href="syntax.html#comments"><span class="toc-section-number">4.07.</span> Comments</a>
 </li>
-<li id="escaping-text-span-toc">
-<span class="toc-section-number"></span><a href="syntax.html#escaping-text-span"><span class="toc-section-number">4.08.</span> Escaping text spans</a>
-</li>
 <li id="svg-mathml-toc">
-<span class="toc-section-number"></span><a href="syntax.html#svg-mathml"><span class="toc-section-number">4.09.</span> SVG and MathML elements in HTML documents</a>
+<span class="toc-section-number"></span><a href="syntax.html#svg-mathml"><span class="toc-section-number">4.08.</span> SVG and MathML elements in HTML documents</a>
 </li>
 <li id="cdata-sections-toc">
-<span class="toc-section-number"></span><a href="syntax.html#cdata-sections"><span class="toc-section-number">4.10.</span> CDATA sections in SVG and MathML contents</a>
+<span class="toc-section-number"></span><a href="syntax.html#cdata-sections"><span class="toc-section-number">4.09.</span> CDATA sections in SVG and MathML contents</a>
 </li>
 </ul>
 </li>

Index: iframe.html
===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- iframe.html	28 Jan 2010 23:22:12 -0000	1.29
+++ iframe.html	29 Jan 2010 00:09:11 -0000	1.30
@@ -22,7 +22,7 @@
         <div></div>
       <div id="iframe-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="iframe-mdl" href="iframe.html#iframe-mdl" class="element">iframe</a> = </span><span>
-      <a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
+      normal character data
       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="iframe.html#iframe.attrs">iframe.attrs</a>
     </span></p>
         </div>

Index: script.html
===================================================================
RCS file: /sources/public/html5/markup/script.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- script.html	28 Jan 2010 23:22:13 -0000	1.28
+++ script.html	29 Jan 2010 00:09:11 -0000	1.29
@@ -23,12 +23,12 @@
       <dl id="script-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="script.elem.embedded"><a class="hash" href="script.html#script.elem.embedded"><span class="element">script</span>.elem.embedded</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      ()
+      <a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a>
       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.html#script.attrs.embedded" title="script.attrs.embedded">script.attrs.embedded</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="script.elem.imported"><a class="hash" href="script.html#script.elem.imported"><span class="element">script</span>.elem.imported</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      ()
+      <a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a>
       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="script.html#script.attrs.imported" title="script.attrs.imported">script.attrs.imported</a>
     </span></dd>
         </dl>

Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- schema.html	28 Jan 2010 22:26:44 -0000	1.3
+++ schema.html	29 Jan 2010 00:09:11 -0000	1.4
@@ -2827,11 +2827,11 @@
 </div>
 <div class='define' id='script.inner.embedded-define'>
   <div class='patternname' id='the-script.inner.embedded'><a href='#the-script.inner.embedded'>script.inner.embedded</a> =</div>
-  <span class='pattern' id='script.inner.embedded'><a class='ref' href='#common.inner.anything'>common.inner.anything</a></span>
+  <span class='pattern' id='script.inner.embedded'><a class='ref' href='#non-replaceable-character-data'>non-replaceable-character-data</a></span>
 </div>
 <div class='define' id='script.inner.imported-define'>
   <div class='patternname' id='the-script.inner.imported'><a href='#the-script.inner.imported'>script.inner.imported</a> =</div>
-  <span class='pattern' id='script.inner.imported'><a class='ref' href='#common.inner.anything'>common.inner.anything</a></span>
+  <span class='pattern' id='script.inner.imported'><a class='ref' href='#non-replaceable-character-data'>non-replaceable-character-data</a></span>
 </div>
 <div class='define' id='script-define'>
   <div class='patternname' id='the-script'><a href='#the-script'>script</a> =</div>

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/syntax.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- syntax.html	28 Jan 2010 17:11:52 -0000	1.30
+++ syntax.html	29 Jan 2010 00:09:11 -0000	1.31
@@ -27,25 +27,23 @@
   <p>This section is divided into the following parts:</p>
   <div class="toc">
 <ul>
-<li id="doctype-syntax-toc"><span class="toc-section-number">&#8199;</span><a href="syntax.html#doctype-syntax"><span class="toc-section-number">1.</span> The doctype</a>
-</li>
-<li id="character-encoding-toc"><span class="toc-section-number">&#8199;</span><a href="syntax.html#character-encoding"><span class="toc-section-number">2.</span> Character encoding declaration</a>
+<li id="doctype-syntax-toc"><span class="toc-section-number"></span><a href="syntax.html#doctype-syntax"><span class="toc-section-number">1.</span> The doctype</a>
 </li>
-<li id="syntax-elements-toc"><span class="toc-section-number">&#8199;</span><a href="syntax.html#syntax-elements"><span class="toc-section-number">3.</span> Elements</a>
+<li id="character-encoding-toc"><span class="toc-section-number"></span><a href="syntax.html#character-encoding"><span class="toc-section-number">2.</span> Character encoding declaration</a>
 </li>
-<li id="syntax-attributes-toc"><span class="toc-section-number">&#8199;</span><a href="syntax.html#syntax-attributes"><span class="toc-section-number">4.</span> Attributes</a>
+<li id="syntax-elements-toc"><span class="toc-section-number"></span><a href="syntax.html#syntax-elements"><span class="toc-section-number">3.</span> Elements</a>
 </li>
-<li id="text-syntax-toc"><span class="toc-section-number">&#8199;</span><a href="syntax.html#text-syntax"><span class="toc-section-number">5.</span> Text and character data</a>
+<li id="syntax-attributes-toc"><span class="toc-section-number"></span><a href="syntax.html#syntax-attributes"><span class="toc-section-number">4.</span> Attributes</a>
 </li>
-<li id="character-references-toc"><span class="toc-section-number">&#8199;</span><a href="syntax.html#character-references"><span class="toc-section-number">6.</span> Character references</a>
+<li id="text-syntax-toc"><span class="toc-section-number"></span><a href="syntax.html#text-syntax"><span class="toc-section-number">5.</span> Text and character data</a>
 </li>
-<li id="comments-toc"><span class="toc-section-number">&#8199;</span><a href="syntax.html#comments"><span class="toc-section-number">7.</span> Comments</a>
+<li id="character-references-toc"><span class="toc-section-number"></span><a href="syntax.html#character-references"><span class="toc-section-number">6.</span> Character references</a>
 </li>
-<li id="escaping-text-span-toc"><span class="toc-section-number">&#8199;</span><a href="syntax.html#escaping-text-span"><span class="toc-section-number">8.</span> Escaping text spans</a>
+<li id="comments-toc"><span class="toc-section-number"></span><a href="syntax.html#comments"><span class="toc-section-number">7.</span> Comments</a>
 </li>
-<li id="svg-mathml-toc"><span class="toc-section-number">&#8199;</span><a href="syntax.html#svg-mathml"><span class="toc-section-number">9.</span> SVG and MathML elements in HTML documents</a>
+<li id="svg-mathml-toc"><span class="toc-section-number"></span><a href="syntax.html#svg-mathml"><span class="toc-section-number">8.</span> SVG and MathML elements in HTML documents</a>
 </li>
-<li id="cdata-sections-toc"><span class="toc-section-number"></span><a href="syntax.html#cdata-sections"><span class="toc-section-number">10.</span> CDATA sections in SVG and MathML contents</a>
+<li id="cdata-sections-toc"><span class="toc-section-number"></span><a href="syntax.html#cdata-sections"><span class="toc-section-number">9.</span> CDATA sections in SVG and MathML contents</a>
 </li>
 </ul>
 </div>
@@ -651,13 +649,13 @@
       <li>must not contain control characters other than
         <a href="terminology.html#space">space characters</a></li>
     </ul>
-    <p class="note">There are two special types of
-    <a href="syntax.html#syntax-text">text</a>,
-    known as
-    <a href="syntax.html#syntax-escape-start">escaping text span starts</a>
-    and
-    <a href="syntax.html#syntax-escape-end">escaping text span ends</a>,
-    that can occur within certain elements.</p>
+    
+    
+    
+    
+    
+    
+    
     <p><dfn id="character-data" title="character-data">Character data</dfn> contains
     <a href="syntax-text">text</a>, in some cases in combination with
     <a href="syntax.html#syntax-charref">character references</a>,
@@ -683,10 +681,10 @@
           <li>must not contain any
           "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
           characters</li>
-          <li>must not contain any
-          <a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersands</a></li>
-          <li>must not contain any
-          <a href="syntax.html#syntax-escape">escaping text spans</a></li>
+          
+          
+          
+          
         </ul>
       </dd>
       <dt><dfn id="replaceable-character-data" title="replaceable-character-data">Replaceable character data</dfn></dt>
@@ -703,8 +701,10 @@
           <li><a href="syntax.html#syntax-text">text</a>,
           optionally including
           "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
-          characters and
-          <a href="syntax.html#syntax-escape">escaping text spans</a></li>
+          characters
+          
+          
+          </li>
           <li><a href="syntax.html#syntax-charref">character references</a></li>
         </ul>
         <p>Replaceable character data has the following restrictions:</p>
@@ -719,16 +719,11 @@
           replaceable character data (for example,
           "<code>&lt;/title</code>" or
           "<code>&lt;/textarea</code>"),
-          followed by one of
-          U+0009 CHARACTER TABULATION,
-          U+000A LINE FEED (LF),
-          U+000C FORM FEED (FF),
-          U+0020 SPACE,
+          followed by a
+          <a href="terminology.html#space">space character</a>,
           "<code title="U+003E GREATER-THAN SIGN">&gt;</code>",
           or
-          "<code title="U+002F SOLIDUS">/</code>",
-          unless that string is part of an
-          <a href="syntax.html#syntax-escape">escaping text span</a>.</li>
+          "<code title="U+002F SOLIDUS">/</code>".</li>
         </ul>
         <p class="note">Replaceable character data,
         as defined in this specification, is a feature of
@@ -756,8 +751,10 @@
           <li><a href="syntax.html#syntax-text">text</a>,
           optionally including
           "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
-          characters and
-          <a href="syntax.html#syntax-escape">escaping text spans</a></li>
+          characters
+          
+          
+          </li>
           <li><a href="syntax.html#syntax-ambiguous-ampersand">ambiguous ampersands</a></li>
         </ul>
         <p>Non-replaceable character data has the following restrictions:</p>
@@ -772,16 +769,11 @@
           "<code>&lt;/script</code>"
           or
           "<code>&lt;/style</code>",
-          followed by one of
-          U+0009 CHARACTER TABULATION,
-          U+000A LINE FEED (LF),
-          U+000C FORM FEED (FF),
-          U+0020 SPACE,
+          followed by a
+          <a href="terminology.html#space">space character</a>,
           "<code title="U+003E GREATER-THAN SIGN">&gt;</code>",
           or
-          "<code title="U+002F SOLIDUS">/</code>",
-          unless that string is part of an
-          <a href="syntax.html#syntax-escape">escaping text span</a>.</li>
+          "<code title="U+002F SOLIDUS">/</code>".</li>
         </ul>
         <p class="note">Non-replaceable character data,
         as defined in this specification, is a feature of
@@ -954,92 +946,8 @@
     <pre>&lt;!-- main content starts here --&gt;</pre>
     </div>
   </div>
-  <div id="escaping-text-span" class="section">
-    <h2>4.08. Escaping text spans <a class="hash" href="#escaping-text-span">#</a> <a class="toc-bak" href="Overview.html#escaping-text-span-toc">T</a></h2>
-    <p>An
-      <dfn id="syntax-escape">escaping text span</dfn>
-      is a span of
-      <a href="syntax.html#syntax-text" title="syntax-text">text</a>
-      that starts with an
-      <a href="syntax.html#syntax-escape-start">escaping text span start</a>
-      that is not itself in an
-      <a href="syntax.html#syntax-escape">escaping text span</a>,
-      and ends at the next
-      <a href="syntax.html#syntax-escape-end">escaping text span end</a>.
-      Escaping text spans have the following restriction:</p>
-    <ul>
-      <li>must not contain any <a href="syntax.html#syntax-charref">character references</a></li>
-    </ul>
-    <p>An
-      <dfn id="syntax-escape-start">escaping text span start</dfn>
-      is the
-      <a href="syntax.html#syntax-text" title="syntax-text">text</a>
-      string
-      "<code title="U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS">&lt;!--</code>".</p>
-     <p>An
-     <dfn id="syntax-escape-end">escaping text span end</dfn>
-     is the
-     <a href="syntax.html#syntax-text" title="syntax-text">text</a>
-     string
-     "<code title="U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN">--&gt;</code>".</p>
-     <div class="note">
-       <ul>
-         <li>An
-         <a href="syntax.html#syntax-escape">escaping text span</a>
-         is not a
-         <a href="syntax.html#syntax-comments">comment</a>.</li>
-         <li>An
-         <a href="syntax.html#syntax-escape-start">escaping text span start</a>
-         is
-         <a href="syntax.html#syntax-text">text</a>;
-         it is not a
-         <a href="syntax.html#comment-start-delimiter">comment start delimiter</a>.</li>
-         <li>An
-         <a href="syntax.html#syntax-escape-end">escaping text span end</a>
-         is
-         <a href="syntax.html#syntax-text">text</a>;
-         it is not a
-         <a href="syntax.html#comment-end-delimiter">comment end delimiter</a>.</li>
-         <li>Any sequences of characters within an
-         <a href="syntax.html#syntax-escape">escaping text span</a>
-         that look like
-         <a href="syntax.html#syntax-charref">character references</a>
-         are
-         <a href="syntax.html#syntax-text">text</a>,
-         not 
-         <a href="syntax.html#syntax-charref">character references</a>.</li>
-       </ul>
-     </div>
-     <p>An
-     <a href="syntax.html#syntax-escape-start">escaping text span start</a>
-     may share its
-     "<code title="U+002D HYPHEN-MINUS">-</code>"
-     characters with its corresponding
-     <a href="syntax.html#syntax-escape-end">escaping text span end</a>.</p>
-    <p>The text in
-    <a href="style.html#style">style</a>,
-    <a href="script.html#script">script</a>,
-    <a href="title.html#title">title</a>,
-    and
-    <a href="textarea.html#textarea">textarea</a>
-    elements must not have an
-     <a href="syntax.html#syntax-escape-start">escaping text span start</a>
-     that is not followed by an
-     <a href="syntax.html#syntax-escape-end">escaping text span end</a>.</p>
-    <div class="example">
-    <p>The following is an example of an
-    <a href="syntax.html#syntax-escape">escaping text span</a>
-    within a
-    <a href="style.html#style" class="element">style</a> element.</p>
-    <pre>&lt;style&gt;
-&lt;!--
-dfn { font-weight: bold; color: brown; }
---&gt;
-&lt;/style&gt;</pre>
-    </div>
- </div>
  <div id="svg-mathml" class="section">
-   <h2>4.09. SVG and MathML elements in HTML documents <a class="hash" href="#svg-mathml">#</a> <a class="toc-bak" href="Overview.html#svg-mathml-toc">T</a></h2>
+   <h2>4.08. SVG and MathML elements in HTML documents <a class="hash" href="#svg-mathml">#</a> <a class="toc-bak" href="Overview.html#svg-mathml-toc">T</a></h2>
    <p id="elements-svg-mathml">
    <dfn id="svg-mathml-elements" title="svg-mathml-elements">SVG and MathML elements</dfn>
    are elements from the SVG and MathML namespaces.
@@ -1089,7 +997,7 @@
    </ul>
  </div>
  <div id="cdata-sections" class="section">
-   <h2>4.10. CDATA sections in SVG and MathML contents <a class="hash" href="#cdata-sections">#</a> <a class="toc-bak" href="Overview.html#cdata-sections-toc">T</a></h2>
+   <h2>4.09. CDATA sections in SVG and MathML contents <a class="hash" href="#cdata-sections">#</a> <a class="toc-bak" href="Overview.html#cdata-sections-toc">T</a></h2>
    <p>
    <dfn id="syntax-cdata-sections" title="syntax-cdata-sections">CDATA sections in SVG and MathML contents</dfn>
    in 

Index: option.html
===================================================================
RCS file: /sources/public/html5/markup/option.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- option.html	28 Jan 2010 23:22:13 -0000	1.23
+++ option.html	29 Jan 2010 00:09:11 -0000	1.24
@@ -24,7 +24,7 @@
         <div></div>
       <div id="option-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="option-mdl" href="option.html#option-mdl" class="element">option</a> = </span><span>
-      <a class="ref" href="syntax.html#normal-character-data">normal-character-data</a>
+      normal character data
       <a href="terminology.html#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="option.html#option.attrs">option.attrs</a>
     </span></p>
         </div>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- spec.html	28 Jan 2010 23:29:40 -0000	1.116
+++ spec.html	29 Jan 2010 00:09:11 -0000	1.117
@@ -213,14 +213,11 @@
 <li id="comments-toc">
 <span class="toc-section-number"></span><a href="#comments"><span class="toc-section-number">4.07.</span> Comments</a>
 </li>
-<li id="escaping-text-span-toc">
-<span class="toc-section-number"></span><a href="#escaping-text-span"><span class="toc-section-number">4.08.</span> Escaping text spans</a>
-</li>
 <li id="svg-mathml-toc">
-<span class="toc-section-number"></span><a href="#svg-mathml"><span class="toc-section-number">4.09.</span> SVG and MathML elements in HTML documents</a>
+<span class="toc-section-number"></span><a href="#svg-mathml"><span class="toc-section-number">4.08.</span> SVG and MathML elements in HTML documents</a>
 </li>
 <li id="cdata-sections-toc">
-<span class="toc-section-number"></span><a href="#cdata-sections"><span class="toc-section-number">4.10.</span> CDATA sections in SVG and MathML contents</a>
+<span class="toc-section-number"></span><a href="#cdata-sections"><span class="toc-section-number">4.09.</span> CDATA sections in SVG and MathML contents</a>
 </li>
 </ul>
 </li>
@@ -1115,34 +1112,31 @@
   <div class="toc">
 <ul>
 <li id="doctype-syntax-toc">
-<span class="toc-section-number">&#8199;</span><a href="#doctype-syntax"><span class="toc-section-number">1.</span> The doctype</a>
+<span class="toc-section-number"></span><a href="#doctype-syntax"><span class="toc-section-number">1.</span> The doctype</a>
 </li>
 <li id="character-encoding-toc">
-<span class="toc-section-number">&#8199;</span><a href="#character-encoding"><span class="toc-section-number">2.</span> Character encoding declaration</a>
+<span class="toc-section-number"></span><a href="#character-encoding"><span class="toc-section-number">2.</span> Character encoding declaration</a>
 </li>
 <li id="syntax-elements-toc">
-<span class="toc-section-number">&#8199;</span><a href="#syntax-elements"><span class="toc-section-number">3.</span> Elements</a>
+<span class="toc-section-number"></span><a href="#syntax-elements"><span class="toc-section-number">3.</span> Elements</a>
 </li>
 <li id="syntax-attributes-toc">
-<span class="toc-section-number">&#8199;</span><a href="#syntax-attributes"><span class="toc-section-number">4.</span> Attributes</a>
+<span class="toc-section-number"></span><a href="#syntax-attributes"><span class="toc-section-number">4.</span> Attributes</a>
 </li>
 <li id="text-syntax-toc">
-<span class="toc-section-number">&#8199;</span><a href="#text-syntax"><span class="toc-section-number">5.</span> Text and character data</a>
+<span class="toc-section-number"></span><a href="#text-syntax"><span class="toc-section-number">5.</span> Text and character data</a>
 </li>
 <li id="character-references-toc">
-<span class="toc-section-number">&#8199;</span><a href="#character-references"><span class="toc-section-number">6.</span> Character references</a>
+<span class="toc-section-number"></span><a href="#character-references"><span class="toc-section-number">6.</span> Character references</a>
 </li>
 <li id="comments-toc">
-<span class="toc-section-number">&#8199;</span><a href="#comments"><span class="toc-section-number">7.</span> Comments</a>
-</li>
-<li id="escaping-text-span-toc">
-<span class="toc-section-number">&#8199;</span><a href="#escaping-text-span"><span class="toc-section-number">8.</span> Escaping text spans</a>
+<span class="toc-section-number"></span><a href="#comments"><span class="toc-section-number">7.</span> Comments</a>
 </li>
 <li id="svg-mathml-toc">
-<span class="toc-section-number">&#8199;</span><a href="#svg-mathml"><span class="toc-section-number">9.</span> SVG and MathML elements in HTML documents</a>
+<span class="toc-section-number"></span><a href="#svg-mathml"><span class="toc-section-number">8.</span> SVG and MathML elements in HTML documents</a>
 </li>
 <li id="cdata-sections-toc">
-<span class="toc-section-number"></span><a href="#cdata-sections"><span class="toc-section-number">10.</span> CDATA sections in SVG and MathML contents</a>
+<span class="toc-section-number"></span><a href="#cdata-sections"><span class="toc-section-number">9.</span> CDATA sections in SVG and MathML contents</a>
 </li>
 </ul>
 </div>
@@ -1775,14 +1769,7 @@
         <a href="#space">space characters</a>
 </li>
     </ul>
-<p class="note">There are two special types of
-    <a href="#syntax-text">text</a>,
-    known as
-    <a href="#syntax-escape-start">escaping text span starts</a>
-    and
-    <a href="#syntax-escape-end">escaping text span ends</a>,
-    that can occur within certain elements.</p>
-    <p><dfn id="character-data" title="character-data">Character data</dfn> contains
+<p><dfn id="character-data" title="character-data">Character data</dfn> contains
     <a href="syntax-text">text</a>, in some cases in combination with
     <a href="#syntax-charref">character references</a>,
     along with certain additional restrictions. There are three
@@ -1807,12 +1794,10 @@
 <li>must not contain any
           "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
           characters</li>
-          <li>must not contain any
-          <a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a>
-</li>
-          <li>must not contain any
-          <a href="#syntax-escape">escaping text spans</a>
-</li>
+          
+          
+          
+          
         </ul>
 </dd>
       <dt><dfn id="replaceable-character-data" title="replaceable-character-data">Replaceable character data</dfn></dt>
@@ -1830,9 +1815,10 @@
 <a href="#syntax-text">text</a>,
           optionally including
           "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
-          characters and
-          <a href="#syntax-escape">escaping text spans</a>
-</li>
+          characters
+          
+          
+          </li>
           <li><a href="#syntax-charref">character references</a></li>
         </ul>
 <p>Replaceable character data has the following restrictions:</p>
@@ -1848,16 +1834,11 @@
           replaceable character data (for example,
           "<code>&lt;/title</code>" or
           "<code>&lt;/textarea</code>"),
-          followed by one of
-          U+0009 CHARACTER TABULATION,
-          U+000A LINE FEED (LF),
-          U+000C FORM FEED (FF),
-          U+0020 SPACE,
+          followed by a
+          <a href="#space">space character</a>,
           "<code title="U+003E GREATER-THAN SIGN">&gt;</code>",
           or
-          "<code title="U+002F SOLIDUS">/</code>",
-          unless that string is part of an
-          <a href="#syntax-escape">escaping text span</a>.</li>
+          "<code title="U+002F SOLIDUS">/</code>".</li>
         </ul>
 <p class="note">Replaceable character data,
         as defined in this specification, is a feature of
@@ -1886,9 +1867,10 @@
 <a href="#syntax-text">text</a>,
           optionally including
           "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
-          characters and
-          <a href="#syntax-escape">escaping text spans</a>
-</li>
+          characters
+          
+          
+          </li>
           <li><a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a></li>
         </ul>
 <p>Non-replaceable character data has the following restrictions:</p>
@@ -1904,16 +1886,11 @@
           "<code>&lt;/script</code>"
           or
           "<code>&lt;/style</code>",
-          followed by one of
-          U+0009 CHARACTER TABULATION,
-          U+000A LINE FEED (LF),
-          U+000C FORM FEED (FF),
-          U+0020 SPACE,
+          followed by a
+          <a href="#space">space character</a>,
           "<code title="U+003E GREATER-THAN SIGN">&gt;</code>",
           or
-          "<code title="U+002F SOLIDUS">/</code>",
-          unless that string is part of an
-          <a href="#syntax-escape">escaping text span</a>.</li>
+          "<code title="U+002F SOLIDUS">/</code>".</li>
         </ul>
 <p class="note">Non-replaceable character data,
         as defined in this specification, is a feature of
@@ -2091,94 +2068,8 @@
     <pre>&lt;!-- main content starts here --&gt;</pre>
     </div>
   </div>
-  <div id="escaping-text-span" class="section">
-    <h2>4.08. Escaping text spans <a class="hash" href="#escaping-text-span">#</a> <a class="toc-bak" href="#escaping-text-span-toc">T</a>
-</h2>
-    <p>An
-      <dfn id="syntax-escape">escaping text span</dfn>
-      is a span of
-      <a href="#syntax-text" title="syntax-text">text</a>
-      that starts with an
-      <a href="#syntax-escape-start">escaping text span start</a>
-      that is not itself in an
-      <a href="#syntax-escape">escaping text span</a>,
-      and ends at the next
-      <a href="#syntax-escape-end">escaping text span end</a>.
-      Escaping text spans have the following restriction:</p>
-    <ul>
-<li>must not contain any <a href="#syntax-charref">character references</a>
-</li>
-    </ul>
-<p>An
-      <dfn id="syntax-escape-start">escaping text span start</dfn>
-      is the
-      <a href="#syntax-text" title="syntax-text">text</a>
-      string
-      "<code title="U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS">&lt;!--</code>".</p>
-     <p>An
-     <dfn id="syntax-escape-end">escaping text span end</dfn>
-     is the
-     <a href="#syntax-text" title="syntax-text">text</a>
-     string
-     "<code title="U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN">--&gt;</code>".</p>
-     <div class="note">
-       <ul>
-<li>An
-         <a href="#syntax-escape">escaping text span</a>
-         is not a
-         <a href="#syntax-comments">comment</a>.</li>
-         <li>An
-         <a href="#syntax-escape-start">escaping text span start</a>
-         is
-         <a href="#syntax-text">text</a>;
-         it is not a
-         <a href="#comment-start-delimiter">comment start delimiter</a>.</li>
-         <li>An
-         <a href="#syntax-escape-end">escaping text span end</a>
-         is
-         <a href="#syntax-text">text</a>;
-         it is not a
-         <a href="#comment-end-delimiter">comment end delimiter</a>.</li>
-         <li>Any sequences of characters within an
-         <a href="#syntax-escape">escaping text span</a>
-         that look like
-         <a href="#syntax-charref">character references</a>
-         are
-         <a href="#syntax-text">text</a>,
-         not 
-         <a href="#syntax-charref">character references</a>.</li>
-       </ul>
-</div>
-     <p>An
-     <a href="#syntax-escape-start">escaping text span start</a>
-     may share its
-     "<code title="U+002D HYPHEN-MINUS">-</code>"
-     characters with its corresponding
-     <a href="#syntax-escape-end">escaping text span end</a>.</p>
-    <p>The text in
-    <a href="#style">style</a>,
-    <a href="#script">script</a>,
-    <a href="#title">title</a>,
-    and
-    <a href="#textarea">textarea</a>
-    elements must not have an
-     <a href="#syntax-escape-start">escaping text span start</a>
-     that is not followed by an
-     <a href="#syntax-escape-end">escaping text span end</a>.</p>
-    <div class="example">
-    <p>The following is an example of an
-    <a href="#syntax-escape">escaping text span</a>
-    within a
-    <a href="#style" class="element">style</a> element.</p>
-    <pre>&lt;style&gt;
-&lt;!--
-dfn { font-weight: bold; color: brown; }
---&gt;
-&lt;/style&gt;</pre>
-    </div>
- </div>
  <div id="svg-mathml" class="section">
-   <h2>4.09. SVG and MathML elements in HTML documents <a class="hash" href="#svg-mathml">#</a> <a class="toc-bak" href="#svg-mathml-toc">T</a>
+   <h2>4.08. SVG and MathML elements in HTML documents <a class="hash" href="#svg-mathml">#</a> <a class="toc-bak" href="#svg-mathml-toc">T</a>
 </h2>
    <p id="elements-svg-mathml">
    <dfn id="svg-mathml-elements" title="svg-mathml-elements">SVG and MathML elements</dfn>
@@ -2229,7 +2120,7 @@
    </ul>
 </div>
  <div id="cdata-sections" class="section">
-   <h2>4.10. CDATA sections in SVG and MathML contents <a class="hash" href="#cdata-sections">#</a> <a class="toc-bak" href="#cdata-sections-toc">T</a>
+   <h2>4.09. CDATA sections in SVG and MathML contents <a class="hash" href="#cdata-sections">#</a> <a class="toc-bak" href="#cdata-sections-toc">T</a>
 </h2>
    <p>
    <dfn id="syntax-cdata-sections" title="syntax-cdata-sections">CDATA sections in SVG and MathML contents</dfn>
@@ -7185,7 +7076,7 @@
         <div></div>
       <div id="iframe-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="iframe-mdl" href="#iframe-mdl" class="element">iframe</a> = </span><span>
-      <a class="ref" href="#normal-character-data">normal-character-data</a>
+      normal character data
       <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#iframe.attrs">iframe.attrs</a>
     </span></p>
         </div>
@@ -12470,7 +12361,7 @@
         <div></div>
       <div id="option-mdls">
         <p class="elem-mdl"><span class="element-pattern-name"><a id="option-mdl" href="#option-mdl" class="element">option</a> = </span><span>
-      <a class="ref" href="#normal-character-data">normal-character-data</a>
+      normal character data
       <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#option.attrs">option.attrs</a>
     </span></p>
         </div>
@@ -13324,12 +13215,12 @@
 <dl id="script-mdls">
 <dt class="content-model"><span class="element-pattern-name" id="script.elem.embedded"><a class="hash" href="#script.elem.embedded"><span class="element">script</span>.elem.embedded</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      ()
+      <a class="ref" href="#non-replaceable-character-data">non-replaceable-character-data</a>
       <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#script.attrs.embedded" title="script.attrs.embedded">script.attrs.embedded</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="script.elem.imported"><a class="hash" href="#script.elem.imported"><span class="element">script</span>.elem.imported</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      ()
+      <a class="ref" href="#non-replaceable-character-data">non-replaceable-character-data</a>
       <a href="#interleave" title="INTERLEAVED IN ANY ORDER" class="rnc-symbol">&amp;</a> <a class="ref" href="#script.attrs.imported" title="script.attrs.imported">script.attrs.imported</a>
     </span></dd>
         </dl>
Received on Friday, 29 January 2010 00:09:16 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 29 January 2010 00:09:25 GMT