From owner-svn-doc-user@freebsd.org Tue Feb 7 17:39:53 2017 Return-Path: Delivered-To: svn-doc-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A9F56CD5AD6 for ; Tue, 7 Feb 2017 17:39:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 84AFC1C15; Tue, 7 Feb 2017 17:39:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v17HdqLF084577; Tue, 7 Feb 2017 17:39:52 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v17HdqSQ084576; Tue, 7 Feb 2017 17:39:52 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201702071739.v17HdqSQ084576@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 7 Feb 2017 17:39:52 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-user@freebsd.org Subject: svn commit: r49945 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng X-SVN-Group: doc-user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for doc experimental trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2017 17:39:53 -0000 Author: gjb Date: Tue Feb 7 17:39:52 2017 New Revision: 49945 URL: https://svnweb.freebsd.org/changeset/doc/49945 Log: Minor updates while reworking the outline being used to update the RE processes: - Create a few convenience entities to save typing/typos. - Add a placeholder section (commented) to contain a list of files to edit when creating stable/X. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Tue Feb 7 11:49:06 2017 (r49944) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Tue Feb 7 17:39:52 2017 (r49945) @@ -8,6 +8,11 @@ +head/"> +stable/"> +stable/11/"> +releng/"> +releng/11.0/"> ]>
Development of &os; has a very specific workflow. In general, all changes to the &os; base system are committed to - the head/ branch, which reflects the top of - the source tree. + the &branch.head; branch, which reflects the top of the source + tree. After a reasonable testing period, changes can then be - merged to the stable/ branches. The default - minimum timeframe before merging to stable/ - branches is three (3) days. + merged to the &branch.stable; branches. The default minimum + timeframe before merging to &branch.stable; branches is three + (3) days. Although a general rule to wait a minimum of three days - before merging from head/, there are a few - special circumstances where an immediate merge may be necessary, - such as a critical security fix, or a bug fix that directly - inhibits the release build process. + before merging from &branch.head;, there are a few special + circumstances where an immediate merge may be necessary, such as + a critical security fix, or a bug fix that directly inhibits the + release build process. After several months, and the number of changes in the - stable/ branch have grown significantly, it - is time to release the next version of &os;. These releases - have been historically referred to as point + &branch.stable; branch have grown significantly, it is time to + release the next version of &os;. These releases have been + historically referred to as point releases. - In between releases from the stable/ - branches, approximately every two (2) years, a release will be - cut directly from head/. These releases - have been historically referred to as dot-zero + In between releases from the &branch.stable; branches, + approximately every two (2) years, a release will be cut + directly from &branch.head;. These releases have been + historically referred to as dot-zero releases. This article will highlight the workflow and @@ -145,23 +150,22 @@ - head/ slush: + &branch.head; slush: August 24 - head/ freeze: + &branch.head; freeze: September 7 - head/ KBI freeze: + &branch.head; KBI freeze: September 21 - stable/10/ - branch: + &branch.stablex; branch: October 10 @@ -176,8 +180,7 @@ - releng/10.0/ - branch: + &branch.relengx; branch: November 1 @@ -201,10 +204,10 @@ If the release is being created from an existing - stable/ branch, the KBI + &branch.stable; branch, the KBI freeze date can be excluded, since the KBI is already considered frozen on established - stable/ branches. + &branch.stable; branches. After general agreement on the schedule, the &team.re; @@ -242,8 +245,8 @@ to the code slush and code freeze during the &os; release cycle. - This applies to both head/ and - stable/ branches. + This applies to both &branch.head; and &branch.stable; + branches. The Code Slush @@ -292,11 +295,10 @@ - Release from <literal>head/</literal> + Release from &branch.head; - This section describes the general procedures of the - &os; release cycle from the head/ - branch. + This section describes the general procedures of the &os; + release cycle from the &branch.head; branch. &os; <quote><literal>ALPHA</literal></quote> @@ -310,7 +312,7 @@ <para>The idea behind <literal>-ALPHA</literal> builds is to provide regular &os;-provided builds before the creation of - the <literal>stable/</literal> branch.</para> + the &branch.stable; branch.</para> <para>&os; <literal>-ALPHA</literal> snapshots should be built approximately once a week.</para> @@ -335,26 +337,45 @@ </sect2> <sect2 xml:id="releng-head-branching"> - <title>Creating the - <literal>stable/<replaceable>N</replaceable></literal> - Branch + Creating the &branch.stablex; Branch -   + When creating the &branch.stable; branch, several changes + are required in both the new &branch.stable; branch and the + &branch.head; branch. + + + + + + File to Edit + What to Change + + + + + +   +   + + + + + ?> - Code Thaw in <literal>head/</literal> + Code Thaw in &branch.head;   - Release from <literal>stable/</literal> + Release from &branch.stable; - This section describes the general procedures of the - &os; release cycle from an extablished - stable/ branch. + This section describes the general procedures of the &os; + release cycle from an extablished &branch.stable; branch. &os; <literal>-BETA</literal> Builds @@ -363,17 +384,13 @@ - Creating the - <literal>releng/<replaceable>N.M/</replaceable></literal> - Branch + Creating the &branch.relengx; Branch   - Code Thaw in the - <literal>stable/<replaceable>N/</replaceable></literal> - Branch + Code Thaw in the &branch.stablex; Branch