git: 456ad6e585 - main - SA/EN templates: drop freebsd-update i386 support for 14.x+

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/doc/commit/?id=456ad6e585422111a3a9f4f93bacfb10b0ab02fa

commit 456ad6e585422111a3a9f4f93bacfb10b0ab02fa
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-11-08 15:52:07 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-11-08 17:59:40 +0000

    SA/EN templates: drop freebsd-update i386 support for 14.x+
    
    In 2021 we announced[1] that i386 was demoted to Tier 2 status for
    FreeBSD 13.x.  We stated that i386 would receive support beyond what is
    specified by Tier 2 status and would receive binary updates for 13.x, as
    an exception to the standard Tier policy.
    
    We also stated that "i386 will receive reduced support inline with
    existing Tier 2 platforms for 14.x".  So, now document that binary
    updates for i386 apply to 13.x and lower.
    
    There is a small nit here, in that we don't officially support arm64 on
    FreeBSD 12 in freebsd-update but have removed that caveat in this change.
    
    My original proposed text was
    
        Systems running a RELEASE version of FreeBSD on the amd64, (on
        FreeBSD 13 and earlier) i386, or (on FreeBSD 13 and later) arm64
        platforms can be updated ...
    
    gordon@ pointed out that this text is rather awkward.
    
    We did actually build 12.4 arm64 updates in the last set of SA/ENs, and
    the branch is EOL at the end of the year anyway.  So, overlook the
    12.x/arm64 quirk and document just the i386 exception.
    
    [1] https://lists.freebsd.org/pipermail/freebsd-announce/2021-January/002006.html
    
    Reviewed by:    delphij
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D42506
---
 website/static/security/advisory-template.txt | 6 +++---
 website/static/security/errata-template.txt   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/website/static/security/advisory-template.txt b/website/static/security/advisory-template.txt
index c28521f6e1..82f02e64a1 100644
--- a/website/static/security/advisory-template.txt
+++ b/website/static/security/advisory-template.txt
@@ -57,9 +57,9 @@ Perform one of the following:
 
 1) To update your vulnerable system via a binary patch:
 
-Systems running a RELEASE version of FreeBSD on the amd64, i386, or
-(on FreeBSD 13 and later) arm64 platforms can be updated via the
-freebsd-update(8) utility:
+Systems running a RELEASE version of FreeBSD on the amd64 or arm64 platforms,
+or the i386 platfrom on FreeBSD 13 and earlier, can be updated via
+the freebsd-update(8) utility:
 
 # freebsd-update fetch
 # freebsd-update install
diff --git a/website/static/security/errata-template.txt b/website/static/security/errata-template.txt
index a93976fe03..ec0715e428 100644
--- a/website/static/security/errata-template.txt
+++ b/website/static/security/errata-template.txt
@@ -57,9 +57,9 @@ Perform one of the following:
 
 1) To update your system via a binary patch:
 
-Systems running a RELEASE version of FreeBSD on the amd64, i386, or
-(on FreeBSD 13 and later) arm64 platforms can be updated via the
-freebsd-update(8) utility:
+Systems running a RELEASE version of FreeBSD on the amd64 or arm64 platforms,
+or the i386 platfrom on FreeBSD 13 and earlier, can be updated via
+the freebsd-update(8) utility:
 
 # freebsd-update fetch
 # freebsd-update install