From owner-svn-doc-user@freebsd.org  Thu Mar 30 22:59:10 2017
Return-Path: <owner-svn-doc-user@freebsd.org>
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 A92F0D266B3
 for <svn-doc-user@mailman.ysv.freebsd.org>;
 Thu, 30 Mar 2017 22:59:10 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org [96.47.72.37])
 (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 8384DAB6;
 Thu, 30 Mar 2017 22:59:10 +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 v2UMvs9x015641;
 Thu, 30 Mar 2017 22:57:54 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2UMvstk015639;
 Thu, 30 Mar 2017 22:57:54 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201703302257.v2UMvstk015639@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 30 Mar 2017 22:57:54 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-user@freebsd.org
Subject: svn commit: r50111 -
 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
 <svn-doc-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-doc-user>,
 <mailto:svn-doc-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-user/>
List-Post: <mailto:svn-doc-user@freebsd.org>
List-Help: <mailto:svn-doc-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-doc-user>,
 <mailto:svn-doc-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Mar 2017 22:59:10 -0000

Author: gjb
Date: Thu Mar 30 22:57:54 2017
New Revision: 50111
URL: https://svnweb.freebsd.org/changeset/doc/50111

Log:
  - Document the schedule.xml and releng/index.xml files.
  - Move the reminder email section to a more appropriate location.
  
  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-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 Mar 30 22:00:22 2017	(r50110)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml	Thu Mar 30 22:57:54 2017	(r50111)
@@ -14,6 +14,7 @@
 <!ENTITY branch.releng "<literal xmlns='http://docbook.org/ns/docbook'>releng/</literal>">
 <!ENTITY branch.relengx "<literal xmlns='http://docbook.org/ns/docbook'>releng/<replaceable>11.0</replaceable>/</literal>">
 <!ENTITY branch.releasex "<literal xmlns='http://docbook.org/ns/docbook'>release/<replaceable>11.0.0</replaceable>/</literal>">
+<!ENTITY branch.revision "<replaceable xmlns='http://docbook.org/ns/docbook'>11.0</replaceable>">
 
 <!-- Externally included files -->
 <!ENTITY release.building SYSTEM "./releng-building.xml">
@@ -345,6 +346,36 @@
       an extension.  A new scheduler, however, may not be feasible,
       especially if such dramatic changes do not exist in another
       branch.</para>
+
+    <para>The schedule is also added to the Project website, in the
+      <literal>doc/</literal> repository, in
+      <filename>head/en_US.ISO8859-1/htdocs/releases/&branch.revision;R/schedule.xml</filename>.
+      This file is continuously updated as the release cycle
+      progresses.</para>
+
+    <note>
+      <para>In most cases, the <filename>schedule.xml</filename> can
+	be copied from a prior release and updated accordingly.</para>
+    </note>
+
+    <para>The schedule is also linked from
+      <filename>head/en_US.ISO8859-1/htdocs/releng/index.xml</filename>.</para>
+
+    <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>Once the first builds of the release cycle are available,
+      update the <literal>beta.local.where</literal> entity in
+      <filename>head/en_US.ISO8859-1/htdocs/releases/&branch.revision;R/schedule.xml</filename>.
+      replacing <literal>IGNORE</literal> with
+      <literal>INCLUDE</literal>.</para>
+
+    <note>
+      <para>If two parallel release cycles are happening at once, the
+	<literal>beta2.local.where</literal> entity may be used
+	instead.</para>
+    </note>
   </sect1>
 
   &release.terminology;

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 Mar 30 22:00:22 2017	(r50110)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.xml	Thu Mar 30 22:57:54 2017	(r50111)
@@ -13,13 +13,6 @@
   <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 not a hard freeze on the tree,
       the &team.re; requests that bugs in the existing code base take
       priority over new features.</para>
@@ -31,13 +24,6 @@
   <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>