diff --git a/en_US.ISO8859-1/htdocs/administration.xml b/en_US.ISO8859-1/htdocs/administration.xml index 65c58e6f7e..b821274746 100644 --- a/en_US.ISO8859-1/htdocs/administration.xml +++ b/en_US.ISO8859-1/htdocs/administration.xml @@ -143,7 +143,7 @@ <p>The Primary Release Engineering Team is responsible for setting and publishing release schedules for official project releases of FreeBSD, - announcing code freezes and maintaining <code>RELENG_*</code> branches, among other + announcing code freezes and maintaining <code>releng/*</code> branches, among other things. The <a href="releng/charter.html">release engineering team charter</a> describes the duties and responsibilities of the Primary Release diff --git a/en_US.ISO8859-1/htdocs/releng/charter.xml b/en_US.ISO8859-1/htdocs/releng/charter.xml index 88a16f52c4..536b0ddf52 100644 --- a/en_US.ISO8859-1/htdocs/releng/charter.xml +++ b/en_US.ISO8859-1/htdocs/releng/charter.xml @@ -29,9 +29,9 @@ change-review committee to decide which changes may be made to a branch during a code freeze. This includes freezes for HEAD when approaching a .0 release as well as the traditional - <tt>RELENG_*</tt> code freeze pending a -STABLE release.</p></li> + <tt>releng/*</tt> code freeze pending a -STABLE release.</p></li> - <li><p>Creation and maintenance of <tt>RELENG_*</tt> branches of the + <li><p>Creation and maintenance of <tt>releng/*</tt> branches of the <tt>src/</tt> tree. This includes final authority over what commits are made (and remain in) the -STABLE branch prior to the branching of a release branch.</p></li> @@ -60,7 +60,7 @@ <li><p>Coordinating with the security officer team to ensure that pending FreeBSD releases are not affected by recently disclosed vulnerabilities. Also, approximately 1 week after a release, - change approval control of release branches (<tt>RELENG_X_Y</tt>) + change approval control of release branches (<tt>releng/X.Y/</tt>) is transfered from the release engineers to the security-officer team. The exact transfer date is to be worked out by the two parties once it is clear that the release was a success. A heads