From owner-svn-doc-head@FreeBSD.ORG Tue May 6 18:10:38 2014 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 246D64BD; Tue, 6 May 2014 18:10:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 108E4B3; Tue, 6 May 2014 18:10:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s46IAbqT049280; Tue, 6 May 2014 18:10:37 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s46IAbGo049279; Tue, 6 May 2014 18:10:37 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201405061810.s46IAbGo049279@svn.freebsd.org> From: Dru Lavigne Date: Tue, 6 May 2014 18:10:37 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r44776 - head/en_US.ISO8859-1/books/handbook/cutting-edge X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2014 18:10:38 -0000 Author: dru Date: Tue May 6 18:10:37 2014 New Revision: 44776 URL: http://svnweb.freebsd.org/changeset/doc/44776 Log: Finish editorial review of Updating chapter. Fix some links. 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 May 6 17:43:53 2014 (r44775) +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Tue May 6 18:10:37 2014 (r44776) @@ -993,7 +993,7 @@ before running "/usr/sbin/freebsd-update &os.stable;. 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. @@ -1077,11 +1077,11 @@ before running "/usr/sbin/freebsd-update Synchronize with the &os.current; sources. Typically, svn is used to check out the -CURRENT code from the head branch of - one of the Subversion mirror - sites. + one of the Subversion mirror + sites listed in . Users with very slow or limited Internet connectivity - can instead use CTM, but it is + can instead use CTM as described in , but it is not as reliable as svn and svn is the recommended method for synchronizing source. @@ -1182,7 +1182,7 @@ before running "/usr/sbin/freebsd-update recent &os.stable; release from the &os; mirror sites or use a monthly snapshot built from &os.stable;. Refer to Snapshots for + xlink:href="&url.base;/snapshots/">www.freebsd.org/snapshots for more information about snapshots. To compile or upgrade to an existing &os; system to @@ -1191,14 +1191,10 @@ before running "/usr/sbin/freebsd-update Subversion to check out the source for the desired branch. Branch names, such as - stable/9, are identified in the release - engineering page. CTM can be used - - -STABLE - syncing with CTM - if a reliable Internet connection is not + stable/9, are listed at www.freebsd.org/releng. + CTM () can be used if a reliable + Internet connection is not available. @@ -1222,11 +1218,11 @@ before running "/usr/sbin/freebsd-update Synchronizing Source - 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 - Subversion and - CTM. + There are various methods for + staying up-to-date with the + &os; sources. This section compares the primary services, + Subversion and + CTM. While it is possible to update only parts of the source @@ -1246,12 +1242,15 @@ before running "/usr/sbin/freebsd-update Subversion uses the pull model of updating sources. The user, or a cron script, invokes the - svn program, and it brings files up-to-date. - Subversion 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 + svn program which updates the local version of the source. + Subversion 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. + requested updates are generated on the fly by the server. How + to synchronize source using + Subversion is described in . CTM @@ -1262,22 +1261,24 @@ before running "/usr/sbin/freebsd-update 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 CTM deltas can then be handed to the - &man.ctm.rmail.1; utility which will automatically decode, + transmission over email in printable ASCII only. Once downloaded, + these deltas can be run through + ctm.rmail which will automatically decode, verify, and apply the changes to the user's copy of the sources. This process is more efficient than Subversion and places less strain on - server resources since it is a push rather - than a pull model. + server resources since it is a push, rather + than a pull, model. Instructions for using + CTM to synchronize source can be + found at . - There are other trade-offs. If a user inadvertently wipes + If a user inadvertently wipes out portions of the local archive, Subversion will detect and rebuild - the damaged portions. CTM will not - do this, and if a user deletes some portion of the source tree + the damaged portions. CTM 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 base delta and rebuild + from the most recent base delta and rebuild it all with CTM.