W3C home > Mailing lists > Public > public-html-diffs@w3.org > August 2009

mike: updated description of <iframe> to indicate that its content model allows non-replaceable character data; refined description of what a conformant document is

From: poot <cvsmail@w3.org>
Date: Thu, 6 Aug 2009 19:34:59 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20090806103459.551292BC91@toro.w3.mag.keio.ac.jp>
mike: updated description of <iframe> to indicate that its content model
allows non-replaceable character data; refined description of what a
conformant document is

http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.344&r2=1.345&f=h

===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -d -r1.344 -r1.345
--- Overview.html	4 Aug 2009 15:46:31 -0000	1.344
+++ Overview.html	6 Aug 2009 10:34:34 -0000	1.345
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>5 August 2009</em>
+<h2>Editor&#8217;s Draft <em>6 August 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -42,7 +42,7 @@
     
     
     <p>
-        This document is the 5 August 2009 Editor&#8217;s Draft of 
+        This document is the 6 August 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>
@@ -179,8 +179,8 @@
 <li id="mime-types-toc">
 <span class="toc-section-number"></span><a href="documents.html#mime-types"><span class="toc-section-number">5.01.</span> The HTML namespace and MIME types</a>
 </li>
-<li id="documents-toc">
-<span class="toc-section-number"></span><a href="documents.html#documents"><span class="toc-section-number">5.02.</span> Conformant documents</a>
+<li id="conformant-documents-toc">
+<span class="toc-section-number"></span><a href="documents.html#conformant-documents"><span class="toc-section-number">5.02.</span> Conformant documents</a>
 </li>
 <li id="case-insensitivity-toc">
 <span class="toc-section-number"></span><a href="documents.html#case-insensitivity"><span class="toc-section-number">5.03.</span> Case insensitivity in tag names and attribute names</a>

Index: iframe.html
===================================================================
RCS file: /sources/public/html5/markup/iframe.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- iframe.html	4 Aug 2009 15:46:33 -0000	1.18
+++ iframe.html	6 Aug 2009 10:34:35 -0000	1.19
@@ -21,7 +21,7 @@
         <h2 class="element-subhead">Content model <a class="hash" href="#iframe-content">#</a></h2>
         <div class="content-models" 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>
+      <a class="ref" href="syntax.html#non-replaceable-character-data">non-replaceable-character-data</a>
       &amp; <a class="ref" href="iframe.html#iframe.attrs">iframe.attrs</a>
     </span></p>
         </div>

Index: intro.html
===================================================================
RCS file: /sources/public/html5/markup/intro.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- intro.html	1 Aug 2009 12:23:47 -0000	1.9
+++ intro.html	6 Aug 2009 10:34:35 -0000	1.10
@@ -30,8 +30,8 @@
     <h2>1.01. Scope <a class="hash" href="#scope">#</a> <a class="toc-bak" href="Overview.html#scope-toc">T</a></h2>
     <p>This specification limits its scope to providing
     the details necessary for HTML producers to create
-    <a href="documents.html#documents">conformant documents</a>. It is
-    designed:</p>
+    <a href="documents.html#conformant-documents">conformant documents</a>.
+    It is designed:</p>
     <ul>
       <li>to describe the syntax, structure, and
       semantics of the HTML language</li>

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/syntax.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- syntax.html	1 Aug 2009 17:59:10 -0000	1.22
+++ syntax.html	6 Aug 2009 10:34:35 -0000	1.23
@@ -642,9 +642,10 @@
         <p>In
         <a href="documents.html#syntax-document-html">documents in the HTML syntax</a>,
         the
-        <a href="script.html#script" class="element">script</a>
-        and 
-        <a href="style.html#style" class="element">style</a>
+        <a href="script.html#script" class="element">script</a>,
+        <a href="style.html#style" class="element">style</a>,
+        and
+        <a href="iframe.html#iframe" class="element">iframe</a>
         elements can contain non-replaceable character data.
         Non-replaceable character data can contain the
         following:</p>
@@ -664,8 +665,11 @@
           followed by characters that case-insensitively match the
           tag name of the element containing the replaceable
           character data (for example,
-          "<code>&lt;/script</code>" or
-          "<code>&lt;/style</code>"),
+          "<code>&lt;/script</code>"
+          or
+          "<code>&lt;/style</code>"
+          or
+          "<code>&lt;/iframe</code>"),
           followed by one of
           U+0009 CHARACTER TABULATION,
           U+000A LINE FEED (LF),

Index: documents.html
===================================================================
RCS file: /sources/public/html5/markup/documents.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- documents.html	1 Aug 2009 17:59:10 -0000	1.7
+++ documents.html	6 Aug 2009 10:34:34 -0000	1.8
@@ -17,7 +17,7 @@
 <ul>
 <li id="mime-types-toc"><span class="toc-section-number"></span><a href="documents.html#mime-types"><span class="toc-section-number">1.</span> The HTML namespace and MIME types</a>
 </li>
-<li id="documents-toc"><span class="toc-section-number"></span><a href="documents.html#documents"><span class="toc-section-number">2.</span> Conformant documents</a>
+<li id="conformant-documents-toc"><span class="toc-section-number"></span><a href="documents.html#conformant-documents"><span class="toc-section-number">2.</span> Conformant documents</a>
 </li>
 <li id="case-insensitivity-toc"><span class="toc-section-number"></span><a href="documents.html#case-insensitivity"><span class="toc-section-number">3.</span> Case insensitivity in tag names and attribute names</a>
 </li>
@@ -84,8 +84,8 @@
     must conform to the rules in this specification for
     <a href="documents.html#syntax-document-xml">documents in the XML syntax</a>.</p>
   </div>
-  <div id="documents" class="section">
-    <h2>5.02. Conformant documents <a class="hash" href="#documents">#</a> <a class="toc-bak" href="Overview.html#documents-toc">T</a></h2>
+  <div id="conformant-documents" class="section">
+    <h2>5.02. Conformant documents <a class="hash" href="#conformant-documents">#</a> <a class="toc-bak" href="Overview.html#conformant-documents-toc">T</a></h2>
     <p>A conformant
     <dfn id="syntax-document-html" title="syntax-document-html">document in the HTML
       syntax</dfn> must consist of the following parts, in the
@@ -100,8 +100,12 @@
       <li>Any number of
       <a href="syntax.html#syntax-comments">comments</a> and
       <a href="terminology.html#space">space characters</a>.</li>
-      <li>The root element, in the form of an
-      <a href="html.html#html" class="element">html</a> element.</li>
+      <li>An
+      <a href="html.html#html" class="element">html</a> element,
+      with its
+      <a href="syntax.html#attribute">attributes</a>
+      and
+      <a href="syntax.html#contents">contents</a>.</li>
       <li>Any number of
       <a href="syntax.html#syntax-comments">comments</a> and
       <a href="terminology.html#space">space characters</a>.</li>
@@ -118,8 +122,12 @@
       in the XML specification <a href="references.html#refsXML">[XML]</a>.</li>
       <li>Any number of comments and space characters, as defined
       in the XML specification <a href="references.html#refsXML">[XML]</a>.</li>
-      <li>The root element, in the form of an
-      <a href="html.html#html" class="element">html</a> element.</li>
+      <li>An
+      <a href="html.html#html" class="element">html</a> element,
+      with its
+      <a href="syntax.html#attribute">attributes</a>
+      and
+      <a href="syntax.html#contents">contents</a>.</li>
       <li>Any number of comments and space characters, as defined
       in the XML specification <a href="references.html#refsXML">[XML]</a>.</li>
     </ol>

Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- patch-schema	4 Aug 2009 15:46:33 -0000	1.75
+++ patch-schema	6 Aug 2009 10:34:35 -0000	1.76
@@ -310,14 +310,17 @@
  					{	( w:string "allow-same-origin" )?
  					,	( w:string "allow-forms" )?
  					,	( w:string "allow-scripts" )?
-@@ -358,7 +361,7 @@
+@@ -358,9 +361,9 @@
  					,	( w:string "allow-forms" )?
  					,	( w:string "allow-same-origin" )?
  					}
 -				} & v5only
 +				)	& v5only
  	iframe.inner =
- 		( text )
+-		( text )
++		( non-replaceable-character-data )
+ 
+ 	common.elem.phrasing |= iframe.elem
  
 @@ -396,20 +399,49 @@
  	area.attrs =

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- spec.html	5 Aug 2009 13:23:16 -0000	1.88
+++ spec.html	6 Aug 2009 10:34:35 -0000	1.89
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>5 August 2009</em>
+<h2>Editor&#8217;s Draft <em>6 August 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -41,7 +41,7 @@
     
     
     <p>
-        This document is the 5 August 2009 Editor&#8217;s Draft of 
+        This document is the 6 August 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>
@@ -178,8 +178,8 @@
 <li id="mime-types-toc">
 <span class="toc-section-number"></span><a href="#mime-types"><span class="toc-section-number">5.01.</span> The HTML namespace and MIME types</a>
 </li>
-<li id="documents-toc">
-<span class="toc-section-number"></span><a href="#documents"><span class="toc-section-number">5.02.</span> Conformant documents</a>
+<li id="conformant-documents-toc">
+<span class="toc-section-number"></span><a href="#conformant-documents"><span class="toc-section-number">5.02.</span> Conformant documents</a>
 </li>
 <li id="case-insensitivity-toc">
 <span class="toc-section-number"></span><a href="#case-insensitivity"><span class="toc-section-number">5.03.</span> Case insensitivity in tag names and attribute names</a>
@@ -709,8 +709,8 @@
 </h2>
     <p>This specification limits its scope to providing
     the details necessary for HTML producers to create
-    <a href="#documents">conformant documents</a>. It is
-    designed:</p>
+    <a href="#conformant-documents">conformant documents</a>.
+    It is designed:</p>
     <ul>
 <li>to describe the syntax, structure, and
       semantics of the HTML language</li>
@@ -824,8 +824,8 @@
 <li id="mime-types-toc">
 <span class="toc-section-number"></span><a href="#mime-types"><span class="toc-section-number">1.</span> The HTML namespace and MIME types</a>
 </li>
-<li id="documents-toc">
-<span class="toc-section-number"></span><a href="#documents"><span class="toc-section-number">2.</span> Conformant documents</a>
+<li id="conformant-documents-toc">
+<span class="toc-section-number"></span><a href="#conformant-documents"><span class="toc-section-number">2.</span> Conformant documents</a>
 </li>
 <li id="case-insensitivity-toc">
 <span class="toc-section-number"></span><a href="#case-insensitivity"><span class="toc-section-number">3.</span> Case insensitivity in tag names and attribute names</a>
@@ -894,8 +894,8 @@
     must conform to the rules in this specification for
     <a href="#syntax-document-xml">documents in the XML syntax</a>.</p>
   </div>
-  <div id="documents" class="section">
-    <h2>5.02. Conformant documents <a class="hash" href="#documents">#</a> <a class="toc-bak" href="#documents-toc">T</a>
+  <div id="conformant-documents" class="section">
+    <h2>5.02. Conformant documents <a class="hash" href="#conformant-documents">#</a> <a class="toc-bak" href="#conformant-documents-toc">T</a>
 </h2>
     <p>A conformant
     <dfn id="syntax-document-html" title="syntax-document-html">document in the HTML
@@ -911,8 +911,12 @@
       <li>Any number of
       <a href="#syntax-comments">comments</a> and
       <a href="#space">space characters</a>.</li>
-      <li>The root element, in the form of an
-      <a href="#html" class="element">html</a> element.</li>
+      <li>An
+      <a href="#html" class="element">html</a> element,
+      with its
+      <a href="#attribute">attributes</a>
+      and
+      <a href="#contents">contents</a>.</li>
       <li>Any number of
       <a href="#syntax-comments">comments</a> and
       <a href="#space">space characters</a>.</li>
@@ -929,8 +933,12 @@
       in the XML specification <a href="#refsXML">[XML]</a>.</li>
       <li>Any number of comments and space characters, as defined
       in the XML specification <a href="#refsXML">[XML]</a>.</li>
-      <li>The root element, in the form of an
-      <a href="#html" class="element">html</a> element.</li>
+      <li>An
+      <a href="#html" class="element">html</a> element,
+      with its
+      <a href="#attribute">attributes</a>
+      and
+      <a href="#contents">contents</a>.</li>
       <li>Any number of comments and space characters, as defined
       in the XML specification <a href="#refsXML">[XML]</a>.</li>
     </ol>
@@ -1663,9 +1671,10 @@
         <p>In
         <a href="#syntax-document-html">documents in the HTML syntax</a>,
         the
-        <a href="#script" class="element">script</a>
-        and 
-        <a href="#style" class="element">style</a>
+        <a href="#script" class="element">script</a>,
+        <a href="#style" class="element">style</a>,
+        and
+        <a href="#iframe" class="element">iframe</a>
         elements can contain non-replaceable character data.
         Non-replaceable character data can contain the
         following:</p>
@@ -1688,8 +1697,11 @@
           followed by characters that case-insensitively match the
           tag name of the element containing the replaceable
           character data (for example,
-          "<code>&lt;/script</code>" or
-          "<code>&lt;/style</code>"),
+          "<code>&lt;/script</code>"
+          or
+          "<code>&lt;/style</code>"
+          or
+          "<code>&lt;/iframe</code>"),
           followed by one of
           U+0009 CHARACTER TABULATION,
           U+000A LINE FEED (LF),
@@ -6980,7 +6992,7 @@
 </h2>
         <div class="content-models" 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>
+      <a class="ref" href="#non-replaceable-character-data">non-replaceable-character-data</a>
       &amp; <a class="ref" href="#iframe.attrs">iframe.attrs</a>
     </span></p>
         </div>
Received on Thursday, 6 August 2009 10:35:35 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 18 December 2010 06:14:08 GMT