Update our history a little (whoops - I thought I'd committed

this days ago!).

1 files changed, 19 insertions, 15 deletions

diff --git a/share/doc/handbook/history.sgml b/share/doc/handbook/history.sgml
index 703d5bd..f7f9279 100644
--- a/share/doc/handbook/history.sgml
+++ b/share/doc/handbook/history.sgml
@@ -1,4 +1,4 @@
-<!-- $Id$ -->
+<!-- $Id: history.sgml,v 1.21 1997/02/22 12:58:35 peter Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>A brief history of FreeBSD<label id="history"></heading>
@@ -24,12 +24,12 @@ snapshot.  Those plans came to a rude halt when Bill Jolitz suddenly
 decided to withdraw his sanction from the project and without any
 clear indication of what would be done instead.
 
-It did not take us long to decide that the goal remained worthwhile
+It did not take us long to decide that the goal remained worthwhile,
 even without Bill's support, and so we adopted the name "FreeBSD",
-which was coined by David Greenman.  Our initial objectives were set
-after consulting with the system's current users, and once it became
-clear that the project was on the road to perhaps even becoming a
-reality, I contacted Walnut Creek CDROM with an eye towards improving
+coined by David Greenman.  Our initial objectives were set after
+consulting with the system's current users and, once it became clear
+that the project was on the road to perhaps even becoming a reality,
+I contacted Walnut Creek CDROM with an eye towards improving
 FreeBSD's distribution channels for those many unfortunates without
 easy access to the Internet.  Walnut Creek CDROM not only supported
 the idea of distributing FreeBSD on CD but went so far as to provide
@@ -74,14 +74,18 @@ robust and easier to install FreeBSD 2.0.5 release in June of 1995.
 <em>Where to from here?</em>
 
 We released FreeBSD 2.1.5 in August of 1996, and it appeared to be
-popular enough among the ISP and commercial communities that one last
-release along the 2.1-stable branch, was merited.  This was FreeBSD 2.1.6,
-released in December 1996, and capping the end of mainstream development
+popular enough among the ISP and commercial communities that another
+release along the 2.1-stable branch was merited.  This was FreeBSD 2.1.7.1,
+released in February 1997 and capping the end of mainstream development
 on 2.1-stable.  Now in maintenance mode, only security enhancements and other
-critical bug fixes will be done on this branch.
+critical bug fixes will be done on this branch (RELENG_2_1_0).
 
-FreeBSD 2.2 is now on a release branch and heading for its first full
-debut in January, 1997.  Long term development projects for everything
-from SMP to DEC ALPHA support will continue to take place in the
-3.0-current branch, which departed from 2.2 in October of 1996. 
-SNAPshot releases of 3.0 are expected to resume in early 1997.
+FreeBSD 2.2 was branched from the development mainline ("-current") in
+November 1996 as the RELENG_2_2 branch, and the first full release
+(2.2.1) was released in April, 1997.  Further releases along the 2.2 branch
+are planned throughout the Summer and Fall of '97 and into early
+Winter, at which point the first 3.0 release will appear.
+
+Long term development projects for everything from SMP to DEC ALPHA support
+will continue to take place in the 3.0-current branch and SNAPshot releases
+of 3.0 on CDROM (and, of course, on the net) will begin to appear in May, 1997.