Initial shuffle to improve flow and tighten up this section.

Subsequent commits will review the content.

Sponsored by: iXsystems
This commit is contained in:
Dru Lavigne 2014-02-04 21:52:57 +00:00
parent 551b212789
commit 7d77345666
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=43778

View file

@ -1137,26 +1137,22 @@ before running "/usr/sbin/freebsd-update install"</screen>
<indexterm><primary>-CURRENT</primary></indexterm> <indexterm><primary>-CURRENT</primary></indexterm>
<indexterm><primary>-STABLE</primary></indexterm> <indexterm><primary>-STABLE</primary></indexterm>
<para>There are two development branches to &os;: &os.current; <para>&os; has two development branches: &os.current;
and &os.stable;. This section provides an explanation of each and &os.stable;.</para>
<para>This section provides an explanation of each
and describes how to keep a system up-to-date with each and describes how to keep a system up-to-date with each
respective tree. &os.current; will be discussed first, then respective branch. &os.current; will be discussed first, then
&os.stable;.</para> &os.stable;.</para>
<sect2 xml:id="current"> <sect2 xml:id="current">
<title>Staying Current with &os;</title> <title>Using &os.current;</title>
<para>&os.current; is the <quote>bleeding edge</quote> of &os; <para>&os.current; is the <quote>bleeding edge</quote> of &os;
development. &os.current; users are expected to have a high development. &os.current; users are expected to have a high
degree of technical skill and should be capable of solving degree of technical skill and should be capable of solving
difficult system problems on their own. If you are new to difficult system problems on their own. If you are new to
&os;, track &os.stable; instead.</para> &os;, track &os.stable; instead.</para>
<sect3>
<title>What Is &os.current;?</title>
<indexterm><primary>snapshot</primary></indexterm>
<para>&os.current; is the very latest source code for &os;. <para>&os.current; is the very latest source code for &os;.
This includes work in progress, experimental changes, and This includes work in progress, experimental changes, and
transitional mechanisms that might or might not be present transitional mechanisms that might or might not be present
@ -1167,10 +1163,6 @@ before running "/usr/sbin/freebsd-update install"</screen>
possible, but whether or not &os.current; brings disaster or possible, but whether or not &os.current; brings disaster or
greatly desired functionality can be a matter of when the greatly desired functionality can be a matter of when the
source code was synced.</para> source code was synced.</para>
</sect3>
<sect3>
<title>Who Needs &os.current;?</title>
<para>&os.current; is made available for three primary <para>&os.current; is made available for three primary
interest groups:</para> interest groups:</para>
@ -1199,10 +1191,8 @@ before running "/usr/sbin/freebsd-update install"</screen>
contribute code.</para> contribute code.</para>
</listitem> </listitem>
</orderedlist> </orderedlist>
</sect3>
<sect3> <para>&os.current; is <emphasis>Not</emphasis>:</para>
<title>What Is &os.current; <emphasis>Not</emphasis>?</title>
<orderedlist> <orderedlist>
<listitem> <listitem>
@ -1222,10 +1212,6 @@ before running "/usr/sbin/freebsd-update install"</screen>
supported</quote>.</para> supported</quote>.</para>
</listitem> </listitem>
</orderedlist> </orderedlist>
</sect3>
<sect3>
<title>Using &os.current;</title>
<indexterm> <indexterm>
<primary>-CURRENT</primary> <primary>-CURRENT</primary>
@ -1327,16 +1313,10 @@ before running "/usr/sbin/freebsd-update install"</screen>
enthusiastically!</para> enthusiastically!</para>
</listitem> </listitem>
</orderedlist> </orderedlist>
</sect3>
</sect2> </sect2>
<sect2 xml:id="stable"> <sect2 xml:id="stable">
<title>Staying Stable with &os;</title> <title>Using &os.stable;</title>
<sect3>
<title>What Is &os.stable;?</title>
<indexterm><primary>-STABLE</primary></indexterm>
<para>&os.stable; is the development branch from which major <para>&os.stable; is the development branch from which major
releases are made. Changes go into this branch at a releases are made. Changes go into this branch at a
@ -1347,10 +1327,6 @@ before running "/usr/sbin/freebsd-update install"</screen>
&os.stable; may or may not be suitable for any particular &os.stable; may or may not be suitable for any particular
purpose. It is simply another engineering development purpose. It is simply another engineering development
track, not a resource for end-users.</para> track, not a resource for end-users.</para>
</sect3>
<sect3>
<title>Who Needs &os.stable;?</title>
<para>Those interested in tracking or contributing to the <para>Those interested in tracking or contributing to the
FreeBSD development process, especially as it relates to the FreeBSD development process, especially as it relates to the
@ -1386,10 +1362,6 @@ before running "/usr/sbin/freebsd-update install"</screen>
testing, it is recommended that users instead run the most testing, it is recommended that users instead run the most
recent release of FreeBSD, and use the binary update recent release of FreeBSD, and use the binary update
mechanism to move from release to release.</para> mechanism to move from release to release.</para>
</sect3>
<sect3>
<title>Using &os.stable;</title>
<indexterm> <indexterm>
<primary>-STABLE</primary> <primary>-STABLE</primary>
@ -1488,7 +1460,6 @@ before running "/usr/sbin/freebsd-update install"</screen>
release.</para> release.</para>
</listitem> </listitem>
</orderedlist> </orderedlist>
</sect3>
</sect2> </sect2>
</sect1> </sect1>