diff --git a/data/branch.sgml b/data/branch.sgml index 55c04234e7..537b83dc8d 100644 --- a/data/branch.sgml +++ b/data/branch.sgml @@ -1,5 +1,5 @@ + %includes; ]> @@ -11,27 +11,27 @@
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.
+branch is also still alive, though now in maintenance mode after the +release of FreeBSD-2.1.7.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:
+our release schedule for 97: -End of 2.1-STABLE branch.
Beginning of 2.2-STABLE.
Bugfix release for 2.2R along 2.2-STABLE branch.
@@ -44,9 +44,9 @@ support, are available.Thanks to The XFree86 project for the timely release, which will be distributed with 2.2-RELEASE -and 2.1.6-RELEASE. +and 2.1.7-RELEASE. -
Lest there be any confusion about the 2.1.6 and 2.2 releases +
Lest there be any confusion about the 2.1.7 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 @@ -56,11 +56,11 @@ stratagems. :)
In summary:
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 +both 2.1.6 and 2.2 releases. Those who have already received +2.1.6 CD are also entitled to a free upgrade to 2.1.7 and should +contact them if you have not already +received 2.1.7. + +
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 55c04234e7..537b83dc8d 100644 --- a/en/branch.sgml +++ b/en/branch.sgml @@ -1,5 +1,5 @@ + %includes; ]> @@ -11,27 +11,27 @@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.
+branch is also still alive, though now in maintenance mode after the +release of FreeBSD-2.1.7.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:
+our release schedule for 97: -End of 2.1-STABLE branch.
Beginning of 2.2-STABLE.
Bugfix release for 2.2R along 2.2-STABLE branch.
@@ -44,9 +44,9 @@ support, are available.Thanks to The XFree86 project for the timely release, which will be distributed with 2.2-RELEASE -and 2.1.6-RELEASE. +and 2.1.7-RELEASE. -
Lest there be any confusion about the 2.1.6 and 2.2 releases +
Lest there be any confusion about the 2.1.7 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 @@ -56,11 +56,11 @@ stratagems. :)
In summary:
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 +both 2.1.6 and 2.2 releases. Those who have already received +2.1.6 CD are also entitled to a free upgrade to 2.1.7 and should +contact them if you have not already +received 2.1.7. + +
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;