[mediaqueries-3] Fold in correction 1, and mark c2 as proposed

See w3c#10245

Author: frivoal

mediaqueries-3/Overview.html

@@ -47,8 +47,8 @@
 
    <h1 id=title>Media Queries Level 3</h1>
 
-   <!-- <p id="w3c-state"><a href="https://www.w3.org/standards/types#REC">W3C Recommendation</a>, <time class="dt-updated" datetime="2022-04-05">05 April 2022</time></p> -->
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#ED">Editor’s Draft</a>, <time class="dt-updated" datetime="2022-04-05">05 April 2022</time></p>
+   <!-- <p id="w3c-state"><a href="https://www.w3.org/standards/types#REC">W3C Recommendation</a>, <time class="dt-updated" datetime="2024-05-14">14 May 2024</time></p> -->
+   <p id="w3c-state"><a href="https://www.w3.org/standards/types#ED">Editor’s Draft</a>, <time class="dt-updated" datetime="2024-05-01">14 May 2024</time></p>
 
    <details open><summary>More details about this document</summary>
    <dl>
@@ -261,8 +261,10 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
    <li><a href="#changes"><span class=secno>7. </span>Changes</a>
     <ul class=toc>
      <li><a href="#changes-2012"><span class=secno>7.1. </span>Changes Since
+      the 05 April 2022 Recommendation</a>
+     <li><a href="#changes-2012"><span class=secno>7.2. </span>Changes Since
       the 19 June 2012 Recommendation</a>
-     <li><a href="#changes-2010"><span class=secno>7.2. </span>Changes Since
+     <li><a href="#changes-2010"><span class=secno>7.4. </span>Changes Since
       the 27 July 2010 Candidate Recommendation</a>
     </ul>
 
@@ -604,20 +606,6 @@ <h3 id=error-handling><span class=secno>3.1. </span>Error Handling</h3>
   <p>For media queries that are not conforming user agents need to follow the
    rules described in this section.
 
-  <div class="correction proposed" id="c1">
-   <span class="marker">Proposed Correction 1:</span>
-   Clarify that the keywords ‘<code>not</code>’, ‘<code>and</code>’, ‘<code>only</code>’, and ‘<code>or</code>’ should not be treated as unknown media types,
-   but as syntax errors when used in place of media types.
-
-   <p>The reasoning for this change can be found in <a href="https://lists.w3.org/Archives/Public/www-style/2013May/0783.html">the minutes of the 2013-05-30 CSS WG teleconference</a>
-   and in the emails referenced therefrom.
-   <details>
-    <summary>This change has tests</summary>
-    <a href="https://github.com/web-platform-tests/wpt/commit/ea1821d4bd24ed1e859db03571cca8e783dbf957">Tests for this change</a> have been added to <abbr title="Web Platform Tests">WPT</abbr>.
-    The results can be viewed at <a href="https://wpt.fyi/results/css/mediaqueries?q=mq-invalid-media-type-0">wpt.fyi</a>.
-   </details>
-  </div>
-
   <div class="correction" id="c2">
    <span class="marker">Candidate Correction 2:</span>
    Require that ‘<code>layer</code>’ is also to not be treated as an unknown media type,
@@ -638,10 +626,10 @@ <h3 id=error-handling><span class=secno>3.1. </span>Error Handling</h3>
     <p><strong>Unknown media types.</strong> Unknown media types evaluate to
      false. Effectively, they are treated identically to known media types
      that do not match the media type of the device.
-     <ins cite="#c1">However, an exception is made for media types <ins cite=#c2>‘<code>layer</code>’, </ins>‘<code>not</code>’, ‘<code>and</code>’, ‘<code>only</code>’, and ‘<code>or</code>’.
+     However, an exception is made for media types <ins cite=#c2>‘<code>layer</code>’, </ins>‘<code>not</code>’, ‘<code>and</code>’, ‘<code>only</code>’, and ‘<code>or</code>’.
      Even though they do match the IDENT production,
      they must not be treated as unknown media types,
-     but rather trigger the malformed query clause.</ins></p>
+     but rather trigger the malformed query clause.</p>
 
      <ins cite=#c2>
      <p class=note>
@@ -650,20 +638,18 @@ <h3 id=error-handling><span class=secno>3.1. </span>Error Handling</h3>
      when used in the <code>@import url(…) layer;</code> syntax
      for the sake of <a href="https://www.w3.org/TR/css-cascade-5/#layering">cascade layers</a>.
      See <a href="biblio-css-cascade-5">[CSS-CASCADE-5]</a>.
-     <ins>
+     </p></ins>
 
     <div class=example>
      <p>The media query "<code>unknown</code>" will evaluate to false, unless
       <code>unknown</code> is actually a supported media type. Similarly,
       "<code>not unknown</code>" will evaluate to true.</p>
     </div>
 
-    <ins cite="#c1">
     <div class="example">
      <p>The following is a malformed media query because it uses ‘<code>only</code>’ and ‘<code>or</code>’ as media types.</p>
      <pre><code>@media only and or { … }</code></pre>
     </div>
-    </ins>
 
     <p class=note>Unknown media types are distinct from media types that do
      not actually match the IDENT production. Those fall under the malformed
@@ -1194,19 +1180,50 @@ <h3 id=resolution0><span class=secno>6.1. </span>Resolution</h3>
 
   <h2 id=changes><span class=secno>7. </span>Changes</h2>
 
-  <h3 id=changes-2012><span class=secno>7.1. </span>Changes Since the 19 June 2012
+  <h3 id=changes-2022><span class=secno>7.1. </span>Changes Since the 05 April 2022
    Recommendation</h3>
 
-  <p>Candidate and Proposed Corrections were introduced:
+  An earlier Proposed Correction was normatively incorporated into the Recommendation:
   <ul>
-   <li><a href="#c1">Proposed Correction 1</a> in <a href="#error-handling">Section 3.1</a>:
+   <li id=c1>
+    Former “Proposed Correction 1” in <a href="#error-handling">Section 3.1</a>:
     Clarify that the keywords ‘<code>not</code>’, ‘<code>and</code>’, ‘<code>only</code>’, and ‘<code>or</code>’ should not be treated as unknown media types,
     but as syntax errors when used in place of media types.
 
-   <li><a href="#c2">Candidate Correction 2</a> in <a href="#error-handling">Section 3.1</a>:
+    <blockquote>
+     <p>Unknown media types evaluate to
+      false. Effectively, they are treated identically to known media types
+      that do not match the media type of the device.
+      <ins>However, an exception is made for media types ‘<code>not</code>’, ‘<code>and</code>’, ‘<code>only</code>’, and ‘<code>or</code>’.
+      Even though they do match the IDENT production,
+      they must not be treated as unknown media types,
+      but rather trigger the malformed query clause.</ins></p>
+	</blockquote>
+
+    <p>
+    The reasoning for this change can be found in <a href="https://lists.w3.org/Archives/Public/www-style/2013May/0783.html">the minutes of the 2013-05-30 CSS WG teleconference</a>
+   and in the emails referenced therefrom.
+
+    <p>
+    <a href="https://github.com/web-platform-tests/wpt/commit/ea1821d4bd24ed1e859db03571cca8e783dbf957">Tests for this change</a> have been added to <abbr title="Web Platform Tests">WPT</abbr>.
+      The results can be viewed at <a href="https://wpt.fyi/results/css/mediaqueries?q=mq-invalid-media-type-0">wpt.fyi</a>.
+  </ul>
+
+  <p>A Proposed Correction was introduced:
+  <ul>
+   <li><a href="#c2">Proposed Correction 2</a> in <a href="#error-handling">Section 3.1</a>:
     Require that ‘<code>layer</code>’ is also to not be treated as an unknown media type,
     but as a syntax errors when used in place of media types.
+  </ul>
 
+  <h3 id=changes-2012><span class=secno>7.2. </span>Changes Since the 19 June 2012
+   Recommendation</h3>
+
+  <p>Proposed Corrections were introduced:
+  <ul>
+   <li><a href="#c1">Proposed Correction 1</a> in <a href="#error-handling">Section 3.1</a>:
+    Clarify that the keywords ‘<code>not</code>’, ‘<code>and</code>’, ‘<code>only</code>’, and ‘<code>or</code>’ should not be treated as unknown media types,
+    but as syntax errors when used in place of media types.
   </ul>
 
   <p>A handful of editorial and markup corrections were also made:
@@ -1242,7 +1259,7 @@ <h3 id=changes-2012><span class=secno>7.1. </span>Changes Since the 19 June 2012
    <li>Various links throughout the specification were updated from http to https.
   </ul>
 
-  <h3 id=changes-2010><span class=secno>7.2. </span>Changes Since the 27 July
+  <h3 id=changes-2010><span class=secno>7.3. </span>Changes Since the 27 July
    2010 Candidate Recommendation</h3>
 
   <p>The following changes were made to this specification since the <a