From owner-svn-doc-all@FreeBSD.ORG Tue Feb 4 21:52:58 2014 Return-Path: Delivered-To: svn-doc-all@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 2B34B45F; Tue, 4 Feb 2014 21:52:58 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 119DC10DA; Tue, 4 Feb 2014 21:52:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s14Lqvbn077094; Tue, 4 Feb 2014 21:52:57 GMT (envelope-from dru@svn.freebsd.org) Received: (from dru@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s14Lqv6P077093; Tue, 4 Feb 2014 21:52:57 GMT (envelope-from dru@svn.freebsd.org) Message-Id: <201402042152.s14Lqv6P077093@svn.freebsd.org> From: Dru Lavigne Date: Tue, 4 Feb 2014 21:52:57 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r43778 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Feb 2014 21:52:58 -0000 Author: dru Date: Tue Feb 4 21:52:57 2014 New Revision: 43778 URL: http://svnweb.freebsd.org/changeset/doc/43778 Log: Initial shuffle to improve flow and tighten up this section. Subsequent commits will review the content. 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 20:58:15 2014 (r43777) +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml Tue Feb 4 21:52:57 2014 (r43778) @@ -1137,26 +1137,22 @@ before running "/usr/sbin/freebsd-update -CURRENT -STABLE - There are two development branches to &os;: &os.current; - and &os.stable;. This section provides an explanation of each + &os; has two development branches: &os.current; + and &os.stable;. + + This section provides an explanation of 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;. - - Staying Current with &os; - + + Using &os.current; &os.current; is the bleeding edge 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. - - What Is &os.current;? - - snapshot - &os.current; is the very latest source code for &os;. This includes work in progress, experimental changes, and transitional mechanisms that might or might not be present @@ -1167,10 +1163,6 @@ before running "/usr/sbin/freebsd-update possible, but whether or not &os.current; brings disaster or greatly desired functionality can be a matter of when the source code was synced. - - - - Who Needs &os.current;? &os.current; is made available for three primary interest groups: @@ -1199,10 +1191,8 @@ before running "/usr/sbin/freebsd-update contribute code. - - - What Is &os.current; <emphasis>Not</emphasis>? + &os.current; is Not: @@ -1222,10 +1212,6 @@ before running "/usr/sbin/freebsd-update supported. - - - - Using &os.current; -CURRENT @@ -1327,16 +1313,10 @@ before running "/usr/sbin/freebsd-update enthusiastically! - - Staying Stable with &os; - - - What Is &os.stable;? - - -STABLE + Using &os.stable; &os.stable; is the development branch from which major releases are made. Changes go into this branch at a @@ -1347,10 +1327,6 @@ before running "/usr/sbin/freebsd-update &os.stable; may or may not be suitable for any particular purpose. It is simply another engineering development track, not a resource for end-users. - - - - Who Needs &os.stable;? Those interested in tracking or contributing to the FreeBSD development process, especially as it relates to the @@ -1386,10 +1362,6 @@ before running "/usr/sbin/freebsd-update testing, it is recommended that users instead run the most recent release of FreeBSD, and use the binary update mechanism to move from release to release. - - - - Using &os.stable; -STABLE @@ -1488,7 +1460,6 @@ before running "/usr/sbin/freebsd-update release. -