diff --git a/data/branch.sgml b/data/branch.sgml index 44526ec0d0..1b3dd69abe 100644 --- a/data/branch.sgml +++ b/data/branch.sgml @@ -1,112 +1,111 @@ + %includes; ]> &header; From jkh, November 4th:

FreeBSD's development stream has, as of today, branched into the 2.2-RELEASE and 3.0-CURRENT development streams. The 2.1-STABLE branch is also still alive, soon to terminate (for real, this time) with the impending release of FreeBSD-2.1.6.

This branch has occurred so that 2.2 may be readied for release without impacting significant new developments, like SMP support, in the mainstream -current branch.

Modulo any of our usual two-week slips here and there, here is our release schedule for 96/97:

December 1996

January 1997

Spring 1997

This is also probably as good a time as any to announce that new -XFree86 +XFree86 3.2 binaries, with early Matrox support, are available.

Thanks to The XFree86 project -for the timely binaries, which will be distributed with 2.2-RELEASE -(2.1.6 binaries are still pending but should be available before that -release).

+for the timely release, which will be distributed with 2.2-RELEASE +and 2.1.6-RELEASE.

Lest there be any confusion about the 2.1.6 and 2.2 releases coming so close together, let me also just explain that the two branches of development had really very little to do with one another, and the fact that both branches came to release status around the same time was simply how the scheduling worked out. When engineering is allowed to do the scheduling, it rarely employs traditional marketing strategems. :)

In summary:

As always, all branches of FreeBSD development are available from a single CVS repository which may be freely replicated to your own machine (see the handbook) or browsed via the WEB.

Please don't hesitate to use this valuable resource!

Note for CDROM customers:

If you are a regular FreeBSD subscription customer of Walnut Creek CDROM, you will receive both 2.1.6 and 2.2 releases. Making each release a full CD distribution was the only way of ensuring that each would meet the quality expectations of each customer base, and any customer who feels they would have preferred to receive only one release may contact the the orders department at Walnut Creek CDROM at any time for a full refund or credit towards the next subscription issue.

&footer; diff --git a/en/branch.sgml b/en/branch.sgml index 44526ec0d0..1b3dd69abe 100644 --- a/en/branch.sgml +++ b/en/branch.sgml @@ -1,112 +1,111 @@ + %includes; ]> &header; From jkh, November 4th:

FreeBSD's development stream has, as of today, branched into the 2.2-RELEASE and 3.0-CURRENT development streams. The 2.1-STABLE branch is also still alive, soon to terminate (for real, this time) with the impending release of FreeBSD-2.1.6.

This branch has occurred so that 2.2 may be readied for release without impacting significant new developments, like SMP support, in the mainstream -current branch.

Modulo any of our usual two-week slips here and there, here is our release schedule for 96/97:

December 1996

January 1997

Spring 1997

This is also probably as good a time as any to announce that new -XFree86 +XFree86 3.2 binaries, with early Matrox support, are available.

Thanks to The XFree86 project -for the timely binaries, which will be distributed with 2.2-RELEASE -(2.1.6 binaries are still pending but should be available before that -release).

+for the timely release, which will be distributed with 2.2-RELEASE +and 2.1.6-RELEASE.

Lest there be any confusion about the 2.1.6 and 2.2 releases coming so close together, let me also just explain that the two branches of development had really very little to do with one another, and the fact that both branches came to release status around the same time was simply how the scheduling worked out. When engineering is allowed to do the scheduling, it rarely employs traditional marketing strategems. :)

In summary:

As always, all branches of FreeBSD development are available from a single CVS repository which may be freely replicated to your own machine (see the handbook) or browsed via the WEB.

Please don't hesitate to use this valuable resource!

Note for CDROM customers:

If you are a regular FreeBSD subscription customer of Walnut Creek CDROM, you will receive both 2.1.6 and 2.2 releases. Making each release a full CD distribution was the only way of ensuring that each would meet the quality expectations of each customer base, and any customer who feels they would have preferred to receive only one release may contact the the orders department at Walnut Creek CDROM at any time for a full refund or credit towards the next subscription issue.

&footer;