git: ed38bff07c - main - freebsd-releng: whitespace cleanup
Ed Maste <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/doc/commit/?id=ed38bff07c726443d3c90f0c998c26b0d2774401 commit ed38bff07c726443d3c90f0c998c26b0d2774401 Author: Ed Maste <[email protected]> AuthorDate: 2023-11-23 15:16:12 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2023-11-23 15:48:03 +0000 freebsd-releng: whitespace cleanup remove extraneous blank line and EOL whitespace --- documentation/content/en/articles/freebsd-releng/_index.adoc | 3 +-- 1 file changed, 1 insertion(+), 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.