Now that the release date is here, re-add the adjustments from 1.658.

This commit is contained in:
Mark Linimon 2004-11-08 06:44:16 +00:00
parent f73ed7c656
commit fdccb80d6d
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=22857

View file

@ -292,10 +292,9 @@
before any releases are made from the before any releases are made from the
<emphasis>6-CURRENT</emphasis> branch.</para> <emphasis>6-CURRENT</emphasis> branch.</para>
<!-- at 5.3-RELEASE, s/will be/has been/ -->
<para>Up until the release of 5.3, the 4.X series was the <para>Up until the release of 5.3, the 4.X series was the
one known as <emphasis>-STABLE</emphasis>. However, one known as <emphasis>-STABLE</emphasis>. However,
as of 5.3, 5.X will be designated the new as of 5.3, 5.X has been designated the new
<emphasis>-STABLE</emphasis> and 4.X will no longer see <emphasis>-STABLE</emphasis> and 4.X will no longer see
much new development. Instead, it will be designated much new development. Instead, it will be designated
for an &quot;extended support&quot; status and receive for an &quot;extended support&quot; status and receive
@ -448,13 +447,10 @@
for some time but focus primarily on security-related bug for some time but focus primarily on security-related bug
fixes and other serious issues.</para> fixes and other serious issues.</para>
<!-- temporarily commented out until 5.3R is released -->
<!--
<para>5-STABLE is the actively developed -STABLE branch. <para>5-STABLE is the actively developed -STABLE branch.
The latest release on the 5-STABLE branch is The latest release on the 5-STABLE branch is
&rel2.current;-RELEASE, which was released in &rel2.current;-RELEASE, which was released in
&rel2.current.date;.</para> &rel2.current.date;.</para>
-->
<para>The 6-CURRENT branch is the actively developed <para>The 6-CURRENT branch is the actively developed
-CURRENT branch toward the next generation of &os;. -CURRENT branch toward the next generation of &os;.
@ -541,9 +537,8 @@
developers.</para> developers.</para>
</listitem> </listitem>
<!-- change -CURRENT to -STABLE on 5.3R -->
<listitem> <listitem>
<para>The latest 5-CURRENT release, &rel2.current;-RELEASE can be <para>The latest 5-STABLE release, &rel2.current;-RELEASE can be
found in the <ulink found in the <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;-RELEASE directory</ulink>.</para> url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;-RELEASE directory</ulink>.</para>
</listitem> </listitem>