Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/misc/bsd-family-tree,v
rcsdiff: /ftp/cvs/cvsroot/src/share/misc/bsd-family-tree,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.43
retrieving revision 1.49
diff -u -p -r1.43 -r1.49
--- src/share/misc/bsd-family-tree	2012/01/27 14:34:30	1.43
+++ src/share/misc/bsd-family-tree	2013/05/19 15:04:39	1.49
@@ -62,9 +62,9 @@ Tenth Edition     |                     
    |                    |                  4.4BSD            |
    |                    |                    / |             |
    |                    |   4.4BSD-Encumbered  |             |
-   |                 NetBSD 0.8                |           BSD/386 1.0
-   |                    |                      |             |
-FreeBSD 1.0          NetBSD 0.9                |           BSD/386 1.1
+   |                -NetBSD 0.8                |           BSD/386 1.0
+   |               /    |                      |             |
+FreeBSD 1.0 <-----'  NetBSD 0.9                |           BSD/386 1.1
    |                    |           .----- 4.4BSD Lite       |
 FreeBSD 1.1             |          /   /       |     \       |
    |                    |         /   /        |      \      |
@@ -216,43 +216,57 @@ FreeBSD 5.2           |      |          
  |     |             10.5    |                 |                       |
  |     |              |      |             OpenBSD 4.2                 |
  |     |              |   NetBSD 4.0           |                       |
- | FreeBSD 6.3        |      |                 |                       |
- |            \       |      |                 |                       |
- *--FreeBSD    |      |      |                 |                DragonFly 1.12.0
- |    7.0      |      |      |                 |                       |
- |     |       |      |      |             OpenBSD 4.3                 |
- |     |       |      |      |                 |                DragonFly 2.0.0
+ | FreeBSD 6.3        |      |    |            |                       |
+ |            \       |      |    |            |                       |
+ *--FreeBSD    |      |      |    |            |                DragonFly 1.12.0
+ |    7.0      |      |      |    |            |                       |
+ |     |       |      |      |    |        OpenBSD 4.3                 |
+ |     |       |      |      | NetBSD 4.0.1    |                DragonFly 2.0.0
  |     |    FreeBSD   |      |             OpenBSD 4.4                 |
  |     |      6.4     |      |                 |                       |
  |     |              |      |                 |                       |
  |  FreeBSD 7.1       |      |                 |                       |
  |     |              |      |                 |                DragonFly 2.2.0
  |  FreeBSD 7.2       |   NetBSD 5.0       OpenBSD 4.5                 |
- |             \      |      |    |            |                       |
- |              |  Mac OS X  |    |            |                       |
- |              |    10.6    |    |            |                       |
- |              |     |      |    |            |                DragonFly 2.4.0
- |              |     |      |    |        OpenBSD 4.6                 |
- |              |     |      |    |            |                       |
- *--FreeBSD     |     |      |    |            |                       |
- |    8.0       |     |      |    |            |                       |
- |     |     FreeBSD  |      |    |            |                       |
- |     |       7.3    |      |    |            |                DragonFly 2.6.0
- |     |        |     |      |    |        OpenBSD 4.7                 |
- |  FreeBSD     |     |      |    |            |                       |
- |    8.1       |     |      |    |            |                       |
- |     |        |     |      |    |            |                DragonFly 2.8.2
- |     |        |     |      |    |        OpenBSD 4.8                 |
- |     |        |     |      | NetBSD 5.1      |                       |
- |  FreeBSD  FreeBSD  |      |                 |                       |
- |    8.2      7.4    |      |                 |               DragonFly 2.10.1
- |     v              |      |             OpenBSD 4.9                 |
- |                 Mac OS X  |                 |                       |
- |                   10.7    |                 |                       |
- |                    |      |             OpenBSD 5.0                 |
- +--FreeBSD           |      |                 |                       |
- |    9.0             |      |                 |                       |
- |     v              |      |                 |                       |
+ |             \      |      | |    \          |                       |
+ |              |  Mac OS X  | |     \         |                       |
+ |              |    10.6    | |      \        |                       |
+ |              |     |      | |   NetBSD      |                DragonFly 2.4.0
+ |              |     |      | |    5.0.1  OpenBSD 4.6                 |
+ |              |     |      | |       |       |                       |
+ *--FreeBSD     |     |      | |       |       |                       |
+ |    8.0       |     |      | |       |       |                       |
+ |     |     FreeBSD  |      | |   NetBSD      |                       |
+ |     |       7.3    |      | |    5.0.2      |                DragonFly 2.6.0
+ |     |        |     |      | |           OpenBSD 4.7                 |
+ |  FreeBSD     |     |      | |               |                       |
+ |    8.1       |     |      | |               |                       |
+ |     |        |     |      | |               |                DragonFly 2.8.2
+ |     |        |     |      |  \          OpenBSD 4.8                 |
+ |     |        |     |      |  NetBSD         |                       |
+ |  FreeBSD  FreeBSD  |      |    5.1          |                       |
+ |    8.2      7.4    |      |     |\          |               DragonFly 2.10.1
+ |     |              |      |     | \     OpenBSD 4.9                 |
+ |     `-----.     Mac OS X  |     |  |        |                       |
+ |            \      10.7    |     |  |        |                       |
+ |             |      |      |     |  |    OpenBSD 5.0                 |
+ *--FreeBSD    |      |      |     |  |        |                       |
+ |    9.0      |      |      |  NetBSD 5.1.2   |               DragonFly 3.0.1
+ |     |    FreeBSD   |      |        |        |                       |
+ |     |      8.3     |      |        |    OpenBSD 5.1                 |
+ |     |           Mac OS X  |        |        |                       |
+ |     |             10.8    |        |        |                       |
+ |     |              |   NetBSD 6.0  |        |                       |
+ |     |              |      |\\      |    OpenBSD 5.2         DragonFly 3.2.1
+ |  FreeBSD           |      | |\  NetBSD 5.2  |                       |
+ |    9.1             |      | | \             |                       |
+ |                    |      | | NetBSD 6.0.1  |                       |
+ |                    |      | |      |   OpenBSD 5.3          DragonFly 3.4.1
+ |                    |      | |      |        |                       |
+ |                    |      | | NetBSD 6.0.2  |                       |
+ |                    |      |  `-NetBSD 6.1   |                       |
+ |                    |      |                 |                       |
+ |                    |      |                 |                       |
  |                    |      |                 |                       |
 FreeBSD 10 -current   |  NetBSD -current  OpenBSD -current             |
  |                    |      |                 |                       |
@@ -526,9 +540,11 @@ NetBSD 5.0		2009-04-29 [NBD]
 OpenBSD 4.5		2009-05-01 [OBD]
 FreeBSD 7.2		2009-05-04 [FBD]
 Mac OS X 10.6		2009-06-08 [APL]
+NetBSD 5.0.1		2009-08-02 [NBD] (security/critical release)
 DragonFly 2.4.0		2009-09-16 [DFB]
 OpenBSD 4.6		2009-10-18 [OBD]
 FreeBSD 8.0		2009-11-26 [FBD]
+NetBSD 5.0.2		2010-02-12 [NBD] (security/critical release)
 FreeBSD 7.3		2010-03-23 [FBD]
 DragonFly 2.6.0		2010-03-28 [DFB]
 OpenBSD 4.7		2010-05-19 [OBD]
@@ -543,6 +559,21 @@ OpenBSD 4.9		2011-05-01 [OBD]
 Mac OS X 10.7		2011-07-20 [APL]
 OpenBSD 5.0		2011-11-01 [OBD]
 FreeBSD 9.0		2012-01-12 [FBD]
+NetBSD 5.1.2		2012-02-02 [NBD] (security/critical release)
+DragonFly 3.0.1		2012-02-21 [DFB]
+FreeBSD 8.3		2012-04-18 [FBD]
+OpenBSD 5.1		2012-05-01 [OBD]
+Mac OS X 10.8		2012-07-25 [APL]
+NetBSD 6.0		2012-10-17 [NBD]
+OpenBSD 5.2		2012-11-01 [OBD]
+DragonFly 3.2.1		2012-11-02 [DFB]
+NetBSD 5.2		2012-12-03 [NBD]
+NetBSD 6.0.1		2012-12-26 [NBD] (security/critical release)
+FreeBSD 9.1		2012-12-30 [FBD]
+DragonFly 3.4.1		2013-04-29 [DFB]
+OpenBSD 5.3		2013-05-01 [OBD]
+NetBSD 6.0.2		2013-05-18 [NBD] (security/critical release)
+NetBSD 6.1		2013-05-18 [NBD]
 
 Bibliography
 ------------------------
@@ -603,4 +634,4 @@ Steven M. Schultz for providing 2.8BSD, 
 Copyright (c) 1997-2012 Wolfram Schneider <wosch@FreeBSD.ORG>
 URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
 
-$FreeBSD: src/share/misc/bsd-family-tree,v 1.150 2012/01/13 06:18:23 maxim Exp $
+$FreeBSD$