Index: 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 (revision 50109) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.xml (revision 50110) @@ -1,69 +1,69 @@ Release Engineering Terminology This section describes some of the terminology used throughout the rest of this document. The Code Slush Approximately one month prior to the scheduled code slush, the &team.re; sends a reminder email to the &os; Developers. ?> - The code slush is not a hard freeze on the tree, the - &team.re; requests that bugs in the existing code base take + Although 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;. 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. The <acronym>KBI</acronym>/<acronym>KPI</acronym> Freeze