From 19fe2e4fc0d1954e9bc4ed32844d046b3a9cc2c5 Mon Sep 17 00:00:00 2001 From: junyoung Date: Wed, 24 Jul 2002 04:49:14 +0000 Subject: [PATCH] Pull in the latest from FreeBSD tree. --- share/misc/bsd-family-tree | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 11bf5a226e9a..c7a7aa614d63 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -137,7 +137,9 @@ FreeBSD 4.0 | | | | | NetBSD 1.4.2 | | | FreeBSD 4.1.1 | | / | | | | | | | | / | v | | | FreeBSD 4.2 Darwin/ | NetBSD 1.4.3 | | - | | Mac OS X | OpenBSD 2.8 BSD/OS 4.2 + | | Mac OS X | | OpenBSD 2.8 BSD/OS 4.2 + | | | | v | | + | | | | | | | | 10.0 NetBSD 1.5 | | | FreeBSD 4.3 | | | | v | | | | v OpenBSD 2.9 @@ -145,8 +147,12 @@ FreeBSD 4.0 | | | | | NetBSD 1.4.2 | | | | | | | | | FreeBSD 4.4 | | NetBSD 1.5.2 | | | | | | | - | v | | NetBSD 1.5.3 | - | | | | + | | | | v OpenBSD 3.0 + | FreeBSD 4.5 | | | + | | | | | + | FreeBSD 4.6 | | | + | | | | | + | v | | | | | | | FreeBSD 5.0-current | NetBSD -current OpenBSD -current | | | | @@ -235,19 +241,21 @@ Tenth Edition 1989-10-xx [QCU] virtual memory, page replacement, demand paging 4.0BSD 1980-10-xx -4.1BSD 1981-06-xx +4.1BSD 1981-07-08 [DOC] 4.1aBSD 1982-04-xx alpha release, 100 sites, networking [44B] 4.1bBSD internal release, fast filesystem [44B] 4.1cBSD late 1982 beta release, IPC [44B] 4.2BSD 1983-09-xx [QCU] + 1983-08-03 [DOC] 4.3BSD 1986-06-xx [QCU] - 1986-04-xx [KB] -4.3BSD Tahoe 1988-06-xx [QCU] + 1986-04-05 [KB], [DOC] +4.3BSD Tahoe 1988-06-15 [QCU], [DOC] 4.3BSD NET/1 1988-11-xx [QCU] -4.3BSD Reno 1990-06-xx [QCU], [DOC] -4.3BSD NET/2 1991-06-xx [QCU] + 1989-01-01 [DOC] +4.3BSD Reno 1990-06-29 [QCU], [DOC] +4.3BSD NET/2 1991-06-28 [QCU], [DOC] BSD/386 ALPHA 1991-12-xx [BSDI] first code released to people outside BSDI @@ -341,9 +349,11 @@ FreeBSD 4.3 2001-04-20 [FBD] OpenBSD 2.9 2001-06-01 [OBD] NetBSD 1.5.1 2001-07-11 [NBD] (patch release) NetBSD 1.5.2 2001-09-13 [NBD] (patch release) -NetBSD 1.5.3 2002-07-22 [NBD] (patch release) FreeBSD 4.4 2001-09-18 [FBD] Mac OS X 10.1 2001-09-xx [APL] +OpenBSD 3.0 2001-12-01 [OBD] +FreeBSD 4.5 2002-01-29 [FBD] +FreeBSD 4.6 2002-06-xx [FBD] Bibliography @@ -401,5 +411,4 @@ Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11BSD manual pages. Copyright (c) 1997-2001 Wolfram Schneider URL: ftp://ftp.freebsd.org/pub/FreeBSD/branches/-current/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.52 2001/09/28 17:18:10 wosch Exp $ -$NetBSD: bsd-family-tree,v 1.12 2002/07/23 06:53:35 grant Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.58 2002/03/10 19:00:37 wosch Exp $