git: 7e6398e4de - main - 14,1: Release-related website updates

From: Colin Percival <cperciva_at_FreeBSD.org>
Date: Tue, 04 Jun 2024 00:26:03 UTC
The branch main has been updated by cperciva:

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

commit 7e6398e4de55a5db223849ccaa407390c8383f45
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-06-01 19:07:03 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-06-04 00:21:49 +0000

    14,1: Release-related website updates
    
    Everything except the announcement itself
---
 shared/releases.adoc                               | 24 +++++-----
 website/content/en/portmgr/policies_eol.adoc       | 14 +++++-
 website/content/en/releases/14.1R/_index.adoc      |  6 +--
 website/content/en/releases/14.1R/schedule.adoc    |  2 +-
 website/content/en/releases/_index.adoc            |  1 +
 website/content/en/security/_index.adoc            |  3 +-
 website/content/en/where.adoc                      | 54 ++++++++++++++++++++++
 website/data/en/news/news.toml                     |  5 ++
 website/themes/beastie/layouts/index.html          |  1 +
 .../themes/beastie/layouts/partials/sidenav.html   |  1 +
 10 files changed, 93 insertions(+), 18 deletions(-)

diff --git a/shared/releases.adoc b/shared/releases.adoc
index 99d5829909..7c9937ce8d 100644
--- a/shared/releases.adoc
+++ b/shared/releases.adoc
@@ -37,7 +37,7 @@
 
 // Set to 'INCLUDE' when the schedule is available.
 
-:beta-upcoming: INCLUDE
+:beta-upcoming: IGNORE
 
 // Set to 'INCLUDE' when the installation images are available.
 
@@ -83,17 +83,17 @@
 // more (in addition to cleaning up this file) following the 11.3
 // release (likely as part of the 11.3 announcement commit). -gjb
 
-//:rel141-current-major: 14
-//:rel141-current: 14.1
-//:rel141-current-date: June 18, 2024
-//
-//:u-rel141-notes: https://www.FreeBSD.org/releases/{rel141-current}R/relnotes/
-//:u-rel141-announce: https://www.FreeBSD.org/releases/{rel141-current}R/announce/
-//:u-rel141-errata: https://www.FreeBSD.org/releases/{rel141-current}R/errata/
-//:u-rel141-hardware: https://www.FreeBSD.org/releases/{rel141-current}R/hardware/
-//:u-rel141-installation: https://www.FreeBSD.org/releases/{rel141-current}R/installation/
-//:u-rel141-readme: https://www.FreeBSD.org/releases/{rel141-current}R/readme/
-//:u-rel141-signatures: https://www.FreeBSD.org/releases/{rel141-current}R/signatures/
+:rel141-current-major: 14
+:rel141-current: 14.1
+:rel141-current-date: June 4, 2024
+
+:u-rel141-notes: https://www.FreeBSD.org/releases/{rel141-current}R/relnotes/
+:u-rel141-announce: https://www.FreeBSD.org/releases/{rel141-current}R/announce/
+:u-rel141-errata: https://www.FreeBSD.org/releases/{rel141-current}R/errata/
+:u-rel141-hardware: https://www.FreeBSD.org/releases/{rel141-current}R/hardware/
+:u-rel141-installation: https://www.FreeBSD.org/releases/{rel141-current}R/installation/
+:u-rel141-readme: https://www.FreeBSD.org/releases/{rel141-current}R/readme/
+:u-rel141-signatures: https://www.FreeBSD.org/releases/{rel141-current}R/signatures/
 
 :rel140-current-major: 14
 :rel140-current: 14.0
diff --git a/website/content/en/portmgr/policies_eol.adoc b/website/content/en/portmgr/policies_eol.adoc
index a488347214..ea693bf2bc 100644
--- a/website/content/en/portmgr/policies_eol.adoc
+++ b/website/content/en/portmgr/policies_eol.adoc
@@ -62,7 +62,19 @@ The _Estimated EoL (end-of-life)_ column gives the earliest date on which that b
 * FreeBSD:14:powerpc64 (only quarterly is updated)
 * FreeBSD:14:powerpc64le (only quarterly is updated)
 
-|14.1-RELEASE + 3 months
+|September 30, 2024
+
+|releng/14.1 |14.1-RELEASE |releng/14.1 a|
+* FreeBSD:14:aarch64
+* FreeBSD:14:amd64
+* FreeBSD:14:armv6
+* FreeBSD:14:armv7
+* FreeBSD:14:i386
+* FreeBSD:14:powerpc (only quarterly is updated)
+* FreeBSD:14:powerpc64 (only quarterly is updated)
+* FreeBSD:14:powerpc64le (only quarterly is updated)
+
+|14.2-RELEASE + 3 months
 |main |n/a |main a|
 * FreeBSD:15:aarch64
 * FreeBSD:15:amd64
diff --git a/website/content/en/releases/14.1R/_index.adoc b/website/content/en/releases/14.1R/_index.adoc
index ab8e9df125..a5105ae668 100644
--- a/website/content/en/releases/14.1R/_index.adoc
+++ b/website/content/en/releases/14.1R/_index.adoc
@@ -20,9 +20,9 @@ More detailed information, such as release notes and hardware notes,
 can be found at these pages:
 
 link:signatures[FreeBSD {localRel}-RELEASE signed checksum files] +
-//link:installation[FreeBSD {localRel}-RELEASE installation information] +
+link:installation[FreeBSD {localRel}-RELEASE installation information] +
 link:hardware[FreeBSD {localRel}-RELEASE hardware information] +
 link:relnotes[FreeBSD {localRel}-RELEASE release notes] +
-//link:errata[FreeBSD {localRel}-RELEASE errata] +
-//link:readme[FreeBSD {localRel}-RELEASE readme] +
+link:errata[FreeBSD {localRel}-RELEASE errata] +
+link:readme[FreeBSD {localRel}-RELEASE readme] +
 link:schedule[FreeBSD {localRel}-RELEASE schedule]
diff --git a/website/content/en/releases/14.1R/schedule.adoc b/website/content/en/releases/14.1R/schedule.adoc
index a81dde6b8b..646a368d6d 100644
--- a/website/content/en/releases/14.1R/schedule.adoc
+++ b/website/content/en/releases/14.1R/schedule.adoc
@@ -39,7 +39,7 @@ General discussions about the pending release and known issues should be sent to
 |BETA3 builds begin |17 May 2024 |17 May 2024 |Third beta test snapshot.
 |RC1 builds begin |24 May 2024 |25 May 2024 |Release candidate.
 |RELEASE builds begin |31 May 2024 |31 May 2024 |{localRel}-RELEASE builds begin.
-|RELEASE announcement |4 June 2024 |- |{localRel}-RELEASE press release.
+|RELEASE announcement |4 June 2024 |4 June 2024 |{localRel}-RELEASE press release.
 |Turn over to the secteam |- |- |{localBranchReleng} branch is handed over to the FreeBSD Security Officer Team in one or two weeks after the announcement.
 |===
 ////
diff --git a/website/content/en/releases/_index.adoc b/website/content/en/releases/_index.adoc
index 9424b17bc7..f0f6185d72 100644
--- a/website/content/en/releases/_index.adoc
+++ b/website/content/en/releases/_index.adoc
@@ -36,6 +36,7 @@ Production:
 * *Release {rel132-current}* ({rel132-current-date}) _link:{u-rel132-announce}[Announcement] : link:{u-rel132-notes}[Release Notes] : link:{u-rel132-installation}[Installation Instructions] : link:{u-rel132-hardware}[Hardware Compatibility List] : link:{u-rel132-readme}[Readme] : link:{u-rel132-errata}[Errata] : link:{u-rel132-signatures}[Signed Checksums]_
 * *Release {rel133-current}* ({rel133-current-date}) _link:{u-rel133-announce}[Announcement] : link:{u-rel133-notes}[Release Notes] : link:{u-rel133-installation}[Installation Instructions] : link:{u-rel133-hardware}[Hardware Compatibility List] : link:{u-rel133-readme}[Readme] : link:{u-rel133-errata}[Errata] : link:{u-rel133-signatures}[Signed Checksums]_
 * *Release {rel140-current}* ({rel140-current-date}) _link:{u-rel140-announce}[Announcement] : link:{u-rel140-notes}[Release Notes] : link:{u-rel140-installation}[Installation Instructions] : link:{u-rel140-hardware}[Hardware Compatibility List] : link:{u-rel140-readme}[Readme] : link:{u-rel140-errata}[Errata] : link:{u-rel140-signatures}[Signed Checksums]_
+* *Release {rel141-current}* ({rel141-current-date}) _link:{u-rel141-announce}[Announcement] : link:{u-rel141-notes}[Release Notes] : link:{u-rel141-installation}[Installation Instructions] : link:{u-rel141-hardware}[Hardware Compatibility List] : link:{u-rel141-readme}[Readme] : link:{u-rel141-errata}[Errata] : link:{u-rel141-signatures}[Signed Checksums]_
 
 ////
 === Legacy
diff --git a/website/content/en/security/_index.adoc b/website/content/en/security/_index.adoc
index ee5c2debb1..2e3a296c70 100644
--- a/website/content/en/security/_index.adoc
+++ b/website/content/en/security/_index.adoc
@@ -104,7 +104,8 @@ link:unsupported[Older releases] are not supported and users are strongly encour
 |===
 |Branch |Release |Release Date |Expected EoL
 |stable/14 |n/a |n/a |November 30, 2028
-|releng/14.0 |14.0-RELEASE |November 20, 2023 |14.1-RELEASE + 3 months
+|releng/14.1 |14.1-RELEASE |June 4, 2024 |14.2-RELEASE + 3 months
+|releng/14.0 |14.0-RELEASE |November 20, 2023 |September 30, 2024
 |stable/13 |n/a |n/a |April 30, 2026
 |releng/13.3 |13.3-RELEASE |March 5, 2024 |13.4-RELEASE + 3 months
 |releng/13.2 |13.2-RELEASE |April 11, 2023 |June 30, 2024
diff --git a/website/content/en/where.adoc b/website/content/en/where.adoc
index 78e998730f..e4f26f5df1 100644
--- a/website/content/en/where.adoc
+++ b/website/content/en/where.adoc
@@ -39,6 +39,60 @@ For embedded platforms: SD card images are available.
 
 `RELEASE` versions of FreeBSD are the end result of _release engineering_.
 
+[[download-rel141]]
+=== FreeBSD {rel141-current}-RELEASE
+
+[.tblbasic]
+[.tblDownload]
+[width="100%",cols="25%,25%,25%,25%",options="header",]
+|===
+|Installer |VM |SD Card |Documentation
+a|
+* link:{url-rel}/amd64/amd64/ISO-IMAGES/{rel141-current}/[amd64]
+* link:{url-rel}/i386/i386/ISO-IMAGES/{rel141-current}/[i386]
+* link:{url-rel}/powerpc/powerpc/ISO-IMAGES/{rel141-current}/[powerpc]
+* link:{url-rel}/powerpc/powerpc64/ISO-IMAGES/{rel141-current}/[powerpc64]
+* link:{url-rel}/powerpc/powerpc64le/ISO-IMAGES/{rel141-current}/[powerpc64le]
+* link:{url-rel}/powerpc/powerpcspe/ISO-IMAGES/{rel141-current}/[powerpcspe]
+* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel141-current}/[armv7]
+* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel141-current}/[aarch64]
+* link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel141-current}/[riscv64]
+
+a|
+* link:{url-rel}/VM-IMAGES/README.txt[README]
+* link:{url-rel}/VM-IMAGES/{rel141-current}-RELEASE/amd64/Latest/[amd64]
+* link:{url-rel}/VM-IMAGES/{rel141-current}-RELEASE/i386/Latest/[i386]
+* link:{url-rel}/VM-IMAGES/{rel141-current}-RELEASE/aarch64/Latest/[aarch64]
+* link:{url-rel}/VM-IMAGES/{rel141-current}-RELEASE/riscv64/Latest/[riscv64]
+* link:{url-rel}/CI-IMAGES/{rel141-current}-RELEASE/amd64/Latest/[amd64] (BASIC-CI)
+
+a|
+* aarch64
+* {blank}
+** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel141-current}/[PINE64]
+** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel141-current}/[PINE64-LTS]
+** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel141-current}/[ROCK64]
+** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel141-current}/[ROCKPRO64]
+** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel141-current}/[RPI] (3/4)
+* armv7
+* {blank}
+** link:{url-rel}/arm/armv7/ISO-IMAGES/{rel141-current}/[GENERICSD]
+* riscv64
+* {blank}
+** link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel141-current}/[GENERICSD]
+
+a|
+* {blank}
+* link:../releases/#current[Released]: {rel141-current-date}
+* link:{u-rel141-notes}[Release Notes]
+* link:{u-rel141-readme}[Readme]
+* link:{u-rel141-hardware}[Hardware Compatibility List]
+* link:{u-rel141-installation}[Installation Instructions]
+* link:{u-rel141-errata}[Errata]
+* link:{u-rel141-signatures}[Signed Checksums]
+
+|===
+
 [[download-rel140]]
 === FreeBSD {rel140-current}-RELEASE
 
diff --git a/website/data/en/news/news.toml b/website/data/en/news/news.toml
index ac1d4a8b87..72c719b63d 100644
--- a/website/data/en/news/news.toml
+++ b/website/data/en/news/news.toml
@@ -1,5 +1,10 @@
 # Sort news by year, month and day
 
+[[news]]
+date = "2024-06-04"
+title = "FreeBSD 14.1-RELEASE Available"
+description = "<a href=\"https://www.FreeBSD.org/releases/14.1R/announce/\">FreeBSD 14.1-RELEASE</a> is now available. Please be sure to check the <a href=\"https://www.FreeBSD.org/releases/14.1R/relnotes/\">Release Notes</a> and <a href=\"https://www.FreeBSD.org/releases/14.1R/errata/\">Release Errata</a> before installation for any late-breaking news and/or issues with 14.1. More information about FreeBSD releases can be found on the <a href=\"https://www.FreeBSD.org/releases/\">Release Information</a> page."
+
 [[news]]
 date= "2024-05-03"
 title = "January-March 2024 Status Report"
diff --git a/website/themes/beastie/layouts/index.html b/website/themes/beastie/layouts/index.html
index 14ac145a6c..99dad24747 100755
--- a/website/themes/beastie/layouts/index.html
+++ b/website/themes/beastie/layouts/index.html
@@ -51,6 +51,7 @@
                 <a href={{ index $.Site.Data.releases "u-rel132-announce" }}>{{ index $.Site.Data.releases "rel132-current" }}</a>,
                 <a href={{ index $.Site.Data.releases "u-rel133-announce" }}>{{ index $.Site.Data.releases "rel133-current" }}</a>,
                 <a href={{ index $.Site.Data.releases "u-rel140-announce" }}>{{ index $.Site.Data.releases "rel140-current" }}</a>
+                <a href={{ index $.Site.Data.releases "u-rel141-announce" }}>{{ index $.Site.Data.releases "rel141-current" }}</a>
               </li>
             <!--
               <li>
diff --git a/website/themes/beastie/layouts/partials/sidenav.html b/website/themes/beastie/layouts/partials/sidenav.html
index 15722a8485..177a7c968d 100644
--- a/website/themes/beastie/layouts/partials/sidenav.html
+++ b/website/themes/beastie/layouts/partials/sidenav.html
@@ -59,6 +59,7 @@
       <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel132-announce" }}>{{ index .data.releases "rel132-current" }}</a></li>
       <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel133-announce" }}>{{ index .data.releases "rel133-current" }}</a></li>
       <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel140-announce" }}>{{ index .data.releases "rel140-current" }}</a></li>
+      <li>{{ i18n "productionRelease" }}: <br /><a href={{ index .data.releases "u-rel141-announce" }}>{{ index .data.releases "rel141-current" }}</a></li>
     </ul>
   </li>
   <li>