From c5a0c1c76995bb04a85ee74883f3dd864f84914b Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 23 Feb 2024 18:36:23 -0500
Subject: [PATCH 1/7] Amend the browser support policy for Safari, per:
 https://github.com/emberjs/rfcs/pull/984

---
 app/templates/browser-support.hbs | 82 ++++++++++++++++---------------
 1 file changed, 43 insertions(+), 39 deletions(-)

diff --git a/app/templates/browser-support.hbs b/app/templates/browser-support.hbs
index b07fbd3f..da97c05a 100644
--- a/app/templates/browser-support.hbs
+++ b/app/templates/browser-support.hbs
@@ -3,6 +3,40 @@
   <section aria-labelledby="section-browser-support-policy">
     <h1 id="section-browser-support-policy">Ember.js Browser Support Policy</h1>
 
+    <h2>Ember 6.0.0</h2>
+
+    <p>
+      In Ember 6.0.0, the framework supports the following major browsers:
+    </p>
+
+    <ul class="list-unstyled layout my-3">
+      <EsCard class="lg:col-2">
+        <div class="text-center text-md">Desktop</div>
+        <ul>
+          <li>Google Chrome >= 103</li>
+          <li>Mozilla Firefox >= 102</li>
+          <li>Microsoft Edge >= 110</li>
+          <li>Safari >= 16.4</li>
+        </ul>
+      </EsCard>
+      <EsCard class="lg:col-2">
+        <div class="text-center text-md">Mobile</div>
+        <ul>
+          <li>Google Chrome >= 112</li>
+          <li>Mozilla Firefox >= 110</li>
+          <li>Safari >= 16.4</li>
+        </ul>
+      </EsCard>
+      <EsCard class="lg:col-2">
+        <div class="text-center text-md">Testing</div>
+        <ul>
+          <li>Google Chrome</li>
+          <li>Mozilla Firefox</li>
+        </ul>
+      </EsCard>
+    </ul>
+
+
     <h2>Ember 5.0.0</h2>
 
     <p>
@@ -109,6 +143,7 @@
           <li>Google Chrome</li>
           <li>Mozilla Firefox</li>
           <li>Microsoft Edge</li>
+          <li>Safari</li>
         </ul>
       </EsCard>
       <EsCard class="lg:col-2">
@@ -116,6 +151,7 @@
         <ul>
           <li>Google Chrome</li>
           <li>Mozilla Firefox</li>
+          <li>Safari</li>
         </ul>
       </EsCard>
       <EsCard class="lg:col-2">
@@ -127,34 +163,18 @@
       </EsCard>
     </ul>
 
-    <h3 class="text-center">Non-evergreen</h3>
-
-    <div class="layout">
-      <ul class="list-unstyled layout lg:col-4 lg:start-2 my-3">
-        <EsCard class="lg:col-3">
-          <div class="text-center text-md">Desktop</div>
-          <ul>
-            <li>Safari</li>
-          </ul>
-        </EsCard>
-        <EsCard class="lg:col-3">
-          <div class="text-center text-md">Mobile</div>
-          <ul>
-            <li>Safari</li>
-          </ul>
-        </EsCard>
-      </ul>
-    </div>
-
     <p>
-      For evergreen browsers, the minimum version of the browser that we support is
+      For evergreen browsers, the minimum version of the browser that we support can be
       determined at the time of every minor release, following this formula:
     </p>
 
     <div class="layout my-3">
       <div class="card">
         <div class="card__content">
-          <p>Whichever browser version is greater/more recent out of:</p>
+           <p>
+            Whichever browser version is greater/more recent out of the following,
+            given that the owning entity (e.g.: Apple, Google, Mozilla) still supports the version
+          </p>
 
           <ol>
             <li>
@@ -181,26 +201,10 @@
 
     <p>
       For non-evergreen browsers, support is locked at a specific major version, and
-      we support all major versions above that version:
+      we support all major versions above that version.
+      However, all supported browsers are considered evergreen.
     </p>
 
-    <div class="layout">
-      <ul class="list-unstyled layout lg:col-4 lg:start-2 my-3">
-        <EsCard class="lg:col-3">
-          <div class="text-center text-md">Desktop</div>
-          <ul>
-            <li>Safari: 12</li>
-          </ul>
-        </EsCard>
-        <EsCard class="lg:col-3">
-          <div class="text-center text-md">Mobile</div>
-          <ul>
-            <li>Safari: 12</li>
-          </ul>
-        </EsCard>
-      </ul>
-    </div>
-
     Within a version of a browser, we only support the most recent patch release.
   </section>
 </div>

From cbb049d495561ee3d6114e0b7357ec5db52f6027 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:56:51 -0500
Subject: [PATCH 2/7] Update browser-support.hbs

---
 app/templates/browser-support.hbs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/templates/browser-support.hbs b/app/templates/browser-support.hbs
index da97c05a..8a65ff02 100644
--- a/app/templates/browser-support.hbs
+++ b/app/templates/browser-support.hbs
@@ -143,7 +143,6 @@
           <li>Google Chrome</li>
           <li>Mozilla Firefox</li>
           <li>Microsoft Edge</li>
-          <li>Safari</li>
         </ul>
       </EsCard>
       <EsCard class="lg:col-2">
@@ -151,7 +150,6 @@
         <ul>
           <li>Google Chrome</li>
           <li>Mozilla Firefox</li>
-          <li>Safari</li>
         </ul>
       </EsCard>
       <EsCard class="lg:col-2">

From eefa8ccaa22e87198d399fd5ad89501d86a9532a Mon Sep 17 00:00:00 2001
From: Aaron Chambers <aaron.chambers@hey.com>
Date: Wed, 17 Apr 2024 15:43:59 +0100
Subject: [PATCH 3/7] Update browser-support.hbs

---
 app/templates/browser-support.hbs | 107 ++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/app/templates/browser-support.hbs b/app/templates/browser-support.hbs
index 8a65ff02..25cc4ad8 100644
--- a/app/templates/browser-support.hbs
+++ b/app/templates/browser-support.hbs
@@ -134,6 +134,8 @@
       either <em>evergreen</em> or <em>non-evergreen</em>. The categorization is as follows:
     </p>
 
+    <h2>Ember >=6.0.0</h2>
+
     <h3 class="text-center">Evergreen</h3>
 
     <ul class="list-unstyled layout my-3">
@@ -204,5 +206,110 @@
     </p>
 
     Within a version of a browser, we only support the most recent patch release.
+
+    <h2>Ember >=4.0.x to <=5.12.x</h2>
+    
+    <h3 class="text-center">Evergreen</h3>
+
+    <ul class="list-unstyled layout my-3">
+      <EsCard class="lg:col-2">
+        <div class="text-center text-md">Desktop</div>
+        <ul>
+          <li>Google Chrome</li>
+          <li>Mozilla Firefox</li>
+          <li>Microsoft Edge</li>
+        </ul>
+      </EsCard>
+      <EsCard class="lg:col-2">
+        <div class="text-center text-md">Mobile</div>
+        <ul>
+          <li>Google Chrome</li>
+          <li>Mozilla Firefox</li>
+        </ul>
+      </EsCard>
+      <EsCard class="lg:col-2">
+        <div class="text-center text-md">Testing</div>
+        <ul>
+          <li>Google Chrome</li>
+          <li>Mozilla Firefox</li>
+        </ul>
+      </EsCard>
+    </ul>
+
+    <h3 class="text-center">Non-evergreen</h3>
+
+    <div class="layout">
+      <ul class="list-unstyled layout lg:col-4 lg:start-2 my-3">
+        <EsCard class="lg:col-3">
+          <div class="text-center text-md">Desktop</div>
+          <ul>
+            <li>Safari</li>
+          </ul>
+        </EsCard>
+        <EsCard class="lg:col-3">
+          <div class="text-center text-md">Mobile</div>
+          <ul>
+            <li>Safari</li>
+          </ul>
+        </EsCard>
+      </ul>
+    </div>
+
+    <p>
+      For evergreen browsers, the minimum version of the browser that we support is
+      determined at the time of every minor release, following this formula:
+    </p>
+
+    <div class="layout my-3">
+      <div class="card">
+        <div class="card__content">
+          <p>Whichever browser version is greater/more recent out of:</p>
+
+          <ol>
+            <li>
+              The lowest/least recent version that fulfills any one of these properties:
+              <ul>
+                <li>It is the latest version of the browser.</li>
+                <li>It is the latest LTS/extended support version of the browser (such as Firefox ESR).</li>
+                <li>It has at least <em>0.25%</em> of global marketshare usage across mobile and
+              desktop, based on <a href="https://gs.statcounter.com/">statcounter</a>.</li>
+              </ul>
+            </li>
+            <li>
+              The minimum version supported in the previous release
+            </li>
+          </ol>
+        </div>
+      </div>
+    </div>
+
+    <p>
+      To simplify, the supported version either moves forward or stays the same for
+      each release based on overall usage and LTS/current release versions.
+    </p>
+
+    <p>
+      For non-evergreen browsers, support is locked at a specific major version, and
+      we support all major versions above that version:
+    </p>
+
+    <div class="layout">
+      <ul class="list-unstyled layout lg:col-4 lg:start-2 my-3">
+        <EsCard class="lg:col-3">
+          <div class="text-center text-md">Desktop</div>
+          <ul>
+            <li>Safari: 12</li>
+          </ul>
+        </EsCard>
+        <EsCard class="lg:col-3">
+          <div class="text-center text-md">Mobile</div>
+          <ul>
+            <li>Safari: 12</li>
+          </ul>
+        </EsCard>
+      </ul>
+    </div>
+
+    Within a version of a browser, we only support the most recent patch release.
   </section>
 </div>

From 736a9bd2e31cf968ccf5ee4be47e98fc97c90539 Mon Sep 17 00:00:00 2001
From: Chris Manson <chris@manson.ie>
Date: Fri, 3 May 2024 19:39:02 +0100
Subject: [PATCH 4/7] fix lint issues for < and >

---
 app/templates/browser-support.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/browser-support.hbs b/app/templates/browser-support.hbs
index 25cc4ad8..31c9ee06 100644
--- a/app/templates/browser-support.hbs
+++ b/app/templates/browser-support.hbs
@@ -207,8 +207,8 @@
 
     Within a version of a browser, we only support the most recent patch release.
 
-    <h2>Ember >=4.0.x to <=5.12.x</h2>
-    
+    <h2>Ember &gt;=4.0.x to &lt;=5.12.x</h2>
+
     <h3 class="text-center">Evergreen</h3>
 
     <ul class="list-unstyled layout my-3">

From 9f30661a1cd19cc2f0bd0617a8a3f3fe9084d968 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 8 May 2024 11:40:23 -0400
Subject: [PATCH 5/7] Updates with Chris

---
 app/templates/browser-support.hbs | 286 ++++++------------------------
 1 file changed, 56 insertions(+), 230 deletions(-)

diff --git a/app/templates/browser-support.hbs b/app/templates/browser-support.hbs
index 31c9ee06..9d123ce4 100644
--- a/app/templates/browser-support.hbs
+++ b/app/templates/browser-support.hbs
@@ -3,46 +3,64 @@
   <section aria-labelledby="section-browser-support-policy">
     <h1 id="section-browser-support-policy">Ember.js Browser Support Policy</h1>
 
-    <h2>Ember 6.0.0</h2>
-
     <p>
-      In Ember 6.0.0, the framework supports the following major browsers:
+      For evergreen browsers, the minimum version of the browser that we support can be
+      determined at the time of every minor release, following this formula:
     </p>
 
-    <ul class="list-unstyled layout my-3">
-      <EsCard class="lg:col-2">
-        <div class="text-center text-md">Desktop</div>
-        <ul>
-          <li>Google Chrome >= 103</li>
-          <li>Mozilla Firefox >= 102</li>
-          <li>Microsoft Edge >= 110</li>
-          <li>Safari >= 16.4</li>
-        </ul>
-      </EsCard>
-      <EsCard class="lg:col-2">
-        <div class="text-center text-md">Mobile</div>
-        <ul>
-          <li>Google Chrome >= 112</li>
-          <li>Mozilla Firefox >= 110</li>
-          <li>Safari >= 16.4</li>
-        </ul>
-      </EsCard>
-      <EsCard class="lg:col-2">
-        <div class="text-center text-md">Testing</div>
-        <ul>
-          <li>Google Chrome</li>
-          <li>Mozilla Firefox</li>
-        </ul>
-      </EsCard>
-    </ul>
+    <div class="layout my-3">
+      <div class="card">
+        <div class="card__content">
+           <p>
+            Whichever browser version is greater/more recent out of the following,
+            given that the owning entity (e.g.: Apple, Google, Mozilla) still supports the version
+          </p>
 
+          <ol>
+            <li>
+              The lowest/least recent version that fulfills any one of these properties:
+              <ul>
+                <li>It is the latest version of the browser.</li>
+                <li>It is the latest LTS/extended support version of the browser (such as Firefox ESR).</li>
+                <li>It has at least <em>0.25%</em> of global marketshare usage across mobile and
+              desktop, based on <a href="https://gs.statcounter.com/">statcounter</a>.</li>
+              </ul>
+            </li>
+            <li>
+              The minimum version supported in the previous release
+            </li>
+          </ol>
+        </div>
+      </div>
+    </div>
 
-    <h2>Ember 5.0.0</h2>
+    <p>Supported evergreen browsers are <strong>Google Chrome</strong> and <strong>Mozilla Firefox</strong> for desktop, mobile, and testing. Additionally, <strong>Microsoft Edge</strong> is supported for desktop.</p>
 
     <p>
-      In Ember 5.0.0, the framework supports the following major browsers:
+      Currently we support one non-evergreen browser: <strong>Apple Safari</strong> on desktop and mobile.
+      Support is locked at a specific major version, and
+      we support all major versions above that version.
     </p>
 
+    <p class="mb-3">
+      Note: Within a major version of a browser, we only support the most recent patch release.
+    </p>
+
+    <EsNote @mascot='zoey'>
+      As of
+      the RFC <a href="https://rfcs.emberjs.com/id/0984-update-browser-support-policy">Treat Safari as an Evergreen Browser</a>,
+      at version 6.0.0 of Ember, Safari will be considered evergreen so the minimum supported Safari version will change based on the above formula.
+    </EsNote>
+
+    <p class="mt-3">
+      Other browsers may work with Ember.js, but are not explicitly supported. If you
+      would like to add support for a new browser, please <a href="https://github.com/emberjs/rfcs">submit an RFC or RFC issue for discussion</a>!
+    </p>
+
+    <h2>Browser Support by Major Ember Version</h2>
+
+    <h3>Ember 5.0.0</h3>
+
     <ul class="list-unstyled layout my-3">
       <EsCard class="lg:col-2">
         <div class="text-center text-md">Desktop</div>
@@ -70,11 +88,7 @@
       </EsCard>
     </ul>
 
-    <h2>Ember 4.0.0</h2>
-
-    <p>
-      In Ember 4.0.0, the framework supports the following major browsers:
-    </p>
+    <h3>Ember 4.0.0</h3>
 
     <ul class="list-unstyled layout my-3">
       <EsCard class="lg:col-2">
@@ -103,213 +117,25 @@
       </EsCard>
     </ul>
 
-    <h2>Ember 3.0.0</h2>
+    <h3>Ember 3.0.0</h3>
 
     <p>
-      Ember currently targets Internet Explorer 11 as a baseline for support. This means that generally all modern and relatively recent browsers will work with Ember, since browsers are backwards compatible by design. Ember runs tests against the latest desktop versions of the following browsers:
+      The first Ember major version to be covered by the <a href="https://rfcs.emberjs.com/id/0685-new-browser-support-policy">New Browser Support Policy</a> was 4.0.0. The following browser support numbers are not official and are estimated based on the CI testing matrix for the 3.0 series.
     </p>
 
     <div class="layout my-3">
       <div class="card lg:col-2 lg:start-3">
         <div class="card__content">
           <ul>
-            <li>Google Chrome</li>
-            <li>Mozilla Firefox</li>
-            <li>Microsoft Edge</li>
+            <li>Google Chrome >= 62</li>
+            <li>Mozilla Firefox >= 57</li>
+            <li>Microsoft Edge >= 14</li>
             <li>Internet Explorer 11</li>
-            <li>Safari</li>
+            <li>Safari >= 8</li>
           </ul>
         </div>
       </div>
     </div>
 
-    <p>
-      Other browsers may work with Ember.js, but are not explicitly supported. If you
-      would like to add support for a new browser, please <a href="https://github.com/emberjs/rfcs">submit an RFC or RFC issue for discussion</a>!
-    </p>
-
-
-    <p>
-      We determine support on a browser-by-browser basis. Browsers are categorized as
-      either <em>evergreen</em> or <em>non-evergreen</em>. The categorization is as follows:
-    </p>
-
-    <h2>Ember >=6.0.0</h2>
-
-    <h3 class="text-center">Evergreen</h3>
-
-    <ul class="list-unstyled layout my-3">
-      <EsCard class="lg:col-2">
-        <div class="text-center text-md">Desktop</div>
-        <ul>
-          <li>Google Chrome</li>
-          <li>Mozilla Firefox</li>
-          <li>Microsoft Edge</li>
-        </ul>
-      </EsCard>
-      <EsCard class="lg:col-2">
-        <div class="text-center text-md">Mobile</div>
-        <ul>
-          <li>Google Chrome</li>
-          <li>Mozilla Firefox</li>
-        </ul>
-      </EsCard>
-      <EsCard class="lg:col-2">
-        <div class="text-center text-md">Testing</div>
-        <ul>
-          <li>Google Chrome</li>
-          <li>Mozilla Firefox</li>
-        </ul>
-      </EsCard>
-    </ul>
-
-    <p>
-      For evergreen browsers, the minimum version of the browser that we support can be
-      determined at the time of every minor release, following this formula:
-    </p>
-
-    <div class="layout my-3">
-      <div class="card">
-        <div class="card__content">
-           <p>
-            Whichever browser version is greater/more recent out of the following,
-            given that the owning entity (e.g.: Apple, Google, Mozilla) still supports the version
-          </p>
-
-          <ol>
-            <li>
-              The lowest/least recent version that fulfills any one of these properties:
-              <ul>
-                <li>It is the latest version of the browser.</li>
-                <li>It is the latest LTS/extended support version of the browser (such as Firefox ESR).</li>
-                <li>It has at least <em>0.25%</em> of global marketshare usage across mobile and
-              desktop, based on <a href="https://gs.statcounter.com/">statcounter</a>.</li>
-              </ul>
-            </li>
-            <li>
-              The minimum version supported in the previous release
-            </li>
-          </ol>
-        </div>
-      </div>
-    </div>
-
-    <p>
-      To simplify, the supported version either moves forward or stays the same for
-      each release based on overall usage and LTS/current release versions.
-    </p>
-
-    <p>
-      For non-evergreen browsers, support is locked at a specific major version, and
-      we support all major versions above that version.
-      However, all supported browsers are considered evergreen.
-    </p>
-
-    Within a version of a browser, we only support the most recent patch release.
-
-    <h2>Ember &gt;=4.0.x to &lt;=5.12.x</h2>
-
-    <h3 class="text-center">Evergreen</h3>
-
-    <ul class="list-unstyled layout my-3">
-      <EsCard class="lg:col-2">
-        <div class="text-center text-md">Desktop</div>
-        <ul>
-          <li>Google Chrome</li>
-          <li>Mozilla Firefox</li>
-          <li>Microsoft Edge</li>
-        </ul>
-      </EsCard>
-      <EsCard class="lg:col-2">
-        <div class="text-center text-md">Mobile</div>
-        <ul>
-          <li>Google Chrome</li>
-          <li>Mozilla Firefox</li>
-        </ul>
-      </EsCard>
-      <EsCard class="lg:col-2">
-        <div class="text-center text-md">Testing</div>
-        <ul>
-          <li>Google Chrome</li>
-          <li>Mozilla Firefox</li>
-        </ul>
-      </EsCard>
-    </ul>
-
-    <h3 class="text-center">Non-evergreen</h3>
-
-    <div class="layout">
-      <ul class="list-unstyled layout lg:col-4 lg:start-2 my-3">
-        <EsCard class="lg:col-3">
-          <div class="text-center text-md">Desktop</div>
-          <ul>
-            <li>Safari</li>
-          </ul>
-        </EsCard>
-        <EsCard class="lg:col-3">
-          <div class="text-center text-md">Mobile</div>
-          <ul>
-            <li>Safari</li>
-          </ul>
-        </EsCard>
-      </ul>
-    </div>
-
-    <p>
-      For evergreen browsers, the minimum version of the browser that we support is
-      determined at the time of every minor release, following this formula:
-    </p>
-
-    <div class="layout my-3">
-      <div class="card">
-        <div class="card__content">
-          <p>Whichever browser version is greater/more recent out of:</p>
-
-          <ol>
-            <li>
-              The lowest/least recent version that fulfills any one of these properties:
-              <ul>
-                <li>It is the latest version of the browser.</li>
-                <li>It is the latest LTS/extended support version of the browser (such as Firefox ESR).</li>
-                <li>It has at least <em>0.25%</em> of global marketshare usage across mobile and
-              desktop, based on <a href="https://gs.statcounter.com/">statcounter</a>.</li>
-              </ul>
-            </li>
-            <li>
-              The minimum version supported in the previous release
-            </li>
-          </ol>
-        </div>
-      </div>
-    </div>
-
-    <p>
-      To simplify, the supported version either moves forward or stays the same for
-      each release based on overall usage and LTS/current release versions.
-    </p>
-
-    <p>
-      For non-evergreen browsers, support is locked at a specific major version, and
-      we support all major versions above that version:
-    </p>
-
-    <div class="layout">
-      <ul class="list-unstyled layout lg:col-4 lg:start-2 my-3">
-        <EsCard class="lg:col-3">
-          <div class="text-center text-md">Desktop</div>
-          <ul>
-            <li>Safari: 12</li>
-          </ul>
-        </EsCard>
-        <EsCard class="lg:col-3">
-          <div class="text-center text-md">Mobile</div>
-          <ul>
-            <li>Safari: 12</li>
-          </ul>
-        </EsCard>
-      </ul>
-    </div>
-
-    Within a version of a browser, we only support the most recent patch release.
   </section>
 </div>

From 47afdf108867cf87beb21c7bee7cd8f1fa356fc9 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 8 May 2024 11:45:20 -0400
Subject: [PATCH 6/7] Update browser-support.hbs

---
 app/templates/browser-support.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/browser-support.hbs b/app/templates/browser-support.hbs
index 9d123ce4..c550ef78 100644
--- a/app/templates/browser-support.hbs
+++ b/app/templates/browser-support.hbs
@@ -54,7 +54,7 @@
 
     <p class="mt-3">
       Other browsers may work with Ember.js, but are not explicitly supported. If you
-      would like to add support for a new browser, please <a href="https://github.com/emberjs/rfcs">submit an RFC or RFC issue for discussion</a>!
+      would like to add support for a new browser, please <a href="https://github.com/emberjs/rfcs">submit an RFC for discussion</a>!
     </p>
 
     <h2>Browser Support by Major Ember Version</h2>

From b84f392e8ce84b7018139a76f185a4fdd51af7d4 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 8 May 2024 11:48:11 -0400
Subject: [PATCH 7/7] ranges

---
 app/templates/browser-support.hbs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/templates/browser-support.hbs b/app/templates/browser-support.hbs
index c550ef78..f5b1fe61 100644
--- a/app/templates/browser-support.hbs
+++ b/app/templates/browser-support.hbs
@@ -59,7 +59,7 @@
 
     <h2>Browser Support by Major Ember Version</h2>
 
-    <h3>Ember 5.0.0</h3>
+    <h3>Ember 5.x</h3>
 
     <ul class="list-unstyled layout my-3">
       <EsCard class="lg:col-2">
@@ -88,7 +88,7 @@
       </EsCard>
     </ul>
 
-    <h3>Ember 4.0.0</h3>
+    <h3>Ember 4.x</h3>
 
     <ul class="list-unstyled layout my-3">
       <EsCard class="lg:col-2">
@@ -117,10 +117,10 @@
       </EsCard>
     </ul>
 
-    <h3>Ember 3.0.0</h3>
+    <h3>Ember 3.x</h3>
 
     <p>
-      The first Ember major version to be covered by the <a href="https://rfcs.emberjs.com/id/0685-new-browser-support-policy">New Browser Support Policy</a> was 4.0.0. The following browser support numbers are not official and are estimated based on the CI testing matrix for the 3.0 series.
+      The first Ember major version to be covered by the <a href="https://rfcs.emberjs.com/id/0685-new-browser-support-policy">New Browser Support Policy</a> was 4.0.0. The following browser support numbers are not official and are estimated based on the CI testing matrix for the 3.x series.
     </p>
 
     <div class="layout my-3">