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

[Glen Barber]

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 @@
       </varlistentry>
 
       <varlistentry>
-	<term><xref linkend="releng-code-slush-freeze"/></term>
+	<term><xref linkend="releng-terms"/></term>
 
 	<listitem>
-	  <para>General information about the <quote>code
-	      slush</quote> and <quote>code freeze</quote>.</para>
+	  <para>Terminology and general information, such as the
+	    <quote>code slush</quote> and <quote>code
+	      freeze</quote>, used throughout this document.</para>
 	</listitem>
       </varlistentry>
 

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 <literal>ALPHA</literal> images.</para>
   </sect2>
 
-  <sect2 xml:id="releng-head-freeze-kbi">
-    <title>The <acronym>KBI</acronym>/<acronym>KPI</acronym>
-      Freeze</title>
-
-    <para> </para>
-  </sect2>
-
   <sect2 xml:id="releng-head-branching">
     <title>Creating the &branch.stablex; Branch</title>
 

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$
 -->
-<sect1 xml:id="releng-code-slush-freeze">
-  <title>Freezing the &os; Source Tree</title>
+<sect1 xml:id="releng-terms">
+  <title>Release Engineering Terminology</title>
 
-  <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 section describes some of the terminology used throughout
+    the rest of this document.</para>
 
-  <para>This applies to both &branch.head; and &branch.stable;
-    branches.</para>
-
-  <sect2 xml:id="releng-code-slush">
+  <sect2 xml:id="releng-terms-code-slush">
     <title>The Code Slush</title>
 
+    <?ignore
+    XXX: this needs to be moved to a more appropriate section
     <para>Approximately one month prior to the scheduled <quote>code
 	slush</quote>, the &team.re; sends a reminder email to the
       &os; Developers.</para>
+    ?>
 
-    <para>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.</para>
+    <para>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.</para>
 
     <para>The code slush does not enforce commit approvals to the
       branch.</para>
   </sect2>
 
-  <sect2 xml:id="releng-code-freeze">
+  <sect2 xml:id="releng-terms-code-freeze">
     <title>The Code Freeze</title>
 
+    <?ignore
+    XXX: this needs to be moved to a more appropriate section
     <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>
@@ -57,4 +59,11 @@
       otherwise the commit will be rejected by the repository
       hooks.</para>
   </sect2>
+
+  <sect2 xml:id="releng-terms-kbi-freeze">
+    <title>The <acronym>KBI</acronym>/<acronym>KPI</acronym>
+      Freeze</title>
+
+    <para> </para>
+  </sect2>
 </sect1>