git: 31300fefbc - main - Merge 86faa3d68f73 to archetypes

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Colin Percival <cperciva_at_FreeBSD.org>
Date: Mon, 14 Oct 2024 20:58:28 UTC
The branch main has been updated by cperciva:

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

commit 31300fefbc0f7d4826a3f619e91cd2be7ce085db
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-10-14 20:39:14 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-10-14 20:58:25 +0000

    Merge 86faa3d68f73 to archetypes
    
    Sponsored by:   Amazon
---
 website/archetypes/release/hardware.adoc     | 6 ++++--
 website/archetypes/release/installation.adoc | 4 +++-
 website/archetypes/release/relnotes.adoc     | 3 ++-
 website/archetypes/release/schedule.adoc     | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/website/archetypes/release/hardware.adoc b/website/archetypes/release/hardware.adoc
index 236559d369..d8e607f273 100644
--- a/website/archetypes/release/hardware.adoc
+++ b/website/archetypes/release/hardware.adoc
@@ -3,7 +3,7 @@ title: FreeBSD X.0 Hardware Notes
 sidenav: download
 ---
 
-= FreeBSD X.0 Hardware Notes
+:localRel: X.Y
 :doctype: article
 :toc: macro
 :toclevels: 1
@@ -12,12 +12,14 @@ sidenav: download
 :source-highlighter: rouge
 :experimental:
 
+= FreeBSD {localRel} Hardware Notes
+
 toc::[]
 
 [[intro]]
 == Introduction
 
-This document contains the hardware compatibility notes for FreeBSD X.0.
+This document contains the hardware compatibility notes for FreeBSD {localRel}.
 It lists the hardware platforms supported by FreeBSD, as well as the various types of hardware devices (storage controllers, network interfaces, and so on), along with known working instances of these devices.
 
 [[proc]]
diff --git a/website/archetypes/release/installation.adoc b/website/archetypes/release/installation.adoc
index c89fb58eeb..7a70e342f6 100644
--- a/website/archetypes/release/installation.adoc
+++ b/website/archetypes/release/installation.adoc
@@ -4,6 +4,8 @@ sidenav: download
 ---
 
 :releaseCurrent: X.0-RELEASE
+:releasePrev: X.-1-RELEASE
+:releasePrevLegacy: X-1.Y-RELEASE
 :localRel: X.0
 
 include::shared/en/urls.adoc[]
@@ -40,7 +42,7 @@ For Git use the releng/{localRel} branch which will be where any upcoming Securi
 == Upgrading Using "FreeBSD Update"
 
 The man:freebsd-update[8] utility supports binary upgrades of amd64, arm64, and i386 systems running earlier FreeBSD releases.
-Systems running 11.4-RELEASE or 12.2-RELEASE can upgrade as follows:
+Systems running {releasePrevLegacy} or {releasePrev} can upgrade as follows:
 
 [.screen]
 ----
diff --git a/website/archetypes/release/relnotes.adoc b/website/archetypes/release/relnotes.adoc
index fb4ae6f935..7f79fe8e1d 100644
--- a/website/archetypes/release/relnotes.adoc
+++ b/website/archetypes/release/relnotes.adoc
@@ -3,6 +3,7 @@ title: "FreeBSD X.0-RELEASE Release Notes"
 sidenav: download
 ---
 
+:localRel: X.0
 :releaseCurrent: X.0-RELEASE
 :releaseBranch: X-STABLE
 :releasePrev: X.Y-RELEASE
@@ -174,7 +175,7 @@ This section describes changes that affect networking in FreeBSD.
 
 This section covers general hardware support for physical machines, hypervisors, and virtualization environments, as well as hardware changes and updates that do not otherwise fit in other sections of this document.
 
-Please see link:https://www.freebsd.org/releases/X.0R/hardware[the list of hardware] supported by {releaseCurrent}, as well as link:https://www.freebsd.org/platforms/[the platforms page] for the complete list of supported CPU architectures.
+Please see link:https://www.freebsd.org/releases/{localRel}R/hardware[the list of hardware] supported by {releaseCurrent}, as well as link:https://www.freebsd.org/platforms/[the platforms page] for the complete list of supported CPU architectures.
 
 [[hardware-virtualization]]
 === Virtualization Support
diff --git a/website/archetypes/release/schedule.adoc b/website/archetypes/release/schedule.adoc
index eda8335849..f3922bf554 100644
--- a/website/archetypes/release/schedule.adoc
+++ b/website/archetypes/release/schedule.adoc
@@ -8,6 +8,7 @@ sidenav: download
 :localBranchHead: head
 :localBranchStable: stable/X
 :localBranchReleng: releng/X.0
+:localMailingList: current
 
 include::shared/en/urls.adoc[]
 
@@ -16,7 +17,7 @@ include::shared/en/urls.adoc[]
 This is the release schedule for FreeBSD {localRel}.
 For more information about the release engineering process, please see the link:../../../releng/[Release Engineering] section of the web site.
 
-General discussions about the pending release and known issues should be sent to the public mailto:FreeBSD-current@FreeBSD.org[freebsd-current] mailing list.
+General discussions about the pending release and known issues should be sent to the public mailto:FreeBSD-{localMailingList}@FreeBSD.org[freebsd-{localMailingList}] mailing list.
 
 // link:{handbook}glossary/#mfc-glossary[MFC] requests should be sent to link:mailto:re@FreeBSD.org[re@FreeBSD.org] following the link:https://wiki.freebsd.org/Releng/ChangeRequestGuidelines[Change Request Guidelines].