From owner-freebsd-doc Wed Jul 26 23:30: 8 2000 Delivered-To: freebsd-doc@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 9D2AB37BB5F for ; Wed, 26 Jul 2000 23:30:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id XAA49003; Wed, 26 Jul 2000 23:30:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from penguin.prod.itd.earthlink.net (penguin.prod.itd.earthlink.net [207.217.120.134]) by hub.freebsd.org (Postfix) with ESMTP id DAA6337B98B for ; Wed, 26 Jul 2000 23:24:50 -0700 (PDT) (envelope-from eogren@rod.darktech.org) Received: from rod.darktech.org (ip36.cambridge2.ma.pub-ip.psi.net [38.32.112.36]) by penguin.prod.itd.earthlink.net (8.9.3-EL_1_3/8.9.3) with ESMTP id XAA01781 for ; Wed, 26 Jul 2000 23:24:45 -0700 (PDT) Received: (from eogren@localhost) by rod.darktech.org (8.10.1/8.9.3) id e6R6OPI00457; Thu, 27 Jul 2000 02:24:25 -0400 (EDT) (envelope-from eogren) Message-Id: <200007270624.e6R6OPI00457@rod.darktech.org> Date: Thu, 27 Jul 2000 02:24:25 -0400 (EDT) From: eogren@earthlink.net Reply-To: eogren@earthlink.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: docs/20209: [PATCH] Update of FAQ to 4.1 Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 20209 >Category: docs >Synopsis: Update of FAQ to 4.1 >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: Wed Jul 26 23:30:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Eric Ogren >Release: FreeBSD 4.1-RC i386 >Organization: >Environment: Updated doc repository. >Description: The FAQ has a couple of entries about 4.0 being the latest release on the 4-STABLE branch. Since 4.1 is hitting the FTP sites very soon (if it hasn't already), these should probably be updated to 4.1. This patch also slightly rewords a couple of sentences in the big ASCII tree in the Preface. >How-To-Repeat: n/a >Fix: Index: book.sgml =================================================================== RCS file: /usr/local/doctree/doc/en_US.ISO_8859-1/books/faq/book.sgml,v retrieving revision 1.80 diff -u -r1.80 book.sgml --- book.sgml 2000/07/25 18:24:48 1.80 +++ book.sgml 2000/07/27 06:19:25 @@ -154,9 +154,9 @@ Version 4.0 + URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/">4.0 is the latest stable version; it was - released in March, 2000. This is also the latest + released in July, 2000. This is also the latest release version. Briefly explained, -STABLE is aimed @@ -300,23 +300,26 @@ 3.0-RELEASE (Oct 1998) | | [3.0-STABLE] - *BRANCH* 3.1-RELESE (Feb 1999) -> 3.2 -> 3.3 -> 3.4 -> ... future 3.x releases ... + *BRANCH* 3.1-RELEASE (Feb 1999) -> 3.2 -> 3.3 -> 3.4 -> ... future 3.x releases ... | (May 1999) (Sep 1999) (Dec 1999) | | [4.0-STABLE] - *BRANCH* 4.0 (Mar 2000) -> ... future 4.x releases ... + *BRANCH* 4.0 (Mar 2000) -> 4.1 -> ... future 4.x releases ... | - | + | (Jul 2000) \|/ + [5.0-CURRENT continues] The -CURRENT branch is slowly progressing towards 5.0 and beyond, the previous 2.2-STABLE branch having been retired - with the release of 2.2.8. 3.4-STABLE has now replaced it, + with the release of 2.2.8. 3-STABLE replaced it, with 3.4-RELEASE being released in mid-December 1999. - 4.0-RELEASE was released in March 2000. Although 4-STABLE - is the actively developed -STABLE branch, bugfixes are + In May 2000, the 3-STABLE branch was more or less replaced + by the 4-STABLE branch. + 4.1-RELEASE was released in July 2000. 4-STABLE + is the actively developed -STABLE branch, although some + bugfixes (mostly security-related) are still being committed to 3-STABLE. It is expected that the 3.X branch will be officially obsoleted some time in summer 2000. @@ -408,9 +411,9 @@ - The current 4.X-STABLE release, 4.0-RELEASE can be + The current 4.X-STABLE release, 4.1-RELEASE can be found in the the 4.0-RELEASE directory. + URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/"> the 4.1-RELEASE directory. @@ -2458,7 +2461,7 @@ -In FreeBSD 4.0-CURRENT or later, the line should be: +In FreeBSD 4.0 or later, the line should be: device psm0 at atkbdc? irq 12 @@ -3834,7 +3837,7 @@ mailing list for periodic updates on new entries. -Most ports should be available for the 2.2, 3.x and 4.0 +Most ports should be available for the 2.2, 3.x and 4.x branches, and many of them should work on 2.1.x systems as well. Each time a FreeBSD release is made, a snapshot of the ports tree at the time of release in also included in the @@ -3877,7 +3880,7 @@ -for 4.0-RELEASE/4.X-STABLE +for 4.1-RELEASE/4.X-STABLE ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message