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

html5/markup/src documents.html,1.4,1.5 intro-scope.html,1.9,1.10 syntax.html,1.63,1.64

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 06 Aug 2009 10:34:37 +0000
To: public-html-commits@w3.org
Message-Id: <E1MZ0Iv-0006Tw-L2@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv24718/src

Modified Files:
	documents.html intro-scope.html syntax.html 
Log Message:
updated description of <iframe> to indicate that its content model allows non-replaceable character data; refined description of what a conformant document is


Index: documents.html
===================================================================
RCS file: /sources/public/html5/markup/src/documents.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- documents.html	31 Jul 2009 08:34:42 -0000	1.4
+++ documents.html	6 Aug 2009 10:34:35 -0000	1.5
@@ -71,7 +71,7 @@
     must conform to the rules in this specification for
     <a href="#syntax-document-xml">documents in the XML syntax</a>.</p>
   </section>
-  <section id="documents">
+  <section id="conformant-documents">
     <h2>Conformant documents</h2>
     <p>A conformant
     <dfn id="syntax-document-html"
@@ -88,8 +88,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>
@@ -107,8 +111,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>

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/src/syntax.html,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- syntax.html	31 Jul 2009 08:34:42 -0000	1.63
+++ syntax.html	6 Aug 2009 10:34:35 -0000	1.64
@@ -641,9 +641,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>
@@ -663,8 +664,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: intro-scope.html
===================================================================
RCS file: /sources/public/html5/markup/src/intro-scope.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- intro-scope.html	20 Jul 2009 22:44:24 -0000	1.9
+++ intro-scope.html	6 Aug 2009 10:34:35 -0000	1.10
@@ -20,8 +20,8 @@
     <h2>Scope</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>
Received on Thursday, 6 August 2009 10:34:47 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 6 August 2009 10:34:48 GMT