From owner-freebsd-doc@FreeBSD.ORG Wed Oct 20 04:03:54 2004 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4B4116A4CE for ; Wed, 20 Oct 2004 04:03:54 +0000 (GMT) Received: from mail.soaustin.net (mail.soaustin.net [207.200.4.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F10A43D49 for ; Wed, 20 Oct 2004 04:03:54 +0000 (GMT) (envelope-from linimon@lonesome.com) Received: by mail.soaustin.net (Postfix, from userid 502) id 1B01A148DB; Tue, 19 Oct 2004 23:03:54 -0500 (CDT) Date: Tue, 19 Oct 2004 23:03:54 -0500 (CDT) From: Mark Linimon X-X-Sender: linimon@pancho To: freebsd-doc@FreeBSD.org Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Subject: CFD: changes to the FAQ to reflect creation of 5-STABLE X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Oct 2004 04:03:54 -0000 It was with a complete lack of delight that I noticed earlier tonight that the FAQ had not yet been modified for the creation of 5-STABLE, leading to my creation of a set of patches. In a couple of places I have left notes about what has to change exactly when 5.3-RELEASE is made (one existed already), but IMHO we should go ahead and commit something based on the following changes ASAP, even if it means fiddling with the tags. (You may now all groan in chorus. After making these patches, I have already done my share tonight). I made my best effort to get the facts and the wording right but I doubt it's 100%. Please provide feedback. And no, I do not wish to open the can of worms about deleting all the pre-4.X information. I will have to go get more cans of paint to create that patch ... mcl Index: book.sgml =================================================================== RCS file: /home/FreeBSD/dcvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v retrieving revision 1.644 diff -u -r1.644 book.sgml --- book.sgml 4 Sep 2004 18:13:26 -0000 1.644 +++ book.sgml 20 Oct 2004 03:51:29 -0000 @@ -6,7 +6,7 @@ - Frequently Asked Questions for FreeBSD 2.X, 3.X, 4.X and 5.X + Frequently Asked Questions for FreeBSD 2.X, 3.X, 4.X, 5.X, and 6.X The FreeBSD Documentation Project @@ -53,7 +53,7 @@ - This is the FAQ for FreeBSD versions 2.X, 3.X, 4.X and 5.X. + This is the FAQ for FreeBSD versions 2.X, 3.X, 4.X, 5.X, and 6.X. All entries are assumed to be relevant to FreeBSD 2.0.5 and later, unless otherwise noted. If you are interested in helping with this project, send email to the &a.doc;. The @@ -73,7 +73,7 @@ Introduction - Welcome to the FreeBSD 2.X-5.X FAQ! + Welcome to the FreeBSD 2.X-6.X FAQ! As is usual with Usenet FAQs, this document aims to cover the most frequently asked questions concerning the FreeBSD operating @@ -277,17 +277,29 @@ - At this point in FreeBSD's development, there are two + At this point in FreeBSD's development, there are three parallel development branches; releases are being made from - both branches. The 4.X series of releases - is being made from the -STABLE branch + two of the three branches. The 4.X series of releases + is being made from the 4-STABLE branch and the 5.X series of releases is being made from - -CURRENT. + 5-STABLE. It will be some time yet + before any releases are made from the + 6-CURRENT branch. + + + Up until the release of 5.3, the 4.X series was the + one known as -STABLE. However, + as of 5.3, 5.X will be designated the new + -STABLE and 4.X will no longer see + much new development. Instead, it will be designated + for an "extended support" status and receive + only fixes for major problems (such as security-related + fixes.) Version &rel.current; @@ -420,9 +432,9 @@ only well-tested bug fixes and other small incremental enhancements. FreeBSD-CURRENT, on the other hand, has been one unbroken line since 2.0 was released, leading - towards 5.2.1-RELEASE (and beyond). At 5.3-RELEASE, the - 5-STABLE branch is expected to be created, and - &os.current; will become 6-CURRENT. More detail information, + towards 5.3-RELEASE (and beyond). Just before 5.3-RELEASE, the + 5-STABLE branch was created, and + &os.current; became 6-CURRENT. More detail information, see FreeBSD Release Engineering: 2.2.1 Creating the Release Branch. @@ -431,7 +443,9 @@ The 3-STABLE branch has ended with the release of 3.5.1, the final 3.X release. The only changes made to either of these branches will be, for the most part, security-related bug - fixes. + fixes. Support for the 4-STABLE branch will continue + for some time but focus primarily on security-related bug + fixes and other serious issues. - The latest 4-STABLE release, &rel2.current;-RELEASE can be + The latest 5-CURRENT release, &rel2.current;-RELEASE can be found in the &rel2.current;-RELEASE directory. 4.X + url="ftp://current.FreeBSD.org/pub/FreeBSD/snapshots/">5.X snapshots are usually made daily. @@ -4393,7 +4408,7 @@ 2003 These warnings are generated by Witness, a run-time lock - diagnostic system found in FreeBSD 5-CURRENT kernels (but + diagnostic system found in FreeBSD -CURRENT kernels (but removed in releases). You can read more about Witness in the &man.witness.4; man page, which talks about its capabilities. Among other things, Witness performs run-time lock order verification @@ -4803,7 +4818,7 @@ linkend="mailing">mailing list for periodic updates on new entries. - Most ports should work on the 4.X and 5.X branches. + Most ports should work on the 4.X, 5.X, and 6.X branches. Each time a FreeBSD release is made, a snapshot of the ports tree at the time of release in also included in the ports/ directory. @@ -4840,13 +4855,22 @@ - for 5.X-CURRENT + for 5.X-RELEASE/5-STABLE ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-5-current + + + for 6-CURRENT + + + ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-6-current + + or your nearest local mirror site. @@ -6746,7 +6770,7 @@ - FreeBSD 5.X uses the &man.devfs.8; device-on-demand + FreeBSD 5.X and beyond use the &man.devfs.8; device-on-demand system. Device drivers automatically create new device nodes as they are needed, obsoleting /dev/MAKEDEV. @@ -6860,7 +6884,7 @@ I tried to update my system to the latest -STABLE, but - got -RC or -PRERELEASE! What is going on? + got -BETAx, -RC or -PRERELEASE! What is going on? @@ -7771,7 +7795,7 @@ &prompt.root; sh MAKEDEV vty12 - On FreeBSD 5.X you do not have to create devices + On FreeBSD 5.X and beyond you do not have to create devices manually if you are using DEVFS, since the proper device nodes will be automatically created under - RELENG_3 AKA - 3.X-STABLE + RELENG_4 AKA + 4-STABLE - RELENG_4 AKA - 4-STABLE + RELENG_5 AKA + 5-STABLE HEAD AKA -CURRENT AKA - 5.X-CURRENT + 6.X-CURRENT @@ -11806,10 +11830,13 @@ stream which we simply refer to as -CURRENT. - Right now, -CURRENT is the 5.X development - stream and the 4-STABLE branch, + Right now, -CURRENT is the 6.X development + stream; the 4-STABLE branch, RELENG_4, forked off from - -CURRENT in Mar 2000. + -CURRENT in March 2000, and + the 5-STABLE branch, + RELENG_5, forked off from + -CURRENT in October 2004.