From owner-freebsd-doc@FreeBSD.ORG Sun May 25 15:40:05 2003 Return-Path: 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 63AA137B401 for ; Sun, 25 May 2003 15:40:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E2D843FA3 for ; Sun, 25 May 2003 15:40:04 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h4PMe4Up006507 for ; Sun, 25 May 2003 15:40:04 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h4PMe4OX006506; Sun, 25 May 2003 15:40:04 -0700 (PDT) Resent-Date: Sun, 25 May 2003 15:40:04 -0700 (PDT) Resent-Message-Id: <200305252240.h4PMe4OX006506@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, "Simon L.Nielsen" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD8AB37B404 for ; Sun, 25 May 2003 15:34:58 -0700 (PDT) Received: from arthur.nitro.dk (port324.ds1-khk.adsl.cybercity.dk [212.242.113.79]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90A3C43F85 for ; Sun, 25 May 2003 15:34:57 -0700 (PDT) (envelope-from simon@arthur.nitro.dk) Received: by arthur.nitro.dk (Postfix, from userid 1000) id 12DD710BF84; Mon, 26 May 2003 00:34:56 +0200 (CEST) Message-Id: <20030525223456.12DD710BF84@arthur.nitro.dk> Date: Mon, 26 May 2003 00:34:56 +0200 (CEST) From: "Simon L.Nielsen" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: docs/52679: [patch] FAQ is out of date with regards to 5.X releases X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Simon L.Nielsen" List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 May 2003 22:40:05 -0000 >Number: 52679 >Category: docs >Synopsis: [patch] FAQ is out of date with regards to 5.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 May 25 15:40:03 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Simon L. Nielsen >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: >Description: The FAQ is out of date with regards to 5.X and is confused by the two release (5.0, 4.8) and somewhat out of date. Main issue : "The latest release on the 4-STABLE is 5.0-RELEASE, which was released in January 2003." The patch also tries to make description of the 5.X future (and present) more accurate... It still still not perfect, but better than the current state. Also update the FreeBSD history ASCII chart to reflect reality a bit better... again not perfect, but better han the current state (IMHO). Change links to hardware notes to point to 4.8 hardware and not 5.0 notes since I think those are the ones people should be most interested in. >How-To-Repeat: >Fix: --- doc-faq-cur-stable.patch begins here --- Index: book.sgml =================================================================== RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/faq/book.sgml,v retrieving revision 1.538 diff -u -d -r1.538 book.sgml --- book.sgml 13 May 2003 19:15:26 -0000 1.538 +++ book.sgml 25 May 2003 22:22:30 -0000 @@ -323,7 +323,8 @@ FreeBSD-CURRENT is the development version of the operating system, which - will in due course become 5.0-RELEASE. As such, it is + will in due course, become the new &os.stable; branch. + This is expected to happen around 5.2-RELEASE. As such, it is really only of interest to developers working on the system and die-hard hobbyists. See the relevant @@ -412,8 +413,10 @@ experimental features are quite undesirable. It receives only well-tested bug fixes and other small incremental enhancements. FreeBSD-CURRENT, on the other hand, has - been one unbroken line leading towards 5.0-RELEASE (and - beyond) since 2.0 was released. If a little ASCII art + since 2.0 was released, been one unbroken line leading + towards 5.2-RELEASE (and beyond), where 5.X-STABLE is + expected to be branched off, and &os.current; becomes + 6-CURRENT. If a little ASCII art would help, this is how it looks: 2.0 @@ -439,9 +442,11 @@ | (May 1999) (Sep 1999) (Dec 1999) (June 2000) (July 2000) | | [4.0-STABLE] - *BRANCH* 4.0 (Mar 2000) -> 4.1 -> 4.1.1 -> 4.2 -> 4.3 -> 4.4 -> ... future 4.X releases ... + *BRANCH* 4.0 (Mar 2000) -> 4.1 -> 4.1.1 -> 4.2 -> 4.3 -> 4.4 -> 4.5 -> 4.6 -> 4.6.2 -> 4.7 -> 4.8 ... future 4.X releases ... + | (Jul 2000) (Sep 2000) (Nov 2000) (Apr 2001) (Sep 2001) (Jan 2002) (Jun 2002) (Aug 2002) (Oct 2002) (Apr 2003) + | + 5.0-RELEASE (Jan 2003) | - | (July 2000) (Sep 2000) (Nov 2000) \|/ + [5.0-CURRENT continues] @@ -454,11 +459,11 @@ 4-STABLE is the actively developed -STABLE branch. The latest release on the 4-STABLE is - &rel.current;-RELEASE, which was released in - &rel.current.date;. + &rel2.current;-RELEASE, which was released in + &rel2.current.date;. The 5-CURRENT branch is slowly progressing toward - 5.0-RELEASE and beyond. See What + 5.1-RELEASE and beyond. See What is FreeBSD-CURRENT? for more information on this branch. @@ -2267,7 +2272,7 @@ lists. Since hardware changes so quickly, however, we expect this. We still strongly recommend that you read through the - Hardware Notes + Hardware Notes and search the mailing list archives before asking about the latest and @@ -2305,7 +2310,7 @@ See the complete list in the current Hardware Notes. + URL="&rel2.current.hardware;">Hardware Notes. --- doc-faq-cur-stable.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: