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.47
retrieving revision 1.54.2.1
diff -u -p -r1.47 -r1.54.2.1
--- src/share/misc/bsd-family-tree	2012/10/24 19:33:04	1.47
+++ src/share/misc/bsd-family-tree	2014/08/10 06:53:28	1.54.2.1
@@ -221,8 +221,8 @@ FreeBSD 5.2           |      |          
  *--FreeBSD    |      |      |    |            |                DragonFly 1.12.0
  |    7.0      |      |      |    |            |                       |
  |     |       |      |      |    |        OpenBSD 4.3                 |
- |     |       |      |      | NetBSD 4.0.1    |                DragonFly 2.0.0
- |     |    FreeBSD   |      |             OpenBSD 4.4                 |
+ |     |       |      |      | NetBSD          |                DragonFly 2.0.0
+ |     |    FreeBSD   |      |  4.0.1      OpenBSD 4.4                 |
  |     |      6.4     |      |                 |                       |
  |     |              |      |                 |                       |
  |  FreeBSD 7.1       |      |                 |                       |
@@ -242,23 +242,67 @@ FreeBSD 5.2           |      |          
  |  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
- |     v    FreeBSD   |      |                 |                       |
- |            8.3     |      |             OpenBSD 5.1                 |
- |                 Mac OS X  |                 |                       |
- |                   10.8    |                 |                       |
- |                    |   NetBSD 6.0           |                       |
+ |     |        |     |      | |           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      |               DragonFly 3.0.1
+ |     |    FreeBSD   |      | |    5.1.2      |                       |
+ |     |      8.3     |      | |      |        |                       |
+ |     |       |      |      | |   NetBSD      |                       |
+ |     |       |      |      | |    5.1.3      |                       |
+ |     |       |      |      | |      |        |                       |
+ |     |       |      |      | |   NetBSD      |                       |
+ |     |       |      |      | |    5.1.4      |                       |
+ |     |       |      |      | |           OpenBSD 5.1                 |
+ |     |       |   Mac OS X  | `----.          |                       |
+ |     |       |     10.8    |       \         |                       |
+ |     |       |      |   NetBSD 6.0  |        |                       |
+ |     |       |      |      | | |    |    OpenBSD 5.2         DragonFly 3.2.1
+ |  FreeBSD    |      |      | | | NetBSD      |                       |
+ |    9.1      |      |      | | |   5.2       |                       |
+ |     |       |      |      | | |    |        |                       |
+ |     |       |      |      | | | NetBSD      |                       |
+ |     |       |      |      | | |  5.2.1      |                       |
+ |     |       |      |      | | |    |        |                       |
+ |     |       |      |      | | | NetBSD      |                       |
+ |     |       |      |      | | |  5.2.2      |                       |
+ |     |       |      |      | | |             |                       |
+ |     |       |      |      | |  \            |                       |
+ |     |       |      |      | |   NetBSD      |                       |
+ |     |       |      |      | |    6.0.1      |                       |
+ |     |       |      |      | |      |   OpenBSD 5.3          DragonFly 3.4.1
+ |     |       |      |      | |   NetBSD      |                       |
+ |     |       |      |      | |    6.0.2      |                       |
+ |     |       |      |      | |      |        |                       |
+ |     |       |      |      | |  NetBSD 6.0.3 |                       |
+ |     |       |      |      | |      |        |                       |
+ |     |       |      |      | |  NetBSD 6.0.4 |                       |
+ |     |       |      |      | |      |        |                       |
+ |     |       |      |      | |  NetBSD 6.0.5 |                       |
+ |     |       |      |      | |               |                       |
+ |     |       |      |      |  `-NetBSD 6.1   |                       |
+ |     |    FreeBSD   |      |       |         |                       |
+ |     |      8.4     |      |    NetBSD 6.1.1 |                       |
+ |     |              |      |       |         |                       |
+ |  FreeBSD           |      |    NetBSD 6.1.2 |                       |
+ |    9.2          Mac OS X  |       |         |                       |
+ |                   10.9    |       |    OpenBSD 5.4                  |
+ |                    |      |       |         |               DragonFly 3.6.0
+ |                    |      |       |         |                       |
+ *--FreeBSD           |      |    NetBSD 6.1.3 |                       |
+ |   10.0             |      |       |         |                       |
+ |                    |      |    NetBSD 6.1.4 |                       |
  |                    |      |                 |                       |
-FreeBSD 10 -current   |  NetBSD -current  OpenBSD -current             |
+ |                    |      |                 |               DragonFly 3.6.1
+ |                    |      |            OpenBSD 5.5                  |
+ |                    |      |                 |                       |
+FreeBSD 11 -current   |  NetBSD -current  OpenBSD -current   DragonFly -current
  |                    |      |                 |                       |
  v                    v      v                 v                       v
 
@@ -555,6 +599,34 @@ 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]
+FreeBSD 8.4		2013-06-07 [FBD]
+NetBSD 6.1.1		2013-08-22 [NBD]
+NetBSD 5.1.3		2013-09-29 [NBD]
+NetBSD 5.2.1		2013-09-29 [NBD]
+FreeBSD 9.2		2013-09-30 [FBD]
+NetBSD 6.0.3		2013-09-30 [NBD]
+NetBSD 6.1.2		2013-09-30 [NBD]
+Mac OS X 10.9		2013-10-22 [APL]
+OpenBSD 5.4		2013-11-01 [OBD]
+DragonFly 3.6.0 	2013-11-25 [DFB]
+FreeBSD 10.0		2014-01-20 [FBD]
+NetBSD 5.1.4		2014-01-25 [NBD]
+NetBSD 5.2.2		2014-01-25 [NBD]
+NetBSD 6.0.4		2014-01-25 [NBD]
+NetBSD 6.1.3		2014-01-25 [NBD]
+DragonFly 3.6.1 	2014-02-22 [DFB]
+NetBSD 6.0.5		2014-04-12 [NBD]
+NetBSD 6.1.4		2014-04-12 [NBD]
+OpenBSD 5.5		2014-05-01 [OBD]
 
 Bibliography
 ------------------------
@@ -613,6 +685,6 @@ 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
+URL: http://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree
 
 $FreeBSD$