git: 56efb8b4b0 - main - 13.1: enable download URLs and comment 13.x snapshot URLs

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Glen Barber <gjb_at_FreeBSD.org>
Date: Fri, 11 Mar 2022 02:08:58 UTC
The branch main has been updated by gjb:

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

commit 56efb8b4b098f0f2165c31969181828fc8b0b822
Author:     Glen Barber <gjb@FreeBSD.org>
AuthorDate: 2022-03-11 02:08:46 +0000
Commit:     Glen Barber <gjb@FreeBSD.org>
CommitDate: 2022-03-11 02:08:46 +0000

    13.1: enable download URLs and comment 13.x snapshot URLs
    
    Approved by:    re (implicit)
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 shared/releases.adoc          |  6 ++--
 website/content/en/where.adoc | 68 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/shared/releases.adoc b/shared/releases.adoc
index 78675a5e6b..5525796d89 100644
--- a/shared/releases.adoc
+++ b/shared/releases.adoc
@@ -40,10 +40,10 @@
 
 // Set to 'INCLUDE' when the installation images are available.
 
-:beta-testing: IGNORE
+:beta-testing: INCLUDE
 :betarel-current-major: 13
 :betarel-current: 13.1
-:betarel-vers: RELEASE
+:betarel-vers: BETA1
 :u-betarel-schedule: https://www.FreeBSD.org/releases/{betarel-current}R/schedule/
 
 // If we have a second release in the release cycle (e.g. 5.x and 6.y
@@ -76,7 +76,7 @@
 :rel131-current: 13.1
 //:rel131-current-date: April 13, 2021
 
-//:u-rel131-notes: https://www.FreeBSD.org/releases/{rel131-current}R/relnotes/
+:u-rel131-notes: https://www.FreeBSD.org/releases/{rel131-current}R/relnotes/
 //:u-rel131-announce: https://www.FreeBSD.org/releases/{rel131-current}R/announce/
 //:u-rel131-errata: https://www.FreeBSD.org/releases/{rel131-current}R/errata/
 //:u-rel131-hardware: https://www.FreeBSD.org/releases/{rel131-current}R/hardware/
diff --git a/website/content/en/where.adoc b/website/content/en/where.adoc
index 5da109e5e6..2eceffc04d 100644
--- a/website/content/en/where.adoc
+++ b/website/content/en/where.adoc
@@ -182,8 +182,64 @@ a|
 
 |===
 
-//[[helptest]]
-//== Help Test
+[[helptest]]
+== Help Test
+
+If you are interested in testing the next upcoming release, please visit the link:../where/[FreeBSD download page].
+
+[[download-rel131]]
+== FreeBSD {rel131-current}-BETA1
+[.tblbasic]
+[.tblDownload]
+[width="100%",cols="25%,25%,25%,25%",options="header",]
+|===
+|Installer Images |Virtual Machine Images |SD Card Images |Documentation
+a|
+* link:{url-rel}/amd64/amd64/ISO-IMAGES/{rel131-current}/[amd64]
+* link:{url-rel}/i386/i386/ISO-IMAGES/{rel131-current}/[i386]
+* link:{url-rel}/powerpc/powerpc/ISO-IMAGES/{rel131-current}/[powerpc]
+* link:{url-rel}/powerpc/powerpc64/ISO-IMAGES/{rel131-current}/[powerpc64]
+* link:{url-rel}/powerpc/powerpc64le/ISO-IMAGES/{rel131-current}/[powerpc64le]
+* link:{url-rel}/powerpc/powerpcspe/ISO-IMAGES/{rel131-current}/[powerpcspe]
+* link:{url-rel}/arm/armv6/ISO-IMAGES/{rel131-current}/[armv6]
+* link:{url-rel}/arm/armv7/ISO-IMAGES/{rel131-current}/[armv7]
+//* link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel131-current}/[aarch64]
+* link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel131-current}/[riscv64]
+
+a|
+* link:{url-rel}/VM-IMAGES/README.txt[README]
+* link:{url-rel}/VM-IMAGES/{rel131-current}-BETA1/amd64/Latest/[amd64]
+* link:{url-rel}/VM-IMAGES/{rel131-current}-BETA1/i386/Latest/[i386]
+//* link:{url-rel}/VM-IMAGES/{rel131-current}-BETA1/aarch64/Latest/[aarch64]
+* link:{url-rel}/VM-IMAGES/{rel131-current}-BETA1/riscv64/Latest/[riscv64]
+* link:{url-rel}/CI-IMAGES/{rel131-current}-BETA1/amd64/Latest/[amd64]
+
+a|
+* aarch64
+* {blank}
+** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel131-current}/[PINE64]
+** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel131-current}/[PINE64-LTS]
+** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel131-current}/[ROCK64]
+** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel131-current}/[ROCKPRO64]
+** link:{url-rel}/arm64/aarch64/ISO-IMAGES/{rel131-current}/[RPI] (3/4)
+* armv6/armv7
+* {blank}
+** link:{url-rel}/arm/armv7/ISO-IMAGES/{rel131-current}/[GENERICSD]
+** link:{url-rel}/arm/armv6/ISO-IMAGES/{rel131-current}/[RPI-B]
+* riscv64
+* {blank}
+** link:{url-rel}/riscv/riscv64/ISO-IMAGES/{rel131-current}/[GENERICSD]
+
+a|
+//* link:../releases/#current[Released]: {rel131-current-date}
+* link:{u-rel131-notes}[Release Notes]
+//* link:{u-rel131-readme}[Readme]
+//* link:{u-rel131-hardware}[Hardware Compatibility List]
+//* link:{u-rel131-installation}[Installation Instructions]
+//* link:{u-rel131-errata}[Errata]
+//* link:{u-rel131-signatures}[Signed Checksums]
+
+|===
 
 [[download-snapshots]]
 == Development Snapshots
@@ -196,11 +252,13 @@ Installer and SD card images are available for link:{url-snapshot}/amd64/amd64/I
 
 VM images are available for link:{url-snapshot}/VM-IMAGES/{rel-head}-CURRENT/amd64/Latest/[amd64], link:{url-snapshot}/VM-IMAGES/{rel-head}-CURRENT/i386/Latest/[i386], link:{url-snapshot}/VM-IMAGES/{rel-head}-CURRENT/aarch64/Latest/[aarch64], and link:{url-snapshot}/VM-IMAGES/{rel-head}-CURRENT/riscv64/Latest/[riscv64].
 
-== FreeBSD {rel130-current}-STABLE
+////
+== FreeBSD {rel131-current}-STABLE
 
-Installer and SD card images are available for link:{url-snapshot}/amd64/amd64/ISO-IMAGES/{rel130-current}/[amd64], link:{url-snapshot}/i386/i386/ISO-IMAGES/{rel130-current}/[i386], link:{url-snapshot}/powerpc/powerpc/ISO-IMAGES/{rel130-current}/[powerpc], link:{url-snapshot}/powerpc/powerpc64/ISO-IMAGES/{rel130-current}/[powerpc64], link:{url-snapshot}/powerpc/powerpc64le/ISO-IMAGES/{rel130-current}/[powerpc64le], link:{url-snapshot}/powerpc/powerpcspe/ISO-IMAGES/{rel130-current}/[powerpcspe], link:{url-snapshot}/arm/armv6/ISO-IMAGES/{rel130-current}/[armv6], link:{url-snapshot}/arm/armv7/ISO-IMAGES/{rel130-current}/[armv7], link:{url-snapshot}/arm64/aarch64/ISO-IMAGES/{rel130-current}/[aarch64], and link:{url-snapshot}/riscv/riscv64/ISO-IMAGES/{rel130-current}/[riscv64].
+Installer and SD card images are available for link:{url-snapshot}/amd64/amd64/ISO-IMAGES/{rel131-current}/[amd64], link:{url-snapshot}/i386/i386/ISO-IMAGES/{rel131-current}/[i386], link:{url-snapshot}/powerpc/powerpc/ISO-IMAGES/{rel131-current}/[powerpc], link:{url-snapshot}/powerpc/powerpc64/ISO-IMAGES/{rel131-current}/[powerpc64], link:{url-snapshot}/powerpc/powerpc64le/ISO-IMAGES/{rel131-current}/[powerpc64le], link:{url-snapshot}/powerpc/powerpcspe/ISO-IMAGES/{rel131-current}/[powerpcspe], link:{url-snapshot}/arm/armv6/ISO-IMAGES/{rel131-current}/[armv6], link:{url-snapshot}/arm/armv7/ISO-IMAGES/{rel131-current}/[armv7], link:{url-snapshot}/arm64/aarch64/ISO-IMAGES/{rel131-current}/[aarch64], and link:{url-snapshot}/riscv/riscv64/ISO-IMAGES/{rel131-current}/[riscv64].
 
-VM images are available for link:{url-snapshot}/VM-IMAGES/{rel130-current}-STABLE/amd64/Latest/[amd64], link:{url-snapshot}/VM-IMAGES/{rel130-current}-STABLE/i386/Latest/[i386], link:{url-snapshot}/VM-IMAGES/{rel130-current}-STABLE/aarch64/Latest/[aarch64], and link:{url-snapshot}/VM-IMAGES/{rel130-current}-STABLE/riscv64/Latest/[riscv64].
+VM images are available for link:{url-snapshot}/VM-IMAGES/{rel131-current}-STABLE/amd64/Latest/[amd64], link:{url-snapshot}/VM-IMAGES/{rel131-current}-STABLE/i386/Latest/[i386], link:{url-snapshot}/VM-IMAGES/{rel131-current}-STABLE/aarch64/Latest/[aarch64], and link:{url-snapshot}/VM-IMAGES/{rel131-current}-STABLE/riscv64/Latest/[riscv64].
+////
 
 == FreeBSD {rel123-current}-STABLE