[src/netbsd-1-6]: src/share/misc Pull up revision 1.17 (requested by cjep in ...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bf56478a82f9
branches:  netbsd-1-6
changeset: 530673:bf56478a82f9
user:      tron <tron%NetBSD.org@localhost>
date:      Tue Sep 09 19:44:23 2003 +0000

description:
Pull up revision 1.17 (requested by cjep in ticket #1451):
Pull in the latest from FreeBSD.

diffstat:

 share/misc/bsd-family-tree |  68 +++++++++++++++++++++++++--------------------
 1 files changed, 38 insertions(+), 30 deletions(-)

diffs (117 lines):

diff -r 1db9a963f5aa -r bf56478a82f9 share/misc/bsd-family-tree
--- a/share/misc/bsd-family-tree        Tue Sep 09 19:43:00 2003 +0000
+++ b/share/misc/bsd-family-tree        Tue Sep 09 19:44:23 2003 +0000
@@ -141,25 +141,28 @@
  |      |             |      |    v            |             |
  |      |             |      |                 |             |
  |      |           10.0  NetBSD 1.5           |             |
- |   FreeBSD 4.3      |      |    |            |             v
- |      |             |      |    |        OpenBSD 2.9
- |      |             |      | NetBSD 1.5.1    |
- |      |             |      |    |            |
- |   FreeBSD 4.4      |      | NetBSD 1.5.2    |
- |      |             |      |    |            |
- |      |             |      |    |        OpenBSD 3.0
- |   FreeBSD 4.5      |      |    |            |
- |      |             |      |    |            |
- |   FreeBSD 4.6      |      |    |            |
- |      |             |      | NetBSD 1.5.3    |
- |      v             |      |    |            |
- |                    |      |    v            |
+ |   FreeBSD 4.3      |      |    |            |             |
+ |      |             |      |    |        OpenBSD 2.9       |
+ |      |             |      | NetBSD 1.5.1    |             |
+ |      |             |      |    |            |             |
+ |   FreeBSD 4.4-.    |      | NetBSD 1.5.2    |             |
+ |      |        | Mac OS X  |    |            |             |
+ |      |        |   10.1    |    |        OpenBSD 3.0       |
+ |   FreeBSD 4.5 |    |      |    |            |             |
+ |      |         \   |      |    |            |           BSD/OS 4.3
+ |   FreeBSD 4.6   \  |      |    |        OpenBSD 3.1       |
+ |      |           \ |      | NetBSD 1.5.3    |             v
+ |      |          Mac OS X  |    |            |
+ |   FreeBSD 4.6.2   10.2    |    v            |
+ |      |             |      |                 |
+ |      |             |   NetBSD 1.6           |
+ |   FreeBSD 4.7      |      |                 |
+ |      |             |      |                 |
+ |      v             |      |                 |
  |                    |      |                 |
 FreeBSD 5.0-current   |   NetBSD -current  OpenBSD -current
  |                    |      |                 |
- v                    |      v                 v
-                   Mac OS X  
-                     10.1
+ v                    v      v                 v
 
 Time
 ----------------
@@ -171,23 +174,23 @@
        and John Quarterman. The Design and Implementation of
        the 4.4BSD Operating System.
 [APL] Apple website [http://www.apple.com/macosx/]
+[BSDI] Berkeley Software Design, Inc.
 [DOC] README, COPYRIGHT on tape.
-[QCU] Salus, Peter H. A quarter century of UNIX.
-[U25] Peter H. Salus. Unix at 25.
-[USE] Usenet announcement.
-[KSJ] Michael J. Karels, Carl F. Smith, and William F. Jolitz.
-       Changes in the Kernel in 2.9BSD. Second Berkeley Software
-       Distribution UNIX Version 2.9, July, 1983.
+[FBD] FreeBSD Project, The.
 [KB]  Keith Bostic. BSD2.10 available from Usenix. comp.unix.sources,
        Volume 11, Info 4, April, 1987.
 [KKK] Mike Karels, Kirk McKusick, and Keith Bostic. tahoe announcement.
        comp.bugs.4bsd.ucb-fixes, June 15, 1988.
-[SMS] Steven M. Schultz. 2.11BSD, UNIX for the PDP-11.
-[FBD] FreeBSD Project, The.
+[KSJ] Michael J. Karels, Carl F. Smith, and William F. Jolitz.
+       Changes in the Kernel in 2.9BSD. Second Berkeley Software
+       Distribution UNIX Version 2.9, July, 1983.
 [NBD] NetBSD Project, The.
 [OBD] OpenBSD Project, The.
+[QCU] Salus, Peter H. A quarter century of UNIX.
+[SMS] Steven M. Schultz. 2.11BSD, UNIX for the PDP-11.
+[USE] Usenet announcement.
+[WRS] Wind River Systems, Inc.
 [dmr] Dennis Ritchie, via E-Mail
-[BSDI] Berkeley Software Design, Inc.
 
 Multics                 1965
 UNIX                    Summer 1969
@@ -351,12 +354,17 @@
 NetBSD 1.5.1           2001-07-11 [NBD] (patch release)
 NetBSD 1.5.2           2001-09-13 [NBD] (patch release)
 FreeBSD 4.4            2001-09-18 [FBD]
-Mac OS X 10.1          2001-09-xx [APL]
+Mac OS X 10.1          2001-09-29 [APL]
 OpenBSD 3.0            2001-12-01 [OBD]
 FreeBSD 4.5            2002-01-29 [FBD]
-FreeBSD 4.6            2002-06-xx [FBD]
+BSD/OS 4.3             2002-03-14 [WRS]
+OpenBSD 3.1            2002-05-19 [OBD]
+FreeBSD 4.6            2002-06-15 [FBD]
 NetBSD 1.5.3           2002-07-22 [NBD] (patch release)
-
+FreeBSD 4.6.2          2002-08-15 [FBD] (patch release)
+Mac OS X 10.2          2002-08-23 [APL]
+NetBSD 1.6             2002-09-14 [NBD]
+FreeBSD 4.7            2002-10-08 [FBD]
 
 Bibliography
 ------------------------
@@ -394,7 +402,7 @@
 URL: http://minnie.tuhs.org/Unix_History/index.html
 
 UNIX history
-URL: http://perso.wanadoo.fr/levenez/unix/
+URL: http://www.levenez.com/unix/
 
 James Howard: The BSD Family Tree
 URL: http://www.daemonnews.org/200104/bsd_family.html
@@ -413,4 +421,4 @@
 Copyright (c) 1997-2001 Wolfram Schneider <wosch%FreeBSD.ORG@localhost>
 URL: ftp://ftp.freebsd.org/pub/FreeBSD/branches/-current/src/share/misc/bsd-family-tree
 
-$FreeBSD: src/share/misc/bsd-family-tree,v 1.58 2002/03/10 19:00:37 wosch Exp $
+$FreeBSD: src/share/misc/bsd-family-tree,v 1.67 2002/10/10 16:42:54 jhb Exp $