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

git-svn-id: http://svn.whatwg.org/webapps@8625 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · May 9, 2014 · 08e2efd · 08e2efd
1 parent 230198f
commit 08e2efd
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/complete.html b/complete.html
@@ -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 &mdash; Last Updated 8 May 2014</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; 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>
@@ -20742,10 +20742,23 @@ <h3 id=embedded-content><span class=secno>4.7 </span>Embedded content</h3>
   In addition, as of 6 May 2014, the editors have made this specification available under the Open Web Foundation Agreement Version 1.0,
   which is available at http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0.
 
+-->
+
+<!--
+
+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@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)-->

diff --git a/index b/index
@@ -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 &mdash; Last Updated 8 May 2014</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; 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>
@@ -20742,10 +20742,23 @@ License for the contributions to this file as of 2014-05-06:
   In addition, as of 6 May 2014, the editors have made this specification available under the Open Web Foundation Agreement Version 1.0,
   which is available at http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0.
 
+-->
+
+<!--
+
+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@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)-->