- From: Sam Ruby via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 24 Aug 2012 06:14:00 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv17398
Modified Files:
content-models.html single-page.html spec.html
the-object-element.html
Log Message:
commit 9e9d6bad81a383a7736b962d0ee3e80330db6d7c
Author: Erika Doyle Navara <erika.doyle@microsoft.com>
Date: Thu Aug 23 22:58:21 2012 -0700
[HTML5 ISSUE-158] Working Group decision applied
http://lists.w3.org/Archives/Public/public-html/2012Jul/0250.html
Index: content-models.html
===================================================================
RCS file: /sources/public/html5/spec/content-models.html,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -d -r1.271 -r1.272
--- content-models.html 24 Aug 2012 03:14:20 -0000 1.271
+++ content-models.html 24 Aug 2012 06:13:57 -0000 1.272
@@ -1051,14 +1051,12 @@
<p>Consider the following markup fragment:</p>
- <pre><p><object><param><ins><map><a href="/">Apples</a></map></ins></object></p></pre>
+ <pre><p><ins><map><a href="/">Apples</a></map></ins></p></pre>
<p>To check whether "Apples" is allowed inside the <code><a href="the-a-element.html#the-a-element">a</a></code>
element, the content models are examined. The <code><a href="the-a-element.html#the-a-element">a</a></code>
element's content model is transparent, as is the <code><a href="the-map-element.html#the-map-element">map</a></code>
- element's, as is the <code><a href="the-ins-element.html#the-ins-element">ins</a></code> element's, as is the part of
- the <code><a href="the-object-element.html#the-object-element">object</a></code> element's in which the <code><a href="the-ins-element.html#the-ins-element">ins</a></code>
- element is found. The <code><a href="the-object-element.html#the-object-element">object</a></code> element is found in the
+ element's, as is the <code><a href="the-ins-element.html#the-ins-element">ins</a></code> element's. The <code><a href="the-ins-element.html#the-ins-element">ins</a></code> element is found in the
<code><a href="the-p-element.html#the-p-element">p</a></code> element, whose content model is <a href="#phrasing-content-1">phrasing
content</a>. Thus, "Apples" is allowed, as text is phrasing
content.</p>
@@ -1246,7 +1244,21 @@
of the first paragraph.</p>
<p>To avoid this confusion, explicit <code><a href="the-p-element.html#the-p-element">p</a></code> elements can be
- used.</p>
+ used. For example:</p>
+
+ <pre><section>
+ <h1>My Fish</h1>
+ You can play with my fish simulator.
+ <object data="fish.sim">
+ <p>To see the fish simulator, use one of the following links:</p>
+ <ul>
+ <li><a href="fish.sim">Download simulator file</a>
+ <li><a href="http://sims.example.com/watch?v=LYds5xY4INU">Use online simulator</a>
+ </ul>
+ <p>Alternatively, upgrade to the Mellblom Browser.</p>
+ </object>
+ I'm quite proud of it.
+</section></pre>
</div>
Index: single-page.html
===================================================================
RCS file: /sources/public/html5/spec/single-page.html,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- single-page.html 24 Aug 2012 03:43:39 -0000 1.80
+++ single-page.html 24 Aug 2012 06:13:57 -0000 1.81
@@ -12335,14 +12335,12 @@
<p>Consider the following markup fragment:</p>
- <pre><p><object><param><ins><map><a href="/">Apples</a></map></ins></object></p></pre>
+ <pre><p><ins><map><a href="/">Apples</a></map></ins></p></pre>
<p>To check whether "Apples" is allowed inside the <code><a href=#the-a-element>a</a></code>
element, the content models are examined. The <code><a href=#the-a-element>a</a></code>
element's content model is transparent, as is the <code><a href=#the-map-element>map</a></code>
- element's, as is the <code><a href=#the-ins-element>ins</a></code> element's, as is the part of
- the <code><a href=#the-object-element>object</a></code> element's in which the <code><a href=#the-ins-element>ins</a></code>
- element is found. The <code><a href=#the-object-element>object</a></code> element is found in the
+ element's, as is the <code><a href=#the-ins-element>ins</a></code> element's. The <code><a href=#the-ins-element>ins</a></code> element is found in the
<code><a href=#the-p-element>p</a></code> element, whose content model is <a href=#phrasing-content-1>phrasing
content</a>. Thus, "Apples" is allowed, as text is phrasing
content.</p>
@@ -12530,7 +12528,21 @@
of the first paragraph.</p>
<p>To avoid this confusion, explicit <code><a href=#the-p-element>p</a></code> elements can be
- used.</p>
+ used. For example:</p>
+
+ <pre><section>
+ <h1>My Fish</h1>
+ You can play with my fish simulator.
+ <object data="fish.sim">
+ <p>To see the fish simulator, use one of the following links:</p>
+ <ul>
+ <li><a href="fish.sim">Download simulator file</a>
+ <li><a href="http://sims.example.com/watch?v=LYds5xY4INU">Use online simulator</a>
+ </ul>
+ <p>Alternatively, upgrade to the Mellblom Browser.</p>
+ </object>
+ I'm quite proud of it.
+</section></pre>
</div>
@@ -25408,7 +25420,7 @@
<dt><a href=#element-dfn-contexts title=element-dfn-contexts>Contexts in which this element can be used</a>:</dt>
<dd>Where <a href=#embedded-content-2>embedded content</a> is expected.</dd>
<dt><a href=#element-dfn-content-model title=element-dfn-content-model>Content model</a>:</dt>
- <dd>Zero or more <code><a href=#the-param-element>param</a></code> elements, then, <a href=#transparent>transparent</a>.</dd>
+ <dd>Zero or more <code><a href=#the-param-element>param</a></code> elements, then <a href=#flow-content-1>flow content</a> and/or <a href=#interactive-content-0>interactive content</a>.</dd>
<dt><a href=#element-dfn-attributes title=element-dfn-attributes>Content attributes</a>:</dt>
<dd><a href=#global-attributes>Global attributes</a></dd>
<dd><code title=attr-object-data><a href=#attr-object-data>data</a></code></dd>
Index: the-object-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-object-element.html,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- the-object-element.html 24 Aug 2012 03:14:29 -0000 1.162
+++ the-object-element.html 24 Aug 2012 06:13:58 -0000 1.163
@@ -345,7 +345,7 @@
<dt><a href="element-definitions.html#element-dfn-contexts" title="element-dfn-contexts">Contexts in which this element can be used</a>:</dt>
<dd>Where <a href="content-models.html#embedded-content-2">embedded content</a> is expected.</dd>
<dt><a href="element-definitions.html#element-dfn-content-model" title="element-dfn-content-model">Content model</a>:</dt>
- <dd>Zero or more <code><a href="the-param-element.html#the-param-element">param</a></code> elements, then, <a href="content-models.html#transparent">transparent</a>.</dd>
+ <dd>Zero or more <code><a href="the-param-element.html#the-param-element">param</a></code> elements, then <a href="content-models.html#flow-content-1">flow content</a> and/or <a href="content-models.html#interactive-content-0">interactive content</a>.</dd>
<dt><a href="element-definitions.html#element-dfn-attributes" title="element-dfn-attributes">Content attributes</a>:</dt>
<dd><a href="global-attributes.html#global-attributes">Global attributes</a></dd>
<dd><code title="attr-object-data"><a href="#attr-object-data">data</a></code></dd>
Received on Friday, 24 August 2012 06:14:55 UTC