[html5] r8625 - [e] (0) Merge upstream changes for <img>

Fri May 9 10:45:13 PDT 2014

Author: ianh
Date: 2014-05-09 10:45:11 -0700 (Fri, 09 May 2014)
New Revision: 8625

Modified:
   complete.html
   index
Log:
[e] (0) Merge upstream changes for <img>

Modified: complete.html
===================================================================

--- complete.html	2014-05-08 22:12:31 UTC (rev 8624)
+++ complete.html	2014-05-09 17:45:11 UTC (rev 8625)
@@ -290,7 +290,7 @@
   </script><body onload=init()>
   <header class="head with-buttons" id=head><p><a href=//www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard — Last Updated 8 May 2014</h2>
+    <h2 class="no-num no-toc">Living Standard — Last Updated 9 May 2014</h2>
    </hgroup><div>
     <div>
      <a href=//whatwg.org/html><span><strong>Multipage Version</strong> <code>whatwg.org/html</code></span></a>
@@ -20744,8 +20744,21 @@
 
 -->
 
+<!--
+
+This file is being maintained at https://github.com/ResponsiveImagesCG/picture-element/blob/gh-pages/source
+
+It is integrated into the WHATWG HTML spec: http://www.whatwg.org/specs/web-apps/current-work/multipage/edits.html#embedded-content
+
+Editor: Simon Pieters <simonp at opera.com>, Opera Software
+
+-->
+
   <!-- START OF PICTURE SECTION -->
 
+  <p class=XXX>The <a href=http://picture.responsiveimages.org/>picture element specification</a>
+  will be folded in to this specification, replacing some of the requirements in this section.</p>
+
   <!-- <h4>The <dfn><code>picture</code></dfn> * element</h4> -->
 
   <!-- <h4>The <dfn><code>imgcandidate</code></dfn> * element</h4> --> <!--(or whatever it gets called)-->

Modified: index
===================================================================
--- index	2014-05-08 22:12:31 UTC (rev 8624)
+++ index	2014-05-09 17:45:11 UTC (rev 8625)
@@ -290,7 +290,7 @@
   </script><body onload=init()>
   <header class="head with-buttons" id=head><p><a href=//www.whatwg.org/ class=logo><img width=101 src=/images/logo alt=WHATWG height=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard — Last Updated 8 May 2014</h2>
+    <h2 class="no-num no-toc">Living Standard — Last Updated 9 May 2014</h2>
    </hgroup><div>
     <div>
      <a href=//whatwg.org/html><span><strong>Multipage Version</strong> <code>whatwg.org/html</code></span></a>
@@ -20744,8 +20744,21 @@
 
 -->
 
+<!--
+
+This file is being maintained at https://github.com/ResponsiveImagesCG/picture-element/blob/gh-pages/source
+
+It is integrated into the WHATWG HTML spec: http://www.whatwg.org/specs/web-apps/current-work/multipage/edits.html#embedded-content
+
+Editor: Simon Pieters <simonp at opera.com>, Opera Software
+
+-->
+
   <!-- START OF PICTURE SECTION -->
 
+  <p class=XXX>The <a href=http://picture.responsiveimages.org/>picture element specification</a>
+  will be folded in to this specification, replacing some of the requirements in this section.</p>
+
   <!-- <h4>The <dfn><code>picture</code></dfn> * element</h4> -->
 
   <!-- <h4>The <dfn><code>imgcandidate</code></dfn> * element</h4> --> <!--(or whatever it gets called)-->

