Re: git: 26bb1e272a - main - handbook/introduction: Improve treatment and correct branch name of -CURRENT

Ryusuke SUZUKI <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.doc
Message-ID <[email protected]> 
Mithell-san,

Thanks you for letting me know!

Committed.

Ryusuke


>It may be better to use the variable {rel-head} from releases.adoc, 
>rather than hard-coding the version. That way, it will always be up to date.
>
>Also, I think 'trunk' should be changed to 'main', now that we have 
>transitioned from subversion to git.
>
>Cheers,
>Mitchell


From: Ryusuke SUZUKI <[email protected]>
Subject: git: 26bb1e272a - main - handbook/introduction: Improve treatment and correct branch name of -CURRENT
Date: Sat, 29 Jan 2022 10:06:40 GMT

> Return-Path: <[email protected]>
> Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2610:1c1:1:606c:0:0:19:2])
> 	by mail.allbsd.org (8.16.1/8.16.1) with ESMTPS id 20TA6gPL039655
> 	(version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=OK)
> 	(Client CN "/CN=mx2.freebsd.org", Issuer "/C=US/O=Let's+20Encrypt/CN=R3");
> 	Sat, 29 Jan 2022 19:06:44 +0900 (JST)
> 	(envelope-from [email protected])
> Authentication-Results: allbsd.org;
> 	dkim=pass (2048-bit key;
> 	unprotected) header.d=freebsd.org [email protected] header.b=ap+8zlKr
> Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
> 	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
> 	 key-exchange X25519 server-signature RSA-PSS (4096 bits)
> 	 client-signature RSA-PSS (4096 bits))
> 	(Client CN "mx1.freebsd.org", Issuer "R3" (verified OK))
> 	by mx2.freebsd.org (Postfix) with ESMTPS id 48C859F303;
> 	Sat, 29 Jan 2022 10:06:42 +0000 (UTC)
> 	(envelope-from [email protected])
> Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
> 	(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 "freefall.freebsd.org", Issuer "R3" (verified OK))
> 	by mx1.freebsd.org (Postfix) with ESMTPS id 4Jm93557lmz3mlH;
> 	Sat, 29 Jan 2022 10:06:41 +0000 (UTC)
> 	(envelope-from [email protected])
> Received: by freefall.freebsd.org (Postfix, from userid 538)
> 	id 9FBB97227; Sat, 29 Jan 2022 10:06:41 +0000 (UTC)
> Delivered-To: [email protected]
> Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80])
> 	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
> 	 key-exchange X25519 server-signature RSA-PSS (4096 bits)
> 	 client-signature RSA-PSS (4096 bits))
> 	(Client CN "mx1.freebsd.org", Issuer "R3" (verified OK))
> 	by freefall.freebsd.org (Postfix) with ESMTPS id 4CBFB7043
> 	for <[email protected]>; Sat, 29 Jan 2022 10:06:41 +0000 (UTC)
> 	(envelope-from [email protected])
> 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 4Jm9346lFxz3mcQ;
> 	Sat, 29 Jan 2022 10:06:40 +0000 (UTC)
> 	(envelope-from [email protected])
> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
> 	t=1643450801;
> 	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=P8yKBvAvLBMwbYoQ7GoF9e6679YdojU32+bPyQyjXQY=;
> 	b=ap+8zlKrRZhf51DshUCWgTF+X2YdxTFJshOREu4rPLcyOfixwsc82DlhqjVqRcirQM3FIV
> 	Nb5xRXNBOS3D39N/IorKey0rETZTh5hKIwIRkTF0GlVzkRSVQp0+OFRgkyZ0Nykkpxcqn8
> 	0vlBLlYzoiaqTHS77PbjCDtBtBrAZfbdVN2Xeq78BepiubMVnD6ltFXwYZE3emIp4YE+dr
> 	O9OFmSl8Ge/NoNtBNphVA8sYh+WqZPjHtg2EXB2FrO+ej/3l3zvrl67z67CRfNHFWr+phl
> 	/+wkY2fzCKYcnRscLDG5S4mmmjTP3S/GgADtBw+WRW5/jpIjKr223zHE/o2Pkw==
> 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 BDE6C13E8C;
> 	Sat, 29 Jan 2022 10:06:40 +0000 (UTC)
> 	(envelope-from [email protected])
> Received: from gitrepo.freebsd.org ([127.0.1.44])
> 	by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20TA6eEZ051689;
> 	Sat, 29 Jan 2022 10:06:40 GMT
> 	(envelope-from [email protected])
> Received: (from git@localhost)
> 	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20TA6eSY051688;
> 	Sat, 29 Jan 2022 10:06:40 GMT
> 	(envelope-from git)
> Message-Id: <[email protected]>
> MIME-Version: 1.0
> X-Git-Committer: ryusuke
> X-Git-Repository: doc
> X-Git-Refname: refs/heads/main
> X-Git-Reftype: branch
> X-Git-Commit: 26bb1e272a49b5b220ae2bd37b74f016c5886264
> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;	s=dkim; t=1643450801;	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=P8yKBvAvLBMwbYoQ7GoF9e6679YdojU32+bPyQyjXQY=;	b=irJbRqdaNovrgllW7M0h//EAgDkTgr8/tHmrcWUB7UUgk+uNkOqqyAgYmDee20rKwIF9jb	lyll6w3sJtIhQyyrQ59WEleBgeaGW0ub8kVHCmUVxL2EPWw6zBCGMZhLa+oiWXKxrLOlJm	0Rq6uSmvmR5AgPY35x261txZxvDRhADiGJ+Ot7512CmElVdt/ctZa0lKXswPL2rEVRR19Z	0aie4OaNOAc4PSHiEal289fbrLBJP4nP+lXK49XaoZwAtJB1gdB2gCBk7oyu3kAS6xNvO0	9EdYbecE6sxqC1tVClH1D07ozkFApsN49he7vn8oaEsiocOojalBtbscJF0AsQ==
> ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643450801; a=rsa-sha256; cv=none;	b=uley9hoIVQtHf2zheM39B30O6CN1qs5aX2fuh9MF1YhMUZk7fEokuVppZPjm6QNSTkBlbt	/+jRk4S11jOcydFgo2ARhMtk1zmOER8ly+SOQsSxp4pW7WZtBZi63ICz5z7tQDSbLvHVx2	qRusus4BTiq4V0+3nubkvgH1TAT/BkYhZBHt3ptN57Towtp8uEKkbC8wQMI+0HfbJDUR/O	VyJy1Vqm7HQ2A7g7cGUnVP9/MxnETEfJUw2jlIF6P+F9U6prSaLyRi76M28FtWe9jiRZCb	6uwaYBycG0zY5Dj8m2yJGvGW5IC2BAzlPQS95fCX4pMtue7lrPPhtuYg4YOTww==
> ARC-Authentication-Results: i=1;	mx1.freebsd.org;	none
> Precedence: bulk
> X-Loop: FreeBSD.org
> List-Id: FreeBSD mail <doc-committers.freebsd.org>
> X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (mail.allbsd.org [IPv6:2001:2f0:104:e001:0:0:0:41]); Sat, 29 Jan 2022 19:06:45 +0900 (JST)
> X-Spam-Status: No, score=-99.9 required=13.0 tests=CONTENT_TYPE_PRESENT,	MAILING_LIST_MULTI,QENCPTR1,RCVD_IN_AHBL,RCVD_IN_AHBL_PROXY,	RCVD_IN_AHBL_SPAM,REVDNSUNKNOWN,SPF_HELO_NONE,SPF_PASS,	USER_IN_WHITELIST autolearn=no autolearn_force=no version=3.4.4
> X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mx.allbsd.org
> X-UIDL: X'4!!F\S"!6+("!GUW!!
> Content-Type: text/plain; charset=utf-8
> Content-Transfer-Encoding: 8bit
> Subject: git: 26bb1e272a - main - handbook/introduction: Improve treatment and correct branch name of -CURRENT
> From: Ryusuke SUZUKI <[email protected]>
> To: [email protected], [email protected]
> Date: Sat, 29 Jan 2022 10:06:40 GMT
> Sender: [email protected]
> Auto-Submitted: auto-generated
> The branch main has been updated by ryusuke:
> 
> URL: https://cgit.FreeBSD.org/doc/commit/?id=26bb1e272a49b5b220ae2bd37b74f016c5886264
> 
> commit 26bb1e272a49b5b220ae2bd37b74f016c5886264
> Author:     Ryusuke SUZUKI <[email protected]>
> AuthorDate: 2022-01-29 10:05:50 +0000
> Commit:     Ryusuke SUZUKI <[email protected]>
> CommitDate: 2022-01-29 10:05:50 +0000
> 
>     handbook/introduction: Improve treatment and correct branch name of -CURRENT
>     
>     o Use {rel-head} variable for -CURRENT version number insted of hard-cording.
>     o 'trunk' -> 'main', -CURRENT is now maintained under main branch
>     
>     Reported by: mhorne
> ---
>  documentation/content/en/books/handbook/introduction/_index.adoc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/documentation/content/en/books/handbook/introduction/_index.adoc b/documentation/content/en/books/handbook/introduction/_index.adoc
> index 4d34253666..663cdebfcb 100644
> --- a/documentation/content/en/books/handbook/introduction/_index.adoc
> +++ b/documentation/content/en/books/handbook/introduction/_index.adoc
> @@ -194,7 +194,7 @@ Despite being still more than a little rough around the edges, the release was a
>  
>  Since that time, FreeBSD has made a series of releases each time improving the stability, speed, and feature set of the previous version.
>  
> -For now, long-term development projects continue to take place in the 14.0-CURRENT (trunk) branch, and snapshot releases of 14.0 are continually made available from link:ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots/[the snapshot server] as work progresses.
> +For now, long-term development projects continue to take place in the {rel-head}-CURRENT (main) branch, and snapshot releases of {rel-head} are continually made available from link:ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots/[the snapshot server] as work progresses.
>  
>  [[goals]]
>  === FreeBSD Project Goals
>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.