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   From owner-svn-doc-user@freebsd.org Tue Feb 7 17:42:18 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 2C0F5CD5D62 for ; Tue, 7 Feb 2017 17:42:18 +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 ED4B122B; Tue, 7 Feb 2017 17:42:17 +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 v17HgHYG088273; Tue, 7 Feb 2017 17:42:17 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v17HgH0s088272; Tue, 7 Feb 2017 17:42:17 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201702071742.v17HgH0s088272@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:42:17 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-user@freebsd.org Subject: svn commit: r49946 - 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:42:18 -0000 Author: gjb Date: Tue Feb 7 17:42:16 2017 New Revision: 49946 URL: https://svnweb.freebsd.org/changeset/doc/49946 Log: Fix a minor FDP spacing nit. 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 17:39:52 2017 (r49945) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Tue Feb 7 17:42:16 2017 (r49946) @@ -361,7 +361,7 @@ - ?> + ?> From owner-svn-doc-user@freebsd.org Tue Feb 7 18:24:59 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 9D476CD594E for ; Tue, 7 Feb 2017 18:24:59 +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 77D821F79; Tue, 7 Feb 2017 18:24:59 +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 v17IOwCU005314; Tue, 7 Feb 2017 18:24:58 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v17IOwpV005313; Tue, 7 Feb 2017 18:24:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201702071824.v17IOwpV005313@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 18:24:58 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-user@freebsd.org Subject: svn commit: r49947 - 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 18:24:59 -0000 Author: gjb Date: Tue Feb 7 18:24:58 2017 New Revision: 49947 URL: https://svnweb.freebsd.org/changeset/doc/49947 Log: Use the dates from the original 11.0-RELEASE cycle, and add in missing milestones, such as the Ports and Doc tree tags. Add a section outlining which teams are responsible for some of these milestones. 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 17:42:16 2017 (r49946) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Tue Feb 7 18:24:58 2017 (r49947) @@ -151,58 +151,140 @@ &branch.head; slush: - August 24 + May 27, 2016 &branch.head; freeze: - September 7 + June 10, 2016 &branch.head; KBI freeze: - September 21 + June 24, 2016 + + + + doc/ tree slush [1]: + June 24, 2016 + + + + Ports quarterly branch [2]: + July 1, 2016 &branch.stablex; branch: - October 10 + July 8, 2016 + + + + doc/ tree tag [3]: + July 8, 2016 BETA1 build starts: - October 12 + July 8, 2016 + + + + &branch.head; thaw: + July 9, 2016 BETA2 build starts: - October 18 + July 15, 2016 + + + + BETA3 build starts [*]: + July 22, 2016 &branch.relengx; branch: - November 1 + July 29, 2016 RC1 build starts: - November 1 + July 29, 2016 + + + + &branch.stablex; thaw: + July 30, 2016 RC2 build starts: - November 9 + August 5, 2016 + + + + Final Ports package builds [4]: + August 6, 2016 + + + + Ports release tag: + August 12, 2016 + + + + RC3 build starts [*]: + August 12, 2016 RELEASE build starts: - November 19 + August 19, 2016 + + + + RELEASE announcement: + September 2, 2016 + Items marked with "[*]" are "as + needed". + + + + + The doc/ tree slush is coordinated by + the &team.doceng;. + + + + The Ports quarterly branch used is determined by when + the final RC build is planned. A new + quarterly branch is created on the first day of the quarter, + so this metric should be used when taking the release cycle + milestones into account. The quarterly branch is created by + the &team.portmgr;. + + + + The doc/ tree is tagged by the + &team.doceng;. + + + + The final Ports package build is done by the + &team.portmgr; after the final (or what is expected to be + final) RC build. + + + + If the release is being created from an existing &branch.stable; branch, the KBI freeze date can be excluded, since the KBI From owner-svn-doc-user@freebsd.org Tue Feb 7 19:29:32 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 5E667CD518A for ; Tue, 7 Feb 2017 19:29:32 +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 392BF16A7; Tue, 7 Feb 2017 19:29:32 +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 v17JTVeO030816; Tue, 7 Feb 2017 19:29:31 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v17JTVhq030815; Tue, 7 Feb 2017 19:29:31 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201702071929.v17JTVhq030815@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 19:29:31 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-user@freebsd.org Subject: svn commit: r49948 - 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 19:29:32 -0000 Author: gjb Date: Tue Feb 7 19:29:31 2017 New Revision: 49948 URL: https://svnweb.freebsd.org/changeset/doc/49948 Log: Remove the leading '-' from ALPHA, BETA, RC, and RELEASE for consistency. 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 18:24:58 2017 (r49947) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Tue Feb 7 19:29:31 2017 (r49948) @@ -306,7 +306,7 @@ approvals, the length of time for the blanket approval should be made clear. For example, a &os; developer may request blanket approvals from the start of the code slush until the - start of the -RC builds. + start of the RC builds. Depending on the underlying set of code in question, and the overall impact the set of code has on &os; as a whole, such @@ -387,28 +387,28 @@ Builds Starting with the &os; 10.0-RELEASE cycle, the notion - of -ALPHA builds was - introduced. Unlike the -BETA and - -RC builds, -ALPHA + of ALPHA builds was + introduced. Unlike the BETA and + RC builds, ALPHA builds are not included in the &os; Release schedule. - The idea behind -ALPHA builds is to + The idea behind ALPHA builds is to provide regular &os;-provided builds before the creation of the &branch.stable; branch. - &os; -ALPHA snapshots should be built + &os; ALPHA snapshots should be built approximately once a week. - For the first -ALPHA build, the - BRANCH value in + For the first ALPHA build, the + BRANCH value in sys/conf/newvers.sh needs to be changed from CURRENT to ALPHA1. - For subsequent -ALPHA builds, increment + For subsequent ALPHA builds, increment each ALPHAN value by one. See for information on - building the -ALPHA images. + building the ALPHA images. @@ -460,7 +460,7 @@ release cycle from an extablished &branch.stable; branch. - &os; <literal>-BETA</literal> Builds + &os; <literal>BETA</literal> Builds   @@ -478,13 +478,13 @@ - &os; <literal>-RC</literal> Builds + &os; <literal>RC</literal> Builds   - The &os; <literal>-RELEASE</literal> Build + The &os; <literal>RELEASE</literal> Build   From owner-svn-doc-user@freebsd.org Thu Feb 9 16:53:41 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 A6BD2CD6671 for ; Thu, 9 Feb 2017 16:53:41 +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 6C05B782; Thu, 9 Feb 2017 16:53:41 +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 v19GreBK057840; Thu, 9 Feb 2017 16:53:40 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v19Grexa057836; Thu, 9 Feb 2017 16:53:40 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201702091653.v19Grexa057836@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 9 Feb 2017 16:53:40 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-user@freebsd.org Subject: svn commit: r49954 - 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: Thu, 09 Feb 2017 16:53:41 -0000 Author: gjb Date: Thu Feb 9 16:53:39 2017 New Revision: 49954 URL: https://svnweb.freebsd.org/changeset/doc/49954 Log: Split out complex sections into different files for editing ease. Some parts of these sections will overlap a bit, so separating them into different files will make inclusion of certain parts much easier. Sponsored by: The FreeBSD Foundation Added: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml (contents, props changed) user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml (contents, props changed) user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.xml (contents, props changed) 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 Thu Feb 9 12:07:58 2017 (r49953) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Thu Feb 9 16:53:39 2017 (r49954) @@ -13,6 +13,11 @@ stable/11/"> releng/"> releng/11.0/"> + + + + + ]>
- - Freezing the &os; Source Tree - - This section describes the general procedures related - to the code slush and code freeze - during the &os; release cycle. - - This applies to both &branch.head; and &branch.stable; - branches. - - - The Code Slush - - Approximately one month prior to the scheduled - code slush, the &team.re; sends a reminder - email to the &os; Developers. - - Although the code slush is technically not a hard freeze - on the tree, the &team.re; requests that bugs in the existing - code base take priority over new features. - - The code slush does not enforce commit approvals to the - branch. - - - - The Code Freeze - - Approximately one week prior to the scheduled - code freeze, the &team.re; sends a reminder - email to the &os; Developers. - - The code freeze marks the point in time where all commits - to the branch require explicit approval from the - &team.re;. - - The &os; Subversion repository - contains several hooks to perform sanity checks before any - commit is actually committed to the tree. One of these hooks - will evaluate if committing to a particular branch requires - specific approval. - - To enforce commit approvals by the &team.re;, the Release - Engineer updates - base/svnadmin/conf/approvers, and commits - the change back to the repository. Once this is done, any - change to the branch must include an Approved - by: line in the commit message. - - The Approved by: line must match the second - column in base/svnadmin/conf/approvers, - otherwise the commit will be rejected by the repository - hooks. - - - - - Release from &branch.head; - - This section describes the general procedures of the &os; - release cycle from the &branch.head; branch. - - - &os; <quote><literal>ALPHA</literal></quote> - Builds - - Starting with the &os; 10.0-RELEASE cycle, the notion - of ALPHA builds was - introduced. Unlike the BETA and - RC builds, ALPHA - builds are not included in the &os; Release schedule. - - The idea behind ALPHA builds is to - provide regular &os;-provided builds before the creation of - the &branch.stable; branch. - - &os; ALPHA snapshots should be built - approximately once a week. - - For the first ALPHA build, the - BRANCH value in - sys/conf/newvers.sh needs to be changed - from CURRENT to ALPHA1. - For subsequent ALPHA builds, increment - each ALPHAN - value by one. - - See for information on - building the ALPHA images. - - - - The <acronym>KBI</acronym>/<acronym>KPI</acronym> - Freeze - -   - - - - 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 &branch.head; - -   - - - - - Release from &branch.stable; - - This section describes the general procedures of the &os; - release cycle from an extablished &branch.stable; branch. - - - &os; <literal>BETA</literal> Builds - -   - - - - Creating the &branch.relengx; Branch - -   - - - - Code Thaw in the &branch.stablex; Branch - -   - - - - &os; <literal>RC</literal> Builds - -   - - - - The &os; <literal>RELEASE</literal> Build - -   - - + &release.terminology; + &release.major.version; + &release.minor.version; Wrapping up the Release Cycle Added: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml Thu Feb 9 16:53:39 2017 (r49954) @@ -0,0 +1,83 @@ + + + + Release from &branch.head; + + + This section describes the general procedures of the &os; + release cycle from the &branch.head; branch. + + + &os; <quote><literal>ALPHA</literal></quote> + Builds + + Starting with the &os; 10.0-RELEASE cycle, the notion + of ALPHA builds was + introduced. Unlike the BETA and + RC builds, ALPHA + builds are not included in the &os; Release schedule. + + The idea behind ALPHA builds is to + provide regular &os;-provided builds before the creation of + the &branch.stable; branch. + + &os; ALPHA snapshots should be built + approximately once a week. + + For the first ALPHA build, the + BRANCH value in + sys/conf/newvers.sh needs to be changed + from CURRENT to ALPHA1. + For subsequent ALPHA builds, increment + each ALPHAN + value by one. + + See for information on + building the ALPHA images. + + + + The <acronym>KBI</acronym>/<acronym>KPI</acronym> + Freeze + +   + + + + 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 &branch.head; + +   + + Added: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml Thu Feb 9 16:53:39 2017 (r49954) @@ -0,0 +1,36 @@ + + + + Release from &branch.stable; + + This section describes the general procedures of the &os; + release cycle from an extablished &branch.stable; branch. + + + &os; <literal>BETA</literal> Builds + +   + + + + Creating the &branch.relengx; Branch + +   + + + + Code Thaw in the &branch.stablex; Branch + +   + + + + &os; <literal>RC</literal> Builds + +   + + Added: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.xml Thu Feb 9 16:53:39 2017 (r49954) @@ -0,0 +1,60 @@ + + + + Freezing the &os; Source Tree + + This section describes the general procedures related to the + code slush and code freeze during + the &os; release cycle. + + This applies to both &branch.head; and &branch.stable; + branches. + + + The Code Slush + + Approximately one month prior to the scheduled code + slush, the &team.re; sends a reminder email to the + &os; Developers. + + Although the code slush is technically not a hard freeze on + the tree, the &team.re; requests that bugs in the existing code + base take priority over new features. + + The code slush does not enforce commit approvals to the + branch. + + + + The Code Freeze + + Approximately one week prior to the scheduled code + freeze, the &team.re; sends a reminder email to the + &os; Developers. + + The code freeze marks the point in time where all commits to + the branch require explicit approval from the &team.re;. + + The &os; Subversion repository + contains several hooks to perform sanity checks before any + commit is actually committed to the tree. One of these hooks + will evaluate if committing to a particular branch requires + specific approval. + + To enforce commit approvals by the &team.re;, the Release + Engineer updates + base/svnadmin/conf/approvers, and commits + the change back to the repository. Once this is done, any + change to the branch must include an Approved by: + line in the commit message. + + The Approved by: line must match the second + column in base/svnadmin/conf/approvers, + otherwise the commit will be rejected by the repository + hooks. + + From owner-svn-doc-user@freebsd.org Thu Feb 9 17:05:33 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 082F9CD6D3D for ; Thu, 9 Feb 2017 17:05:33 +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 BDE16128D; Thu, 9 Feb 2017 17:05:32 +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 v19H5VPW062459; Thu, 9 Feb 2017 17:05:31 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v19H5Vvu062458; Thu, 9 Feb 2017 17:05:31 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201702091705.v19H5Vvu062458@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 9 Feb 2017 17:05:31 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-user@freebsd.org Subject: svn commit: r49955 - 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: Thu, 09 Feb 2017 17:05:33 -0000 Author: gjb Date: Thu Feb 9 17:05:31 2017 New Revision: 49955 URL: https://svnweb.freebsd.org/changeset/doc/49955 Log: Fix indentation. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml Thu Feb 9 16:53:39 2017 (r49954) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml Thu Feb 9 17:05:31 2017 (r49955) @@ -4,80 +4,79 @@ $FreeBSD$ --> - - Release from &branch.head; + + Release from &branch.head; - This section describes the general procedures of the &os; - release cycle from the &branch.head; branch. + This section describes the general procedures of the &os; + release cycle from the &branch.head; branch. - - &os; <quote><literal>ALPHA</literal></quote> - Builds - - Starting with the &os; 10.0-RELEASE cycle, the notion - of ALPHA builds was - introduced. Unlike the BETA and - RC builds, ALPHA - builds are not included in the &os; Release schedule. - - The idea behind ALPHA builds is to - provide regular &os;-provided builds before the creation of - the &branch.stable; branch. - - &os; ALPHA snapshots should be built - approximately once a week. - - For the first ALPHA build, the - BRANCH value in - sys/conf/newvers.sh needs to be changed - from CURRENT to ALPHA1. - For subsequent ALPHA builds, increment - each ALPHAN - value by one. - - See for information on - building the ALPHA images. - - - - The <acronym>KBI</acronym>/<acronym>KPI</acronym> - Freeze - -   - - - - 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 &branch.head; - -   - - + + &os; <quote><literal>ALPHA</literal></quote> Builds + + Starting with the &os; 10.0-RELEASE cycle, the notion + of ALPHA builds was + introduced. Unlike the BETA and + RC builds, ALPHA builds + are not included in the &os; Release schedule. + + The idea behind ALPHA builds is to + provide regular &os;-provided builds before the creation of the + &branch.stable; branch. + + &os; ALPHA snapshots should be built + approximately once a week. + + For the first ALPHA build, the + BRANCH value in + sys/conf/newvers.sh needs to be changed + from CURRENT to ALPHA1. + For subsequent ALPHA builds, increment each + ALPHAN value by + one. + + See for information on + building the ALPHA images. + + + + The <acronym>KBI</acronym>/<acronym>KPI</acronym> + Freeze + +   + + + + 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 &branch.head; + +   + + From owner-svn-doc-user@freebsd.org Thu Feb 9 23:21:29 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 845B9CD8D5A for ; Thu, 9 Feb 2017 23:21:29 +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 45292A06; Thu, 9 Feb 2017 23:21:29 +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 v19NLSeG020835; Thu, 9 Feb 2017 23:21:28 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v19NLS61020832; Thu, 9 Feb 2017 23:21:28 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201702092321.v19NLS61020832@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 9 Feb 2017 23:21:28 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-user@freebsd.org Subject: svn commit: r49961 - 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: Thu, 09 Feb 2017 23:21:29 -0000 Author: gjb Date: Thu Feb 9 23:21:27 2017 New Revision: 49961 URL: https://svnweb.freebsd.org/changeset/doc/49961 Log: Add a 'terminology' section to the general outline to reduce repetition for future sections yet to be written. Comment two areas that will be moved elsewhere, but keep them in the document to save time with the wording. Sponsored by: The FreeBSD Foundation 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/releng-major-version.xml user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.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 Thu Feb 9 22:16:33 2017 (r49960) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Thu Feb 9 23:21:27 2017 (r49961) @@ -90,11 +90,12 @@ - + - General information about the code - slush and code freeze. + Terminology and general information, such as the + code slush and code + freeze, used throughout this document. Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml Thu Feb 9 22:16:33 2017 (r49960) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml Thu Feb 9 23:21:27 2017 (r49961) @@ -39,13 +39,6 @@ building the ALPHA images. - - The <acronym>KBI</acronym>/<acronym>KPI</acronym> - Freeze - -   - - Creating the &branch.stablex; Branch Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.xml Thu Feb 9 22:16:33 2017 (r49960) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.xml Thu Feb 9 23:21:27 2017 (r49961) @@ -4,37 +4,39 @@ $FreeBSD$ --> - - Freezing the &os; Source Tree + + Release Engineering Terminology - This section describes the general procedures related to the - code slush and code freeze during - the &os; release cycle. + This section describes some of the terminology used throughout + the rest of this document. - This applies to both &branch.head; and &branch.stable; - branches. - - + The Code Slush + Approximately one month prior to the scheduled code slush, the &team.re; sends a reminder email to the &os; Developers. + ?> - Although the code slush is technically not a hard freeze on - the tree, the &team.re; requests that bugs in the existing code - base take priority over new features. + The code slush is not a hard freeze on the tree, the + &team.re; requests that bugs in the existing code base take + priority over new features. The code slush does not enforce commit approvals to the branch. - + The Code Freeze + Approximately one week prior to the scheduled code freeze, the &team.re; sends a reminder email to the &os; Developers. + ?> The code freeze marks the point in time where all commits to the branch require explicit approval from the &team.re;. @@ -57,4 +59,11 @@ otherwise the commit will be rejected by the repository hooks. + + + The <acronym>KBI</acronym>/<acronym>KPI</acronym> + Freeze + +   +