From owner-freebsd-doc@FreeBSD.ORG Sun Feb 5 00:30:16 2006 Return-Path: X-Original-To: freebsd-doc@hub.freebsd.org Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D2A2E16A420 for ; Sun, 5 Feb 2006 00:30:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B2EA43D46 for ; Sun, 5 Feb 2006 00:30:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k150UGbC059440 for ; Sun, 5 Feb 2006 00:30:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k150UGcD059439; Sun, 5 Feb 2006 00:30:16 GMT (envelope-from gnats) Resent-Date: Sun, 5 Feb 2006 00:30:16 GMT Resent-Message-Id: <200602050030.k150UGcD059439@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alec Berryman Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9980116A420 for ; Sun, 5 Feb 2006 00:25:26 +0000 (GMT) (envelope-from alec@thened.net) Received: from empmail.bowdoin.edu (empmail.bowdoin.edu [139.140.14.26]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E90E43D46 for ; Sun, 5 Feb 2006 00:25:25 +0000 (GMT) (envelope-from alec@thened.net) Received: from shredder.bowdoin.edu ([139.140.181.133]) by empmail.bowdoin.edu (Sun Java System Messaging Server 6.1 HotFix 0.01 (built Jun 24 2004)) with ESMTPP id <0IU60074GUID7M50@empmail.bowdoin.edu> for FreeBSD-gnats-submit@freebsd.org; Sat, 04 Feb 2006 19:25:25 -0500 (EST) Received: by shredder.bowdoin.edu (Postfix, from userid 12008) id 442D8C022; Sat, 04 Feb 2006 19:25:25 -0500 (EST) Message-Id: <20060205002525.442D8C022@shredder.bowdoin.edu> Date: Sat, 04 Feb 2006 19:25:25 -0500 (EST) From: Alec Berryman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: docs/92829: [patch] Update FAQ introduction for 6.X releases X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alec Berryman List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 00:30:16 -0000 >Number: 92829 >Category: docs >Synopsis: [patch] Update FAQ introduction for 6.X releases >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Sun Feb 05 00:30:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alec Berryman >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD shredder.bowdoin.edu 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Jan 21 01:26:30 EST 2006 root@shredder.bowdoin.edu:/usr/obj/usr/src/sys/SERVER i386 >Description: The FAQ introduction is badly out of date for recent releases. The attached diff deemphasizes the 4.X branch, notes the 5.X branch is still actively supported and improved but at a slower rate, and marks 6.X as the preferred -STABLE branch to which most merges from -CURRENT are being made. While I am here, change a quote escape into a proper quote tag and try to normalize use of expansions where appropriate. book.sgml passes 'make lint' with the attached patch. Feedback appreciated. >How-To-Repeat: >Fix: --- what-is-freebsd-stable.diff begins here --- Index: book.sgml =================================================================== RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v retrieving revision 1.773 diff -u -r1.773 book.sgml --- book.sgml 12 Jan 2006 19:14:15 -0000 1.773 +++ book.sgml 5 Feb 2006 00:15:45 -0000 @@ -24,6 +24,7 @@ 2003 2004 2005 + 2006 The FreeBSD Documentation Project @@ -286,32 +287,28 @@ At this point in FreeBSD's development, there are three parallel development branches; releases are being made from - 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 - 5-STABLE. It will be some time in - mid-to-late 2005 before the first release will be made from the - 6-CURRENT branch; that release (6.0) - will be aimed at early adopters. + two of the three branches. The 5.X series of releases + is being made from the 5-STABLE branch + and the 6.X series of releases from 6-STABLE. Up until the release of 5.3, the 4.X series was the one known as -STABLE. However, - as of 5.3, 5.X has been 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.) + as of 5.3, the 4.X branch will be designated for + an extended support status and receive + only fixes for major problems, such as security-related + fixes. There will be more releases made from the + 5-STABLE branch, but it is considered + a legacy branch and most current work will + only become a part of 6-STABLE. - Version &rel.current; is the latest release from the - 5-STABLE branch; it was released in + &rel.current;-STABLE branch; it was released in &rel.current.date;. Version &rel2.current; is the latest release from the - 4-STABLE branch; it was released in + &rel2.current;-STABLE branch; it was released in &rel2.current.date;. Briefly, -STABLE is aimed at the @@ -327,8 +324,8 @@ Releases are made every few months. While many people stay more up-to-date with the FreeBSD sources (see the questions on FreeBSD-CURRENT and FreeBSD-STABLE) than that, doing so + linkend="current">&os.current; and &os.stable;) than that, doing so is more of a commitment, as the sources are a moving target. @@ -346,7 +343,7 @@ FreeBSD-CURRENT + url="&url.books.handbook;/cutting-edge.html#CURRENT">&os.current; is the development version of the operating system, which will in due course become the new &os.stable; branch. As such, it is @@ -360,9 +357,9 @@ If you are not familiar with the operating system or are not capable of identifying the difference between a real problem and a temporary problem, you should not use - FreeBSD-CURRENT. This branch sometimes evolves quite quickly + &os.current;. This branch sometimes evolves quite quickly and can be un-buildable for a number of days at a time. - People that use FreeBSD-CURRENT are expected to be able to + People that use &os.current; are expected to be able to analyze any problems and only report them if they are deemed to be mistakes rather than glitches. Questions such as make world produces some error about @@ -435,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.3-RELEASE (and beyond). Just before 5.3-RELEASE, the - 5-STABLE branch was created, and - &os.current; became 6-CURRENT. For more detailed information, + towards 6.0-RELEASE and beyond. Just before 6.0-RELEASE, the + 6-STABLE branch was created, and + &os.current; became 7-CURRENT. For more detailed information, see FreeBSD Release Engineering: Creating the Release Branch. @@ -446,17 +443,17 @@ 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. Support for the 4-STABLE branch will continue - for some time but focus primarily on security-related bug - fixes and other serious issues. + fixes. Support for the 4-STABLE and 5-STABLE branches will + continue for some time but focus primarily on security-related + bug fixes and other serious issues. - 5-STABLE is the actively developed -STABLE branch. - The latest release on the 5-STABLE branch is + &rel.current;-STABLE is the actively developed -STABLE branch. + The latest release on the &rel.current;-STABLE branch is &rel.current;-RELEASE, which was released in &rel.current.date;. - The 6-CURRENT branch is the actively developed - -CURRENT branch toward the next generation of &os;. + The 7-CURRENT branch is the actively developed + -CURRENT branch toward the next generation of &os;. See What is &os;-CURRENT? for more information on this branch. --- what-is-freebsd-stable.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: