os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Finish editorial review of Updating chapter.

Browse source 
Fix some links.

Sponsored by:	iXsystems
This commit is contained in:
Dru Lavigne 2014-05-06 18:10:37 +00:00
parent 8a0905985e
commit ab95585247
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=44776
1 changed files with 33 additions and 32 deletions

65
en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
View file

@ -993,7 +993,7 @@ before running "/usr/sbin/freebsd-update install"</screen>
&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
intended audience, as well as how to keep a system up-to-date
with each respective branch.</para>
<sect2 xml:id="current">
@ -1077,11 +1077,11 @@ before running "/usr/sbin/freebsd-update install"</screen>
<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>.</para>
one of the Subversion mirror
sites listed in <xref linkend="svn-mirrors"/>.</para>
<para>Users with very slow or limited Internet connectivity
can instead use <link linkend="ctm">CTM</link>, but it is
can instead use CTM as described in <xref linkend="ctm"/>, but it is
not as reliable as <application>svn</application> and
<application>svn</application> is the recommended method
for synchronizing source.</para>
@ -1182,7 +1182,7 @@ before running "/usr/sbin/freebsd-update install"</screen>
recent &os.stable; release from the <link
linkend="mirrors">&os; mirror sites</link> or use a
monthly snapshot built from &os.stable;. Refer to <link
xlink:href="&url.base;/snapshots/">Snapshots</link> for
xlink:href="&url.base;/snapshots/">www.freebsd.org/snapshots</link> for
more information about snapshots.</para>
<para>To compile or upgrade to an existing &os; system to
@ -1191,14 +1191,10 @@ before running "/usr/sbin/freebsd-update install"</screen>
<primary>Subversion</primary>
</indexterm> to check out the source for the desired
branch. Branch names, such as
<literal>stable/9</literal>, are identified in <link
xlink:href="&url.base;/releng/">the release
engineering page</link>. <link
linkend="ctm">CTM</link> can be used
<indexterm>
<primary>-STABLE</primary>
<secondary>syncing with CTM</secondary>
</indexterm> if a reliable Internet connection is not
<literal>stable/9</literal>, are listed at <link
xlink:href="&url.base;/releng/">www.freebsd.org/releng</link>.
CTM (<xref linkend="ctm"/>) can be used if a reliable
Internet connection is not
available.</para>
</listitem>
@ -1222,11 +1218,11 @@ before running "/usr/sbin/freebsd-update install"</screen>
<sect1 xml:id="synching">
<title>Synchronizing Source</title>
<para>There are various ways of using an Internet or email
connection to stay up-to-date with any given area, or all areas,
of the &os; project sources. The primary services are
<link linkend="svn">Subversion</link> and
<link linkend="ctm">CTM</link>.</para>
<para>There are various methods for
staying up-to-date with the
&os; sources. This section compares the primary services,
<application>Subversion</application> and
<application>CTM</application>.</para>
<warning>
<para>While it is possible to update only parts of the source
@ -1246,12 +1242,15 @@ before running "/usr/sbin/freebsd-update install"</screen>
<para><application>Subversion</application> uses the
<emphasis>pull</emphasis> model of updating sources. The user,
or a <command>cron</command> script, invokes the
<command>svn</command> program, and it brings files up-to-date.
<application>Subversion</application> is the preferred means of
updating local source trees. The updates are up-to-the-minute
and the user controls when they are downloaded. It is easy to
<command>svn</command> program which updates the local version of the source.
<application>Subversion</application> is the preferred method for
updating local source trees as updates are up-to-the-minute
and the user controls when updates are downloaded. It is easy to
restrict updates to specific files or directories and the
requested updates are generated on the fly by the server.</para>
requested updates are generated on the fly by the server. How
to synchronize source using
<application>Subversion</application> is described in <xref
linkend="svn"/>.</para>
<indexterm>
<primary><application>CTM</application></primary>
@ -1262,22 +1261,24 @@ before running "/usr/sbin/freebsd-update install"</screen>
changes in files since its previous run is executed several
times a day on the master CTM machine. Any detected changes are
compressed, stamped with a sequence-number, and encoded for
transmission over email in printable ASCII only. Once received,
these <quote>CTM deltas</quote> can then be handed to the
&man.ctm.rmail.1; utility which will automatically decode,
transmission over email in printable <acronym>ASCII</acronym> only. Once downloaded,
these <firstterm>deltas</firstterm> can be run through
<command>ctm.rmail</command> which will automatically decode,
verify, and apply the changes to the user's copy of the sources.
This process is more efficient than
<application>Subversion</application> and places less strain on
server resources since it is a <emphasis>push</emphasis> rather
than a <emphasis>pull</emphasis> model.</para>
server resources since it is a <emphasis>push</emphasis>, rather
than a <emphasis>pull</emphasis>, model. Instructions for using
<application>CTM</application> to synchronize source can be
found at <xref linkend="ctm"/>.</para>
<para>There are other trade-offs. If a user inadvertently wipes
<para>If a user inadvertently wipes
out portions of the local archive,
<application>Subversion</application> will detect and rebuild
the damaged portions. <application>CTM</application> will not
do this, and if a user deletes some portion of the source tree
the damaged portions. <application>CTM</application> will not,
and if a user deletes some portion of the source tree
and does not have a backup, they will have to start from scratch
from the most recent CTM <quote>base delta</quote> and rebuild
from the most recent <firstterm>base delta</firstterm> and rebuild
it all with <application>CTM</application>.</para>
</sect1>