svn commit: r49954 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng
Glen Barber
gjb at FreeBSD.org
Thu Feb 9 16:53:41 UTC 2017
Author: gjb
Date: Thu Feb 9 16:53:39 2017
New Revision: 49954
URL: https://svnweb.freebsd.org/changeset/doc/49954
Log:
Split out complex sections into different files for editing
ease. Some parts of these sections will overlap a bit, so
separating them into different files will make inclusion of
certain parts much easier.
Sponsored by: The FreeBSD Foundation
Added:
user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml (contents, props changed)
user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml (contents, props changed)
user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.xml (contents, props changed)
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 Thu Feb 9 12:07:58 2017 (r49953)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Thu Feb 9 16:53:39 2017 (r49954)
@@ -13,6 +13,11 @@
<!ENTITY branch.stablex "<literal xmlns='http://docbook.org/ns/docbook'>stable/<replaceable>11</replaceable>/</literal>">
<!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>">
+
+<!-- Externally included files -->
+<!ENTITY release.major.version SYSTEM "./releng-major-version.xml">
+<!ENTITY release.minor.version SYSTEM "./releng-minor-version.xml">
+<!ENTITY release.terminology SYSTEM "./releng-terminology.xml">
]>
<article xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
@@ -320,175 +325,9 @@
branch.</para>
</sect1>
- <sect1 xml:id="releng-code-slush-freeze">
- <title>Freezing the &os; Source Tree</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 applies to both &branch.head; and &branch.stable;
- branches.</para>
-
- <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
- 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 does not enforce commit approvals to the
- branch.</para>
- </sect2>
-
- <sect2 xml:id="releng-code-freeze">
- <title>The Code Freeze</title>
-
- <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 &branch.head;</title>
-
- <para>This section describes the general procedures of the &os;
- release cycle from the &branch.head; branch.</para>
-
- <sect2 xml:id="releng-head-builds-alpha">
- <title>&os; <quote><literal>ALPHA</literal></quote>
- Builds</title>
-
- <para>Starting with the &os; 10.0-RELEASE cycle, the notion
- of <quote><literal>ALPHA</literal></quote> builds was
- introduced. Unlike the <literal>BETA</literal> and
- <literal>RC</literal> builds, <literal>ALPHA</literal>
- builds are not included in the &os; Release schedule.</para>
-
- <para>The idea behind <literal>ALPHA</literal> builds is to
- provide regular &os;-provided builds before the creation of
- the &branch.stable; branch.</para>
-
- <para>&os; <literal>ALPHA</literal> snapshots should be built
- approximately once a week.</para>
-
- <para>For the first <literal>ALPHA</literal> build, the
- <varname>BRANCH</varname> value in
- <filename>sys/conf/newvers.sh</filename> needs to be changed
- from <literal>CURRENT</literal> to <literal>ALPHA1</literal>.
- For subsequent <literal>ALPHA</literal> builds, increment
- each <literal>ALPHA<replaceable>N</replaceable></literal>
- value by one.</para>
-
- <para>See <xref linkend="releng-building"/> for information on
- 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>
-
- <para>When creating the &branch.stable; branch, several changes
- are required in both the new &branch.stable; branch and the
- &branch.head; branch.</para>
-
- <?ignore
- <informaltable frame="none" pgwide="0">
- <tgroup cols="2">
- <thead>
- <row>
- <entry>File to Edit</entry>
- <entry>What to Change</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry> </entry>
- <entry> </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
- ?>
- </sect2>
-
- <sect2 xml:id="releng-head-thaw">
- <title>Code Thaw in &branch.head;</title>
-
- <para> </para>
- </sect2>
- </sect1>
-
- <sect1 xml:id="releng-stable">
- <title>Release from &branch.stable;</title>
-
- <para>This section describes the general procedures of the &os;
- release cycle from an extablished &branch.stable; branch.</para>
-
- <sect2 xml:id="releng-stable-builds-beta">
- <title>&os; <literal>BETA</literal> Builds</title>
-
- <para> </para>
- </sect2>
-
- <sect2 xml:id="releng-stable-branching">
- <title>Creating the &branch.relengx; Branch</title>
-
- <para> </para>
- </sect2>
-
- <sect2 xml:id="releng-stable-thaw">
- <title>Code Thaw in the &branch.stablex; Branch</title>
-
- <para> </para>
- </sect2>
-
- <sect2 xml:id="releng-release-rc">
- <title>&os; <literal>RC</literal> Builds</title>
-
- <para> </para>
- </sect2>
-
- <sect2 xml:id="releng-release-final">
- <title>The &os; <literal>RELEASE</literal> Build</title>
-
- <para> </para>
- </sect2>
- </sect1>
+ &release.terminology;
+ &release.major.version;
+ &release.minor.version;
<sect1 xml:id="releng-wrapup">
<title>Wrapping up the Release Cycle</title>
Added: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml Thu Feb 9 16:53:39 2017 (r49954)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+ The FreeBSD Documentation Project
+
+ $FreeBSD$
+-->
+ <sect1 xml:id="releng-head">
+ <title>Release from &branch.head;</title>
+
+
+ <para>This section describes the general procedures of the &os;
+ release cycle from the &branch.head; branch.</para>
+
+ <sect2 xml:id="releng-head-builds-alpha">
+ <title>&os; <quote><literal>ALPHA</literal></quote>
+ Builds</title>
+
+ <para>Starting with the &os; 10.0-RELEASE cycle, the notion
+ of <quote><literal>ALPHA</literal></quote> builds was
+ introduced. Unlike the <literal>BETA</literal> and
+ <literal>RC</literal> builds, <literal>ALPHA</literal>
+ builds are not included in the &os; Release schedule.</para>
+
+ <para>The idea behind <literal>ALPHA</literal> builds is to
+ provide regular &os;-provided builds before the creation of
+ the &branch.stable; branch.</para>
+
+ <para>&os; <literal>ALPHA</literal> snapshots should be built
+ approximately once a week.</para>
+
+ <para>For the first <literal>ALPHA</literal> build, the
+ <varname>BRANCH</varname> value in
+ <filename>sys/conf/newvers.sh</filename> needs to be changed
+ from <literal>CURRENT</literal> to <literal>ALPHA1</literal>.
+ For subsequent <literal>ALPHA</literal> builds, increment
+ each <literal>ALPHA<replaceable>N</replaceable></literal>
+ value by one.</para>
+
+ <para>See <xref linkend="releng-building"/> for information on
+ 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>
+
+ <para>When creating the &branch.stable; branch, several changes
+ are required in both the new &branch.stable; branch and the
+ &branch.head; branch.</para>
+
+ <?ignore
+ <informaltable frame="none" pgwide="0">
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>File to Edit</entry>
+ <entry>What to Change</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry> </entry>
+ <entry> </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ ?>
+ </sect2>
+
+ <sect2 xml:id="releng-head-thaw">
+ <title>Code Thaw in &branch.head;</title>
+
+ <para> </para>
+ </sect2>
+ </sect1>
Added: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml Thu Feb 9 16:53:39 2017 (r49954)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+ The FreeBSD Documentation Project
+
+ $FreeBSD$
+-->
+<sect1 xml:id="releng-stable">
+ <title>Release from &branch.stable;</title>
+
+ <para>This section describes the general procedures of the &os;
+ release cycle from an extablished &branch.stable; branch.</para>
+
+ <sect2 xml:id="releng-stable-builds-beta">
+ <title>&os; <literal>BETA</literal> Builds</title>
+
+ <para> </para>
+ </sect2>
+
+ <sect2 xml:id="releng-stable-branching">
+ <title>Creating the &branch.relengx; Branch</title>
+
+ <para> </para>
+ </sect2>
+
+ <sect2 xml:id="releng-stable-thaw">
+ <title>Code Thaw in the &branch.stablex; Branch</title>
+
+ <para> </para>
+ </sect2>
+
+ <sect2 xml:id="releng-release-rc">
+ <title>&os; <literal>RC</literal> Builds</title>
+
+ <para> </para>
+ </sect2>
+</sect1>
Added: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.xml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-terminology.xml Thu Feb 9 16:53:39 2017 (r49954)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+ The FreeBSD Documentation Project
+
+ $FreeBSD$
+-->
+<sect1 xml:id="releng-code-slush-freeze">
+ <title>Freezing the &os; Source Tree</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 applies to both &branch.head; and &branch.stable;
+ branches.</para>
+
+ <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 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 does not enforce commit approvals to the
+ branch.</para>
+ </sect2>
+
+ <sect2 xml:id="releng-code-freeze">
+ <title>The Code Freeze</title>
+
+ <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>
More information about the svn-doc-user
mailing list