- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 29 Jan 2010 00:36:25 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv2457
Modified Files:
a.html html.html spec.html
Log Message:
experiment with prose content model
Index: html.html
===================================================================
RCS file: /sources/public/html5/markup/html.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- html.html 29 Jan 2010 00:25:42 -0000 1.22
+++ html.html 29 Jan 2010 00:36:23 -0000 1.23
@@ -17,13 +17,13 @@
<p>The <a href="html.html#html" class="element">html</a> element
represents the root of a document.</p>
</div>
- <div class="no-number no-toc" id="html-content">
- <h2 class="element-subhead">Content model <a class="hash" href="#html-content">#</a></h2><div class="content-models">
- <div class="prose-model">A
+ <div class="no-number no-toc"><h2 class="element-subhead">Permitted contents <a class="hash" href="#">#</a></h2><div class="content-models">A
<a href="head.html#head" class="element">head</a>
element followed by a
<a href="body.html#body" class="element">body</a>
- element.</div>
+ element.</div></div><div class="no-number no-toc" id="html-content">
+ <h2 class="element-subhead">Content model <a class="hash" href="#html-content">#</a></h2><div class="content-models">
+
<div id="html-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="html-mdl" href="html.html#html-mdl" class="element">html</a> = </span><span>
<a class="ref" href="head.html#head">head</a><a href="terminology.html#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
Index: a.html
===================================================================
RCS file: /sources/public/html5/markup/a.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- a.html 29 Jan 2010 00:25:42 -0000 1.33
+++ a.html 29 Jan 2010 00:36:23 -0000 1.34
@@ -18,11 +18,11 @@
<a class="element" href="a.html#a">a</a>
element represents a hyperlink.</p>
</div>
- <div class="no-number no-toc" id="a-content">
- <h2 class="element-subhead">Content model <a class="hash" href="#a-content">#</a></h2><div class="content-models">
- <div class="prose-model">
+ <div class="no-number no-toc"><h2 class="element-subhead">Permitted contents <a class="hash" href="#">#</a></h2><div class="content-models">
<a href="terminology.html#transparent">Transparent</a>
- </div>
+ </div></div><div class="no-number no-toc" id="a-content">
+ <h2 class="element-subhead">Content model <a class="hash" href="#a-content">#</a></h2><div class="content-models">
+
<dl id="a-mdls">
<dt class="content-model"><span class="element-pattern-name" id="a.elem.phrasing"><a class="hash" href="a.html#a.elem.phrasing"><span class="element">a</span>.elem.phrasing</a> = </span></dt>
<dd class="elem-mdl"><span>
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- spec.html 29 Jan 2010 00:25:43 -0000 1.119
+++ spec.html 29 Jan 2010 00:36:23 -0000 1.120
@@ -2579,13 +2579,18 @@
<a class="element" href="#a">a</a>
element represents a hyperlink.</p>
</div>
- <div class="no-number no-toc" id="a-content">
- <h2 class="element-subhead">Content model <a class="hash" href="#a-content">#</a>
+ <div class="no-number no-toc">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#">#</a>
</h2>
<div class="content-models">
- <div class="prose-model">
<a href="#transparent">Transparent</a>
</div>
+</div>
+<div class="no-number no-toc" id="a-content">
+ <h2 class="element-subhead">Content model <a class="hash" href="#a-content">#</a>
+</h2>
+<div class="content-models">
+
<dl id="a-mdls">
<dt class="content-model"><span class="element-pattern-name" id="a.elem.phrasing"><a class="hash" href="#a.elem.phrasing"><span class="element">a</span>.elem.phrasing</a> = </span></dt>
<dd class="elem-mdl"><span>
@@ -6905,15 +6910,20 @@
<p>The <a href="#html" class="element">html</a> element
represents the root of a document.</p>
</div>
- <div class="no-number no-toc" id="html-content">
- <h2 class="element-subhead">Content model <a class="hash" href="#html-content">#</a>
+ <div class="no-number no-toc">
+<h2 class="element-subhead">Permitted contents <a class="hash" href="#">#</a>
</h2>
-<div class="content-models">
- <div class="prose-model">A
+<div class="content-models">A
<a href="#head" class="element">head</a>
element followed by a
<a href="#body" class="element">body</a>
element.</div>
+</div>
+<div class="no-number no-toc" id="html-content">
+ <h2 class="element-subhead">Content model <a class="hash" href="#html-content">#</a>
+</h2>
+<div class="content-models">
+
<div id="html-mdls">
<p class="elem-mdl"><span class="element-pattern-name"><a id="html-mdl" href="#html-mdl" class="element">html</a> = </span><span>
<a class="ref" href="#head">head</a><a href="#in-order" title="ORDERED GROUP" class="rnc-symbol">,</a>
Received on Friday, 29 January 2010 00:36:27 UTC