Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

MFC: Make BSD tree more contemporary-looking.

This is actually batch of MFCs from the beginning of stable/10 branch.

MFC r256327:

Fix NetBSD release number

Approved by: re (glebius)

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Add the latest NetBSD and FreeBSD releases.

Approved by: re (glebius)

Add FreeBSD 9.2-RELEASE to the BSD Family Tree

Approved by: re (hrs)
Sponsored by: The FreeBSD Foundation

Add the newest NetBSD releases.

Approved by: re (gjb)

cvsweb -> svnweb

Merge latest NetBSD changes.
This adds some new NetBSD releases and makes some simple formatting changes.

With this commit NetBSD and FreeBSD should have identical files.
DragonflyFBSD has the version immediately prior to this commit.

When committing to this file please try to coordinate with all three groups.

Submitted by: Alan Barrett <apb@cequrux.com>

FreeBSD 8.4 added.

NetBSD 6.1 added.

By request, add an arrow from NetBSD-0.8 to FreeBSD-1.0.

While here, add a few more NetBSD versions to the tree itself.

Submitted by: Alan Barrett <apb@cequrux.com>
Submitted by: Thomas Klausner <wiz@netbsd.org>

I miscopied the previous date. Also add another NetBSD release.

Obtained from: NetBSD

Add two missing NetBSD releases

Obtained from: NetBSD

Add DragonFly BSD 3.4.1, released April 29 2013.

Submitted by: Nikolai Lifanov <lifanov@mail.lifanov.com>

Add OpenBSD 5.3, released today, May 1 2013.

Add FreeBSD 9.1.

o DragonFly 2.3.1 added.

o OpenBSD 5.2 added.

Document NetBSD 6.0

Add OS X 10.8.
Although they dropped the 'Mac' in this version,
prefer to stick with it for consistency.

Reviewed by: maxim

Revert r235194: 10.8 appears to be a developer preview.

Reported by: trasz

Mac OS X 10.8 added (belatedly).

OpenBSD 5.1 added.

o FreeBSD 8.3-RELEASE added.

DragonFly 3.0.1 added.

Copyright years updated.

o Mac OS X 10.7 added (belatedly). FreeBSD 9.0-RELEASE added.

OpenBSD 5.0 added.

Re-encode files from ISO-8859-1 to UTF-8

o OpenBSD 4.9 added.

Add DragonFly 2.10.1 release.

Add two missing vertical bars.

o FreeBSD 8.2 and 7.4-RELEASE added. Mac OS X 10.6 added belatedly.

o Correct version of DragonFly: it was 2.8.2 released, not 2.8.0.

Submitted by: Sascha Wildner

o NetBSD 5.1 added.

Add DragonflyBSD 2.8 and OpenBSD 4.8 releases

Also expand a stray tab in the family tree

MFC after: 1 week

o FreeBSD 8.1-RELEASED added.

PR: misc/149118
Submitted by: pluknet

o DragonFly 2.6.0 added.

Submitted by: pluknet

o OpenBSD 4.7 added.

o FreeBSD 7.3 added.

o Correct URL to announcements collection.

PR: docs/142204
Submitted by: Jason Helfman
MFC after: 1 week

o HEAD is FreeBSD 9-current now.

Submitted by: Alex Kozlov

o FreeBSD 8.0 added.

o OpenBSD 4.6 added.

o DragonflyBSD 2.4.0 added.

Correct some minor nits with the 2BSD and 3BSD series of releases
based on the information at The Unix Historical Society web page
(http://www.tuhs.org/Unix_History). Where multiple sources differ,
retain all data. Prefer 2.79BSD to 2.7.9BSD, since the former is from
/LABEL form the actual release. Use the /LABEL date as in the TUHS
tables (the curious can read http://minnie.tuhs.org/Unix_History/2bsd
for all the conflicting date confusion if they want).

Approved by: re@

o FreeBSD 7.2 added.

o OpenBSD 4.5 added.

o NetBSD 5.0 added.
> Description of fields to fill in above: 76 columns --|
> PR: If a GNATS PR is affected by the change.
> Submitted by: If someone else sent in the change.
> Reviewed by: If someone else reviewed your modification.
> Approved by: If you needed approval for this commit.
> Obtained from: If the change is from a third party.
> MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email.
> Security: Vulnerability reference (one per line) or description.
> Empty fields above will be automatically removed.

M bsd-family-tree

o Fix year in the previous commit.

Submitted by: Munehiro Matsuda

o DragonFly 2.2.0 added.

o FreeBSD 7.1 added.

o FreeBSD 6.4-RELEASE added.

o OpenBSD 4.4 added.

o DragonFly BSD 2.0 added.

o OpenBSD 4.3 added.

o Add FreeBSD 7.0, MacOS X 10.5 (belated), DragonFly BSD 1.12.0.

o FreeBSD 6.3-RELEASE added.

o NetBSD 4.0 added.

o OpenBSD 4.2 added.

o Indent "DragonFly".

Approved by: re (bmah)

o DragonFlyBSD 1.10.0 added.

Approved by: re (bmah)
MFC after: 1 week

Add information for FreeBSD 1.0.2 from November 1993. I have a
January 1994 Trans-Ameritech Release 1 CD-ROM that has this directory
named "update_bsd_1.0.2" dated November 14, 1993.

I didn't add it into the main-line sequence of releases because that
would disrupt things too much...

o OpenBSD 4.1 added.

o DragonFly 1.8.0 added.

o Add FreeBSD 6.2, bump copyright years.

o Add NetBSD 3.0.2 and NetBSD 3.1.

o OpenBSD 4.0 added.

o Reserve space for 3.x releases similar to 2.1.
o 3.0.1 is a security/critical release.

Submitted by: rpaulo@netbsd

o Add NetBSD 3.0.1 and DragonFlyBSD 1.6.0.

s/2005/2006/ for FreeBSD 6.1 and 5.5.

o FreeBSD 5.5 added.

o FreeBSD 6.1 added.

o OpenBSD 3.9 added.

o Fix an URL to the "The BSD Family Tree" article.

Spotted by: Marcin Jessa

o DragonFly 1.4.0 added.

o NetBSD 3.0 added.

o NetBSD 2.0.3 and NetBSD 2.1 added.

Obtained from: NetBSD
MFC after: 3 days

Merge from RELENG_6: FreeBSD 6.0. Not sure the release date is correct
because no release announce yet.

o OpenBSD 3.8 added.

Document NetBSD 2.0.2.

Submitted by: SODA Noriyuki (soda at NetBSD dot org)
PR: doc/82619
Approved by: re (implicitly)

o Typo.

Submitted by: Jung-uk Kim

o Fix the release dates of FreeBSD 1.1, 1.1.5.1, 2.0, add the release
date of FreeBSD 1.1.5.

o URL to "Unix at 25" is reachable now.

PR: misc/81931
Submitted by: Gavin Atkinson
MFC after: 3 days

Add OpenBSD 3.7.

Add MacOS 10.4.

Submitted by: Jung-uk Kim

Add FreeBSD 5.4.

o Add DragonFly 1.2.0.
o s/DFD/DFB/g as DragonFly people did.

Add FreeBSD 4.11.

Add NetBSD 2.0.

Fix the release date of 5.3-RELEASE.

Add OpenBSD 3.6.

Update the family tree for FreeBSD 5.3

Two things:
1. we are already under 6.0-CURRENT
2. add FreeBSD Design and Impl. book description
(obtained from http://www.awprofessional.com/title/0201702452)

Approved by: wosch (maintainer)

Add DragonFly BSD 1.0.

Approved by: wosch (maintainer)

Add FreeBSD 4.10-RELEASE.

MFC after: 3 days

o Add OpenBSD 3.5.
o NetBSD 1.6.2 was a patch release.

MFC after: 3 days

Add final version of BSD/OS, BSD/OS 5.1 ISE.

Add NetBSD 1.6.2.

Add FreeBSD 5.2.1

Added FreeBSD 5.2-RELEASE.

MFC after: 3 days

Add OpenBSD 3.4
fix footer.

Add FreeBSD 4.9 and MacOS 10.3.

Add FreeBSD 5.1 and BSD/OS 5.0 to the family tree.

Added OpenBSD 3.3

Submitted by: itojun@iijlab.net

Add NetBSD 1.6.1

Add release of FreeBSD 4.8.

MFC after: 3 days

Added FreeBSD 5.0

Add OpenBSD 3.2.

Submitted by: Sergey A. Osokin <osa@freebsd.org.ru>
MFC after: 1 week

- Fix a missort in the Time section.
- Specify date for OS X 10.1.
- Whitespace fix for NetBSD 1.5.3 release date.

Submitted by: Sergey A. Osokin <osa@freebsd.org.ru> (mostly)

Update "UNIX History" URL.

Submitted by: Sergey A. Osokin <osa@freebsd.org.ru>

- Sort references in the Time section alphabetically.
- Remove U25 time reference as it is never referenced.

Submitted by: Sergey A. Osokin <osa@freebsd.org.ru>

Update BSD family tree to include FreeBSD 4.6.2, NetBSD 1.6, and Mac OS X
10.2.

Submitted by: Sergey A. Osokin <osa@freebsd.org.ru>

Add BSD/OS 4.3.

Submitted by: Sergey A. Osokin <osa@FreeBSD.org.ru>
Reviewed by: grog
MFC after: 1 week

FreeBSD 4.7 enters the BSD family tree sometime on October 8, 2002.

NetBSD style fixes.

PR: misc/41164
Submitted by: Bang Jun-Young <junyoung@netbsd.org>

Added NetBSD 1.5.3

Submitted by: Bang Jun-Young <junyoung@netbsd.org>

Update FreeBSD 4.6 release date.
Added OpenBSD 3.1

Added upcoming FreeBSD 4.6

FreeBSD 4.5 is releaseed "29 Jan 2002" (not 20 Jan)

PR: misc/35738
Submitted by: WAKABAYASHI Susumu <susumu@wakabaya.net>

Update some release dates.

PR: misc/34432

Added upcoming FreeBSD 4.5

Added OpenBSD 3.0.

NetBSD 1.4 branch and NetBSD 1.5 branch are still alive.

Submitted by: jhawk@netbsd.org, itojun@iijlab.net

Added NetBSD 1.5.2

Welcome 4.4-FreeBSD to the family.

Add Mac OS X 10.0 and 10.1 as well as Darwin.
Partially submitted by the PR, the rest by yours truly, corrections welcomed.

PR: 26137
Submitted by: trevor

netbsd 1.5.1: official announcement on Wed, 11 Jul 2001 16:35:16 -0400 (EDT)

netbsd 1.5.1 is in jul 2001 (available via ftp already, but we need a concrete
date of the announcement)

couple of URL fixes. From: Petri Koistinen <pkoistin@cs.stadia.fi>
(http://www.byte.com/art/9410/sec8/art3.htm is now a dangling link.
any alternative URL?)

openbsd 2.9 (2001/6/1)

Change 93-11-XX for the FreeBSD 1.0 release to 93-11-01, based on this
announcement from JKH (back when he was still working for Lotus)

http://minnie.tuhs.org/cgi-bin/newsread?23150

This also means that if, as Microsoft say, Linux is a Cancer, FreeBSD is
a Scorpio.

typo in last commit

Added upcoming NetBSD 1.5.1 patch release.

Added the Daemonnews article `The BSD Family Tree' by James Howard
to bibliography.

Update FreeBSD 4.3 release date.

FOO -> FreeBSD

Submitted by: andrew@ugh.net.au

Adjust FreeBSD 4.3 release date.

Approved by: jkh

Added upcoming FreeBSD 4.3

BSD/OS was called BSD/386 prior to 2.0.

Added BSD/OS 4.2

Added NetBSD 1.5

Added releases dates for BSD/OS
Added BSD/OS releases up to 4.1

Submitted by: seebs@plethora.net (Peter Seebach), Jeff Polk <polk@BSDI.COM>

BSDI -> BSD/OS
Reorder 4.4BSD Lite2

Correct some more dates and fix the order based on those dates.
Also add some forgotten point releases.

NetBSD 1.4.3 is released.
Detail some FreeBSD release dates.
OpenBSD 2.8 will be released 1 Dec 2000.

Some grammar and typo fixes.

update URL and copyright

Added upcoming FreeBSD 4.2

fix ordering of NetBSD 1.3 (sync with NetBSD share/misc/bsd-family-tree).

Added FreeBSD 4.1.1

Added page http://perso.wanadoo.fr/levenez/unix/ to Bibliography.
This is the most comprehensive UNIX famility tree I know of.

Submitted by: Poul-Henning Kamp <phk@critter.freebsd.dk>

Added OpenBSD 2.7

Added FreeBSD 3.5.1

Add dates for FreeBSD 3.5 and 4.1.
Not included in both the tree and the dates part FreeBSD 3.5.1.

Add reference to UNIX history graphing project.

Correct derivation of Eighth Edition Research UNIX. According to dmr,
it was derived from 4.1cBSD; according to the 4.4BSD book, it was
derived from 4.1BSD. Since dmr did the work, he's more likely to be
correct.

Correct typos.

Remove dead URLs.

The latest patchlevel of 2.11BSD is 430

Submitted by: Victor.Langeveld@mbfys.kun.nl

Added NetBSD 1.4.2

Added upcoming FreeBSD 3.5, FreeBSD 4.0, FreeBSD 4.1 and FreeBSD 5.0-current.

Minor NetBSD fixes.

Added NetBSD -current, OpenBSD -current and Added NetBSD 1.4.1
Update/Fix release date for NetBSD 1.3, 1.3.1, 1.4, 1.4.1

Update the graph to include FreeBSD 3.4 and OpenBSD 2.6
Update the play-by-play history to include FreeBSD 3.[234] and OpenBSD 2.[56]

Dates obtained from: www.FreeBSD.org and www.OpenBSD.org

Update the ASCII diagram for FreeBSD 3.3

$Revision$,$Date$ -> $FreeBSD$

Typo

Submitted by: Christian Weisgerber <naddy@mips.rhein-neckar.de>

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
(about Jan 15 if I recall correctly).

----> FreeBSD-3.0-----\----- FreeBSD-4.x-current -----....
\
3.x-stable ----> 3.1 ---> 3.2 ....

Submitted by: peter

Space typos from last commit.

Added upcoming releases FreeBSD 3.2, NetBSD 1.3, OpenBSD 2.5

NetBSD 1.2.1 is a patch release of NetBSD 1.2 (a branch of 1.2)
NetBSD 1.3.1, 1.3.2, 1.3.3 are a patch release of NetBSD 1.3 (a branch of 1.3).

FreeBSD 3.0, FreeBSD 3.1 and FreeBSD 3.2 are a releases
from the 3.0-stable branch.

Added FreeBSD 4.0-current.

Added FreeBSD 3.1 release date.

I've taken a pass through to add NetBSD and OpenBSD release dates,
and to shuffle the NetBSD and OpenBSD entries in the tree to line
the dates up with FreeBSD.

Submitted by: David Brownlee <abs@anim.dreamworks.com>

Misspelt Eighth Edition.
The Eighth Edition is *not* descended from the Seventh Edition.

Submitted by: Greg Lehey <grog@lemis.com>
and Dennis Ritchie

Here's a quote from Dennis Ritchie, posted to Warren Toomey:
[January 1999]
----- Forwarded message from dmr -----

I also got mail from Norman Wilson today about the discussion.

This is mainly to confirm and fill out details of Wilson's account.

The Eighth Edition system started with (I believe) BSD 4.1c and
the work was done on VAX 11/750s -- our group did not get
a 780 until a while later.

Most of the operating system superstructure of BSD was retained
(in particular no one (even the indefatigable Norman)
wanted to get much into the paging code. Norman is also
right that the competitor was John Reiser's (and Tom London's)
32V descendant from another group at the Labs. In structure
this system had a lot to offer (in particular the buffer cache and the page
pool were unified, but it was clear that their work was not being
supported by their own management. It was used for a while on
our first 750 and also our first 11/780 ("alice", a name that lives
in netnews fame preceding the reach of Dejanews).

The big change leading to V8 was the scooping-out and replacement of
the character-device and networking part by the streams mechanism. Later,
Peter Weinberger added the file-system switch that enabled
remote file systems and prescient things ideas like /proc). Weinberger,
as Norman said, also did a simple-minded FFS.

The TCP/IP stack wasn't very important to us then and it has a mixed and
murky history. Much of it came from early CSRG work, but it was converted
to a streams approach by Robert Morris and subsequently fiddled over a lot.

Likewise, as Norman said, the applications (/bin and whatnot) were somewhat
of a mixture. Many were the locally-done versions, some were taken
from BSD in some incarnation, some from System V.

Dennis

----- End of forwarded message from dmr -----

Added FreeBSD 2.2.8, FreeBSD 3.0, FreeBSD 3.1
Added NetBSD 1.3.3, OpenBSD 2.4
Update URL & Copyright

Adjust family tree to list some freebsd dates as well.

Update URL of BSD Hypertext Man Pages.

Add upcoming NetBSD 1.3.2
Submitted by: Sune Stjerneby <stjerneby@usa.net>

Add upcoming FreeBSD 2.2.7 and FreeBSD 2.2.8
Add NetBSD-1.3.1.

Sync: add FreeBSD 2.2.6, OpenBSD 2.3; Correct 4.4BSD Lite2 integreation links.

Sync with original source: add FreeBSD 2.2.5, NetBSD 1.3, and OpenBSD 2.2

Sync with original source:
Add Steven M. Schultz for providing 2.11 BSD manual pages.
Add OpenBSD 2.1, FreeBSD 2.2.2, BSDI 2.0.1 releases.

Sync with original source.

BTW, the BSD family tree has been reviewed by:
John S. Quarterman, Keith Bostic, Kirk McKusick, Peter H. Salus.

The Unix system family tree, BSD part. This is a local copy of
http://www.de.freebsd.org/de/ftp/unix-stammbaum