git: b1fcdc9515 - main - home, sidebars, /releases/: updates, corrections
Graham Perrin <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by grahamperrin: URL: https://cgit.FreeBSD.org/doc/commit/?id=b1fcdc951599e9baf7e71e59c8dcee3b5c10d3d6 commit b1fcdc951599e9baf7e71e59c8dcee3b5c10d3d6 Author: Graham Perrin <[email protected]> AuthorDate: 2022-09-10 21:55:40 +0000 Commit: Graham Perrin <[email protected]> CommitDate: 2022-09-10 21:55:40 +0000 home, sidebars, /releases/: updates, corrections 13.0 is end of life, 14.0-RELEASE is scheduled. <https://www.freebsd.org/releases/>: * whilst the legacy section is commented out, it makes no sense to distinguish between production and legacy * do not misdirect readers to the Release Documentation page, which directs readers back to this page * <https://www.freebsd.org/security/unsupported/> is not a section, it's a separate page. PR: 266094, 266167 Reviewed by: carlavilla, gjb (mentors) Approved by: carlavilla (mentor) Differential revision: https://reviews.freebsd.org/D36520 --- shared/releases.adoc | 13 +++++++++- website/content/en/releases/_index.adoc | 40 ++++++++++++++++++------------- website/themes/beastie/layouts/index.html | 12 +++++++--- 3 files changed, 44 insertions(+), 21 deletions(-) diff --git a/shared/releases.adoc b/shared/releases.adoc index 332f6d507e..1ce96e3cf2 100644 --- a/shared/releases.adoc +++ b/shared/releases.adoc @@ -26,6 +26,7 @@ // Do not set this to 'INCLUDE' in this file. :beta-local-where: IGNORE :beta2-local-where: IGNORE +:beta3-local-where: IGNORE :rel-head-major: 14 :rel-head: {rel-head-major}.0 @@ -53,7 +54,6 @@ :beta2-upcoming: INCLUDE - // Set to 'INCLUDE' when the installation images are available. :beta2-testing: IGNORE @@ -61,6 +61,17 @@ :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/ + // Release-specific macros to help keep other macros such as // rel.current up-to-date without needing to do an entire tree // sweep. This allows switching rel.current, rel1.current, and diff --git a/website/content/en/releases/_index.adoc b/website/content/en/releases/_index.adoc index bed668cc73..6f4580ced2 100644 --- a/website/content/en/releases/_index.adoc +++ b/website/content/en/releases/_index.adoc @@ -10,45 +10,51 @@ include::shared/en/urls.adoc[] [.right] image:../gifs/releases.jpg[FreeBSD Releases,width=300,height=200] +//// +// <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266094#c2> FreeBSD releases are classified into _Production Releases_ and _Legacy Releases_. Production releases are best suited to users looking for the latest new features. Legacy releases are for users wishing to stay with a more conservative upgrade strategy. +//// +//// +// <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266094#c2> -Documentation files for each release are available for viewing in HTML format on the link:../relnotes/[Release Documentation] page. - +Documentation files for each release are at link:../relnotes/[Release Documentation]. +//// [[supported-releases]] -== Currently Supported Releases +== Currently Supported -Complete information about the release date and the estimated End-Of-Life (EOL) for currently supported releases can be found on the link:../security/#sup[Supported Releases] section of the link:../security/[FreeBSD Security Information] page. +For information about branches, release dates, and estimated end-of-life (EOL) dates, please see the link:../security/#sup[Supported Releases] section of link:../security/[FreeBSD Security Information]. [[current]] -== Most Recent Releases +== Most Recent -=== Production Release - -*Release {rel131-current}* ({rel131-current-date}) _link:{u-rel131-announce}[Announcement] : link:{u-rel131-notes}[Release Notes] : link:{u-rel131-installation}[Installation Instructions] : link:{u-rel131-hardware}[Hardware Compatibility List] : link:{u-rel131-readme}[Readme] : link:{u-rel131-errata}[Errata] : link:{u-rel131-signatures}[Signed Checksums]_ - -*Release {rel130-current}* ({rel130-current-date}) _link:{u-rel130-announce}[Announcement] : link:{u-rel130-notes}[Release Notes] : link:{u-rel130-installation}[Installation Instructions] : link:{u-rel130-hardware}[Hardware Compatibility List] : link:{u-rel130-readme}[Readme] : link:{u-rel130-errata}[Errata] : link:{u-rel130-signatures}[Signed Checksums]_ +//// +=== Production Releases +//// +Production: -*Release {rel123-current}* ({rel123-current-date}) _link:{u-rel123-announce}[Announcement] : link:{u-rel123-notes}[Release Notes] : link:{u-rel123-installation}[Installation Instructions] : link:{u-rel123-hardware}[Hardware Compatibility List] : link:{u-rel123-readme}[Readme] : link:{u-rel123-errata}[Errata] : link:{u-rel123-signatures}[Signed Checksums]_ +* *Release {rel123-current}* ({rel123-current-date}) _link:{u-rel123-announce}[Announcement] : link:{u-rel123-notes}[Release Notes] : link:{u-rel123-installation}[Installation Instructions] : link:{u-rel123-hardware}[Hardware Compatibility List] : link:{u-rel123-readme}[Readme] : link:{u-rel123-errata}[Errata] : link:{u-rel123-signatures}[Signed Checksums]_ +* *Release {rel131-current}* ({rel131-current-date}) _link:{u-rel131-announce}[Announcement] : link:{u-rel131-notes}[Release Notes] : link:{u-rel131-installation}[Installation Instructions] : link:{u-rel131-hardware}[Hardware Compatibility List] : link:{u-rel131-readme}[Readme] : link:{u-rel131-errata}[Errata] : link:{u-rel131-signatures}[Signed Checksums]_ //// -=== Legacy Release +=== Legacy *Release {rel112-current}* ({rel112-current-date}) _link:{u-rel112-announce}[Announcement] : link:{u-rel112-notes}[Release Notes] : link:{u-rel112-installation}[Installation Instructions] : link:{u-rel112-hardware}[Hardware Notes] : link:{u-rel112-readme}[Readme] : link:{u-rel112-errata}[Errata] : link:{u-rel112-signatures}[Checksums]_ //// [[future]] -== Future Releases +== Future -For the schedule of upcoming releases, or for more information about the release engineering process, please visit the link:../releng/[Release Engineering] page. +For schedules, and for more information about the release engineering process, please see link:../releng/[Release Engineering]. -The latest snapshots from our link:{handbook}cutting-edge/#stable[FreeBSD-STABLE] and link:{handbook}cutting-edge/#current[FreeBSD-CURRENT] branches are also available. Please see link:../where/[Getting FreeBSD] for details. +The latest snapshots from our link:{handbook}cutting-edge/#stable[FreeBSD-STABLE] and link:{handbook}cutting-edge/#current[FreeBSD-CURRENT] branches are also available. See link:../where/[Getting FreeBSD]. [[prior-unsupported]] -== Prior Releases Which Have Reached End-Of-Life +== Prior Releases – EOL -Complete historical information about the release date, the classification type, and the effective End-Of-Life (EOL) for these releases can be found on the link:../security/unsupported/[Unsupported Releases] section of the link:../security/[FreeBSD Security Information] page. +For historical information about branches, release dates, types, and EOL dates, see link:../security/unsupported/[Unsupported Releases]. +* *{rel130-current}* ({rel130-current-date}) _link:{u-rel130-announce}[Announcement] : link:{u-rel130-notes}[Release Notes] : link:{u-rel130-installation}[Installation Instructions] : link:{u-rel130-hardware}[Hardware Compatibility List] : link:{u-rel130-readme}[Readme] : link:{u-rel130-errata}[Errata] : link:{u-rel130-signatures}[Signed Checksums]_ * *12.2* ({rel122-current-date}) _link:{u-rel122-announce}[Announcement] : link:{u-rel122-notes}[Release Notes] : link:{u-rel122-installation}[Installation Instructions] : link:{u-rel122-hardware}[Hardware Compatibility List] : link:{u-rel122-readme}[Readme] : link:{u-rel122-errata}[Errata] : link:{u-rel122-signatures}[Signed Checksums]_ * *{rel121-current}* ({rel121-current-date}) _link:{u-rel121-announce}[Announcement] : link:{u-rel121-notes}[Release Notes] : link:{u-rel121-installation}[Installation Instructions] : link:{u-rel121-hardware}[Hardware Compatibility List] : link:{u-rel121-readme}[Readme] : link:{u-rel121-errata}[Errata] : link:{u-rel121-signatures}[Signed Checksums]_ * *12.0* ({rel120-current-date}) _link:12.0R/announce/[Announcement]: link:12.0R/relnotes/[Release Notes]: link:12.0R/installation/[Installation Instructions]: link:12.0R/hardware/[Hardware Notes]: link:12.0R/readme/[Readme]: link:12.0R/errata/[Errata]: link:12.0R/signatures/[Checksums]_ diff --git a/website/themes/beastie/layouts/index.html b/website/themes/beastie/layouts/index.html index f29ea41878..6a44d83944 100755 --- a/website/themes/beastie/layouts/index.html +++ b/website/themes/beastie/layouts/index.html @@ -48,9 +48,8 @@ <ul id="frontreleaseslist"> <li> {{ i18n "production" }}: - <a href={{ index $.Site.Data.releases "u-rel131-announce" }}>{{ index $.Site.Data.releases "rel131-current" }}</a>, - <a href={{ index $.Site.Data.releases "u-rel130-announce" }}>{{ index $.Site.Data.releases "rel130-current" }}</a>, - <a href={{ index $.Site.Data.releases "u-rel123-announce" }}>{{ index $.Site.Data.releases "rel123-current" }}</a> + <a href={{ index $.Site.Data.releases "u-rel123-announce" }}>{{ index $.Site.Data.releases "rel123-current" }}</a>, + <a href={{ index $.Site.Data.releases "u-rel131-announce" }}>{{ index $.Site.Data.releases "rel131-current" }}</a> </li> {{ $betaUpcoming := index $.Site.Data.releases "beta-upcoming" }} {{ if ne $betaUpcoming "IGNORE" }} @@ -66,6 +65,13 @@ <a href={{ index $.Site.Data.releases "u-betarel2-schedule" }}>{{ index $.Site.Data.releases "betarel2-current" }}</a> </li> {{ end }} + {{ $beta3Upcoming := index $.Site.Data.releases "beta3-upcoming" }} + {{ if ne $beta3Upcoming "IGNORE" }} + <li> + {{ i18n "upcoming" }}: + <a href={{ index $.Site.Data.releases "u-betarel3-schedule" }}>{{ index $.Site.Data.releases "betarel3-current" }}</a> + </li> + {{ end }} <li> <a href={{ "security/" | absLangURL }}#sup>{{ i18n "supportLifecycle" }}</a> </li>