diff --git a/shared/releases.adoc b/shared/releases.adoc --- a/shared/releases.adoc +++ b/shared/releases.adoc @@ -28,49 +28,29 @@ :beta2-local-where: IGNORE :beta3-local-where: IGNORE -:rel-head-major: 14 -:rel-head: {rel-head-major}.0 - -// If there is no release currently in the release cycle (i.e. we -// don't have something in BETAn or RCn), then change %beta.testing -// below to "IGNORE". If we do, use "INCLUDE". - -// Set to 'INCLUDE' when the schedule is available. - -:beta-upcoming: IGNORE - -// Set to 'INCLUDE' when the installation images are available. - +// Set :beta-upcoming: to 'INCLUDE' when the schedule is available. +:beta-upcoming: INCLUDE +// Set :beta-testing: to 'INCLUDE' when installation images are available. :beta-testing: IGNORE -:betarel-current-major: 12 -:betarel-current: 12.4 +:betarel-current: 13.2 :betarel-vers: RELEASE :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 -// are having release candidates at the same time), do the same here. - -// Set to 'INCLUDE' when the schedule is available. - +// If two releases will be scheduled, then have a section for +// beta2-⋯, betarel2-⋯, and u-betarel2-⋯ +// +// Set :beta2-upcoming: to 'INCLUDE' when the schedule is available. :beta2-upcoming: INCLUDE - -// Set to 'INCLUDE' when the installation images are available. - +// Set :beta2-testing: to 'INCLUDE' when installation images are available. :beta2-testing: IGNORE -:betarel2-current: 13.2 +:betarel2-current: 14.0 :betarel2-vers: RELEASE :u-betarel2-schedule: https://www.FreeBSD.org/releases/{betarel2-current}R/schedule/ -// Set to 'INCLUDE' when the schedule is available. - -:beta3-upcoming: INCLUDE - -// Set to 'INCLUDE' when the installation images are available. - -:beta3-testing: IGNORE -:betarel3-current: 14.0 -:betarel3-vers: RELEASE -:u-betarel3-schedule: https://www.FreeBSD.org/releases/{betarel3-current}R/schedule/ +// If three releases will be scheduled, then have a section for +// beta3-⋯, betarel3-⋯, and u-betarel3-⋯ +// +// … // Release-specific macros to help keep other macros such as // rel.current up-to-date without needing to do an entire tree @@ -83,6 +63,9 @@ // more (in addition to cleaning up this file) following the 11.3 // release (likely as part of the 11.3 announcement commit). -gjb +:rel-head-major: 14 +:rel-head: {rel-head-major}.0 + :rel131-current-major: 13 :rel131-current: 13.1 :rel131-current-date: May 16, 2022 diff --git a/website/content/en/releases/12.4R/_index.adoc b/website/content/en/releases/12.4R/_index.adoc --- a/website/content/en/releases/12.4R/_index.adoc +++ b/website/content/en/releases/12.4R/_index.adoc @@ -18,10 +18,10 @@ 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:hardware/[FreeBSD {localRel}-RELEASE hardware 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:readme/[FreeBSD {localRel}-RELEASE readme] + link:schedule/[FreeBSD {localRel}-RELEASE schedule] + //link:todo/[FreeBSD Release Engineering TODO Page] + diff --git a/website/themes/beastie/layouts/partials/sidenav.html b/website/themes/beastie/layouts/partials/sidenav.html --- a/website/themes/beastie/layouts/partials/sidenav.html +++ b/website/themes/beastie/layouts/partials/sidenav.html @@ -62,6 +62,7 @@ {{ i18n "releases" }} @@ -70,7 +71,6 @@
  • {{ i18n "portedApplications" }}