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 + +   +