1 files changed, 49 insertions, 63 deletions

diff --git a/FAQ/preface.sgml b/FAQ/preface.sgml
index c537f0185f..9235064bb1 100644
--- a/FAQ/preface.sgml
+++ b/FAQ/preface.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: preface.sgml,v 1.20 1998-11-08 11:04:57 jkh Exp $ -->
+<!-- $Id: preface.sgml,v 1.21 1998-12-03 13:47:28 jkh Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
   <sect>
@@ -171,54 +171,39 @@
       help, this is how it looks:
 
 <verb>
-                  2.0
-                   |
-                   |
-                   |  [2.1-stable]
-  *BRANCH*       2.0.5 -> 2.1 -> 2.1.5 -> 2.1.6 -> 2.1.7.1  [2.1-stable ends]
-                   |                            (Mar 1997)
-                   |
-                   |
-                   |  [2.2-stable]
-  *BRANCH*      2.2.1 -> 2.2.2-RELEASE -> 2.2.5 -> 2.2.6 -> 2.2.7
-                   |       (Mar 1997)   (Oct 97)  (Apr 98)  (Jul 98) 
-                   |
-                   |
-                3.0-SNAPs  (started Q1 1997)
-                   |
-                   |
-              3.0.0-RELEASE (Oct 1998)
-                   |
-                  \|/
-                   +
-           [future 3.x releases]
+                 2.0
+                  |
+                  |
+                  |  [2.1-stable]
+ *BRANCH*       2.0.5 -> 2.1 -> 2.1.5 -> 2.1.6 -> 2.1.7.1  [2.1-stable ends]
+                  |                            (Mar 1997)
+                  |
+                  |
+                  |  [2.2-stable]
+ *BRANCH*       2.2.1 -> 2.2.2-RELEASE -> 2.2.5 -> 2.2.6 -> 2.2.7 -> 2.2.8 [end]
+                  |       (Mar 1997)    (Oct 97) (Apr 98) (Jul 98) (Dec 98)
+                  |
+                  |
+               3.0-SNAPs  (started Q1 1997)
+                  |
+                  |
+             3.0.0-RELEASE (Oct 1998)
+                  |
+                  |  [3.0-stable]
+ *BRANCH*       3.0.1 (Feb 1999) -> ... future 3.0.x releases ...
+                  |
+                  |
+                 \|/
+                  +
+          [3.1-current continues]
 </verb>
 
-      <p>The -current branch is slowly progressing towards 3.0 and beyond,
-      whereas the previous 2.1-stable branch was superceded by the
-      release of 2.2.0, the new "stability branch" aka 2.2-stable.
-      3.0-current will continue to be where the active development takes
-      place, up until the actual release of 3.0.  At that point, 3.0 will
-      become yet another branch and 3.1-current will become the next
-      "current branch".
-
-    <sect1>
-      <heading>Why did the 2.1-stable branch end with 2.1.7.1?</heading>
-
-      <p>While we'd certainly like to be able to continue 3 branches of
-      development, we've found that the version control tools available to
-      us are not particularly well-suited for this; in fact, they quickly
-      result in a maintenance nightmare for any branch which lives much
-      beyond 2-3 months. The 2.1-stable branch has, by contrast, lasted for
-      well over a year and what little sanity the FreeBSD developers have
-      left would be in serious jeopardy if we continued in this way.
-      Perhaps in the future we'll figure out another model which gives
-      everyone what they want, and we are working on such a model, but in
-      the meantime it's probably best to think of the old -stable coming
-      to an end with <url
-      url="ftp://ftp.freebsd.org/pub/FreeBSD/pub/2.1.7.1-RELEASE"
-      name="2.1.7.1-RELEASE"> (the final point release after 2.1.7), and
-      the new -stable beginning with 2.2.2.
+      <p>The -current branch is slowly progressing towards 3.0.1 and beyond,
+      the previous 2.2-stable branch having just retired with the release
+      of 2.2.8.  3.0-current will continue to be where the active development
+      takes place up until the actual release of 3.0.1 in early 1999. At that
+      point, 3.0 will become yet another branch and 3.1-current will become
+      the next "current branch".
 
     <sect1>
       <heading>When are FreeBSD releases made?</heading>
@@ -232,7 +217,7 @@
       frustrating when waiting for all the latest goodies to become
       available...
 
-      <p>Releases are made about every 6 months on average.
+      <p>Releases are made about every 4 months on average.
 
       <p>For people needing (or wanting) a little more excitement, there are
       SNAPs released more frequently, particularly during the month or so
@@ -241,11 +226,12 @@
     <sect1>
       <heading>Is FreeBSD only available for PCs ?</heading>
 
-      <p>At present, yes, though a port to the <url
-      url="../alpha/alpha.html" name="DEC Alpha">
-      and <url url="http://www.freebsd.org/~jseger/freebsd-sparc/"
-      name="UltraSPARC"> architecture
-      is under way.  If your machine has a different architecture and
+      <p>FreeBSD 3.x currently runs on the <url
+      url="../alpha/alpha.html" name="DEC Alpha"> as well as the
+      x86 architecture.  Some interest has also been expressed in a
+      SPARC port, but details on this project are not yet clear.
+
+      If your machine has a different architecture and
       you need something right now, we suggest you look at
       <url url="http://www.netbsd.org/" name="NetBSD"> or
       <url url="http://www.openbsd.org/" name="OpenBSD">.
@@ -256,8 +242,8 @@
       <p>The key decisions concerning the FreeBSD project, such as the
       overall direction of the project and who is allowed to add code to
       the source tree, are made by a <url url="../handbook/staff:core.html"
-      name="core team"> of some 17 people. There is a much larger team of
-      around 80+ <url url="../handbook/staff:committers.html"
+      name="core team"> of some 15 people. There is a much larger team of
+      over 100 <url url="../handbook/staff:committers.html"
       name="committers"> who are authorized to make changes directly to the
       FreeBSD source tree.
 
@@ -273,20 +259,20 @@
       name="FreeBSD FTP site">:
 
       <itemize>
-        <item>For the current 2.2-stable release, 2.2.7R see the
-        <url url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/2.2.7-RELEASE/"
-        name="2.2.7-RELEASE"> directory.
+        <item>For the current 2.2-stable release, 2.2.8R see the
+        <url url="ftp://ftp.FreeBSD.ORG/pub/FreeBSD/2.2.8-RELEASE/"
+        name="2.2.8-RELEASE"> directory.
 
         <item>For the current 3.0-current release, 3.0-SNAP, see the
         <url url="ftp://current.freebsd.org/pub/FreeBSD/" name="3.0"> directory.
 
         <item><url url="ftp://releng22.freebsd.org/pub/FreeBSD/"
         name="2.2 Snapshot"> releases are made once a day along the
-        RELENG_2_2 branch (2.2.7 -> 2.2.x) as it winds its way towards the
-        next point release on the 2.2 branch. With the occasional
-        exception of accidental breakage, the RELENG_2_2 branch is
-        being carefully maintained (no experimental changes, fixes made
-        only after testing in -current).
+        RELENG_2_2 branch (post 2.2.8) as it slowly winds down in
+        maintenance mode.  The RELENG_2_2 branch is currently being carefully
+        maintained by the legacy support folks and no changes other than
+        those strictly necessary for security or reliability enhancements
+        are now made.
 
         <item><url url="ftp://current.freebsd.org/pub/FreeBSD/"
         name="3.0 Snapshot">releases are also made once a day for the