o Update content:

- FreeBSD versions and series.
  - Copyright year.
  - Use entities.

Submitted by:	Alec Berryman <alec@thened.net>
Approved by:	trhodes (mentor)
This commit is contained in:
Jesus R. Camou 2006-02-09 14:36:20 +00:00
parent a1b063a2ea
commit ac057fe759
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=27065

View file

@ -24,6 +24,7 @@
<year>2003</year> <year>2003</year>
<year>2004</year> <year>2004</year>
<year>2005</year> <year>2005</year>
<year>2006</year>
<holder>The FreeBSD Documentation Project</holder> <holder>The FreeBSD Documentation Project</holder>
</copyright> </copyright>
@ -286,24 +287,20 @@
<answer> <answer>
<para>At this point in FreeBSD's development, there are three <para>At this point in FreeBSD's development, there are three
parallel development branches; releases are being made from parallel development branches; releases are being made from
two of the three branches. The 4.X series of releases two of the three branches. The 5.X series of releases
is being made from the <emphasis>4-STABLE</emphasis> branch is being made from the <emphasis>5-STABLE</emphasis> branch
and the 5.X series of releases is being made from and the 6.X series of releases from <emphasis>6-STABLE</emphasis>.
<emphasis>5-STABLE</emphasis>. It will be some time in
mid-to-late 2005 before the first release will be made from the
<emphasis>6-CURRENT</emphasis> branch; that release (6.0)
will be aimed at early adopters.</para>
<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 has been designated the new as of 5.3, the 4.X branch will be designated for
<emphasis>-STABLE</emphasis> and 4.X will no longer see an <quote>extended support</quote> status and receive
much new development. Instead, it will be designated only fixes for major problems, such as security-related
for an &quot;extended support&quot; status and receive fixes. There will be more releases made from the
only fixes for major problems (such as security-related <emphasis>5-STABLE</emphasis> branch, but it is considered
fixes.)</para> a <quote>legacy</quote> branch and most current work will
only become a part of <emphasis>6-STABLE</emphasis>.
<!-- note: the entity definitions are out of date -->
<para>Version <ulink <para>Version <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;</ulink> url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;</ulink>
is the latest release from the is the latest release from the
@ -311,7 +308,7 @@
&rel.current.date;. Version <ulink &rel.current.date;. Version <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;</ulink> url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;</ulink>
is the latest release from the is the latest release from the
<emphasis>4-STABLE</emphasis> branch; it was released in <emphasis>6-STABLE</emphasis> branch; it was released in
&rel2.current.date;.</para> &rel2.current.date;.</para>
<para>Briefly, <emphasis>-STABLE</emphasis> is aimed at the <para>Briefly, <emphasis>-STABLE</emphasis> is aimed at the
@ -327,8 +324,8 @@
<para>Releases are made <link linkend="release-freq">every <para>Releases are made <link linkend="release-freq">every
few months</link>. While many people stay more up-to-date with few months</link>. While many people stay more up-to-date with
the FreeBSD sources (see the questions on <link the FreeBSD sources (see the questions on <link
linkend="current">FreeBSD-CURRENT</link> and <link linkend="current">&os.current;</link> and <link
linkend="stable">FreeBSD-STABLE</link>) than that, doing so linkend="stable">&os.stable;</link>) than that, doing so
is more of a commitment, as the sources are a moving is more of a commitment, as the sources are a moving
target.</para> target.</para>
@ -346,7 +343,7 @@
<answer> <answer>
<para><ulink <para><ulink
url="&url.books.handbook;/cutting-edge.html#CURRENT">FreeBSD-CURRENT</ulink> url="&url.books.handbook;/cutting-edge.html#CURRENT">&os.current;</ulink>
is the development version of the operating system, which is the development version of the operating system, which
will in due course become the new &os.stable; branch. will in due course become the new &os.stable; branch.
As such, it is As such, it is
@ -360,9 +357,9 @@
<para>If you are not familiar with the operating system or are <para>If you are not familiar with the operating system or are
not capable of identifying the difference between a real not capable of identifying the difference between a real
problem and a temporary problem, you should not use problem and a temporary problem, you should not use
FreeBSD-CURRENT. This branch sometimes evolves quite quickly &os.current;. This branch sometimes evolves quite quickly
and can be un-buildable for a number of days at a time. and can be un-buildable for a number of days at a time.
People that use FreeBSD-CURRENT are expected to be able to People that use &os.current; are expected to be able to
analyze any problems and only report them if they are deemed analyze any problems and only report them if they are deemed
to be mistakes rather than <quote>glitches</quote>. Questions to be mistakes rather than <quote>glitches</quote>. Questions
such as <quote>make world produces some error about such as <quote>make world produces some error about
@ -435,9 +432,9 @@
only well-tested bug fixes and other small incremental only well-tested bug fixes and other small incremental
enhancements. FreeBSD-CURRENT, on the other hand, has enhancements. FreeBSD-CURRENT, on the other hand, has
been one unbroken line since 2.0 was released, leading been one unbroken line since 2.0 was released, leading
towards 5.3-RELEASE (and beyond). Just before 5.3-RELEASE, the towards 6.0-RELEASE and beyond. Just before 6.0-RELEASE, the
5-STABLE branch was created, and 6-STABLE branch was created, and
&os.current; became 6-CURRENT. For more detailed information, &os.current; became 7-CURRENT. For more detailed information,
see <quote><ulink url="&url.articles.releng;/release-proc.html#REL-BRANCH"> see <quote><ulink url="&url.articles.releng;/release-proc.html#REL-BRANCH">
FreeBSD Release Engineering: FreeBSD Release Engineering:
Creating the Release Branch</ulink></quote>.</para> Creating the Release Branch</ulink></quote>.</para>
@ -446,17 +443,17 @@
The 3-STABLE branch has ended with the release of 3.5.1, the The 3-STABLE branch has ended with the release of 3.5.1, the
final 3.X release. The only changes made to either of these final 3.X release. The only changes made to either of these
branches will be, for the most part, security-related bug branches will be, for the most part, security-related bug
fixes. Support for the 4-STABLE branch will continue fixes. Support for the 4-STABLE and 5-STABLE branches will
for some time but focus primarily on security-related bug continue for some time but focus primarily on security-related
fixes and other serious issues.</para> bug fixes and other serious issues.</para>
<para>5-STABLE is the actively developed -STABLE branch. <para>&rel.current;-STABLE is the actively developed -STABLE branch.
The latest release on the 5-STABLE branch is The latest release on the &rel.current;-STABLE branch is
&rel.current;-RELEASE, which was released in &rel.current;-RELEASE, which was released in
&rel.current.date;.</para> &rel.current.date;.</para>
<para>The 6-CURRENT branch is the actively developed <para>The 7-CURRENT branch is the actively developed
-CURRENT branch toward the next generation of &os;. -CURRENT branch toward the next generation of &os;.
See <link linkend="current">What is &os;-CURRENT?</link> for more See <link linkend="current">What is &os;-CURRENT?</link> for more
information on this branch.</para> information on this branch.</para>
</answer> </answer>