merge

Author: tabatkins

mediaqueries/Overview.html

@@ -54,7 +54,7 @@
 </p>
   <h1 class="p-name no-ref" id=title>Media Queries Level 4</h1>
   <h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
-    <span class=dt-updated><span class=value-title title=20131218>18 December 2013</span></span></span></h2>
+    <span class=dt-updated><span class=value-title title=20131219>19 December 2013</span></span></span></h2>
   <div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/mediaqueries4/>http://dev.w3.org/csswg/mediaqueries4/</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/mediaqueries4/>http://dev.w3.org/csswg/mediaqueries4/</a>
     <dt>Feedback:</dt>
         <dd><a href="mailto:www-style@w3.org?subject=%5Bmediaqueries%5D%20feedback">www-style@w3.org</a>
@@ -266,7 +266,7 @@ <h3 class="heading settled heading" data-level=1.3 id=units><span class=secno>1.
 <h2 class="heading settled heading" data-level=2 id=media><span class=secno>2 </span><span class=content>
 Media Queries</span><a class=self-link href=#media></a></h2>
 
-<p>	A <dfn data-dfn-type=dfn data-noexport="" id=media-query>media query<a class=self-link href=#media-query></a></dfn> is a method of testing certain aspects of the user agent
+<p>	A <dfn data-dfn-type=dfn data-export="" id=media-query>media query<a class=self-link href=#media-query></a></dfn> is a method of testing certain aspects of the user agent
 	or device that the document is being displayed in.
 	<a data-link-type=dfn href=#media-query title="media queries">Media queries</a> are (almost) always independent of the contents of the document,
 	its styling,

mediaqueries/Overview.src.html

@@ -124,7 +124,7 @@ <h3 id="units">
 <h2 id="media">
 Media Queries</h2>
 
-	A <dfn>media query</dfn> is a method of testing certain aspects of the user agent
+	A <dfn export>media query</dfn> is a method of testing certain aspects of the user agent
 	or device that the document is being displayed in.
 	<a>Media queries</a> are (almost) always independent of the contents of the document,
 	its styling,