diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2023-11-23 15:16:12 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-11-23 15:48:03 +0000 |
| commit | ed38bff07c726443d3c90f0c998c26b0d2774401 (patch) | |
| tree | 0966486b64459e23094d14217090f1e4350a37e2 /documentation | |
| parent | e7f98317f13616ce63bc0aaf2b686a3c70cad18a (diff) | |
Diffstat (limited to 'documentation')
| -rw-r--r-- | documentation/content/en/articles/freebsd-releng/_index.adoc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/documentation/content/en/articles/freebsd-releng/_index.adoc b/documentation/content/en/articles/freebsd-releng/_index.adoc index d027dba983..d82ee6ecde 100644 --- a/documentation/content/en/articles/freebsd-releng/_index.adoc +++ b/documentation/content/en/articles/freebsd-releng/_index.adoc @@ -78,7 +78,7 @@ The default minimum timeframe before merging to {branchStable} branches is three Although a general rule to wait a minimum of three days before merging from {branchHead}, there are a few special circumstances where an immediate merge may be necessary, such as a critical security fix, or a bug fix that directly inhibits the release build process. -After several months, and the number of changes in the {branchStable} branch have grown significantly, it is time to release the next version of FreeBSD. +After several months, and the number of changes in the {branchStable} branch have grown significantly, it is time to release the next version of FreeBSD. These releases have been historically referred to as "point" releases. In between releases from the {branchStable} branches, approximately every two (2) years, a release will be cut directly from {branchHead}. @@ -764,7 +764,6 @@ When a release reaches End-of-Life, references to that release should be removed | File | What to Change - |[.filename]#~/website/themes/beastie/layouts/index.html# |Remove `u-relXXX-announce` and `u-relXXX-announce` references. |