From 9e4f0cd041ea438eb8124d350695723258577af2 Mon Sep 17 00:00:00 2001 From: Jim Mock Date: Fri, 4 Aug 2000 20:55:26 +0000 Subject: [PATCH] Update bits of the FAQ for the latest release. PR: 20209 Submitted by: Eric Ogren With suggestions from: Udo Erdelhoff --- en_US.ISO8859-1/books/faq/book.sgml | 42 +++++++++++++++------------- en_US.ISO_8859-1/books/faq/book.sgml | 42 +++++++++++++++------------- 2 files changed, 44 insertions(+), 40 deletions(-) diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml index 8c791f84ba..720c9e18e3 100644 --- a/en_US.ISO8859-1/books/faq/book.sgml +++ b/en_US.ISO8859-1/books/faq/book.sgml @@ -15,7 +15,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.81 2000/07/28 00:37:03 ben Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.82 2000/07/28 01:19:17 ben Exp $ This is the FAQ for FreeBSD versions 2.X, 3.X, and 4.X. All entries @@ -154,9 +154,9 @@ Version 4.0 + URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/">4.1 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 ... - | (May 1999) (Sep 1999) (Dec 1999) + *BRANCH* 3.1-RELEASE (Feb 1999) -> 3.2 -> 3.3 -> 3.4 -> 3.5 -> 3.5.1 + | (May 1999) (Sep 1999) (Dec 1999) (June 2000) (July 2000) | | [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 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 + with the release of 2.2.8. 3-STABLE replaced it, + with 3.5.1 (the final 3.X release) being released in July 2000. + In May 2000 (even though 3.5 came after that), 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. @@ -403,14 +406,13 @@ For the current 3.X-STABLE release, 3.4-RELEASE, see the 3.4-RELEASE - directory. + URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/3.4-RELEASE/">3.4-RELEASE directory. - The current 4.X-STABLE release, 4.0-RELEASE can be + The current 4-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/">4.1-RELEASE directory. @@ -2178,7 +2180,7 @@ world. This is not supported. Make world. How do I upgrade from 3.X -> 4.X? We strongly recommend that you use -binary snapshots to do this. 4.X-STABLE snapshots are available at +binary snapshots to do this. 4-STABLE snapshots are available at releng4.FreeBSD.org. If you wish to upgrade using source, please see the -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 @@ -3850,7 +3852,7 @@ back to check often or subscribe to the freebsd-announcemailing 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 @@ -3893,7 +3895,7 @@ of FreeBSD at the following locations: -for 4.0-RELEASE/4.X-STABLE +for 4.1-RELEASE/4-STABLE ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/ @@ -9131,7 +9133,7 @@ a year, which is why there are only three active branches of development): -RELENG_4 AKA 4.X-STABLE +RELENG_4 AKA 4-STABLE diff --git a/en_US.ISO_8859-1/books/faq/book.sgml b/en_US.ISO_8859-1/books/faq/book.sgml index 8c791f84ba..720c9e18e3 100644 --- a/en_US.ISO_8859-1/books/faq/book.sgml +++ b/en_US.ISO_8859-1/books/faq/book.sgml @@ -15,7 +15,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.81 2000/07/28 00:37:03 ben Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.82 2000/07/28 01:19:17 ben Exp $ This is the FAQ for FreeBSD versions 2.X, 3.X, and 4.X. All entries @@ -154,9 +154,9 @@ Version 4.0 + URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/4.1-RELEASE/">4.1 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 ... - | (May 1999) (Sep 1999) (Dec 1999) + *BRANCH* 3.1-RELEASE (Feb 1999) -> 3.2 -> 3.3 -> 3.4 -> 3.5 -> 3.5.1 + | (May 1999) (Sep 1999) (Dec 1999) (June 2000) (July 2000) | | [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 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 + with the release of 2.2.8. 3-STABLE replaced it, + with 3.5.1 (the final 3.X release) being released in July 2000. + In May 2000 (even though 3.5 came after that), 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. @@ -403,14 +406,13 @@ For the current 3.X-STABLE release, 3.4-RELEASE, see the 3.4-RELEASE - directory. + URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/3.4-RELEASE/">3.4-RELEASE directory. - The current 4.X-STABLE release, 4.0-RELEASE can be + The current 4-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/">4.1-RELEASE directory. @@ -2178,7 +2180,7 @@ world. This is not supported. Make world. How do I upgrade from 3.X -> 4.X? We strongly recommend that you use -binary snapshots to do this. 4.X-STABLE snapshots are available at +binary snapshots to do this. 4-STABLE snapshots are available at releng4.FreeBSD.org. If you wish to upgrade using source, please see the -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 @@ -3850,7 +3852,7 @@ back to check often or subscribe to the freebsd-announcemailing 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 @@ -3893,7 +3895,7 @@ of FreeBSD at the following locations: -for 4.0-RELEASE/4.X-STABLE +for 4.1-RELEASE/4-STABLE ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/packages-4-stable/ @@ -9131,7 +9133,7 @@ a year, which is why there are only three active branches of development): -RELENG_4 AKA 4.X-STABLE +RELENG_4 AKA 4-STABLE