From aae5a21d565f613e8c94632b66191a67a8083461 Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 04:50:42 +0100 Subject: [PATCH 01/15] releng: 14.1 supported errata fix branch --- website/content/en/releng/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index 3059b13b14d1..c3b3438548eb 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -47,7 +47,7 @@ This table lists the code freeze status for major branches of the `src/` reposit |Branch |Status |Contact |Notes |`main` |Open |committers |Active development branch for 15.0-CURRENT. |`stable/14` |Open |committers |Development branch for FreeBSD 14-STABLE. -|`releng/14.1` |Frozen |re@FreeBSD.org |FreeBSD 14.0 supported errata fix branch. +|`releng/14.1` |Frozen |re@FreeBSD.org |FreeBSD 14.1 supported errata fix branch. |`releng/14.0` |Frozen |security-officer@FreeBSD.org |FreeBSD 14.0 supported errata fix branch. |`stable/13` |Open |committers |Development branch for FreeBSD 13-STABLE. |`releng/13.3` |Frozen |security-officer@FreeBSD.org |FreeBSD 13.3 supported errata fix branch. From 5567c5ff4a0ac95f62b0c08ca9357ca6604301da Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 05:04:35 +0100 Subject: [PATCH 02/15] releng: begin reducing verbosity Reduce repetition. (No need to use the word 'table' above and below what's obviously a table; and so on.) --- website/content/en/releng/_index.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index c3b3438548eb..c2eee6de2dc4 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -39,12 +39,12 @@ 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. +Commits to any branch listed as "frozen" must first be reviewed and approved by the relevant contact party. [.tblbasic] [cols="1,1,2,4",options="header",] |=== -|Branch |Status |Contact |Notes +|`src` tree branch |Status |Contact |Notes |`main` |Open |committers |Active development branch for 15.0-CURRENT. |`stable/14` |Open |committers |Development branch for FreeBSD 14-STABLE. |`releng/14.1` |Frozen |re@FreeBSD.org |FreeBSD 14.1 supported errata fix branch. @@ -66,12 +66,12 @@ 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* |`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.) +Historic `src` branches corresponding to FreeBSD 10.x and earlier are not represented above. [[docs]] == Release Engineering Documentation From 53fce8f7b86d1239c987b31bf70df67904dc0943 Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 05:05:37 +0100 Subject: [PATCH 03/15] releng: Code Freeze Status, non-hyphenated Consistency. --- website/content/en/releng/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index c2eee6de2dc4..f390d77d818a 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -37,7 +37,7 @@ As of 2024-06-04, the next release has not yet been announced. |=== //// [[freeze]] -== Code-Freeze Status +== Code Freeze Status Commits to any branch listed as "frozen" must first be reviewed and approved by the relevant contact party. From 6125f1d1f47d3c44cba5aed182614e1cbed7003d Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 05:10:15 +0100 Subject: [PATCH 04/15] releng: HTTP instead of FTP for the archive URL --- website/content/en/releng/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index f390d77d818a..a2701d79a407 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -93,6 +93,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 FreeBSD Project does not maintain a complete archive of old release ISO images, but many of them are available at http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/[]. Older releases that are no longer present on any FTP mirror might still be available from CD-ROM vendors. From cbcd4f201469c8af7fc92f7835ccb8b5989160d5 Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 05:19:32 +0100 Subject: [PATCH 05/15] releng: tidy the two archive paragraphs --- website/content/en/releng/_index.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index a2701d79a407..3740f799dfe2 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -93,6 +93,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 http://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. From 179f51070e6a2d82cae050546f70e70f7b8b11a5 Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 05:27:38 +0100 Subject: [PATCH 06/15] releng: teams Introduce the RE abbreviation. Initial caps for the Primary Release Engineering Team. Multiple teams, so modernise the subheading. --- website/content/en/releng/_index.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index 3740f799dfe2..1c5de25d9011 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] * <> -* <> +* <> * <> //// @@ -80,9 +80,9 @@ Historic `src` branches corresponding to FreeBSD 10.x and earlier are not repres 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. [[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. From e137e021ee1d62fa6b8f2cf0040d1f902d90875f Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 05:36:44 +0100 Subject: [PATCH 07/15] releng: Documentation Reduce verbosity. --- website/content/en/releng/_index.adoc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index 1c5de25d9011..27394283dc67 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -13,7 +13,7 @@ About the FreeBSD release engineering (RE) process. * <> * <> * link:../releng/charter/[Charter for the Release Engineering Team] -* <> +* <> * <> * <> @@ -74,10 +74,12 @@ Commits to any branch listed as "frozen" must first be reviewed and approved by Historic `src` branches corresponding to FreeBSD 10.x and earlier are not represented above. [[docs]] -== Release Engineering Documentation +== Documentation -* 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. +link:{freebsd-releng}[FreeBSD Release Engineering] describes: + +- the Primary Release Engineering Team's methods +- tools to customize releases. [[team]] == Teams From cc800f7089ed4ad3cb300119bb60c4f29f00534c Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 05:39:49 +0100 Subject: [PATCH 08/15] releng: src tree branch: nonbreaking spaces Tidiness for the table header. --- website/content/en/releng/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index 27394283dc67..f926a37a3b62 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -44,7 +44,7 @@ Commits to any branch listed as "frozen" must first be reviewed and approved by [.tblbasic] [cols="1,1,2,4",options="header",] |=== -|`src` tree branch |Status |Contact |Notes +|`src` tree branch |Status |Contact |Notes |`main` |Open |committers |Active development branch for 15.0-CURRENT. |`stable/14` |Open |committers |Development branch for FreeBSD 14-STABLE. |`releng/14.1` |Frozen |re@FreeBSD.org |FreeBSD 14.1 supported errata fix branch. From d91e640c7b7750a628c0314253da4f6504074021 Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 05:42:08 +0100 Subject: [PATCH 09/15] releng: Development branch No need to state that a development branch is active. --- website/content/en/releng/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index f926a37a3b62..af04c0fe1dd0 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -45,7 +45,7 @@ Commits to any branch listed as "frozen" must first be reviewed and approved by [cols="1,1,2,4",options="header",] |=== |`src` tree branch |Status |Contact |Notes -|`main` |Open |committers |Active development branch for 15.0-CURRENT. +|`main` |Open |committers |Development branch for 15.0-CURRENT. |`stable/14` |Open |committers |Development branch for FreeBSD 14-STABLE. |`releng/14.1` |Frozen |re@FreeBSD.org |FreeBSD 14.1 supported errata fix branch. |`releng/14.0` |Frozen |security-officer@FreeBSD.org |FreeBSD 14.0 supported errata fix branch. From ba1ad04ca285d3470974b24b4edaa087e8bdf9d8 Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 05:43:04 +0100 Subject: [PATCH 10/15] releng: FreeBSD 15.0-CURRENT Consistency. --- website/content/en/releng/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index af04c0fe1dd0..40e5bbd227f4 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -45,7 +45,7 @@ Commits to any branch listed as "frozen" must first be reviewed and approved by [cols="1,1,2,4",options="header",] |=== |`src` tree branch |Status |Contact |Notes -|`main` |Open |committers |Development branch for 15.0-CURRENT. +|`main` |Open |committers |Development branch for FreeBSD 15.0-CURRENT. |`stable/14` |Open |committers |Development branch for FreeBSD 14-STABLE. |`releng/14.1` |Frozen |re@FreeBSD.org |FreeBSD 14.1 supported errata fix branch. |`releng/14.0` |Frozen |security-officer@FreeBSD.org |FreeBSD 14.0 supported errata fix branch. From ebe27700eaa1355c17fa794373fbfd9ac74122ec Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 05:50:52 +0100 Subject: [PATCH 11/15] releng: move the prior approval line Below the table, and less verbose. --- website/content/en/releng/_index.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index 40e5bbd227f4..78e5f109c7d6 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -39,8 +39,6 @@ As of 2024-06-04, the next release has not yet been announced. [[freeze]] == Code Freeze Status -Commits to any branch listed as "frozen" must first be reviewed and approved by the relevant contact party. - [.tblbasic] [cols="1,1,2,4",options="header",] |=== @@ -71,7 +69,9 @@ Commits to any branch listed as "frozen" must first be reviewed and approved by |`doc/` |Open |freebsd-doc@FreeBSD.org |ASCIIDoc-based documentation set. |=== -Historic `src` branches corresponding to FreeBSD 10.x and earlier are not represented above. +Commits to frozen branches require prior approval. + +Historic branches for FreeBSD 10.x and earlier are not represented above. [[docs]] == Documentation From d77e437ab4b2538f10a8ad4cd75df927868ab31f Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 05:52:54 +0100 Subject: [PATCH 12/15] releng: doc, AsciiDoc, ports, Alphabetical order. AsciiDoc, not ASCIIDoc. --- website/content/en/releng/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index 78e5f109c7d6..9f94a9044488 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -65,8 +65,8 @@ As of 2024-06-04, the next release has not yet been announced. |`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). |*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. |=== Commits to frozen branches require prior approval. From 92f5d9d0d8700b580c3889a51fb6f62a203bf4b9 Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 06:01:54 +0100 Subject: [PATCH 13/15] shared/authors.adoc: R.I.P. Mike Karels --- shared/authors.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shared/authors.adoc b/shared/authors.adoc index 9267f2f52de8..c48986efff45 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 @@ -3751,8 +3751,8 @@ // FreeBSD Release Engineering Teams :re: re@FreeBSD.org -:re-members: {kib}, {blackend}, {karels}, {delphij}, {cperciva} -:re-members-email: {kib-email}, {blackend-email}, {karels-email}, {delphij-email}, {cperciva-email} +:re-members: {kib}, {blackend}, {delphij}, {cperciva} +:re-members-email: {kib-email}, {blackend-email}, {delphij-email}, {cperciva-email} :re-builders: {marcel}, {nyan}, {nwhitehorn} // FreeBSD Security Officer From 6d2e331dd9889cda7400af89c994a6b3bbc72f17 Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Wed, 5 Jun 2024 06:15:44 +0100 Subject: [PATCH 14/15] releng: order of links Link to the Charter below, not above, Teams. --- website/content/en/releng/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releng/_index.adoc b/website/content/en/releng/_index.adoc index 9f94a9044488..25a25517b4ab 100644 --- a/website/content/en/releng/_index.adoc +++ b/website/content/en/releng/_index.adoc @@ -12,9 +12,9 @@ About the FreeBSD release engineering (RE) process. * <> * <> -* link:../releng/charter/[Charter for the Release Engineering Team] * <> * <> +* link:../releng/charter/[Charter for the Release Engineering Team] * <> //// From 2d71b44a50d8c058153471e752ef9ba666d71783 Mon Sep 17 00:00:00 2001 From: Graham Perrin Date: Mon, 17 Jun 2024 04:24:29 +0100 Subject: [PATCH 15/15] 14.1R/schedule: re@ to secteam@ handover ff7e94c667b9 on 11th June noted the handover. --- website/content/en/releases/14.1R/schedule.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releases/14.1R/schedule.adoc b/website/content/en/releases/14.1R/schedule.adoc index 646a368d6dc5..1145c0c36f98 100644 --- a/website/content/en/releases/14.1R/schedule.adoc +++ b/website/content/en/releases/14.1R/schedule.adoc @@ -40,7 +40,7 @@ General discussions about the pending release and known issues should be sent to |RC1 builds begin |24 May 2024 |25 May 2024 |Release candidate. |RELEASE builds begin |31 May 2024 |31 May 2024 |{localRel}-RELEASE builds begin. |RELEASE announcement |4 June 2024 |4 June 2024 |{localRel}-RELEASE press release. -|Turn over to the secteam |- |- |{localBranchReleng} branch is handed over to the FreeBSD Security Officer Team in one or two weeks after the announcement. +|Turn over to the secteam |11 June 2024 |11 June 2024 |{localBranchReleng} branch is handed over to the FreeBSD Security Officer Team in one or two weeks after the announcement. |=== ////