From 5fb51d470ce843c64517c3ceab9643acfe975c70 Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Mon, 8 Mar 2021 16:12:17 -0800
Subject: [PATCH 1/3] Firefox no longer supports PPC Mac OS X

So remove mention of PPC Mac OS X.
---
 files/en-us/web/http/headers/user-agent/firefox/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/files/en-us/web/http/headers/user-agent/firefox/index.html b/files/en-us/web/http/headers/user-agent/firefox/index.html
index c6ae45fc406ee11..0191ef4006d7ae1 100644
--- a/files/en-us/web/http/headers/user-agent/firefox/index.html
+++ b/files/en-us/web/http/headers/user-agent/firefox/index.html
@@ -105,10 +105,6 @@ <h2 id="Macintosh">Macintosh</h2>
    <td>Mac OS X on x86, x86_64, or aarch64</td>
    <td>Mozilla/5.0 (Macintosh; Intel Mac OS X <em>x.y</em>; rv:10.0) Gecko/20100101 Firefox/10.0</td>
   </tr>
-  <tr>
-   <td>Mac OS X on PowerPC</td>
-   <td>Mozilla/5.0 (Macintosh; PPC Mac OS X <em>x.y</em>; rv:10.0) Gecko/20100101 Firefox/10.0</td>
-  </tr>
  </tbody>
 </table>
 

From df6fd40d652d21980be90e3350aa66cd34b9ea37 Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Mon, 8 Mar 2021 16:20:38 -0800
Subject: [PATCH 2/3] Firefox 87 caps Mac OS X version at 10.15

This change was made in https://bugzilla.mozilla.org/show_bug.cgi?id=1679929 to work around webcompat problems from websites that broke when the User-Agent string reported "Mac OS X 11.0". Safari also caps the reported Mac OS X version at 10.15 and Chrome plans to cap soon, too.
---
 files/en-us/web/http/headers/user-agent/firefox/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/en-us/web/http/headers/user-agent/firefox/index.html b/files/en-us/web/http/headers/user-agent/firefox/index.html
index 0191ef4006d7ae1..0ae48bf0a9217e8 100644
--- a/files/en-us/web/http/headers/user-agent/firefox/index.html
+++ b/files/en-us/web/http/headers/user-agent/firefox/index.html
@@ -91,7 +91,7 @@ <h2 id="Windows">Windows</h2>
 
 <h2 id="Macintosh">Macintosh</h2>
 
-<p>Here, <em>x.y</em> is the version of Mac OS X (for instance, Mac OS X 10.6).</p>
+<p>Here, <em>x.y</em> is the version of Mac OS X (for instance, Mac OS X 10.15). Starting in Firefox 87, Firefox caps the reported Mac OS X version number to 10.15, so macOS 11.0 Big Sur and later will be reported as "10.15" in the User-Agent string.</p>
 
 <table class="standard-table">
  <thead>

From 4c3481af576fc2b254653b2e6ca0c3f79288bc5c Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Sat, 13 Mar 2021 15:01:52 -0800
Subject: [PATCH 3/3] Restore "PPC Mac OS X" User-Agent string example

But note that Firefox no longer officially supports Mac OS X on PowerPC.
---
 files/en-us/web/http/headers/user-agent/firefox/index.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/files/en-us/web/http/headers/user-agent/firefox/index.html b/files/en-us/web/http/headers/user-agent/firefox/index.html
index 0ae48bf0a9217e8..53d7238c5350da8 100644
--- a/files/en-us/web/http/headers/user-agent/firefox/index.html
+++ b/files/en-us/web/http/headers/user-agent/firefox/index.html
@@ -93,6 +93,8 @@ <h2 id="Macintosh">Macintosh</h2>
 
 <p>Here, <em>x.y</em> is the version of Mac OS X (for instance, Mac OS X 10.15). Starting in Firefox 87, Firefox caps the reported Mac OS X version number to 10.15, so macOS 11.0 Big Sur and later will be reported as "10.15" in the User-Agent string.</p>
 
+<p>Note that <a href="https://support.mozilla.org/kb/firefox-no-longer-works-mac-os-10-4-or-powerpc">Firefox no longer officially supports Mac OS X on PowerPC</a>.</p>
+
 <table class="standard-table">
  <thead>
   <tr>
@@ -105,6 +107,10 @@ <h2 id="Macintosh">Macintosh</h2>
    <td>Mac OS X on x86, x86_64, or aarch64</td>
    <td>Mozilla/5.0 (Macintosh; Intel Mac OS X <em>x.y</em>; rv:10.0) Gecko/20100101 Firefox/10.0</td>
   </tr>
+  <tr>
+   <td>Mac OS X on PowerPC</td>
+   <td>Mozilla/5.0 (Macintosh; PPC Mac OS X <em>x.y</em>; rv:10.0) Gecko/20100101 Firefox/10.0</td>
+  </tr>
  </tbody>
 </table>