diff options
Diffstat (limited to 'FAQ/hackers.sgml')
| -rw-r--r-- | FAQ/hackers.sgml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/FAQ/hackers.sgml b/FAQ/hackers.sgml index 9394caff52..0d1bdd4417 100644 --- a/FAQ/hackers.sgml +++ b/FAQ/hackers.sgml @@ -1,4 +1,4 @@ -<!-- $Id: hackers.sgml,v 1.10 1999-01-18 20:12:22 des Exp $ --> +<!-- $Id: hackers.sgml,v 1.11 1999-01-21 01:49:12 jkh Exp $ --> <!-- The FreeBSD Documentation Project --> <sect> @@ -13,9 +13,9 @@ <url url="http://www.freebsd.org/cgi/cvsweb.cgi" name="CVS Repository">: <itemize> - <item><bf/RELENG_2_1_0/ AKA <bf/2.1-stable/ AKA <bf/"2.1 branch"/ <item><bf/RELENG_2_2/ AKA <bf/2.2-stable/ AKA <bf/"2.2 branch"/ - <item><bf/HEAD/ AKA <bf/-current/ AKA <bf/3.0-current/ + <item><bf/RELENG_3/ AKA <bf/3.x-stable/ AKA <bf/"3.0 branch"/ + <item><bf/HEAD/ AKA <bf/-current/ AKA <bf/4.0-current/ </itemize> <p><bf/HEAD/ is not an actual branch tag, like the other two, it's @@ -23,12 +23,15 @@ <em/"the current, non-branched development stream"/ which we simply refer to as <bf/-current/. - <p>Right now, <bf/-current/ is the 3.0 development stream and the - <bf/2.2-stable/ branch, <bf/RELENG_2_2/, forked off from - <bf/-current/ in November 1996. + <p>Right now, <bf/-current/ is the 4.0 development stream and the + <bf/3.0-stable/ branch, <bf/RELENG_3/, forked off from + <bf/-current/ in Jan 1999. + + <p>The <bf/2.2-stable/ branch, <bf/RELENG_2_2/, departed -current in + November 1996. <p>The <bf/2.1-stable/ branch, <bf/RELENG_2_1_0/, departed -current in - September of 1994. + September of 1994. This branch has been fully retired. <sect1> <heading> |