[m-rev.] for review: mention beta-releases on web site

[Fergus Henderson]

Estimated hours taken: 1
Branches: main

w3/download/include/rotd.inc:
	Mention the beta-release versions.

w3/Makefile:
w3/RELEASE_INFO:
w3/include/globals.inc.in:
	Record the number of the next beta-release.

Workspace: /home/ceres/fjh/mercury
Index: w3/Makefile
===================================================================
RCS file: /home/mercury1/repository/w3/Makefile,v
retrieving revision 1.15
diff -u -d -r1.15 Makefile
--- w3/Makefile	19 Oct 2001 05:24:10 -0000	1.15
+++ w3/Makefile	17 Jan 2003 09:23:23 -0000
@@ -28,7 +28,9 @@
 globals.inc: include/globals.inc
 
 include/globals.inc: include/globals.inc.in
-	sed -e "s/<RELEASE_VERSION>/$(RELEASE_VERSION)/" < $< > $@
+	sed -e "s/<RELEASE_VERSION>/$(RELEASE_VERSION)/" \
+	    -e "s/<NEXT_BETA_VERSION>/$(NEXT_BETA_VERSION)/" \
+	     < $< > $@
 
 index.html: latest_news.inc newsdb.inc
 news.html: latest_news.inc newsdb.inc
Index: w3/RELEASE_INFO
===================================================================
RCS file: /home/mercury1/repository/w3/RELEASE_INFO,v
retrieving revision 1.2
diff -u -d -r1.2 RELEASE_INFO
--- w3/RELEASE_INFO	24 Dec 2002 05:38:30 -0000	1.2
+++ w3/RELEASE_INFO	17 Jan 2003 09:23:23 -0000
@@ -1,6 +1,9 @@
 # A descriptive name for the release. See mercury/VERSION
 RELEASE_VERSION=0.11.0
 
+# A name for the next beta-release.
+NEXT_BETA_VERSION=0.11.1-beta
+
 # The CVS tag of the release branch.
 # This is used to check out the documentation sources.
 # We use the release *branch* tag, rather than the release tag,
Index: w3/download/include/rotd.inc
===================================================================
RCS file: /home/mercury1/repository/w3/download/include/rotd.inc,v
retrieving revision 1.6
diff -u -d -r1.6 rotd.inc
--- w3/download/include/rotd.inc	17 Jan 2003 09:23:16 -0000	1.6
+++ w3/download/include/rotd.inc	17 Jan 2003 09:23:23 -0000
@@ -1,10 +1,40 @@
 <H2>Release of the Day</H2>
 
-Mercury can have up to three different releases at any given point.
-<p>
-The most stable release will be a <em>numbered</em> release, such as 0.6 or
-0.7.3.   These releases have been extensively tested, and often have 
+Mercury can have up to four different releases at any given point.
+
+<H3> Current release </H3>
+
+The most stable release will be a <em>numbered release</em>, such as 0.10.1 or
+0.11.0.   These releases have been extensively tested, and often have 
 pre-compiled binary packages for easy installation.
+<p>
+The <a href="release.html">current stable release</a>
+is version <? echo $current_release ?>.
+
+<H3> Current beta-release </H3>
+
+The next most stable release will be a <em>numbered beta-release</em>,
+such as 0.11.1-beta-2003-01-17.  These releases are snapshots from a
+"release" branch of our CVS repository.
+They may provide additional bug fixes not yet present
+in the previous numbered release.
+However, in general they are not as well tested.
+Generally the only reason to use these versions would be if you need
+one of the additional bug fixes.
+<p>
+The current beta-release series is named <? echo $next_beta_version ?>.
+Individual releases in this series are named with a date stamp, e.g.
+<? echo $next_beta_version ?>-YYYY-MM-DD.
+<p>
+<B>Download <? echo $next_beta_version ?>:</b>
+<ul>
+<li> <A HREF="<? echo $root; ?>/download/files/beta-releases/">
+Mercury web site</A><br>
+<li> <A HREF="ftp://ftp.mercury.cs.mu.OZ.AU/pub/mercury/beta-releases/<? echo $next_beta_version ?>">
+Mercury ftp site</A>
+</ul>
+
+<H3> Stable ROTD (release-of-the-day) </H3>
 <p>
 To cater for those who need access to the latest cutting edge features
 of Mercury, but would still like some stability, we release a daily
Index: w3/include/globals.inc.in
===================================================================
RCS file: /home/mercury1/repository/w3/include/globals.inc.in,v
retrieving revision 1.1
diff -u -d -r1.1 globals.inc.in
--- w3/include/globals.inc.in	19 Oct 2001 05:24:24 -0000	1.1
+++ w3/include/globals.inc.in	17 Jan 2003 09:23:23 -0000
@@ -1,6 +1,7 @@
 <?
 	$installed_path="/home/mercury5/installed_w3";
 	$current_release="<RELEASE_VERSION>";
+	$next_beta_version="<NEXT_BETA_VERSION>";
 	$release_doc_dir="$root/information/doc-release";
 	$latest_doc_dir="$root/information/doc-latest";
 	$ref_man_toc="reference_manual_toc.html";

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------