From nobody Thu Nov 23 15:48:41 2023 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SbjFk24nsz51jZK for ; Thu, 23 Nov 2023 15:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SbjFk1812z4LpV; Thu, 23 Nov 2023 15:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700754522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gn6zxphRJKeL4eqf8UOjt9RQkdlmCVLmVuwm46sBQRE=; b=y3mavkVMd8vB0JeJK8iK+8qAL+w9u/+Ld0Z16VsPWMx1rKJ3KDoOtbcJxGZ2q0WVvCkIcc GFEJQnHK0uIvYnjkYWkfJ8/UUynVsH0rwdmKNVBcndZ1lUgBVH2ijjVFnUnonSkjC2GV8c 8V07Q3NVzo17KtFGxa//PQQRxhG33LK6bdjlZ5mlglL4aT1BFpyvBuhOGlyHgx4q/LzHLi 52NDVNtfATHwK3GYBS7sd4tv83oxj21MuM7OAdR6m1r9+eLGIw956ZxehDlC5IlHl10Dua tmraBSeBrV5Qb+f5AOXF8eUm6H5JvoI/IXJ79At6Ie1spDw9pZwrEV8acE6cWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700754522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gn6zxphRJKeL4eqf8UOjt9RQkdlmCVLmVuwm46sBQRE=; b=Z6jUfc2TftZ1MD2Nt6rGqAHGEm5MMJR8CQVL9et7mKWZokFtRR0dPPRwpDwrUEIGp+HSAB VsONAqGZFnW3sKFlejkGdRM9LHgd9qLZQzgPBvkvUbv6eVsjXdiiwZX8btycfjLIfaE737 /Gc8g6lhpqbj2UqUiw+Pj0CHY6zGfGCOBbXS+2RwLG1zHGUvs8lYCiQ/CDEdLBIyjr3Smf w+hR7eD98z0D26MGM+3Qu0NXALhWVXJ/Nsq0A1Q2DQ9f2pkjpBeQ+JNJfnYCYX2UeGWye3 vZBU84xuL47sq2wXdbKFbQmGFIOvKrfjRr/Nox2GWEt3QdGytrqAy+oRmZaRxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700754522; a=rsa-sha256; cv=none; b=er4GXnqNodwyxE7uitP6eINvj7Pw8/7Hk6LyHA2QBa5JZELruPhEra17KJYbyJ3yRB+y0Q 4cmK0Ax+diGMKDvlNmKtBulQH/GNKTV/yBkEdD2QJnqDhTS12itwyf6TwIic+krYvLRRUh hWLV4NCqFBkYejQs2QvGfLo7PnMv1d73EJLfLUFsT6Yvf9c82TPwuq9rYppdTbLTarP0jJ oZ8VGhhS++lkQl1SNQJP9masPp76qVum+nTIA/+yNQ64hT/pxRpSf22cN7jbXGsO9MgtlC QeNy1lCy4WZmTwYq+9jLHmBoWgFL04RgnuI9sJStaHfuQ7U6bJve4CBjBR9AUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SbjFk05C6z16yd; Thu, 23 Nov 2023 15:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ANFmfT9073549; Thu, 23 Nov 2023 15:48:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ANFmfp6073546; Thu, 23 Nov 2023 15:48:41 GMT (envelope-from git) Date: Thu, 23 Nov 2023 15:48:41 GMT Message-Id: <202311231548.3ANFmfp6073546@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ed Maste Subject: git: ed38bff07c - main - freebsd-releng: whitespace cleanup List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed38bff07c726443d3c90f0c998c26b0d2774401 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/doc/commit/?id=ed38bff07c726443d3c90f0c998c26b0d2774401 commit ed38bff07c726443d3c90f0c998c26b0d2774401 Author: Ed Maste AuthorDate: 2023-11-23 15:16:12 +0000 Commit: Ed Maste 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.