From owner-dev-commits-src-all@freebsd.org Thu Jun 10 15:42:59 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B9DC364F542; Thu, 10 Jun 2021 15:42:59 +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 4G17Xg4p69z3MBB; Thu, 10 Jun 2021 15:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8BAF5122F5; Thu, 10 Jun 2021 15:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15AFgxJc031059; Thu, 10 Jun 2021 15:42:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15AFgxCe031058; Thu, 10 Jun 2021 15:42:59 GMT (envelope-from git) Date: Thu, 10 Jun 2021 15:42:59 GMT Message-Id: <202106101542.15AFgxCe031058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: cb96c6ba30cb - stable/13 - Clarify that the new STABLE branch is branched off CURRENT, not renamed MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb96c6ba30cb917bc1223247caa93d135818199a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2021 15:42:59 -0000 The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=cb96c6ba30cb917bc1223247caa93d135818199a commit cb96c6ba30cb917bc1223247caa93d135818199a Author: Li-Wen Hsu AuthorDate: 2021-03-18 09:16:16 +0000 Commit: Li-Wen Hsu CommitDate: 2021-06-10 15:42:39 +0000 Clarify that the new STABLE branch is branched off CURRENT, not renamed Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D29317 (cherry picked from commit 53844d3ea4aa504c37c8bd679cfea9966ade1400) --- share/man/man7/development.7 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index f64f01f24d17..a0459ccfad72 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -77,8 +77,8 @@ Git branch represents CURRENT; all changes are first committed to CURRENT and then usually cherry-picked back to STABLE, which refers to Git branches such as .Ql stable/13 . -Every few years the CURRENT branch is renamed to STABLE, and a new -CURRENT is branched, with an incremented major version number. +Every few years a new STABLE is branched from CURRENT, +with an incremented major version number. Releases are then branched off STABLE and numbered with consecutive minor numbers. .Pp