Date: Sat, 12 Jul 2014 23:41:02 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r45260 - in head: en_US.ISO8859-1/htdocs/releases en_US.ISO8859-1/htdocs/releases/10.1R en_US.ISO8859-1/share/xml share/xml Message-ID: <201407122341.s6CNf22T093289@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Sat Jul 12 23:41:02 2014 New Revision: 45260 URL: http://svnweb.freebsd.org/changeset/doc/45260 Log: - 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 Modified: head/en_US.ISO8859-1/htdocs/releases/10.1R/schedule.xml head/en_US.ISO8859-1/htdocs/releases/Makefile head/en_US.ISO8859-1/share/xml/release.l10n.ent head/share/xml/release.ent Modified: head/en_US.ISO8859-1/htdocs/releases/10.1R/schedule.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/releases/10.1R/schedule.xml Sat Jul 12 16:55:15 2014 (r45259) +++ head/en_US.ISO8859-1/htdocs/releases/10.1R/schedule.xml Sat Jul 12 23:41:02 2014 (r45260) @@ -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> Modified: head/en_US.ISO8859-1/htdocs/releases/Makefile ============================================================================== --- head/en_US.ISO8859-1/htdocs/releases/Makefile Sat Jul 12 16:55:15 2014 (r45259) +++ head/en_US.ISO8859-1/htdocs/releases/Makefile Sat Jul 12 23:41:02 2014 (r45260) @@ -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= Modified: head/en_US.ISO8859-1/share/xml/release.l10n.ent ============================================================================== --- head/en_US.ISO8859-1/share/xml/release.l10n.ent Sat Jul 12 16:55:15 2014 (r45259) +++ head/en_US.ISO8859-1/share/xml/release.l10n.ent Sat Jul 12 23:41:02 2014 (r45260) @@ -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 ''> Modified: head/share/xml/release.ent ============================================================================== --- head/share/xml/release.ent Sat Jul 12 16:55:15 2014 (r45259) +++ head/share/xml/release.ent Sat Jul 12 23:41:02 2014 (r45260) @@ -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'>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407122341.s6CNf22T093289>