W3C home > Mailing lists > Public > public-html-commits@w3.org > June 2009

html5/markup Overview.html,1.315,1.316 audio.html,1.4,1.5 schema.html,1.103,1.104 schema.rnc,1.90,1.91 shared-attributes.html,1.5,1.6 source.html,1.5,1.6 spec.html,1.35,1.36 video.html,1.4,1.5

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 15 Jun 2009 20:27:04 +0000
To: public-html-commits@w3.org
Message-Id: <E1MGIlk-0007Xt-K7@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv28605

Modified Files:
	Overview.html audio.html schema.html schema.rnc 
	shared-attributes.html source.html spec.html video.html 
Log Message:
h:tml; fixed handling of attribute descriptions for audio and video elements


Index: Overview.html
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- Overview.html	15 Jun 2009 17:16:09 -0000	1.315
+++ Overview.html	15 Jun 2009 20:27:00 -0000	1.316
@@ -646,14 +646,11 @@
 <li id="shared-attributes-toc">
 <a href="shared-attributes.html#shared-attributes">9. Other shared attributes</a>
 <ul>
-<li id="common-media-attrs-toc">
-<a href="shared-attributes.html#common-media-attrs">9.1. Media attributes</a>
-</li>
 <li id="shared-hyperlink-attrs-toc">
-<a href="shared-attributes.html#shared-hyperlink-attrs">9.2. Hyperlink attributes</a>
+<a href="shared-attributes.html#shared-hyperlink-attrs">9.1. Hyperlink attributes</a>
 </li>
 <li id="common-form-attrs-toc">
-<a href="shared-attributes.html#common-form-attrs">9.3. Form attributes</a>
+<a href="shared-attributes.html#common-form-attrs">9.2. Form attributes</a>
 </li>
 </ul>
 </li>

Index: audio.html
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- audio.html	3 May 2009 15:59:39 -0000	1.4
+++ audio.html	15 Jun 2009 20:27:01 -0000	1.5
@@ -22,18 +22,18 @@
         <dl class="content-models" id="audio-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="audio.elem.flow"><a class="hash" href="audio.html#audio.elem.flow"><span class="element">audio</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      <span class="attr-qualifier">media.attrs.</span><a class="ref" href="shared-attributes.html#media.attrs.src">src</a>
-  | (<a class="ref" href="source.html#source-pattern">source</a>*,
-     <a class="ref" href="source.html#source.elem.last">source.elem.last</a>),
+      (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
+   | (<a class="ref" href="source.html#source-pattern">source</a>*,
+      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="audio.elem.phrasing"><a class="hash" href="audio.html#audio.elem.phrasing"><span class="element">audio</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      <span class="attr-qualifier">media.attrs.</span><a class="ref" href="shared-attributes.html#media.attrs.src">src</a>
-  | (<a class="ref" href="source.html#source-pattern">source</a>*,
-     <a class="ref" href="source.html#source.elem.last">source.elem.last</a>),
+      (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
+   | (<a class="ref" href="source.html#source-pattern">source</a>*,
+      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
@@ -43,8 +43,37 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#audio-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="audio.html#audio.attrs">audio.attrs</a> = <span class="pattern" id="audio.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="shared-attributes.html#media.attrs">media.attrs</a></span></p></div></div>
-      
+  &amp; <a class="ref" href="audio.html#audio.attrs.autoplay" title="audio.attrs.autoplay">autoplay</a>?
+  &amp; <a class="ref" href="audio.html#audio.attrs.autobuffer" title="audio.attrs.autobuffer">autobuffer</a>?
+  &amp; <a class="ref" href="audio.html#audio.attrs.controls" title="audio.attrs.controls">controls</a>?
+  &amp; <a class="ref" href="audio.html#audio.attrs.loop" title="audio.attrs.loop">loop</a>?</span></p></div></div>
+      <div class="no-number no-toc" id="audio-attributes">
+        <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#audio-attributes">#</a></h2>
+        <dl class="attr-defs">
+            <dt><a class="attribute-name" id="audio.attrs.autoplay" title="audio.attrs.autoplay" href="audio.html#audio.attrs.autoplay">autoplay</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to automatically begin playback of
+        the audio stream as soon as it can do so without
+        stopping.</dd>
+          
+            <dt><a class="attribute-name" id="audio.attrs.autobuffer" title="audio.attrs.autobuffer" href="audio.html#audio.attrs.autobuffer">autobuffer</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA that the author believes that
+        downloading the entire audio stream optimistically will be
+        worthwhile.</dd>
+          
+            <dt><a class="attribute-name" id="audio.attrs.controls" title="audio.attrs.controls" href="audio.html#audio.attrs.controls">controls</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to expose a user interface for
+        controlling playback of the audio stream.</dd>
+          
+            <dt><a class="attribute-name" id="audio.attrs.loop" title="audio.attrs.loop" href="audio.html#audio.attrs.loop">loop</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to seek back to the start of the
+        audio stream upon reaching the end.</dd>
+          
+            <dt><a class="attribute-name" id="audio.attrs.src" title="audio.attrs.src" href="audio.html#audio.attrs.src">src</a><span class="attr-values"> = 
+      <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
+    </span> </dt>
+            <dd>The URL for the audio stream.</dd>
+          
+        </dl></div>
       
       <div class="no-number no-toc" id="audio-assertions">
         <h2 class="element-subhead">Assertions <a class="hash" href="#audio-assertions">#</a></h2>

Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- schema.html	15 Jun 2009 17:16:10 -0000	1.103
+++ schema.html	15 Jun 2009 20:27:01 -0000	1.104
@@ -3424,50 +3424,11 @@
 </div>
 <div class='chunk'>
 <div class='chunk'>
-<div class='define' id='media.attrs-define'>
+<div class='define' id='source.elem-define'>
 <span class='comment'># #####################################################################</span>
 
-<span class='comment'># src not included</span>
-
 <span class='comment'>##  RELAX NG Schema for HTML 5: Advanced Embedded Content             #</span>
 <span class='comment'># #####################################################################</span>
-<span class='comment'>## Attributes Common to Media Elements</span>
-  <div class='patternname' id='the-media.attrs'><a href='#the-media.attrs'>media.attrs</a> =</div>
-  <span class='pattern' id='media.attrs'><a class='ref' href='#media.attrs.autoplay'>media.attrs.autoplay</a>?
-  &amp; <a class='ref' href='#media.attrs.autobuffer'>media.attrs.autobuffer</a>?
-  &amp; <a class='ref' href='#media.attrs.controls'>media.attrs.controls</a>?
-  &amp; <a class='ref' href='#media.attrs.loop'>media.attrs.loop</a>?</span>
-</div>
-<div class='define' id='media.attrs.autoplay-define'>
-  <div class='patternname' id='the-media.attrs.autoplay'><a href='#the-media.attrs.autoplay'>media.attrs.autoplay</a> =</div>
-  <span class='pattern' id='media.attrs.autoplay'><span class='type'>attribute </span>
-  <span class='name'>autoplay</span>
-   {<span class='model'> d:string "autoplay" | d:string "" </span>}
-  </span>
-</div>
-<div class='define' id='media.attrs.autobuffer-define'>
-  <div class='patternname' id='the-media.attrs.autobuffer'><a href='#the-media.attrs.autobuffer'>media.attrs.autobuffer</a> =</div>
-  <span class='pattern' id='media.attrs.autobuffer'><span class='type'>attribute </span>
-  <span class='name'>autobuffer</span>
-   {<span class='model'> d:string "autobuffer" | d:string "" </span>}
-  </span>
-</div>
-<div class='define' id='media.attrs.controls-define'>
-  <div class='patternname' id='the-media.attrs.controls'><a href='#the-media.attrs.controls'>media.attrs.controls</a> =</div>
-  <span class='pattern' id='media.attrs.controls'><span class='type'>attribute </span>
-  <span class='name'>controls</span>
-   {<span class='model'> d:string "controls" | d:string "" </span>}
-  </span>
-</div>
-<div class='define' id='media.attrs.loop-define'>
-  <div class='patternname' id='the-media.attrs.loop'><a href='#the-media.attrs.loop'>media.attrs.loop</a> =</div>
-  <span class='pattern' id='media.attrs.loop'><span class='type'>attribute </span>
-  <span class='name'>loop</span>
-   {<span class='model'> d:string "loop" | d:string "" </span>}
-  </span>
-</div>
-<div class='define' id='source.elem-define'>
-
 <span class='comment'>## Source: &lt;source></span>
   <div class='patternname' id='the-source.elem'><a href='#the-source.elem'>source.elem</a> =</div>
   <span class='pattern' id='source.elem'><span class='type'>element </span>
@@ -3529,23 +3490,6 @@
     </span>}
   </span>
 </div>
-<div class='define' id='media.source-define'>
-
-<span class='comment'>## Media Source</span>
-  <div class='patternname' id='the-media.source'><a href='#the-media.source'>media.source</a> =</div>
-  <span class='pattern' id='media.source'><a class='ref' href='#media.attrs.src'>media.attrs.src</a>
-  | (<a class='ref' href='#source.elem'>source.elem</a>*,
-     <a class='ref' href='#source.elem.last'>source.elem.last</a>)</span>
-</div>
-<div class='define' id='media.attrs.src-define'>
-  <div class='patternname' id='the-media.attrs.src'><a href='#the-media.attrs.src'>media.attrs.src</a> =</div>
-  <span class='pattern' id='media.attrs.src'><span class='type'>attribute </span>
-  <span class='name'>src</span>
-   {<span class='model'>
-      <a class='ref' href='#common.data.uri'>common.data.uri</a>
-    </span>}
-  </span>
-</div>
 <div class='define' id='video.elem.flow-define'>
 
 <span class='comment'>## Video: &lt;video></span>
@@ -3571,7 +3515,10 @@
 <div class='define' id='video.attrs-define'>
   <div class='patternname' id='the-video.attrs'><a href='#the-video.attrs'>video.attrs</a> =</div>
   <span class='pattern' id='video.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
-  &amp; <a class='ref' href='#media.attrs'>media.attrs</a>
+  &amp; <a class='ref' href='#video.attrs.autoplay'>video.attrs.autoplay</a>?
+  &amp; <a class='ref' href='#video.attrs.autobuffer'>video.attrs.autobuffer</a>?
+  &amp; <a class='ref' href='#video.attrs.controls'>video.attrs.controls</a>?
+  &amp; <a class='ref' href='#video.attrs.loop'>video.attrs.loop</a>?
   &amp; <a class='ref' href='#video.attrs.poster'>video.attrs.poster</a>?
   &amp; <a class='ref' href='#video.attrs.height'>video.attrs.height</a>?
   &amp; <a class='ref' href='#video.attrs.width'>video.attrs.width</a>?</span>
@@ -3603,14 +3550,27 @@
     </span>}
   </span>
 </div>
+<div class='define' id='video.attrs.src-define'>
+  <div class='patternname' id='the-video.attrs.src'><a href='#the-video.attrs.src'>video.attrs.src</a> =</div>
+  <span class='pattern' id='video.attrs.src'><span class='type'>attribute </span>
+  <span class='name'>src</span>
+   {<span class='model'>
+      <a class='ref' href='#common.data.uri'>common.data.uri</a>
+    </span>}
+  </span>
+</div>
 <div class='define' id='video.inner.flow-define'>
   <div class='patternname' id='the-video.inner.flow'><a href='#the-video.inner.flow'>video.inner.flow</a> =</div>
-  <span class='pattern' id='video.inner.flow'><a class='ref' href='#media.source'>media.source</a>,
+  <span class='pattern' id='video.inner.flow'>(<a class='ref' href='#video.attrs.src'>video.attrs.src</a>
+   | (<a class='ref' href='#source.elem'>source.elem</a>*,
+      <a class='ref' href='#source.elem.last'>source.elem.last</a>)),
   <a class='ref' href='#common.inner.flow'>common.inner.flow</a></span>
 </div>
 <div class='define' id='video.inner.phrasing-define'>
   <div class='patternname' id='the-video.inner.phrasing'><a href='#the-video.inner.phrasing'>video.inner.phrasing</a> =</div>
-  <span class='pattern' id='video.inner.phrasing'><a class='ref' href='#media.source'>media.source</a>,
+  <span class='pattern' id='video.inner.phrasing'>(<a class='ref' href='#video.attrs.src'>video.attrs.src</a>
+   | (<a class='ref' href='#source.elem'>source.elem</a>*,
+      <a class='ref' href='#source.elem.last'>source.elem.last</a>)),
   <a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
 </div>
 <div class='define' id='audio.elem.flow-define'>
@@ -3638,16 +3598,32 @@
 <div class='define' id='audio.attrs-define'>
   <div class='patternname' id='the-audio.attrs'><a href='#the-audio.attrs'>audio.attrs</a> =</div>
   <span class='pattern' id='audio.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
-  &amp; <a class='ref' href='#media.attrs'>media.attrs</a></span>
+  &amp; <a class='ref' href='#audio.attrs.autoplay'>audio.attrs.autoplay</a>?
+  &amp; <a class='ref' href='#audio.attrs.autobuffer'>audio.attrs.autobuffer</a>?
+  &amp; <a class='ref' href='#audio.attrs.controls'>audio.attrs.controls</a>?
+  &amp; <a class='ref' href='#audio.attrs.loop'>audio.attrs.loop</a>?</span>
+</div>
+<div class='define' id='audio.attrs.src-define'>
+  <div class='patternname' id='the-audio.attrs.src'><a href='#the-audio.attrs.src'>audio.attrs.src</a> =</div>
+  <span class='pattern' id='audio.attrs.src'><span class='type'>attribute </span>
+  <span class='name'>src</span>
+   {<span class='model'>
+      <a class='ref' href='#common.data.uri'>common.data.uri</a>
+    </span>}
+  </span>
 </div>
 <div class='define' id='audio.inner.flow-define'>
   <div class='patternname' id='the-audio.inner.flow'><a href='#the-audio.inner.flow'>audio.inner.flow</a> =</div>
-  <span class='pattern' id='audio.inner.flow'><a class='ref' href='#media.source'>media.source</a>,
+  <span class='pattern' id='audio.inner.flow'>(<a class='ref' href='#audio.attrs.src'>audio.attrs.src</a>
+   | (<a class='ref' href='#source.elem'>source.elem</a>*,
+      <a class='ref' href='#source.elem.last'>source.elem.last</a>)),
   <a class='ref' href='#common.inner.flow'>common.inner.flow</a></span>
 </div>
 <div class='define' id='audio.inner.phrasing-define'>
   <div class='patternname' id='the-audio.inner.phrasing'><a href='#the-audio.inner.phrasing'>audio.inner.phrasing</a> =</div>
-  <span class='pattern' id='audio.inner.phrasing'><a class='ref' href='#media.source'>media.source</a>,
+  <span class='pattern' id='audio.inner.phrasing'>(<a class='ref' href='#audio.attrs.src'>audio.attrs.src</a>
+   | (<a class='ref' href='#source.elem'>source.elem</a>*,
+      <a class='ref' href='#source.elem.last'>source.elem.last</a>)),
   <a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
 </div>
 <div class='define' id='figure.elem-define'>

Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- schema.rnc	15 Jun 2009 17:16:10 -0000	1.90
+++ schema.rnc	15 Jun 2009 20:27:02 -0000	1.91
@@ -1205,24 +1205,8 @@
   # include "media.rng"
   div {
     # #####################################################################
-    # src not included
-    
     ##  RELAX NG Schema for HTML 5: Advanced Embedded Content             #
     # #####################################################################
-    ## Attributes Common to Media Elements
-    media.attrs =
-      media.attrs.autoplay?
-      & media.attrs.autobuffer?
-      & media.attrs.controls?
-      & media.attrs.loop?
-    media.attrs.autoplay =
-      attribute autoplay { d:string "autoplay" | d:string "" }
-    media.attrs.autobuffer =
-      attribute autobuffer { d:string "autobuffer" | d:string "" }
-    media.attrs.controls =
-      attribute controls { d:string "controls" | d:string "" }
-    media.attrs.loop = attribute loop { d:string "loop" | d:string "" }
-    
     ## Source: <source>
     source.elem = element source { empty & source.attrs }
     source.elem.last = element source { empty & source.last.attrs }
@@ -1239,17 +1223,16 @@
     source.attrs.type = attribute type { common.data.mimetype }
     source.attrs.media = attribute media { common.data.mediaquery }
     
-    ## Media Source
-    media.source = media.attrs.src | (source.elem*, source.elem.last)
-    media.attrs.src = attribute src { common.data.uri }
-    
     ## Video: <video>
     video.elem.flow = element video { video.inner.flow & video.attrs }
     video.elem.phrasing =
       element video { video.inner.phrasing & video.attrs }
     video.attrs =
       common.attrs
-      & media.attrs
+      & video.attrs.autoplay?
+      & video.attrs.autobuffer?
+      & video.attrs.controls?
+      & video.attrs.loop?
       & video.attrs.poster?
       & video.attrs.height?
       & video.attrs.width?
@@ -1257,16 +1240,31 @@
     video.attrs.height =
       attribute height { common.data.integer.positive }
     video.attrs.width = attribute width { common.data.integer.positive }
-    video.inner.flow = media.source, common.inner.flow
-    video.inner.phrasing = media.source, common.inner.phrasing
+    video.attrs.src = attribute src { common.data.uri }
+    video.inner.flow =
+      (video.attrs.src | (source.elem*, source.elem.last)),
+      common.inner.flow
+    video.inner.phrasing =
+      (video.attrs.src | (source.elem*, source.elem.last)),
+      common.inner.phrasing
     
     ## Audio: <audio>
     audio.elem.flow = element audio { audio.inner.flow & audio.attrs }
     audio.elem.phrasing =
       element audio { audio.inner.phrasing & audio.attrs }
-    audio.attrs = common.attrs & media.attrs
-    audio.inner.flow = media.source, common.inner.flow
-    audio.inner.phrasing = media.source, common.inner.phrasing
+    audio.attrs =
+      common.attrs
+      & audio.attrs.autoplay?
+      & audio.attrs.autobuffer?
+      & audio.attrs.controls?
+      & audio.attrs.loop?
+    audio.attrs.src = attribute src { common.data.uri }
+    audio.inner.flow =
+      (audio.attrs.src | (source.elem*, source.elem.last)),
+      common.inner.flow
+    audio.inner.phrasing =
+      (audio.attrs.src | (source.elem*, source.elem.last)),
+      common.inner.phrasing
     
     ## Captioned Content: <figure>
     figure.elem = element figure { figure.inner & figure.attrs }

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- spec.html	15 Jun 2009 17:16:10 -0000	1.35
+++ spec.html	15 Jun 2009 20:27:02 -0000	1.36
@@ -645,14 +645,11 @@
 <li id="shared-attributes-toc">
 <a href="#shared-attributes">9. Other shared attributes</a>
 <ul>
-<li id="common-media-attrs-toc">
-<a href="#common-media-attrs">9.1. Media attributes</a>
-</li>
 <li id="shared-hyperlink-attrs-toc">
-<a href="#shared-hyperlink-attrs">9.2. Hyperlink attributes</a>
+<a href="#shared-hyperlink-attrs">9.1. Hyperlink attributes</a>
 </li>
 <li id="common-form-attrs-toc">
-<a href="#common-form-attrs">9.3. Form attributes</a>
+<a href="#common-form-attrs">9.2. Form attributes</a>
 </li>
 </ul>
 </li>
@@ -2607,18 +2604,18 @@
         <dl class="content-models" id="audio-mdls">
 <dt class="content-model"><span class="element-pattern-name" id="audio.elem.flow"><a class="hash" href="#audio.elem.flow"><span class="element">audio</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      <span class="attr-qualifier">media.attrs.</span><a class="ref" href="#media.attrs.src">src</a>
-  | (<a class="ref" href="#source-pattern">source</a>*,
-     <a class="ref" href="#source.elem.last">source.elem.last</a>),
+      (<a class="ref" href="#audio.attrs.src">audio.attrs.src</a>
+   | (<a class="ref" href="#source-pattern">source</a>*,
+      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="#audio.attrs">audio.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="audio.elem.phrasing"><a class="hash" href="#audio.elem.phrasing"><span class="element">audio</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      <span class="attr-qualifier">media.attrs.</span><a class="ref" href="#media.attrs.src">src</a>
-  | (<a class="ref" href="#source-pattern">source</a>*,
-     <a class="ref" href="#source.elem.last">source.elem.last</a>),
+      (<a class="ref" href="#audio.attrs.src">audio.attrs.src</a>
+   | (<a class="ref" href="#source-pattern">source</a>*,
+      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="#audio.attrs">audio.attrs</a>
@@ -2630,10 +2627,46 @@
 </h2>
         <div class="attr-content-models">
           <p><a href="#audio.attrs">audio.attrs</a> = <span class="pattern" id="audio.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="#media.attrs">media.attrs</a></span></p>
+  &amp; <a class="ref" href="#audio.attrs.autoplay" title="audio.attrs.autoplay">autoplay</a>?
+  &amp; <a class="ref" href="#audio.attrs.autobuffer" title="audio.attrs.autobuffer">autobuffer</a>?
+  &amp; <a class="ref" href="#audio.attrs.controls" title="audio.attrs.controls">controls</a>?
+  &amp; <a class="ref" href="#audio.attrs.loop" title="audio.attrs.loop">loop</a>?</span></p>
 </div>
 </div>
-      
+      <div class="no-number no-toc" id="audio-attributes">
+        <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#audio-attributes">#</a>
+</h2>
+        <dl class="attr-defs">
+<dt>
+<a class="attribute-name" id="audio.attrs.autoplay" title="audio.attrs.autoplay" href="#audio.attrs.autoplay">autoplay</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to automatically begin playback of
+        the audio stream as soon as it can do so without
+        stopping.</dd>
+          
+            <dt>
+<a class="attribute-name" id="audio.attrs.autobuffer" title="audio.attrs.autobuffer" href="#audio.attrs.autobuffer">autobuffer</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA that the author believes that
+        downloading the entire audio stream optimistically will be
+        worthwhile.</dd>
+          
+            <dt>
+<a class="attribute-name" id="audio.attrs.controls" title="audio.attrs.controls" href="#audio.attrs.controls">controls</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to expose a user interface for
+        controlling playback of the audio stream.</dd>
+          
+            <dt>
+<a class="attribute-name" id="audio.attrs.loop" title="audio.attrs.loop" href="#audio.attrs.loop">loop</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to seek back to the start of the
+        audio stream upon reaching the end.</dd>
+          
+            <dt>
+<a class="attribute-name" id="audio.attrs.src" title="audio.attrs.src" href="#audio.attrs.src">src</a><span class="attr-values"> = 
+      <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
+    </span> </dt>
+            <dd>The URL for the audio stream.</dd>
+          
+        </dl>
+</div>
       
       <div class="no-number no-toc" id="audio-assertions">
         <h2 class="element-subhead">Assertions <a class="hash" href="#audio-assertions">#</a>
@@ -12118,27 +12151,27 @@
 </h2>
         <ul>
 <li class="context-mdl">
-<a href="#video.elem.flow">video.elem.flow</a> = <span class="attr-qualifier">media.attrs.</span><a class="ref" href="#media.attrs.src">src</a>
-  | (<a class="ref" href="#source-pattern">source</a>*,
-     <a class="ref" href="#source.elem.last">source.elem.last</a>),
+<a href="#video.elem.flow">video.elem.flow</a> = (<a class="ref" href="#video.attrs.src">video.attrs.src</a>
+   | (<a class="ref" href="#source-pattern">source</a>*,
+      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl">
-<a href="#video.elem.phrasing">video.elem.phrasing</a> = <span class="attr-qualifier">media.attrs.</span><a class="ref" href="#media.attrs.src">src</a>
-  | (<a class="ref" href="#source-pattern">source</a>*,
-     <a class="ref" href="#source.elem.last">source.elem.last</a>),
+<a href="#video.elem.phrasing">video.elem.phrasing</a> = (<a class="ref" href="#video.attrs.src">video.attrs.src</a>
+   | (<a class="ref" href="#source-pattern">source</a>*,
+      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)</li>
         <li class="context-mdl">
-<a href="#audio.elem.flow">audio.elem.flow</a> = <span class="attr-qualifier">media.attrs.</span><a class="ref" href="#media.attrs.src">src</a>
-  | (<a class="ref" href="#source-pattern">source</a>*,
-     <a class="ref" href="#source.elem.last">source.elem.last</a>),
+<a href="#audio.elem.flow">audio.elem.flow</a> = (<a class="ref" href="#audio.attrs.src">audio.attrs.src</a>
+   | (<a class="ref" href="#source-pattern">source</a>*,
+      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl">
-<a href="#audio.elem.phrasing">audio.elem.phrasing</a> = <span class="attr-qualifier">media.attrs.</span><a class="ref" href="#media.attrs.src">src</a>
-  | (<a class="ref" href="#source-pattern">source</a>*,
-     <a class="ref" href="#source.elem.last">source.elem.last</a>),
+<a href="#audio.elem.phrasing">audio.elem.phrasing</a> = (<a class="ref" href="#audio.attrs.src">audio.attrs.src</a>
+   | (<a class="ref" href="#source-pattern">source</a>*,
+      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)</li>
 </ul>
@@ -13453,18 +13486,18 @@
         <dl class="content-models" id="video-mdls">
 <dt class="content-model"><span class="element-pattern-name" id="video.elem.flow"><a class="hash" href="#video.elem.flow"><span class="element">video</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      <span class="attr-qualifier">media.attrs.</span><a class="ref" href="#media.attrs.src">src</a>
-  | (<a class="ref" href="#source-pattern">source</a>*,
-     <a class="ref" href="#source.elem.last">source.elem.last</a>),
+      (<a class="ref" href="#video.attrs.src">video.attrs.src</a>
+   | (<a class="ref" href="#source-pattern">source</a>*,
+      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="#video.attrs">video.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="video.elem.phrasing"><a class="hash" href="#video.elem.phrasing"><span class="element">video</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      <span class="attr-qualifier">media.attrs.</span><a class="ref" href="#media.attrs.src">src</a>
-  | (<a class="ref" href="#source-pattern">source</a>*,
-     <a class="ref" href="#source.elem.last">source.elem.last</a>),
+      (<a class="ref" href="#video.attrs.src">video.attrs.src</a>
+   | (<a class="ref" href="#source-pattern">source</a>*,
+      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="#video.attrs">video.attrs</a>
@@ -13476,7 +13509,10 @@
 </h2>
         <div class="attr-content-models">
           <p><a href="#video.attrs">video.attrs</a> = <span class="pattern" id="video.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="#media.attrs">media.attrs</a>
+  &amp; <a class="ref" href="#video.attrs.autoplay" title="video.attrs.autoplay">autoplay</a>?
+  &amp; <a class="ref" href="#video.attrs.autobuffer" title="video.attrs.autobuffer">autobuffer</a>?
+  &amp; <a class="ref" href="#video.attrs.controls" title="video.attrs.controls">controls</a>?
+  &amp; <a class="ref" href="#video.attrs.loop" title="video.attrs.loop">loop</a>?
   &amp; <a class="ref" href="#video.attrs.poster" title="video.attrs.poster">poster</a>?
   &amp; <a class="ref" href="#video.attrs.height" title="video.attrs.height">height</a>?
   &amp; <a class="ref" href="#video.attrs.width" title="video.attrs.width">width</a>?</span></p>
@@ -13487,6 +13523,27 @@
 </h2>
         <dl class="attr-defs">
 <dt>
+<a class="attribute-name" id="video.attrs.autoplay" title="video.attrs.autoplay" href="#video.attrs.autoplay">autoplay</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to automatically begin playback of the
+        video as soon as it can do so without stopping.</dd>
+          
+            <dt>
+<a class="attribute-name" id="video.attrs.autobuffer" title="video.attrs.autobuffer" href="#video.attrs.autobuffer">autobuffer</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA that the author believes that
+        downloading the entire video optimistically will be
+        worthwhile.</dd>
+          
+            <dt>
+<a class="attribute-name" id="video.attrs.controls" title="video.attrs.controls" href="#video.attrs.controls">controls</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to expose a user interface for
+        controlling playback of the video.</dd>
+          
+            <dt>
+<a class="attribute-name" id="video.attrs.loop" title="video.attrs.loop" href="#video.attrs.loop">loop</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to seek back to the start of the video
+        upon reaching the end.</dd>
+          
+            <dt>
 <a class="attribute-name" id="video.attrs.poster" title="video.attrs.poster" href="#video.attrs.poster">poster</a><span class="attr-values"> = 
       <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
     </span> </dt>
@@ -13505,6 +13562,12 @@
     </span> </dt>
             <dd>The width of the video, in CSS pixels.</dd>
           
+            <dt>
+<a class="attribute-name" id="video.attrs.src" title="video.attrs.src" href="#video.attrs.src">src</a><span class="attr-values"> = 
+      <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
+    </span> </dt>
+            <dd>The URL for the video.</dd>
+          
         </dl>
 </div>
       
@@ -14058,46 +14121,8 @@
     <div id="shared-attributes" class="section">
         <h2>9. Other shared attributes <a class="hash" href="#shared-attributes">#</a> <a class="toc-bak" href="#shared-attributes-toc">T</a>
 </h2>
-<div id="common-media-attrs" class="section">
-        <h2>9.1. Media attributes <a class="hash" href="#common-media-attrs">#</a> <a class="toc-bak" href="#common-media-attrs-toc">T</a>
-</h2>
-        <div class="content-model">
-<span class="common-pattern-name"><dfn id="media.attrs">media.attrs</dfn></span> = <a class="ref" href="#media.attrs.autoplay" title="media.attrs.autoplay">autoplay</a>?
-  &amp; <a class="ref" href="#media.attrs.autobuffer" title="media.attrs.autobuffer">autobuffer</a>?
-  &amp; <a class="ref" href="#media.attrs.controls" title="media.attrs.controls">controls</a>?
-  &amp; <a class="ref" href="#media.attrs.loop" title="media.attrs.loop">loop</a>? <a class="hash" href="#media.attrs">#</a>
-            </div>
-      <div class="no-number no-toc">
-        <dl class="attr-defs">
-<dt>
-<a class="attribute-name" id="media.attrs.autoplay" title="media.attrs.autoplay" href="#media.attrs.autoplay">autoplay</a><span class="attr-values"> =   "autoplay" |  "" </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
-          
-            <dt>
-<a class="attribute-name" id="media.attrs.autobuffer" title="media.attrs.autobuffer" href="#media.attrs.autobuffer">autobuffer</a><span class="attr-values"> =   "autobuffer" |  "" </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
-          
-            <dt>
-<a class="attribute-name" id="media.attrs.controls" title="media.attrs.controls" href="#media.attrs.controls">controls</a><span class="attr-values"> =   "controls" |  "" </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
-          
-            <dt>
-<a class="attribute-name" id="media.attrs.loop" title="media.attrs.loop" href="#media.attrs.loop">loop</a><span class="attr-values"> =   "loop" |  "" </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
-          
-        </dl>
-<dl class="attr-defs">
-<dt>
-<a class="attribute-name" id="media.attrs.src" title="media.attrs.src" href="#media.attrs.src">src</a><span class="attr-values"> = 
-      <a class="ref" href="#common.data.uri" title="common.data.uri">uri</a>
-    </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
-          
-        </dl>
-</div>
-    </div>
     <div id="shared-hyperlink-attrs" class="section">
-        <h2>9.2. Hyperlink attributes <a class="hash" href="#shared-hyperlink-attrs">#</a> <a class="toc-bak" href="#shared-hyperlink-attrs-toc">T</a>
+        <h2>9.1. Hyperlink attributes <a class="hash" href="#shared-hyperlink-attrs">#</a> <a class="toc-bak" href="#shared-hyperlink-attrs-toc">T</a>
 </h2>
         <dl class="attr-defs">
 <dt>
@@ -14156,7 +14181,7 @@
         </dl>
 </div>
     <div id="common-form-attrs" class="section">
-        <h2>9.3. Form attributes <a class="hash" href="#common-form-attrs">#</a> <a class="toc-bak" href="#common-form-attrs-toc">T</a>
+        <h2>9.2. Form attributes <a class="hash" href="#common-form-attrs">#</a> <a class="toc-bak" href="#common-form-attrs-toc">T</a>
 </h2>
         <div class="content-model">
 <span class="common-pattern-name"><dfn id="common-form.attrs">common-form.attrs</dfn></span> = (<a class="ref" href="#common-form.attrs.name" title="common-form.attrs.name">name</a>?

Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/video.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- video.html	3 May 2009 15:59:43 -0000	1.4
+++ video.html	15 Jun 2009 20:27:02 -0000	1.5
@@ -22,18 +22,18 @@
         <dl class="content-models" id="video-mdls">
         <dt class="content-model"><span class="element-pattern-name" id="video.elem.flow"><a class="hash" href="video.html#video.elem.flow"><span class="element">video</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      <span class="attr-qualifier">media.attrs.</span><a class="ref" href="shared-attributes.html#media.attrs.src">src</a>
-  | (<a class="ref" href="source.html#source-pattern">source</a>*,
-     <a class="ref" href="source.html#source.elem.last">source.elem.last</a>),
+      (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
+   | (<a class="ref" href="source.html#source-pattern">source</a>*,
+      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="video.html#video.attrs">video.attrs</a>
     </span></dd>
         <dt class="content-model"><span class="element-pattern-name" id="video.elem.phrasing"><a class="hash" href="video.html#video.elem.phrasing"><span class="element">video</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
-      <span class="attr-qualifier">media.attrs.</span><a class="ref" href="shared-attributes.html#media.attrs.src">src</a>
-  | (<a class="ref" href="source.html#source-pattern">source</a>*,
-     <a class="ref" href="source.html#source.elem.last">source.elem.last</a>),
+      (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
+   | (<a class="ref" href="source.html#source-pattern">source</a>*,
+      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="video.html#video.attrs">video.attrs</a>
@@ -43,13 +43,33 @@
         <h2 class="element-subhead">Attribute model <a class="hash" href="#video-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="video.html#video.attrs">video.attrs</a> = <span class="pattern" id="video.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="shared-attributes.html#media.attrs">media.attrs</a>
+  &amp; <a class="ref" href="video.html#video.attrs.autoplay" title="video.attrs.autoplay">autoplay</a>?
+  &amp; <a class="ref" href="video.html#video.attrs.autobuffer" title="video.attrs.autobuffer">autobuffer</a>?
+  &amp; <a class="ref" href="video.html#video.attrs.controls" title="video.attrs.controls">controls</a>?
+  &amp; <a class="ref" href="video.html#video.attrs.loop" title="video.attrs.loop">loop</a>?
   &amp; <a class="ref" href="video.html#video.attrs.poster" title="video.attrs.poster">poster</a>?
   &amp; <a class="ref" href="video.html#video.attrs.height" title="video.attrs.height">height</a>?
   &amp; <a class="ref" href="video.html#video.attrs.width" title="video.attrs.width">width</a>?</span></p></div></div>
       <div class="no-number no-toc" id="video-attributes">
         <h2 class="element-subhead">Element-specific attributes <a class="hash" href="#video-attributes">#</a></h2>
         <dl class="attr-defs">
+            <dt><a class="attribute-name" id="video.attrs.autoplay" title="video.attrs.autoplay" href="video.html#video.attrs.autoplay">autoplay</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to automatically begin playback of the
+        video as soon as it can do so without stopping.</dd>
+          
+            <dt><a class="attribute-name" id="video.attrs.autobuffer" title="video.attrs.autobuffer" href="video.html#video.attrs.autobuffer">autobuffer</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA that the author believes that
+        downloading the entire video optimistically will be
+        worthwhile.</dd>
+          
+            <dt><a class="attribute-name" id="video.attrs.controls" title="video.attrs.controls" href="video.html#video.attrs.controls">controls</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to expose a user interface for
+        controlling playback of the video.</dd>
+          
+            <dt><a class="attribute-name" id="video.attrs.loop" title="video.attrs.loop" href="video.html#video.attrs.loop">loop</a><span class="attr-values"> = </span> </dt>
+            <dd>Instructs the UA to seek back to the start of the video
+        upon reaching the end.</dd>
+          
             <dt><a class="attribute-name" id="video.attrs.poster" title="video.attrs.poster" href="video.html#video.attrs.poster">poster</a><span class="attr-values"> = 
       <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
     </span> </dt>
@@ -66,6 +86,11 @@
     </span> </dt>
             <dd>The width of the video, in CSS pixels.</dd>
           
+            <dt><a class="attribute-name" id="video.attrs.src" title="video.attrs.src" href="video.html#video.attrs.src">src</a><span class="attr-values"> = 
+      <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
+    </span> </dt>
+            <dd>The URL for the video.</dd>
+          
         </dl></div>
       
       <div class="no-number no-toc" id="video-assertions">

Index: source.html
===================================================================
RCS file: /sources/public/html5/markup/source.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- source.html	7 Jun 2009 05:27:01 -0000	1.5
+++ source.html	15 Jun 2009 20:27:02 -0000	1.6
@@ -84,24 +84,24 @@
       <div class="no-number no-toc" id="source-context">
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#source-context">#</a></h2>
         <ul>
-        <li class="context-mdl"><a href="video.html#video.elem.flow">video.elem.flow</a> = <span class="attr-qualifier">media.attrs.</span><a class="ref" href="shared-attributes.html#media.attrs.src">src</a>
-  | (<a class="ref" href="source.html#source-pattern">source</a>*,
-     <a class="ref" href="source.html#source.elem.last">source.elem.last</a>),
+        <li class="context-mdl"><a href="video.html#video.elem.flow">video.elem.flow</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
+   | (<a class="ref" href="source.html#source-pattern">source</a>*,
+      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
-        <li class="context-mdl"><a href="video.html#video.elem.phrasing">video.elem.phrasing</a> = <span class="attr-qualifier">media.attrs.</span><a class="ref" href="shared-attributes.html#media.attrs.src">src</a>
-  | (<a class="ref" href="source.html#source-pattern">source</a>*,
-     <a class="ref" href="source.html#source.elem.last">source.elem.last</a>),
+        <li class="context-mdl"><a href="video.html#video.elem.phrasing">video.elem.phrasing</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
+   | (<a class="ref" href="source.html#source-pattern">source</a>*,
+      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li>
-        <li class="context-mdl"><a href="audio.html#audio.elem.flow">audio.elem.flow</a> = <span class="attr-qualifier">media.attrs.</span><a class="ref" href="shared-attributes.html#media.attrs.src">src</a>
-  | (<a class="ref" href="source.html#source-pattern">source</a>*,
-     <a class="ref" href="source.html#source.elem.last">source.elem.last</a>),
+        <li class="context-mdl"><a href="audio.html#audio.elem.flow">audio.elem.flow</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
+   | (<a class="ref" href="source.html#source-pattern">source</a>*,
+      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
-        <li class="context-mdl"><a href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a> = <span class="attr-qualifier">media.attrs.</span><a class="ref" href="shared-attributes.html#media.attrs.src">src</a>
-  | (<a class="ref" href="source.html#source-pattern">source</a>*,
-     <a class="ref" href="source.html#source.elem.last">source.elem.last</a>),
+        <li class="context-mdl"><a href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
+   | (<a class="ref" href="source.html#source-pattern">source</a>*,
+      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li></ul>
       </div></div>

Index: shared-attributes.html
===================================================================
RCS file: /sources/public/html5/markup/shared-attributes.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- shared-attributes.html	15 Jun 2009 17:16:10 -0000	1.5
+++ shared-attributes.html	15 Jun 2009 20:27:02 -0000	1.6
@@ -12,39 +12,9 @@
 <span class="nav-next"><a href="datatypes.html">datatypes &#187;</a></span>
 </div>
 <div id="shared-attributes" class="section">
-        <h2>9. Other shared attributes <a class="hash" href="#shared-attributes">#</a> <a class="toc-bak" href="Overview.html#shared-attributes-toc">T</a></h2><div id="common-media-attrs" class="section">
-        <h2>9.1. Media attributes <a class="hash" href="#common-media-attrs">#</a> <a class="toc-bak" href="Overview.html#common-media-attrs-toc">T</a></h2>
-        <div class="content-model"><span class="common-pattern-name"><dfn id="media.attrs">media.attrs</dfn></span> = <a class="ref" href="shared-attributes.html#media.attrs.autoplay" title="media.attrs.autoplay">autoplay</a>?
-  &amp; <a class="ref" href="shared-attributes.html#media.attrs.autobuffer" title="media.attrs.autobuffer">autobuffer</a>?
-  &amp; <a class="ref" href="shared-attributes.html#media.attrs.controls" title="media.attrs.controls">controls</a>?
-  &amp; <a class="ref" href="shared-attributes.html#media.attrs.loop" title="media.attrs.loop">loop</a>? <a class="hash" href="shared-attributes.html#media.attrs">#</a>
-            </div>
-      <div class="no-number no-toc">
-        <dl class="attr-defs">
-            <dt><a class="attribute-name" id="media.attrs.autoplay" title="media.attrs.autoplay" href="shared-attributes.html#media.attrs.autoplay">autoplay</a><span class="attr-values"> =   "autoplay" |  "" </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
-          
-            <dt><a class="attribute-name" id="media.attrs.autobuffer" title="media.attrs.autobuffer" href="shared-attributes.html#media.attrs.autobuffer">autobuffer</a><span class="attr-values"> =   "autobuffer" |  "" </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
-          
-            <dt><a class="attribute-name" id="media.attrs.controls" title="media.attrs.controls" href="shared-attributes.html#media.attrs.controls">controls</a><span class="attr-values"> =   "controls" |  "" </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
-          
-            <dt><a class="attribute-name" id="media.attrs.loop" title="media.attrs.loop" href="shared-attributes.html#media.attrs.loop">loop</a><span class="attr-values"> =   "loop" |  "" </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
-          
-        </dl>
-      <dl class="attr-defs">
-            <dt><a class="attribute-name" id="media.attrs.src" title="media.attrs.src" href="shared-attributes.html#media.attrs.src">src</a><span class="attr-values"> = 
-      <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
-    </span> </dt>
-            <dd><i class="TK">(detailed attribute description to come)</i></dd>
-          
-        </dl>
-      </div>
-    </div>
+        <h2>9. Other shared attributes <a class="hash" href="#shared-attributes">#</a> <a class="toc-bak" href="Overview.html#shared-attributes-toc">T</a></h2>
     <div id="shared-hyperlink-attrs" class="section">
-        <h2>9.2. Hyperlink attributes <a class="hash" href="#shared-hyperlink-attrs">#</a> <a class="toc-bak" href="Overview.html#shared-hyperlink-attrs-toc">T</a></h2>
+        <h2>9.1. Hyperlink attributes <a class="hash" href="#shared-hyperlink-attrs">#</a> <a class="toc-bak" href="Overview.html#shared-hyperlink-attrs-toc">T</a></h2>
         <dl class="attr-defs"><dt><dfn class="attribute-name" id="shared-hyperlink.attrs.href" title="shared-hyperlink.attrs.href">href</dfn><span class="attr-values"> = 
       <a class="ref" href="datatypes.html#common.data.uri" title="common.data.uri">uri</a>
     </span><a class="hash" href="shared-attributes.html#shared-hyperlink.attrs.href">#</a></dt><dd><dd>A URL that provides the <dfn id="destination">destination resource</dfn> of the
@@ -74,7 +44,7 @@
         </dl>
     </div>
     <div id="common-form-attrs" class="section">
-        <h2>9.3. Form attributes <a class="hash" href="#common-form-attrs">#</a> <a class="toc-bak" href="Overview.html#common-form-attrs-toc">T</a></h2>
+        <h2>9.2. Form attributes <a class="hash" href="#common-form-attrs">#</a> <a class="toc-bak" href="Overview.html#common-form-attrs-toc">T</a></h2>
         <div class="content-model"><span class="common-pattern-name"><dfn id="common-form.attrs">common-form.attrs</dfn></span> = (<a class="ref" href="shared-attributes.html#common-form.attrs.name" title="common-form.attrs.name">name</a>?
    &amp; <a class="ref" href="shared-attributes.html#common-form.attrs.disabled" title="common-form.attrs.disabled">disabled</a>?)
   &amp; <a class="ref" href="shared-attributes.html#common-form.attrs.form" title="common-form.attrs.form">form</a>? <a class="hash" href="shared-attributes.html#common-form.attrs">#</a>
Received on Monday, 15 June 2009 20:27:11 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Monday, 15 June 2009 20:27:19 GMT