diff --git a/shared/authors.adoc b/shared/authors.adoc index f7a54608ac86..26daf0147497 100644 --- a/shared/authors.adoc +++ b/shared/authors.adoc @@ -1789,8 +1789,8 @@ :kan: {kan-name} <{kan-email}> :karels-name: Mike Karels -:karels-email: karels@FreeBSD.org -:karels: {karels-name} <{karels-email}> +:karels-email: +:karels: {karels-name} :kargl-name: Steven G. Kargl :kargl-email: kargl@FreeBSD.org diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index b6c73131599b..c25de1a05c4d 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -8,13 +8,13 @@ include::shared/en/urls.adoc[] = Release Engineering Information -This page contains documentation about the FreeBSD release engineering process. +About the FreeBSD release engineering (RE) process. * <> * <> +* <> +* <> * link:../releng/charter/[Charter for the Release Engineering Team] -* <> -* <> * <> //// @@ -37,15 +37,13 @@ As of 2024-06-04, the next release has not yet been announced. |=== //// [[freeze]] -== Code-Freeze Status - -This table lists the code freeze status for major branches of the `src/` repository of the FreeBSD Git repositories. Commits to any branch listed as "frozen" must first be reviewed and approved by the relevant contact party. The status of other repositories such as `ports/` and `doc/` is also provided below. +== Code Freeze Status [.tblbasic] [cols="1,1,2,4",options="header",] |=== -|Branch |Status |Contact |Notes -|`main` |Open |committers |Active development branch for 15.0-CURRENT. +|`src` tree branch |Status |Contact |Notes +|`main` |Open |committers |Development branch for FreeBSD 15.0-CURRENT. |`stable/14` |Open |committers |Development branch for FreeBSD 14-STABLE. |`releng/14.1` |Frozen |security-officer@FreeBSD.org |FreeBSD 14.1 supported errata fix branch. |`releng/14.0` |Frozen |security-officer@FreeBSD.org |FreeBSD 14.0 supported errata fix branch. @@ -66,23 +64,27 @@ This table lists the code freeze status for major branches of the `src/` reposit |`releng/11.2` |Frozen |security-officer@FreeBSD.org |FreeBSD 11.2 errata fix branch (not officially supported). |`releng/11.1` |Frozen |security-officer@FreeBSD.org |FreeBSD 11.1 errata fix branch (not officially supported). |`releng/11.0` |Frozen |security-officer@FreeBSD.org |FreeBSD 11.0 errata fix branch (not officially supported). -|*Repository* |*Status* |*Contact* |*Notes* +|*Tree* |*Status* |*Contact* |*Notes* +|`doc/` |Open |freebsd-doc@FreeBSD.org |AsciiDoc-based documentation set. |`ports/` |Open |portmgr@FreeBSD.org |FreeBSD Ports Collection. -|`doc/` |Open |freebsd-doc@FreeBSD.org |ASCIIDoc-based documentation set. |=== -(Branches corresponding to FreeBSD 10.x and earlier are of historical interest only, and are omitted from the table above.) +Commits to frozen branches require prior approval. + +Historic branches for FreeBSD 10.x and earlier are not represented above. [[docs]] -== Release Engineering Documentation +== Documentation + +link:{freebsd-releng}[FreeBSD Release Engineering] describes: -* link:{freebsd-releng}[FreeBSD Release Engineering] + -This document details the approach used by the FreeBSD release engineering team to make production-quality releases of the FreeBSD Operating System. It describes the tools available for those interested in producing customized FreeBSD releases for corporate rollouts or commercial productization. +- the Primary Release Engineering Team's methods +- tools to customize releases. [[team]] -== Release Engineering Team +== Teams -The primary release engineering team is responsible for approving link:{handbook}glossary/#mfc-glossary[MFC] requests during code freezes, setting release schedules, and all of the other responsibilities laid out in our link:../releng/charter/[charter]. +The Primary Release Engineering Team is responsible for approving link:{handbook}glossary/#mfc-glossary[MFC] requests during code freezes, setting release schedules, and all of the other responsibilities laid out in its link:../releng/charter/[charter]. *Primary RE Team (re@FreeBSD.org)* : {re-members} form the primary release engineering decision-making group. @@ -93,6 +95,6 @@ The third party packages in the Ports Collection are managed by the pkgmgr@ team [[old]] == Old Releases -The FreeBSD Project does not maintain a complete archive of old release ISO images, but many of them are available at ftp://ftp-archive.FreeBSD.org/pub/FreeBSD-Archive/old-releases/. +The archive at http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/[] includes many ISO images. -Older releases that are no longer present on any FTP mirror might still be available from CD-ROM vendors. +The FreeBSD Project does not maintain a complete archive. Older releases that are no longer online may be available from CD-ROM vendors.