Skip to content

Commit

Permalink
[e] (0) Make the change requested by Sam in http://lists.w3.org/Archi…
Browse files Browse the repository at this point in the history
…ves/Public/public-html/2010Jun/0562.html and revert r4768 in the WHATWG version.

git-svn-id: http://svn.whatwg.org/webapps@5108 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Jun 24, 2010
1 parent e59cd2f commit 64099b1
Show file tree
Hide file tree
Showing 3 changed files with 125 additions and 26 deletions.
51 changes: 42 additions & 9 deletions complete.html
Expand Up @@ -209,7 +209,7 @@

<header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
<hgroup><h1>Web Applications 1.0</h1>
<h2 class="no-num no-toc">Draft Standard &mdash; 15 June 2010</h2>
<h2 class="no-num no-toc">Draft Standard &mdash; 24 June 2010</h2>
</hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
<p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
<!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
Expand Down Expand Up @@ -22940,25 +22940,58 @@ <h4 id=the-param-element><span class=secno>4.8.5 </span>The <dfn><code>param</co

<pre>&lt;!DOCTYPE HTML&gt;
&lt;html lang="en"&gt;
&lt;head&gt;
&lt;title&gt;O3D Utah Teapot&lt;/title&gt;
&lt;/head&gt;
&lt;body&gt;
&lt;p&gt;
&lt;object type="application/vnd.o3d.auto"&gt;
<strong>&lt;param name="o3d_features" value="FloatingPointTextures"&gt;</strong>
&lt;img src="o3d-teapot.png"
title="3D Utah Teapot illustration rendered using O3D."
alt="When O3D renders the Utah Teapot, it appears as a squat
teapot with a shiny metallic finish on which the
surroundings are reflected, with a faint shadow caused by
the lighting."&gt;
&lt;p&gt;To see the teapot actually rendered by O3D on your
computer, please download and install the &lt;a
href="http://code.google.com/apis/o3d/docs/gettingstarted.html#install"&gt;O3D plugin&lt;/a&gt;.&lt;/p&gt;
&lt;/object&gt;
&lt;script src="o3d-teapot.js"&gt;&lt;/script&gt;
&lt;/p&gt;
&lt;/body&gt;
&lt;/html&gt;</pre>

</div>

<!--POLITICS-->
<div class=example>

<p>Here is another example showing much the same, this time using a
<code><a href=#the-param-element>param</a></code> element to pass a parameter to the Flash
plugin.</p>

<pre>&lt;!DOCTYPE HTML&gt;
&lt;html lang="en"&gt;
&lt;head&gt;
&lt;title&gt;O3D test page&lt;/title&gt;
&lt;title&gt;Flash test page&lt;/title&gt;
&lt;/head&gt;
&lt;body&gt;
&lt;p&gt;
&lt;object type="application/vnd.o3d.auto"&gt;
<strong>&lt;param name="o3d_features" value="FloatingPointTextures"&gt;</strong>
&lt;object type="application/x-shockwave-flash"&gt;
<strong>&lt;param name=movie value="http://www.macromedia.com/shockwave/download/triggerpages_mmcom/flash.swf"&gt;</strong>
This page requires the use of a proprietary technology. Since you
have not installed the software product required to view this
page, you should try visiting another site that instead uses open
vendor-neutral technologies.
&lt;/object&gt;
&lt;script src="o3dtest.js"&gt;&lt;/script&gt;
page, possibly because your device does not support that software
product, you should try visiting another site that instead uses
open vendor-neutral technologies.
&lt;/object&gt;
&lt;/p&gt;
&lt;/body&gt;
&lt;/html&gt;</pre>

</div>

<!--POLITICS-->

<h4 id=video><span class=secno>4.8.6 </span>The <dfn><code>video</code></dfn> element</h4>

Expand Down
51 changes: 42 additions & 9 deletions index
Expand Up @@ -213,7 +213,7 @@

<header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
<hgroup><h1>HTML5 (including next generation additions still in development)</h1>
<h2 class="no-num no-toc">Draft Standard &mdash; 22 June 2010</h2>
<h2 class="no-num no-toc">Draft Standard &mdash; 24 June 2010</h2>
</hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
<p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
<!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
Expand Down Expand Up @@ -22867,25 +22867,58 @@ href="?audio"&gt;audio&lt;/a&gt; test instead.)&lt;/p&gt;</pre>

<pre>&lt;!DOCTYPE HTML&gt;
&lt;html lang="en"&gt;
&lt;head&gt;
&lt;title&gt;O3D Utah Teapot&lt;/title&gt;
&lt;/head&gt;
&lt;body&gt;
&lt;p&gt;
&lt;object type="application/vnd.o3d.auto"&gt;
<strong>&lt;param name="o3d_features" value="FloatingPointTextures"&gt;</strong>
&lt;img src="o3d-teapot.png"
title="3D Utah Teapot illustration rendered using O3D."
alt="When O3D renders the Utah Teapot, it appears as a squat
teapot with a shiny metallic finish on which the
surroundings are reflected, with a faint shadow caused by
the lighting."&gt;
&lt;p&gt;To see the teapot actually rendered by O3D on your
computer, please download and install the &lt;a
href="http://code.google.com/apis/o3d/docs/gettingstarted.html#install"&gt;O3D plugin&lt;/a&gt;.&lt;/p&gt;
&lt;/object&gt;
&lt;script src="o3d-teapot.js"&gt;&lt;/script&gt;
&lt;/p&gt;
&lt;/body&gt;
&lt;/html&gt;</pre>

</div>

<!--POLITICS-->
<div class=example>

<p>Here is another example showing much the same, this time using a
<code><a href=#the-param-element>param</a></code> element to pass a parameter to the Flash
plugin.</p>

<pre>&lt;!DOCTYPE HTML&gt;
&lt;html lang="en"&gt;
&lt;head&gt;
&lt;title&gt;O3D test page&lt;/title&gt;
&lt;title&gt;Flash test page&lt;/title&gt;
&lt;/head&gt;
&lt;body&gt;
&lt;p&gt;
&lt;object type="application/vnd.o3d.auto"&gt;
<strong>&lt;param name="o3d_features" value="FloatingPointTextures"&gt;</strong>
&lt;object type="application/x-shockwave-flash"&gt;
<strong>&lt;param name=movie value="http://www.macromedia.com/shockwave/download/triggerpages_mmcom/flash.swf"&gt;</strong>
This page requires the use of a proprietary technology. Since you
have not installed the software product required to view this
page, you should try visiting another site that instead uses open
vendor-neutral technologies.
&lt;/object&gt;
&lt;script src="o3dtest.js"&gt;&lt;/script&gt;
page, possibly because your device does not support that software
product, you should try visiting another site that instead uses
open vendor-neutral technologies.
&lt;/object&gt;
&lt;/p&gt;
&lt;/body&gt;
&lt;/html&gt;</pre>

</div>

<!--POLITICS-->

<h4 id=video><span class=secno>4.8.6 </span>The <dfn><code>video</code></dfn> element</h4>

Expand Down
49 changes: 41 additions & 8 deletions source
Expand Up @@ -24518,25 +24518,58 @@ href="?audio">audio&lt;/a> test instead.)&lt;/p></pre>

<pre>&lt;!DOCTYPE HTML>
&lt;html lang="en">
&lt;head>
&lt;title>O3D Utah Teapot&lt;/title>
&lt;/head>
&lt;body>
&lt;p>
&lt;object type="application/vnd.o3d.auto">
<strong>&lt;param name="o3d_features" value="FloatingPointTextures"></strong>
&lt;img src="o3d-teapot.png"
title="3D Utah Teapot illustration rendered using O3D."
alt="When O3D renders the Utah Teapot, it appears as a squat
teapot with a shiny metallic finish on which the
surroundings are reflected, with a faint shadow caused by
the lighting.">
&lt;p>To see the teapot actually rendered by O3D on your
computer, please download and install the &lt;a
href="http://code.google.com/apis/o3d/docs/gettingstarted.html#install">O3D plugin&lt;/a>.&lt;/p>
&lt;/object>
&lt;script src="o3d-teapot.js">&lt;/script>
&lt;/p>
&lt;/body>
&lt;/html></pre>

</div>

<!--END w3c-html--><!--POLITICS-->
<div class="example">

<p>Here is another example showing much the same, this time using a
<code>param</code> element to pass a parameter to the Flash
plugin.</p>

<pre>&lt;!DOCTYPE HTML>
&lt;html lang="en">
&lt;head>
&lt;title>O3D test page&lt;/title>
&lt;title>Flash test page&lt;/title>
&lt;/head>
&lt;body>
&lt;p>
&lt;object type="application/vnd.o3d.auto">
<strong>&lt;param name="o3d_features" value="FloatingPointTextures"></strong>
&lt;object type="application/x-shockwave-flash">
<strong>&lt;param name=movie value="http://www.macromedia.com/shockwave/download/triggerpages_mmcom/flash.swf"></strong>
This page requires the use of a proprietary technology. Since you
have not installed the software product required to view this
page, you should try visiting another site that instead uses open
vendor-neutral technologies.
&lt;/object>
&lt;script src="o3dtest.js">&lt;/script>
page, possibly because your device does not support that software
product, you should try visiting another site that instead uses
open vendor-neutral technologies.
&lt;/object>
&lt;/p>
&lt;/body>
&lt;/html></pre>

</div>

<!--START w3c-html--><!--POLITICS-->

<h4 id="video">The <dfn><code>video</code></dfn> element</h4>

Expand Down

0 comments on commit 64099b1

Please sign in to comment.