svn commit: r43941 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng

[Glen Barber]

Author: gjb
Date: Fri Feb 14 22:31:14 2014
New Revision: 43941
URL: http://svnweb.freebsd.org/changeset/doc/43941

Log:
  Consolidate the 'code slush' and 'code freeze' into its own section.
  
  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	Fri Feb 14 22:31:12 2014	(r43940)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml	Fri Feb 14 22:31:14 2014	(r43941)
@@ -80,6 +80,15 @@
       </varlistentry>
 
       <varlistentry>
+	<term><xref linkend="releng-code-slush-freeze"/></term>
+
+	<listitem>
+	  <para>General information about the <quote>code
+	      slush</quote> and <quote>code freeze</quote>.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
 	<term><xref linkend="releng-head"/></term>
 
 	<listitem>
@@ -217,15 +226,18 @@
       branch.</para>
   </sect1>
 
-  <sect1 xml:id="releng-head">
+  <sect1 xml:id="releng-code-slush-freeze">
     <title>Release from <literal>head/</literal></title>
 
-    <para>This section describes the general procedures of the
-      &os; release cycle from the <literal>head/</literal>
-      branch.</para>
+    <para>This section describes the general procedures related
+      to the <quote>code slush</quote> and <quote>code freeze</quote>
+      during the &os; release cycle.</para>
+
+    <para>This applies to both <literal>head/</literal> and
+      <literal>stable/</literal> branches.</para>
 
-    <sect2 xml:id="releng-head-slush">
-      <title>Code Slush in <literal>head/</literal></title>
+    <sect2 xml:id="releng-code-slush">
+      <title>The Code Slush</title>
 
       <para>Approximately one month prior to the scheduled
 	<quote>code slush</quote>, the &team.re; sends a reminder
@@ -239,11 +251,43 @@
 	branch.</para>
     </sect2>
 
-    <sect2 xml:id="releng-head-freeze">
-      <title>Code Freeze in <literal>head/</literal></title>
+    <sect2 xml:id="releng-code-freeze">
+      <title>The Code Freeze</title>
 
-      <para> </para>
+      <para>Approximately one week prior to the scheduled
+	<quote>code freeze</quote>, the &team.re; sends a reminder
+	email to the &os; Developers.</para>
+
+      <para>The code freeze marks the point in time where all commits
+	to the branch require explicit approval from the
+	&team.re;.</para>
+
+      <para>The &os; <application>Subversion</application> 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.</para>
+
+      <para>To enforce commit approvals by the &team.re;, the Release
+	Engineer updates
+	<filename>base/svnadmin/conf/approvers</filename>, and commits
+	the change back to the repository.  Once this is done, any
+	change to the branch must include an <quote>Approved
+	  by:</quote> line in the commit message.</para>
+
+      <para>The <quote>Approved by:</quote> line must match the second
+	column in <filename>base/svnadmin/conf/approvers</filename>,
+	otherwise the commit will be rejected by the repository
+	hooks.</para>
     </sect2>
+  </sect1>
+
+  <sect1 xml:id="releng-head">
+    <title>Release from <literal>head/</literal></title>
+
+    <para>This section describes the general procedures of the
+      &os; release cycle from the <literal>head/</literal>
+      branch.</para>
 
     <sect2 xml:id="releng-head-builds-alpha">
       <title>&os; <quote><literal>ALPHA</literal></quote>
@@ -281,36 +325,6 @@
       &os; release cycle from an extablished
       <literal>stable/</literal> branch.</para>
 
-    <sect2 xml:id="releng-stable-slush">
-      <title>Code Slush in <literal>head/</literal></title>
-
-      <note>
-	<para>If the release is being created from
-	  <literal>head/</literal>, this section can be skipped
-	  because the code slush would have already been in effect.
-	  Instead, continue with <xref
-	    linkend="releng-stable-builds-beta"/>.</para>
-      </note>
-
-      <para> </para>
-    </sect2>
-
-    <sect2 xml:id="releng-stable-freeze">
-      <title>Code Freeze in the
-	<literal>stable/<replaceable>N/</replaceable></literal>
-	Branch</title>
-
-      <note>
-	<para>If the release is being created from
-	  <literal>head/</literal>, this section can be skipped
-	  because the code freeze would have already been in effect.
-	  Instead, continue with <xref
-	    linkend="releng-stable-builds-beta"/>.</para>
-      </note>
-
-      <para> </para>
-    </sect2>
-
     <sect2 xml:id="releng-stable-builds-beta">
       <title>&os; <literal>-BETA</literal> Builds</title>