[src/trunk]: src/doc Close out 1.5 and note differences between netbsd-2 and ...

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

details:   https://anonhg.NetBSD.org/src/rev/4f164f97d87b
branches:  trunk
changeset: 579546:4f164f97d87b
user:      jmc <jmc%NetBSD.org@localhost>
date:      Thu Mar 17 02:19:00 2005 +0000

description:
Close out 1.5 and note differences between netbsd-2 and netbsd-2-0 branches

diffstat:

 doc/BRANCHES |  27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r b37ca48d5add -r 4f164f97d87b doc/BRANCHES
--- a/doc/BRANCHES      Thu Mar 17 01:47:18 2005 +0000
+++ b/doc/BRANCHES      Thu Mar 17 02:19:00 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: BRANCHES,v 1.36 2005/03/17 00:21:04 jmc Exp $
+#      $NetBSD: BRANCHES,v 1.37 2005/03/17 02:19:00 jmc Exp $
 #
 # This file contains a list of branches that exist in the NetBSD CVS
 # tree and their current state.
@@ -115,9 +115,9 @@
 
 Branch:                netbsd-1-5
 Description:   The NetBSD 1.5 release branch
-Status:                Active
+Status:                Terminated
 Start Date:    20 Jun 2000
-End Date:
+End Date:      26 Jan 2005
 Base Tag:      netbsd-1-5-base
 Maintainer:    1.5 Release Engineering <releng-1-5%NetBSD.org@localhost>
 Scope:         Entire tree.
@@ -136,13 +136,28 @@
                Commits restricted to Release Engineering.
 
 Branch:                netbsd-2-0
-Description:   The NetBSD 2.0 release branch
+Description:   Originally the NetBSD 2.0 release branch and now the branch 
+               tracking security/critical fixes for the NetBSD 2.0 series
 Status:                Active
-Start Date:    28 Mar 2004
+Start Date:    28 Mar 2004 and changed for security/critical function on
+                       23 Dec 2004
 End Date:
 Base Tag:      netbsd-2-0-base
 Maintainer:    2.0 Release Engineering <releng-2-0%NetBSD.org@localhost>
 Scope:         Entire tree. (src + xsrc)
+Notes:         Branch was re-purposed to security/critical change function
+               once 2.0 released. See netbsd-2 for current branch to track
+               NetBSD 2 tree.
+               Commits restricted to Release Engineering.
+
+Branch:                netbsd-2
+Description:    The NetBSD 2 release branch
+Status:                Active
+Start Date:    23 Dec 2004
+End Date:
+Base Tag:      netbsd-2-base
+Maintainer:    2 Release Engineering <releng-2%NetBSD.org@localhost>
+Scope:         Entire tree. (src + xsrc)
 Notes:
                Commits restricted to Release Engineering.
 
@@ -152,7 +167,7 @@
 Start Date:    16 Mar 2005
 End Date:
 Base Tag:      netbsd-3-base
-Maintainer:    3.0 Release Engineering <releng-3%NetBSD.org@localhost>
+Maintainer:    3 Release Engineering <releng-3%NetBSD.org@localhost>
 Scope:         Entire tree. (src + xsrc)
 Notes:
                Commits restricted to Release Engineering.