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

html5/markup/src terms.html,1.17,1.18

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 04 Feb 2010 15:09:24 +0000
To: public-html-commits@w3.org
Message-Id: <E1Nd3Ke-0001Qp-R5@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv2080/src

Modified Files:
	terms.html 
Log Message:
checkpointing; reverted to generating content models from schema, but with translation of RNC syntax to natural language

Index: terms.html
===================================================================
RCS file: /sources/public/html5/markup/src/terms.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- terms.html	30 Jan 2010 05:50:00 -0000	1.17
+++ terms.html	4 Feb 2010 15:09:22 -0000	1.18
@@ -1,6 +1,6 @@
 <section id="terminology"
   xmlns="http://www.w3.org/1999/xhtml">
-  <h2>Terminology and symbols</h2>
+  <h2>Terminology</h2>
     <p>The following is a list of terms that are used in other
     sections of this specification.</p>
   <dl>
@@ -33,6 +33,14 @@
       content that is to be used when the embedded content cannot
       be used (for example, when it is of an unsupported format).</dd>
     <dt><dfn
+        id="flow-content"
+        title="flow-content"
+        >flow content</dfn></dt>
+    <dd><a href="#flow-content">Flow content</a> consists of
+      <a href="#common.elem.flow">flow elements</a>
+      intermixed with
+      <a href="#normal-character-data">normal character data</a>.</dd>
+    <dt><dfn
         id="html-producer"
         title="html-producer">HTML producers</dfn></dt>
     <dd>HTML authors (that is, people) and applications
@@ -57,6 +65,14 @@
       </ul>
     </dd>
     <dt><dfn
+        id="phrasing-content"
+        title="phrasing-content"
+        >phrasing content</dfn></dt>
+    <dd><a href="#phrasing-content">Phrasing content</a> consists of
+      <a href="#common.elem.phrasing">phrasing elements</a>
+      intermixed with
+      <a href="#normal-character-data">normal character data</a>.</dd>
+    <dt><dfn
         id="space"
         title="space"
         >space</dfn></dt>
Received on Thursday, 4 February 2010 15:09:25 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 4 February 2010 15:09:26 GMT