git: b33831bdd6 - main - Adjust the 32-bit deprecation to keep armv7 around for 15.x.

The branch main has been updated by jhb:

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

commit b33831bdd69f17cbeda2797457997f5ace418020
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-11-13 19:12:43 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-11-13 19:12:43 +0000

    Adjust the 32-bit deprecation to keep armv7 around for 15.x.
    
    Reviewed by:    karels, emaste
    Differential Revision:  https://reviews.freebsd.org/D42508
---
 website/content/en/releases/14.0R/relnotes.adoc | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/website/content/en/releases/14.0R/relnotes.adoc b/website/content/en/releases/14.0R/relnotes.adoc
index 534f45fa7f..7d4a2b2569 100644
--- a/website/content/en/releases/14.0R/relnotes.adoc
+++ b/website/content/en/releases/14.0R/relnotes.adoc
@@ -933,21 +933,28 @@ This section covers changes to the FreeBSD Ports Collection, package infrastruct
 [[future-releases]]
 == General Notes Regarding Future FreeBSD Releases
 
-FreeBSD 15.0 is not expected to include support for 32-bit platforms.
-However, 64-bit systems will still be able to run older 32-bit binaries.
+FreeBSD 15.0 is not expected to include support for 32-bit platforms other than armv7.
+The armv6, i386, and powerpc platforms are deprecated and will be removed.
+64-bit systems will still be able to run older 32-bit binaries.
+
+We expect to support armv7 as a Tier 2 architecture in FreeBSD 15.0 and stable/15.
+However, we also anticipate that armv7 may be removed in FreeBSD 16.0.
+We will provide an update on the status of armv7 for both 15.x and 16.x at the time of 15.0 release.
 
 Support for executing 32-bit binaries on 64-bit platforms via the `COMPAT_FREEBSD32` option will continue for at least the stable/15 and stable/16 branches.
 Support for compiling individual 32-bit applications via `cc -m32` will also continue for at least the stable/15 branch, which includes suitable headers in [.filename]#/usr/include# and libraries in [.filename]#/usr/lib32#.
 
-Support for 32-bit platforms in ports for FreeBSD 15.0 and later releases is also deprecated, and these future releases may not include binary packages for 32-bit platforms or support for building 32-bit applications from ports.
+Ports will not include support for deprecated 32-bit platforms for FreeBSD 15.0 and later releases.
+These future releases will not include binary packages or support for building packages from ports for deprecated 32-bit platforms.
 
 The FreeBSD stable/14 and earlier branches will retain existing 32-bit kernel and world support.
 Ports will retain existing support for building ports and packages for 32-bit systems on stable/14 and earlier branches as long as those branches are supported by the ports system.
 However, all 32-bit platforms are Tier-2 or Tier-3, and support for individual ports should be expected to degrade as upstreams deprecate 32-bit platforms.
 
 With the current support schedule, stable/14 will reach end of life (EOL) 5 years after the release of FreeBSD {releaseCurrent}.
-The EOL of stable/14 would mark the end of support for 32-bit platforms, including source releases, pre-built packages, and support for building applications from ports.
-Given an estimated release date of November 2023 for {releaseCurrent}, support for 32-bit platforms would end in November 2028.
+The EOL of stable/14 will mark the end of support for deprecated 32-bit platforms, including source releases, pre-built packages, and support for building applications from ports.
+With the release of {releaseCurrent} in November 2023, support for deprecated 32-bit platforms will end in November 2028.
 
-The project may choose to alter this approach when FreeBSD 15.0 is released by extending some level of 32-bit support for one or more platforms in 15.0 or later.
+The project may choose to alter this approach when FreeBSD 15.0 is released by extending some level of support for one or more of the deprecated platforms in 15.0 or later.
+Any alterations will be driven by community feedback and committed efforts to support these platforms.
 Use FreeBSD {releaseCurrent} and following releases, or the stable/14 branch, to migrate off 32-bit platforms.