- Add support for concurrent upcoming releases.

- Set beta2 macros to 10.1-R, and enable the beta2.upcoming
  text.
- Connect the 10.1R directory to the build.

Approved by:	re (implicit), doceng (implicit)
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2014-07-12 23:41:02 +00:00
parent c94cea3698
commit 67875388e4
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=45260
4 changed files with 20 additions and 6 deletions
en_US.ISO8859-1
htdocs/releases
share/xml
share/xml

View file

@ -5,7 +5,8 @@
<!ENTITY local.branch.stable "stable/10">
<!ENTITY local.branch.releng "releng/10.1">
<!ENTITY title "FreeBSD &local.rel; Release Process">
<!ENTITY % beta.local.where "INCLUDE">
<!ENTITY % beta.local.where "IGNORE">
<!ENTITY % beta2.local.where "IGNORE">
]>
<html xmlns="http://www.w3.org/1999/xhtml">
@ -32,6 +33,7 @@
<a href="mailto:re@FreeBSD.org">re@FreeBSD.org</a>.</p>
&beta.local.where;
&beta2.local.where;
<h1>Schedule</h1>

View file

@ -18,7 +18,7 @@ SUBDIR+= 6.0R 6.1R 6.2R 6.3R 6.4R
SUBDIR+= 7.0R 7.1R 7.2R 7.3R 7.4R
SUBDIR+= 8.0R 8.1R 8.2R 8.3R 8.4R
SUBDIR+= 9.0R 9.1R 9.2R 9.3R
SUBDIR+= 10.0R
SUBDIR+= 10.0R 10.1R
.if defined(NEW_BUILD)
SUBDIR=

View file

@ -167,4 +167,15 @@
'>
]]>
<![%beta2.local.where;[
<!ENTITY beta2.local.where '
<div xmlns="http://www.w3.org/1999/xhtml">
&beta.helptest;
<p>Available installation images are listed on the <a
href="&base;/where.html#helptest">download page</a>.</p>
</div>
'>
]]>
<!ENTITY beta.local.where ''>
<!ENTITY beta2.local.where ''>

View file

@ -24,6 +24,7 @@
<!-- Do not set this to 'INCLUDE' in this file. -->
<!ENTITY % beta.local.where "IGNORE">
<!ENTITY % beta2.local.where "IGNORE">
<!ENTITY rel.head.major '11'>
<!ENTITY rel.head '&rel.head.major;.0'>
@ -46,13 +47,13 @@
are having release candidates at the same time), do the same here. -->
<!-- Set to 'INCLUDE' when the schedule is available. -->
<!ENTITY beta2.upcoming "IGNORE">
<!ENTITY beta2.upcoming "INCLUDE">
<!-- Set to 'INCLUDE' when the installation images are available. -->
<!ENTITY beta2.testing "IGNORE">
<!ENTITY beta2.testing "INCLUDE">
<!ENTITY % beta2.testing "IGNORE">
<!ENTITY betarel2.current '9.2'>
<!ENTITY betarel2.vers 'RC4'>
<!ENTITY betarel2.current '10.1'>
<!ENTITY betarel2.vers 'STABLE'>
<!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
<!ENTITY rel.current.major '10'>