svn commit: r43780 - head/en_US.ISO8859-1/books/handbook/cutting-edge
Dru Lavigne
dru at FreeBSD.org
Tue Feb 4 22:40:49 UTC 2014
Author: dru
Date: Tue Feb 4 22:40:49 2014
New Revision: 43780
URL: http://svnweb.freebsd.org/changeset/doc/43780
Log:
Improve flow and clarity of first 1/2 of this section.
Sponsored by: iXsystems
Modified:
head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Tue Feb 4 21:57:41 2014 (r43779)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Tue Feb 4 22:40:49 2014 (r43780)
@@ -1140,28 +1140,28 @@ before running "/usr/sbin/freebsd-update
<para>&os; has two development branches: &os.current;
and &os.stable;.</para>
- <para>This section provides an explanation of each
- and describes how to keep a system up-to-date with each
- respective branch. &os.current; will be discussed first, then
- &os.stable;.</para>
+ <para>This section provides an explanation of each branch and its
+ intended audience as well as
+ how to keep a system up-to-date with each
+ respective branch.</para>
<sect2 xml:id="current">
<title>Using &os.current;</title>
<para>&os.current; is the <quote>bleeding edge</quote> of &os;
- development. &os.current; users are expected to have a high
- degree of technical skill and should be capable of solving
- difficult system problems on their own. If you are new to
- &os;, track &os.stable; instead.</para>
+ development and &os.current; users are expected to have a high
+ degree of technical skill. Less technical users who wish
+ to track a development brach should
+ track &os.stable; instead.</para>
- <para>&os.current; is the very latest source code for &os;.
- This includes work in progress, experimental changes, and
+ <para>&os.current; is the very latest source code for &os; and
+ includes works in progress, experimental changes, and
transitional mechanisms that might or might not be present
- in the next official release of the software. While many
+ in the next official release. While many
&os; developers compile the &os.current; source code daily,
- there are periods of time when the sources are not
+ there are short periods of time when the source may not be
buildable. These problems are resolved as quickly as
possible, but whether or not &os.current; brings disaster or
- greatly desired functionality can be a matter of when the
+ new functionality can be a matter of when the
source code was synced.</para>
<para>&os.current; is made available for three primary
@@ -1170,53 +1170,40 @@ before running "/usr/sbin/freebsd-update
<orderedlist>
<listitem>
<para>Members of the &os; community who are actively
- working on some part of the source tree and for whom
- keeping <quote>current</quote> is an absolute
- requirement.</para>
+ working on some part of the source tree.</para>
</listitem>
<listitem>
<para>Members of the &os; community who are active
- testers, willing to spend time solving problems in order
- to ensure that &os.current; remains as sane as possible.
- These testers wish to make topical suggestions on
- changes and the general direction of &os;, and submit
- patches to implement them.</para>
+ testers. They are willing to spend time solving problems,
+ making topical suggestions on
+ changes and the general direction of &os;, and submitting
+ patches.</para>
</listitem>
<listitem>
- <para>Those who merely wish to keep an eye on things, or
- to use the current sources for reference purposes.
- These people also make the occasional comment or
- contribute code.</para>
+ <para>Users who wish to keep an eye on things,
+ use the current source for reference purposes, or
+ make the occasional comment or
+ code contribution.</para>
</listitem>
</orderedlist>
- <para>&os.current; is <emphasis>Not</emphasis>:</para>
-
- <orderedlist>
- <listitem>
- <para>A fast-track to getting new features before the next
- release. Pre-release features are not yet fully tested
- and most likely contain bugs.</para>
- </listitem>
-
- <listitem>
- <para>A quick way of getting bug fixes. Any given commit
+ <para>&os.current; should <emphasis>not</emphasis> be
+ considered a fast-track to getting new features before the next
+ release as pre-release features are not yet fully tested
+ and most likely contain bugs. It is not a quick way of getting bug fixes as any given commit
is just as likely to introduce new bugs as to fix
- existing ones.</para>
- </listitem>
-
- <listitem>
- <para>In any way <quote>officially
+ existing ones. &os.current; is not in any way <quote>officially
supported</quote>.</para>
- </listitem>
- </orderedlist>
<indexterm>
<primary>-CURRENT</primary>
<secondary>using</secondary>
</indexterm>
+
+ <para>To track &os.current;:</para>
+
<orderedlist>
<listitem>
<para>Join the &a.current.name; and the
@@ -1238,57 +1225,30 @@ before running "/usr/sbin/freebsd-update
</listitem>
<listitem>
- <para>Grab the sources from a &os;
- <link linkend="mirrors">mirror site</link> using
- one of the following methods:</para>
-
- <orderedlist>
- <listitem>
- <para>Use <link linkend="svn">svn</link>
- <indexterm>
- <primary>Subversion</primary>
- </indexterm>
- <indexterm>
- <primary>-CURRENT</primary>
- <secondary>Syncing with
- <application>Subversion</application></secondary>
- </indexterm>
- to check out the desired development or release
- branch. This is the recommended method, providing
- access to &os; development as it occurs. Checkout
+ <para>Synchronize with the &os.current; sources. Typically,
+ <link linkend="svn">svn</link> is used
+ to check out
the -CURRENT code from the <literal>head</literal>
branch of one of the <link
linkend="svn-mirrors">Subversion mirror
- sites</link>. Due to the size of the repository,
- it is recommended that only desired subtrees be
- checked out.</para>
- </listitem>
+ sites</link>.</para>
- <listitem>
- <para>Use the
- <application>CTM</application>
- <indexterm>
- <primary>-CURRENT</primary>
- <secondary>Syncing with CTM</secondary>
- </indexterm> facility. If you have bad connectivity
- such as high price connections or only email access,
- <application>CTM</application> is an option, but it
+ <para>Users with very slow or limited Internet connectivity
+ can instead use <link linkend="ctm">CTM</link>, but it
is not as reliable as
- <application>Subversion</application>. For this
- reason, <application>Subversion</application> is the
- recommended method for any system with Internet
- connectivity.</para>
+ <application>svn</application> and
+ <application>svn</application> is the
+ recommended method for synchronizing
+ source.</para>
</listitem>
- </orderedlist>
- </listitem>
<listitem>
- <para>If you plan to run, and not just look at the
- sources, download <emphasis>all</emphasis> of
- &os.current;, not just selected portions. Various parts
- of the source depend on updates elsewhere, and trying to
- compile just a subset is almost guaranteed to cause
- problems.</para>
+ <para> Due to the size of the repository, some users choose
+ to only synchronize the sections of source that interest them
+ or which they are contributing patches to.
+ However, users that plan to compile the operating system from
+ source must download <emphasis>all</emphasis> of
+ &os.current;, not just selected portions.</para>
<para>Before compiling
&os.current;
@@ -1309,8 +1269,8 @@ before running "/usr/sbin/freebsd-update
<listitem>
<para>Be active! &os.current; users are encouraged to
submit their suggestions for enhancements or bug fixes.
- Suggestions with accompanying code are received most
- enthusiastically!</para>
+ Suggestions with accompanying code are always
+ welcome.</para>
</listitem>
</orderedlist>
</sect2>
More information about the svn-doc-all
mailing list