html5/markup/src syntax.html,1.66,1.67

Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv27967/src

Modified Files:
	syntax.html 
Log Message:
unwound the <iframe> content-model change; made some other refinements to Syntax section


Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/src/syntax.html,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- syntax.html	7 Aug 2009 14:50:29 -0000	1.66
+++ syntax.html	8 Aug 2009 14:02:59 -0000	1.67
@@ -138,7 +138,7 @@
       "<code>http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</code>".</li>
     </ul>
     <div class="example">
-    <p>The following are examples of
+    <p>The following are examples of some
     <a href="#deprecated-doctype">deprecated doctypes</a>.</p>
     <pre>&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"></pre>
@@ -148,10 +148,13 @@
   </section>
   <section id="character-encoding">
     <h2>Character encoding declaration</h2>
-    <p>A <dfn id="encoding-declaration" >character
-      encoding declaration</dfn> is a mechanism by which the
-    character encoding used to store or transmit a document is
-    specified.</p>
+    <p>A
+    <dfn
+      id="encoding-declaration"
+      title="encoding-declaration"
+      >character encoding declaration</dfn>
+    is a mechanism for specifying the character encoding used to store
+    or transmit a document.</p>
     <p>The following restrictions apply to character encoding
     declarations:</p>
     <ul>
@@ -208,19 +211,30 @@
     </p>
     <p>In a
     <a href="#syntax-document-xml">document the XML syntax</a>,
-    the XML declaration should be used to provide
-    character-encoding information, if necessary.</p>
+    the
+    <dfn
+      id="xml-declaration"
+      title="xml-declaration"
+      >XML declaration</dfn>,
+    as defined in the XML specification
+    <a href="#refsXML">[XML]</a>
+    should be used to provide character-encoding information, if
+    necessary.</p>
   </section>
   <section id="syntax-elements">
     <h2>Elements</h2>
-    <p>An element’s <dfn id="content-model" title="content-model"
-      >content model</dfn> defines the element’s structure: What
+    <p>An element’s
+    <dfn
+      id="content-model"
+      title="content-model"
+      >content model</dfn>
+    defines the element’s structure: What
     <a href="#contents">contents</a> (if any) the element can
     contain, as well as what attributes (if any) the element can
     have. The
     <a href="#elements">HTML elements</a>
     section of this specification defines the content models for
-    all of the elements that are part of the
+    all of elements that are part of the
     <a href="#html-language">HTML language</a>.
     An element must not contain
     <a href="#contents">contents</a>
@@ -269,7 +283,7 @@
       <a href="#refsXML">[XML]</a>.</p>
     <ul>
       <li><dfn id="tags" title="syntax-tags">Tags</dfn> are used to
-      delimit the start and end of elements in the markup. Elements
+      delimit the start and end of elements in markup. Elements
       have a
       <a href="#syntax-start-tags">start tag</a>
       to indicate where they begin. Non-<a
@@ -439,7 +453,15 @@
       <li>
       <dfn id="syntax-attribute-value">Attribute values</dfn>, in
       general, are
-      <a href="#normal-character-data">normal character data</a>.</li>
+      <a href="#normal-character-data">normal character data</a>;
+      however, the <a href="#elements">HTML elements</a> section
+      of this specification defines further restrictions on the
+      allowed values of all attributes that are part of the
+      <a href="#html-language">HTML language</a>.
+      An attribute must not have a value that is not allowed by
+      the
+      <a href="#content-model">content model</a>
+      of the element that contains it.</li>
     </ul>
     <p>In the <a href="#html-syntax">the HTML syntax</a>,
     attributes can be specified in four different ways:</p>
@@ -725,9 +747,8 @@
         <a href="#syntax-document-html">documents in the HTML syntax</a>,
         the
         <a href="#script" class="element">script</a>,
-        <a href="#style" class="element">style</a>,
         and
-        <a href="#iframe" class="element">iframe</a>
+        <a href="#style" class="element">style</a>
         elements can contain non-replaceable character data.
         Non-replaceable character data can contain the
         following:</p>
@@ -749,9 +770,7 @@
           character data (for example,
           "<code>&lt;/script</code>"
           or
-          "<code>&lt;/style</code>"
-          or
-          "<code>&lt;/iframe</code>"),
+          "<code>&lt;/style</code>",
           followed by one of
           U+0009 CHARACTER TABULATION,
           U+000A LINE FEED (LF),
@@ -1016,7 +1035,6 @@
     <p>The text in
     <a href="#style">style</a>,
     <a href="#script">script</a>,
-    <a href="#iframe">iframe</a>,
     <a href="#title">title</a>,
     and
     <a href="#textarea">textarea</a>

Received on Saturday, 8 August 2009 14:03:11 UTC