Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/share/misc pullup 1.5 -> 1.6 (approved by releng-1-5)



details:   https://anonhg.NetBSD.org/src/rev/0495f91f0131
branches:  netbsd-1-5
changeset: 489709:0495f91f0131
user:      itojun <itojun%NetBSD.org@localhost>
date:      Sun Oct 08 02:26:27 2000 +0000

description:
pullup 1.5 -> 1.6 (approved by releng-1-5)
sync with FreeBSD share/misc/bsd-family-tree.

diffstat:

 share/misc/bsd-family-tree |  217 ++++++++++++++++++++++++++------------------
 1 files changed, 127 insertions(+), 90 deletions(-)

diffs (truncated from 317 to 300 lines):

diff -r eb84a08b08d6 -r 0495f91f0131 share/misc/bsd-family-tree
--- a/share/misc/bsd-family-tree        Sun Oct 08 02:09:52 2000 +0000
+++ b/share/misc/bsd-family-tree        Sun Oct 08 02:26:27 2000 +0000
@@ -1,5 +1,5 @@
-The Unix system family tree / BSD history chart
------------------------------------------------
+The UNIX system family tree: Research and BSD
+---------------------------------------------
 
 First Edition (V1)
      |
@@ -27,17 +27,15 @@
                   |                      |
                4.0BSD               2.7.9BSD
                   |                      |
-       *------ 4.1BSD --------------> 2.8BSD
-      /           |                      |
-Eighth Edition     |                 2.8.1BSD
-     |            |                      |
-     |        4.1aBSD -----------\       |
-     |            |                \     |
-     |        4.1bBSD                \   |
-     |            |                    \ |
-     |        4.1cBSD --------------> 2.9BSD
-     |            |                      |
-     |            |                   2.9BSD-Seismo
+               4.1BSD --------------> 2.8BSD
+                  |                      |
+              4.1aBSD -----------\       |
+                  |                \     |
+              4.1bBSD                \   |
+                  |                    \ |
+      *------ 4.1cBSD --------------> 2.9BSD
+     /            |                      |
+Eighth Edition    |                   2.9BSD-Seismo
      |            |                      |
      +----<--- 4.2BSD               2.9.1BSD
      |            |                      |
@@ -49,7 +47,7 @@
      |            |                \     |
      v            |                  2.11BSD
 Tenth Edition     |                      |
-                  |                  2.11BSD rev #366
+                  |                  2.11BSD rev #430
                4.3BSD NET/1              |
                   |                      v
                4.3BSD Reno
@@ -81,44 +79,64 @@
    |                       \
    |                        \
 FreeBSD 2.1                  |
- |   |                    NetBSD 1.1 ---------.
- | FreeBSD 2.1.5             |                 \
- |     |                  NetBSD 1.2            \
- | FreeBSD 2.1.6             |    |           OpenBSD 2.0
- |     |                     |    |               |
- | FreeBSD 2.1.6.1           |    |               |
- |     |                     |    |               |
- | FreeBSD 2.1.7             |    |               |
- |     |                     | NetBSD 1.2.1       |
- | FreeBSD 2.1.7.1           |                    |
- |                           |                    |
- |                           |                    |
- *-FreeBSD 2.2               |                    |
-    |   |                    |                    |
-    |  FreeBSD 2.2.1         |                    |
-    |      |                 |                    |
-    |  FreeBSD 2.2.2         |                OpenBSD 2.1
-    |      |                 |                    |
-    |  FreeBSD 2.2.5         |                    |
-    |      |                 |                OpenBSD 2.2
-    |      |              NetBSD 1.3              |
-    |  FreeBSD 2.2.6         |    |               |       
-    |      |                 | NetBSD 1.3.1       |
-    |      |                 |    |           OpenBSD 2.3
-    |      |                 | NetBSD 1.3.2       |
-    |  FreeBSD 2.2.7         |    |               |
-    |      |                 |    |               |
-    |  FreeBSD 2.2.8         |    |               |
-    |                        |    |               |
-FreeBSD 3.0                  |    |           OpenBSD 2.4
-    |                        | NetBSD 1.3.3       |
-    *---FreeBSD 3.1          |                    |
-    |      |              NetBSD 1.4              |
-    |   FreeBSD 3.2          |                OpenBSD 2.5
-    |                        |                    |
-FreeBSD 4.0-CURRENT       NetBSD -current     OpenBSD -current
-    |                        |                    |
-    v                        v                    v
+ |   |                    NetBSD 1.1 ------.
+ | FreeBSD 2.1.5             |              \
+ |     |                  NetBSD 1.2         \
+ | FreeBSD 2.1.6             |  \          OpenBSD 2.0
+ |     |                     |   \             |
+ | FreeBSD 2.1.6.1           |    \            |
+ |     |                     |     \           |
+ | FreeBSD 2.1.7             |      |          |
+ |     |                     |  NetBSD 1.2.1   |
+ | FreeBSD 2.1.7.1           |                 |
+ |                           |                 |
+ |                           |                 |
+ *-FreeBSD 2.2               |                 |
+ |        \                  |                 |
+ |     FreeBSD 2.2.1         |                 |
+ |         |                 |                 |
+ |     FreeBSD 2.2.2         |             OpenBSD 2.1
+ |         |                 |                 |
+ |     FreeBSD 2.2.5         |                 |
+ |         |                 |             OpenBSD 2.2
+ |         |              NetBSD 1.3           |
+ |     FreeBSD 2.2.6         |    |            |
+ |         |                 | NetBSD 1.3.1    |
+ |         |                 |    |        OpenBSD 2.3
+ |         |                 | NetBSD 1.3.2    |
+ |     FreeBSD 2.2.7         |    |            |
+ |         |                 |    |            |
+ |         v                 |    |            |
+ |     FreeBSD 2.2.8         |    |            |
+ |                           |    |            |
+ |                           |    |        OpenBSD 2.4
+FreeBSD 3.0                  |    v            |
+ |                           | NetBSD 1.3.3    |
+ *---FreeBSD 3.1             |                 |
+ |       |                   |                 |
+ |   FreeBSD 3.2          NetBSD 1.4       OpenBSD 2.5
+ |       |                   |    |            |
+ |   FreeBSD 3.3             | NetBSD 1.4.1    |
+ |       |                   |    |        OpenBSD 2.6
+ |   FreeBSD 3.4             |    |            |
+ |           |               |    |            |
+FreeBSD 4.0  |               | NetBSD 1.4.2    |
+ |           |               |                 |
+ |           |               |                 |
+ |   FreeBSD 3.5             |             OpenBSD 2.7
+ |           |               |                 |
+ |   FreeBSD 3.5.1           |                 |
+ |                           |                 |
+ *---FreeBSD 4.1             |                 |
+ |      |                    |                 | 
+ |   FreeBSD 4.1.1           |                 |
+ |      |                    |                 |
+ |      v                    |                 |
+ |                           |                 |
+ |                           |                 |
+FreeBSD 5.0-current       NetBSD -current  OpenBSD -current
+ |                           |                 |
+ v                           v                 v
 
 
 Time
@@ -149,12 +167,12 @@
 
 
 Multics                 1965
-Unix                    Summer 1969
+UNIX                    Summer 1969
                                DEC PDP-7
 First   Edition         1971-11-03 [QCU]
                                DEC PDP-11/20, Assembler
 Second  Edition         1972-06-12 [QCU]
-                               10 Unix installations
+                               10 UNIX installations
 Third   Edition         1973-02-xx [QCU]
                                Pipes, 16 installations
 Fourth  Edition         1973-11-xx [QCU]
@@ -165,8 +183,8 @@
 Sixth   Edition         1975-05-xx [QCU]
                                port to DEC Vax
 Seventh Edition         1979-01-xx [QCU]
-                               first portable Unix
-Eight   Edition         1985-02-xx [QCU]
+                               first portable UNIX
+Eighth  Edition         1985-02-xx [QCU]
                                VAX 11/750, VAX 11/780 [dmr]
                                descended from 4.1c BSD [dmr]
                                descended from 4.1 BSD [44B]
@@ -194,7 +212,7 @@
 2.10BSD                        1987-04-xx [KKK]
 2.10.1BSD              1989-01-xx [SMS]
 2.11BSD                        1992-02-xx [SMS]
-2.11BSD rev #366       1997-02-xx [SMS]
+2.11BSD rev #430       1999-12-13 [SMS]
 
 32V                    1978-1[01]-xx [QCU]
 3BSD                    late 1979 [QCU]
@@ -217,46 +235,61 @@
 386BSD 0.0              1992-02-xx [DOC]
 386BSD 0.1              1992-07-xx [DOC]
 4.4BSD Alpha            1992-07-07
-NetBSD 0.8              1993-04-19 [NBD]
+NetBSD 0.8              1993-04-20 [NBD]
 4.4BSD                  1993-06-01 [USE]
 NetBSD 0.9              1993-08-23 [NBD]
-FreeBSD 1.0             1993-11-xx [FOO]
+FreeBSD 1.0            1993-11-xx [FOO]
 4.4BSD Lite             1994-03-01 [USE]
-FreeBSD 1.1             1994-04-xx [FBD]
-FreeBSD 1.1.5.1         1994-07-xx [FBD]
-                                supercedes 1.1.5 3 days after release.
-NetBSD 1.0              1994-11-08 [NBD]
+FreeBSD 1.1            1994-04-xx [FBD]
+FreeBSD 1.1.5.1                1994-07-xx [FBD]
+                               supersedes 1.1.5 3 days after release.
+NetBSD 1.0              1994-10-26 [NBD]
 386BSD 1.0              1994-11-12 [USE]
-FreeBSD 2.0             1995-01-xx [FBD]
-FreeBSD 2.0.5           1995-06-xx [FBD]
-4.4BSD Lite Release 2   1995-06-xx [44B]
-                                the true final distribution from the CSRG
+FreeBSD 2.0            1995-01-xx [FBD]
+FreeBSD 2.0.5          1995-06-xx [FBD]
+4.4BSD Lite Release 2  1995-06-xx [44B]
+                               the true final distribution from the CSRG
 NetBSD 1.1              1995-11-26 [NBD]
-FreeBSD 2.1             1995-12-xx [FBD]
-FreeBSD 2.1.5           1996-08-xx [FBD]
+FreeBSD 2.1            1995-12-xx [FBD]
+FreeBSD 2.1.5          1996-08-xx [FBD]
 NetBSD 1.2              1996-10-04 [NBD]
 OpenBSD 2.0             1996-10-18 [OBD]
-FreeBSD 2.1.6           1996-12-xx [FBD]
-FreeBSD 2.1.7           1997-02-xx [FBD]
-FreeBSD 2.2.1           1997-04-xx [FBD]
-NetBSD 1.2.1            1997-05-20 [NBD]
+FreeBSD 2.1.6          1996-12-xx [FBD]
+FreeBSD 2.1.7          1997-02-xx [FBD]
+FreeBSD 2.2.1          1997-04-xx [FBD]
+NetBSD 1.2.1            1997-05-20 [NBD] (patch release)
 OpenBSD 2.1             1997-06-01 [OBD]
-FreeBSD 2.2.2           1997-06-xx [FBD]
-FreeBSD 2.2.5           1997-11-xx [FBD]
+FreeBSD 2.2.2          1997-06-xx [FBD]
+FreeBSD 2.2.5          1997-11-xx [FBD]
 OpenBSD 2.2             1997-12-01 [OBD]
 NetBSD 1.3              1998-01-04 [NBD]
-FreeBSD 2.2.6           1998-03-xx [FBD]
-NetBSD 1.3.1            1998-04-xx [NBD]
+FreeBSD 2.2.6          1998-03-xx [FBD]
+NetBSD 1.3.1            1998-03-09 [NBD] (patch release)
 OpenBSD 2.3             1998-05-19 [OBD]
-NetBSD 1.3.2            1998-05-24 [NBD]
-FreeBSD 2.2.7           1998-07-xx [FBD]
-FreeBSD 3.0             1998-10-16 [FBD]
+NetBSD 1.3.2            1998-05-29 [NBD] (patch release)
+FreeBSD 2.2.7          1998-07-xx [FBD]
+FreeBSD 3.0            1998-10-16 [FBD]
+                               FreeBSD-3.0 is a snapshot from -current, 
+                               while 3.1 and 3.2 are from 3.x-stable which 
+                               was branched quite some time after 3.0-release
 FreeBSD 2.2.8           1998-11-29 [FBD]
 OpenBSD 2.4             1998-12-01 [OBD]
-NetBSD 1.3.3            1998-12-23 [NBD]
-FreeBSD 3.1             1999-02-15 [FBD]
+NetBSD 1.3.3            1998-12-23 [NBD] (patch release)
+FreeBSD 3.1            1999-02-15 [FBD]
 NetBSD 1.4              1999-05-12 [NBD]
+FreeBSD 3.2             1999-05-17 [FBD]
 OpenBSD 2.5             1999-05-19 [OBD]
+NetBSD 1.4.1            1999-08-26 [NBD] (patch release)
+FreeBSD 3.3             1999-09-17 [FBD]
+OpenBSD 2.6             1999-12-01 [OBD]
+FreeBSD 3.4             1999-12-20 [FBD]
+FreeBSD 4.0             2000-03-13 [FBD]
+NetBSD 1.4.2            2000-03-19 [NBD] (patch release)
+OpenBSD 2.7             2000-06-15 [OBD]
+FreeBSD 3.5            2000-06-24 [FBD]
+FreeBSD 4.1            2000-07-27 [FBD]
+FreeBSD 3.5.1          2000-07-28 [FBD]
+FreeBSD 4.1.1          2000-09-25 [FBD] (a network-only patch release)
 
 
 Bibliography
@@ -278,25 +311,29 @@
 Michael G. Brown. The Role of BSD in the Development of Unix.
 Presented to the Tasmanian Unix Special Interest Group of the
 Australian Computer Society, Hobart, August 1993.
-URL: http://www.dpac.tas.gov.au/~mgb/papers/bsdrole.html
 
-Peter H. Salus. Unix at 25. Byte Magazin, October 1994.
+Peter H. Salus. Unix at 25. Byte Magazine, October 1994.
 URL: http://www.byte.com/art/9410/sec8/art3.htm
 
 Andreas Klemm, Lars Köller. If you're going to San Francisco ...
 Die freien BSD-Varianten von Unix. c't April 1997, page 368ff.
-URL: http://www.heise.de
 
 BSD Release Announcements collection.
-URL: http://www.de.FreeBSD.ORG/de/ftp/releases/
+URL: http://www.de.FreeBSD.org/de/ftp/releases/
 
 BSD Hypertext Man Pages
-http://www.freebsd.org/cgi/man.cgi
+http://www.FreeBSD.org/cgi/man.cgi
+
+UNIX history graphing project
+http://minnie.cs.adfa.edu.au/Unix_History/index.html
+
+UNIX history
+http://perso.wanadoo.fr/levenez/unix/
 



Home | Main Index | Thread Index | Old Index