From 34c42fd3b3d491814035dc03b476fa2fd9fd156a Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Mon, 22 May 2023 16:14:45 -0400 Subject: FAQ: switch Subversion references to Git FreeBSD uses Git for src, doc, and ports. Also update the number of active branches. Some further updates are necessary. Reviewed by: bcr, debdrup Event: Kitchener-Waterloo Hackathon 202305 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40214 --- documentation/content/en/books/faq/_index.adoc | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/documentation/content/en/books/faq/_index.adoc b/documentation/content/en/books/faq/_index.adoc index 9fb59a7736..bba00f934d 100644 --- a/documentation/content/en/books/faq/_index.adoc +++ b/documentation/content/en/books/faq/_index.adoc @@ -21,17 +21,17 @@ layout: single :source-highlighter: rouge :experimental: :images-path: books/faq/ -:rel-numbranch: 4 +:rel-numbranch: 3 :rel-head: 14-CURRENT :rel-head-relx: 14.X -:rel-head-releng: head/ +:rel-head-releng: main :rel-relx: 13.X :rel-stable: 13-STABLE -:rel-releng: stable/13/ -:rel-relengdate: December 2018 +:rel-releng: stable/13 +:rel-relengdate: January 2021 :rel2-relx: 12.X :rel2-stable: 12-STABLE -:rel2-releng: stable/12/ +:rel2-releng: stable/12 :rel2-relengdate: December 2018 ifdef::env-beastie[] @@ -214,7 +214,7 @@ The goals behind each snapshot release are: * To test the latest version of the installation software. * To give people who would like to run _-CURRENT_ or _-STABLE_ but who do not have the time or bandwidth to follow it on a day-to-day basis an easy way of bootstrapping it onto their systems. * To preserve a fixed reference point for the code in question, just in case we break something really badly later. -(Although Subversion normally prevents anything horrible like this happening.) +(Although Git normally prevents anything horrible like this happening.) * To ensure that all new features and fixes in need of testing have the greatest possible number of potential testers. No claims are made that any _-CURRENT_ snapshot can be considered "production quality" for any purpose. @@ -1840,7 +1840,7 @@ When the source code is in shape for the release the name will be changed to 6.3 Once in the RC stage, only the most critical bugs found can be fixed. Once the release (6.3-RELEASE in this example) and release branch have been made, the branch will be renamed to 6.3-STABLE. -For more information on version numbers and the various Subversion branches, refer to the extref:{releng}[Release Engineering] article. +For more information on version numbers and the various Git branches, refer to the extref:{releng}[Release Engineering] article. [[kernel-chflag-failure]] === I tried to install a new kernel, and the man:chflags[1] failed. How do I get around this? @@ -3003,16 +3003,13 @@ And thanks for the thought! [[define-snap-release]] === What are snapshots and releases? -There are currently {rel-numbranch} active/semi-active branches in the FreeBSD http://svnweb.FreeBSD.org/base/[Subversion Repository]. +There are currently {rel-numbranch} active/semi-active branches in the FreeBSD http://cgit.FreeBSD.org/src/[Git Repository]. (Earlier branches are only changed very rarely, which is why there are only {rel-numbranch} active branches of development): * {rel2-releng} AKA {rel2-stable} * {rel-releng} AKA {rel-stable} * {rel-head-releng} AKA _-CURRENT_ AKA {rel-head} -`HEAD` is not an actual branch tag. -It is a symbolic constant for the current, non-branched development stream known as _-CURRENT_. - Right now, _-CURRENT_ is the {rel-head-relx} development stream; the {rel-stable} branch, {rel-releng}, forked off from _-CURRENT_ in {rel-relengdate} and the {rel2-stable} branch, {rel2-releng}, forked off from _-CURRENT_ in {rel2-relengdate}. [[kernel-panic-troubleshooting]] -- cgit v1.2.3