From owner-svn-doc-all@FreeBSD.ORG Fri May 23 22:46:39 2014 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 28A84865; Fri, 23 May 2014 22:46:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 091952DC6; Fri, 23 May 2014 22:46:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4NMkcXX097235; Fri, 23 May 2014 22:46:38 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4NMkcje097230; Fri, 23 May 2014 22:46:38 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201405232246.s4NMkcje097230@svn.freebsd.org> From: Glen Barber Date: Fri, 23 May 2014 22:46:38 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r44927 - in head: en_US.ISO8859-1/htdocs en_US.ISO8859-1/share/xml share/xml X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 May 2014 22:46:39 -0000 Author: gjb Date: Fri May 23 22:46:38 2014 New Revision: 44927 URL: http://svnweb.freebsd.org/changeset/doc/44927 Log: The current flow of our website does not allow easily advertising that we will be soon entering the release cycle. As such, we are not able to easily link to the upcoming release schedule.html page from the index page unless we already have BETA release builds on the FTP mirrors. Implement some evil to eliminate this limitation: - In share/xml/release.l10n.ent, move reusable text from the 'helptest' header, and into a beta.helptest macro, and include the new macro in beta.desc. - Add a new entity, beta.local.where, which is ignored by default. When enabled in the schedule.xml for the upcoming release, it prints information about where to download the testing builds. - Add two new entities, beta.upcoming and beta2.upcoming, which are used in index.xsl, and when set, direct the URL to the upcoming release schedule.html page instead of directly to where.html. With this change, we can advertise that a release cycle is about to start, and not need downloadable images yet. Sponsored by: The FreeBSD Foundation Modified: head/en_US.ISO8859-1/htdocs/index.xsl head/en_US.ISO8859-1/share/xml/release.l10n.ent head/share/xml/release.ent Modified: head/en_US.ISO8859-1/htdocs/index.xsl ============================================================================== --- head/en_US.ISO8859-1/htdocs/index.xsl Fri May 23 20:29:35 2014 (r44926) +++ head/en_US.ISO8859-1/htdocs/index.xsl Fri May 23 22:46:38 2014 (r44927) @@ -83,13 +83,13 @@ href="&u.rel2.announce;">&rel2.current;, &rel3.current; - -
  • Upcoming: &betarel.current;-&betarel.vers;
    • + +
  • Upcoming:
    &betarel.current;-&betarel.vers;
    •  - -
  • Upcoming: &betarel2.current;-&betarel2.vers;
    • + +
  • Upcoming:
    &betarel2.current;-&betarel2.vers;
    •  Modified: head/en_US.ISO8859-1/share/xml/release.l10n.ent ============================================================================== --- head/en_US.ISO8859-1/share/xml/release.l10n.ent Fri May 23 20:29:35 2014 (r44926) +++ head/en_US.ISO8859-1/share/xml/release.l10n.ent Fri May 23 22:46:38 2014 (r44927) @@ -73,14 +73,7 @@ - -

    Help With The Next FreeBSD Release&beta.plural;

    - -

    Our developers and release engineers are working on the the - next release&beta.plural; of FreeBSD; if you wish to help with - testing, please download the latest build&beta.plural;. Please - note that these images are, by their very nature, intended for - testing and should not be used in production environments.

    + &beta.helptest; @@ -150,3 +143,28 @@ ]]> + + + +

    Help With The Next FreeBSD Release&beta.plural;

    + +

    Our developers and release engineers are working on the the + next release&beta.plural; of FreeBSD; if you wish to help with + testing, please download the latest build&beta.plural;. Please + note that these images are, by their very nature, intended for + testing and should not be used in production environments.

    + +'> + + + &beta.helptest; +

    Available installation images are listed on the download page.

    + +'> +]]> + + Modified: head/share/xml/release.ent ============================================================================== --- head/share/xml/release.ent Fri May 23 20:29:35 2014 (r44926) +++ head/share/xml/release.ent Fri May 23 22:46:38 2014 (r44927) @@ -22,6 +22,9 @@ rel2.* and u.rel2.* for the "conservative users" version. --> + + + @@ -29,6 +32,10 @@ don't have something in BETAn or RCn), then change %beta.testing below to "IGNORE". If we do, use "INCLUDE". --> + + + + @@ -37,6 +44,11 @@ + + + + +