[m-rev.] for review: changes to download pages (DIFF)

[Ian MacLarty]

Index: Makefile
===================================================================
RCS file: /home/mercury1/repository/w3/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	12 Sep 2005 03:25:42 -0000	1.17
+++ Makefile	30 Sep 2005 02:57:41 -0000
@@ -30,6 +30,7 @@
 include/globals.inc: include/globals.inc.in RELEASE_INFO
 	sed -e "s/<RELEASE_VERSION>/$(RELEASE_VERSION)/" \
 	    -e "s/<NEXT_BETA_VERSION>/$(NEXT_BETA_VERSION)/" \
+	    -e "s/<WWW_DOMAIN>/$(WWW_DOMAIN)/" \
 	     < $< > $@
 
 index.html: latest_news.inc newsdb.inc
@@ -40,8 +41,9 @@
 
 local_install:
 	$(CP) images $(INSTALL_WEBDIR)
+	cd cgi-bin && $(MAKE) install
 	chgrp -R mercury $(INSTALL_WEBDIR)/images
-	chmod -R g+w,a+r $(INSTALL_WEBDIR)/images
+	chmod -R g+w,a+rx $(INSTALL_WEBDIR)/images
 
 clean: local_clean
 
Index: Makefile.common
===================================================================
RCS file: /home/mercury1/repository/w3/Makefile.common,v
retrieving revision 1.14
diff -u -r1.14 Makefile.common
--- Makefile.common	21 Jan 2004 06:30:19 -0000	1.14
+++ Makefile.common	30 Sep 2005 02:50:41 -0000
@@ -4,7 +4,17 @@
 # Public License - see the file COPYING in the Mercury distribution.
 #-----------------------------------------------------------------------------#
 
-PHP3=/usr/lib/cgi-bin/php3 -q
+ifndef PHP3
+	PHP3=/usr/lib/cgi-bin/php3 -q
+endif
+ifndef WWW_DOMAIN
+	# The domain cannot be www.cs.mu.oz.au/mercury, because the
+	# departmental web server does not handle cgi scripts.
+	WWW_DOMAIN="www.mercury.cs.mu.oz.au"
+endif
+ifndef CGIBIN_DIR
+	CGIBIN_DIR="/usr/lib/cgi-bin"
+endif
 CP=cp -af
 
 #-----------------------------------------------------------------------------#
@@ -42,16 +52,18 @@
 	done
 endif
 
-
 .PHONY: install
 install: html
 	[ -d $(INSTALL_WEBDIR) ] || mkdir -p $(INSTALL_WEBDIR)
+ifdef HTML
 	$(CP) $(HTML) $(INSTALL_WEBDIR)/
+endif
 ifdef DIRS
 	for dir in $(DIRS);						\
 	do				        			\
 		[ -d $(INSTALL_WEBDIR)/$$dir ] ||			\
 			mkdir -p $(INSTALL_WEBDIR)/$$dir;		\
+		chmod a+rx $(INSTALL_WEBDIR)/$$dir;			\
 		(export INSTALL_WEBDIR=$(INSTALL_WEBDIR)/$$dir &&	\
 		cd $$dir && $(MAKE) install);				\
 	done
Index: README
===================================================================
RCS file: README
diff -N README
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ README	30 Sep 2005 05:12:45 -0000
@@ -0,0 +1,63 @@
+This directory contains the source for the Mercury website.
+
+BUILDING THE WEBSITE
+
+The site is written in PHP3 which is converted to HTML before being uploaded
+to the web server (unlike the usual way php is used where it generates HTML
+dynamically).
+
+Type `make' to build all the html files from the php3 source.  The php3 
+executable should be located in /usr/lib/cgi-bin.  To specify a different
+location for the php3 executable, set the PHP3 environment variable to the
+path of the php3 executable.
+
+CGI SCRIPTS
+
+The cgi-bin directory holds CGI scripts necessary for some dynamic content
+on the website, such as the currently available release of the day.
+
+The Mercury website is served by two web servers:
+	1. The CSSE departmental web server (www.cs.mu.oz.au/research/mercury).
+	2. The Mercury group web server (www.mercury.cs.mu.oz.au).
+
+The departmental web server does not support CGI scripts, but the Mercury
+group server does.  Therefore any links to CGI scripts should be absolute
+links to the CGI script on the Mercury group web server.  Use the $www_domain
+php variable for this purpose.
+
+TESTING
+
+It is very important to view in a web browser any changes to the website, 
+as php will insert error messages directly into the web pages it generates
+instead of aborting.
+
+To test changes to static HTML pages simply run `make' and open the generated
+html pages in a web browser.
+
+To test changes to CGI scripts, or pages that link to CGI scripts, you need
+to install the website to a test machine with a web server installed.  The
+test machine should recognise /cgi-bin as a CGI scripts directory.  At the
+time of writing this saturn.cs.mu.oz.au was set up as a suitable test
+web server.
+
+INSTALLING
+
+There are a few things that must be done before running `make install':
+
+1. The environment variable INSTALL_WEBDIR must be set to the location where 
+the web pages should be copied to.  Set and export INSTALL_WEBDIR before
+running `make install', do not run `make install INSTALL_WEBDIR=...' as this
+will not work.
+
+2. The CGI scripts will be installed to /usr/lib/cgi-bin by default, but this
+can be overridden by setting the CGIBIN_DIR environment variable.
+
+3. If you are installing to a machine other that www.mercury.cs.mu.oz.au, then
+set the WWW_DOMAIN environment variable to the domain of the machine you are
+installing to (e.g. saturn.cs.mu.oz.au).
+
+4.  Before installing checkout the tutorial cvs module with the command 
+`cvs co tutorial'.  It should be checked out to the base directory of your w3
+workspace.
+
+To install type `make install'.
Index: RELEASE_INFO
===================================================================
RCS file: /home/mercury1/repository/w3/RELEASE_INFO,v
retrieving revision 1.4
diff -u -r1.4 RELEASE_INFO
--- RELEASE_INFO	9 Sep 2005 05:20:05 -0000	1.4
+++ RELEASE_INFO	30 Sep 2005 02:40:31 -0000
@@ -2,7 +2,9 @@
 RELEASE_VERSION=0.12.0
 
 # A name for the next beta-release.
-NEXT_BETA_VERSION=0.12.1-beta
+# Note: only set this variable to a non-empty value if a source distribution
+# for the next beta release is being built.
+NEXT_BETA_VERSION=
 
 # The CVS tag of the release branch.
 # This is used to check out the documentation sources.
Index: cgi-bin/Makefile
===================================================================
RCS file: cgi-bin/Makefile
diff -N cgi-bin/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cgi-bin/Makefile	30 Sep 2005 02:40:38 -0000
@@ -0,0 +1,32 @@
+#-----------------------------------------------------------------------------#
+# Copyright (C) 2005 University of Melbourne.
+# This file may only be copied under the terms of the GNU General
+# Public License - see the file COPYING in the Mercury distribution.
+#-----------------------------------------------------------------------------#
+
+CGI_SCRIPTS = generate_rotd_page
+
+#-----------------------------------------------------------------------------#
+
+target: all
+
+all: $(CGI_SCRIPTS)
+	
+generate_rotd_page: generate_rotd_page.in
+	sed s/\<INSTALL_WEBDIR\>/`echo $(INSTALL_WEBDIR) | \
+		sed 's/\\//\\\\\\//g'`/g \
+		generate_rotd_page.in > generate_rotd_page
+	
+install: local_install
+
+local_install: all
+	[ -d $(CGIBIN_DIR) ] || mkdir -p $(CGIBIN_DIR)
+	cp $(CGI_SCRIPTS) $(CGIBIN_DIR)/
+	chmod ugo+xr $(CGIBIN_DIR)/* || true
+
+clean: local_clean
+
+local_clean:
+	rm -f generate_rotd_page
+
+include ../Makefile.common
Index: cgi-bin/generate_rotd_page.in
===================================================================
RCS file: cgi-bin/generate_rotd_page.in
diff -N cgi-bin/generate_rotd_page.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cgi-bin/generate_rotd_page.in	30 Sep 2005 05:41:02 -0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+#-----------------------------------------------------------------------------#
+# Copyright (C) 1998 University of Melbourne.
+# This file may only be copied under the terms of the GNU General
+# Public License - see the file COPYING in the Mercury distribution.
+#-----------------------------------------------------------------------------#
+#
+# This CGI script generates the release of the day download page.
+# It does this by replacing occurances of the string "<ROTD_VERSION>" in
+# download/rotd.html with the latest release of the day version and outputting 
+# the result.
+#
+echo Content-type: text/html
+echo
+ROTD=`cat <INSTALL_WEBDIR>/download/files/beta-releases/rotd/latest-unstable-version`
+sed s/\<ROTD_VERSION\>/$ROTD/ <INSTALL_WEBDIR>/download/rotd.html
Index: download/Makefile
===================================================================
RCS file: /home/mercury1/repository/w3/download/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- download/Makefile	9 Sep 2005 05:20:05 -0000	1.11
+++ download/Makefile	30 Sep 2005 02:40:31 -0000
@@ -41,7 +41,7 @@
 	release-0.12-contents.html	\
 	rotd.html
 
-current-release-bugs.html: release-0.11-bugs.inc
+current-release-bugs.html: release-0.12-bugs.inc
 
 install: local_install
 
Index: download/include/release.inc
===================================================================
RCS file: /home/mercury1/repository/w3/download/include/release.inc,v
retrieving revision 1.37
diff -u -r1.37 release.inc
--- download/include/release.inc	9 Sep 2005 06:47:57 -0000	1.37
+++ download/include/release.inc	30 Sep 2005 02:40:31 -0000
@@ -5,8 +5,8 @@
 # see /usr/share/doc/php3-doc/html/index.html for documentation on PHP3.
 #
 
-$aus_ftp = "ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/";
-$aus_http = "http://www.cs.mu.oz.au/mercury/download/files/";
+$aus_ftp = "ftp://$ftp_domain/pub/mercury/";
+$aus_http = "http://$www_domain/download/files/";
 $usa_sourceforge_http = "http://prdownloads.sourceforge.net/mercury/";
 $usa_sunsite_ftp = "ftp://sunsite.unc.edu/pub/Linux/devel/lang/mercury/";
 $usa_sunysb_ftp = "ftp://ftp.cs.sunysb.edu/pub/XSB/mercury/";
@@ -172,12 +172,6 @@
      </ol>
 </ul>
 
-<h3>How to get the distribution</h3>
-
-You can download the latest release directly from this web page, see below.
-
-<p>
-
 <h3><a name="source">Source Distribution</a></h3>
 
 The main "mercury-compiler" source distribution is about 15 Mb.
@@ -196,8 +190,6 @@
 of useful additional libraries.  This is distributed separately,
 mainly for copyright reasons (some of the additional libraries do
 not meet the Debian Free Software Guidelines).
-We strongly recommend that everyone who downloads the "compiler"
-distribution should also download the "extras" distribution.
 
 <p>
 
Index: download/include/rotd.inc
===================================================================
RCS file: /home/mercury1/repository/w3/download/include/rotd.inc,v
retrieving revision 1.10
diff -u -r1.10 rotd.inc
--- download/include/rotd.inc	8 Sep 2005 09:35:35 -0000	1.10
+++ download/include/rotd.inc	30 Sep 2005 05:22:03 -0000
@@ -1,87 +1,179 @@
-<H2>Release of the Day</H2>
+<?
 
-Mercury can have up to four different releases at any given point.
-<p>
-Please note that all the currently available versions of Mercury will not work
-with GCC 4.0 because of a 
-<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22362">bug</a> in that 
-version of GCC.
+#
+# This is PHP3 code.  On Debian systems (e.g. venus.cs.mu.oz.au),
+# see /usr/share/doc/php3-doc/html/index.html for documentation on PHP3.
+#
+
+$aus_ftp = "ftp://$ftp_domain/pub/mercury/beta-releases/rotd/";
+$aus_http = "http://$www_domain/download/files/beta-releases/rotd/";
+
+function link_to ($directory, $filename, $description)
+{
+	echo "<a href = \"" . $directory . $filename .
+		"\">" . $description . "</a>\n";
+	echo "   \n";
+}
+
+function links_to_file ($filename)
+{
+	global $aus_ftp, $aus_http;
+
+	link_to ($aus_ftp, $filename, "Australia (FTP)");
+	link_to ($aus_http, $filename, "Australia (HTTP)");
+}
 
-<H3> Current release </H3>
+?>
+<h2><a name="info">Release of the day</a></h2>
 
-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 ?>.
+The latest release of the day is version <? echo $rotd_version; ?>.
 
-<H3> Beta release </H3>
+Please treat ROTDs with caution -- although they are often very
+useful and reasonably stable, they are not widely tested, and
+may have unfinished features and rough edges.  We are still interested
+in feedback and bug reports on the ROTDs.  Please send bug reports to 
+<a href="mailto:mercury-bugs at cs.mu.oz.au">mercury-bugs at cs.mu.oz.au</a>.
+
+<h3>Information</h3>
 
-A beta version of the upcoming 0.12.0 release is also available.
-The source distribution for this beta release is available for download from:
 <ul>
-<li> <A HREF="<? echo $root; ?>/download/files/beta-releases/0.12.0-beta/index.html">
-the Mercury web site</A> or<br>
-<li> <A 
-HREF="ftp://ftp.mercury.cs.mu.OZ.AU/pub/mercury/beta-releases/0.12.0-beta">
-the Mercury ftp site</A>.
+<li> <a href = "<? echo $root; 
+?>/download/files/beta-releases/rotd/mercury-NEWS-<? echo $rotd_version; 
+?>-unstable.txt">
+     Changes since version <? echo $current_release; ?>
+     </a>
+<li> <a href = "<? echo $root; 
+?>/download/files/beta-releases/rotd/mercury-INSTALL-<? echo $rotd_version; 
+?>-unstable.txt">
+     Instructions for installing from the source distribution
+     </a>
 </ul>
 
-Binary distributions will be available for the 0.12.0 release when
-it comes out.
+<h3>Supported Platforms</h3>
+
+The latest release of the day is known to work on the following platforms:
 
-<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
-snapshot of the development system.  This is called a "release of the
-day (ROTD)" and is given a version number "rotd-YYYY-MM-DD" according to
-the date it was built.
 <p>
-<B>Download releases of the day:</b>
+
 <ul>
-<li> <A HREF="<? echo $root; ?>/download/files/beta-releases/rotd/">
-Mercury web site</A><br>
-<li> <A HREF="ftp://ftp.mercury.cs.mu.OZ.AU/pub/mercury/beta-releases/rotd/">
-Mercury ftp site</A>
+    <li> x86 machines running Debian Linux 
+    <li> x86 machines running SuSE Linux 
 </ul>
 
-<H3> Unstable ROTD </H3>
+<p>
+
+Mercury should also work on the following platforms, although this is not
+tested for every release of the day.
 
-For some people, the cutting edge is not enough, and they want the
-bleeding edge.  To help these developers, we have an <em>unstable</em>
-release of the day.  This is just like a ROTD, but may not have passed
-all its tests.  It is marked with a version number
-"rotd-YYYY-MM-DD-unstable".
 <p>
-<B>Download unstable releases of the day:</b>
+
 <ul>
-<li> <A HREF="<? echo $root; ?>/download/files/beta-releases/rotd/">
-Mercury web site</A><br>
-<li> <A HREF="ftp://ftp.mercury.cs.mu.OZ.AU/pub/mercury/beta-releases/rotd/">
-Mercury ftp site</A>
+    <li> x86 machines running other versions of Microsoft Windows
+         (95, 98, 98SE, ME, NT, 2000)
+    <li> x86 machines running other versions of Linux
+         (however, there are some known problems with the version of GNU C
+	 that shipped with Red Hat Linux 7.0)
+    <li> x86 machines running FreeBSD 3.0
+    <li> x86 machines running other BSD Unix systems
+    <li> x86 machines running SunOS 5.x
+    <li> x86 machines running Microsoft Windows XP
+    <li> PowerPC machines running Linux
+    <li> PowerPC machines running Mac OS 10.3 and above
+    <li> Sun SPARC machines running SunOS 4.x and 5.x
+    <li> HP PA machines running HPUX
+    <li> IBM RS/6000 machines running AIX
+    <li> DEC Mips machines running ULTRIX
+    <li> DEC Alpha machines running OSF/1 (Digital Unix)
+    <li> DEC Alpha machines running Linux
+    <li> SGI Mips machines running IRIX 5.x
 </ul>
 
-<H3> Contents of the ROTD </H3>
+<p>
+
+<h3>What do I need?</h3>
+
+<ul>
+<li> For Unix systems, you will need the following:<p>
+    <ol>
+    <li> <a href="http://gcc.gnu.org">GNU C (gcc)</a>
+         <p>
+         We recommend GCC 3.4.x.
+         <p>
+         GCC 3.0, 3.3.1 and 4.0 will NOT work. 
+	 They have bugs which cause 
+	 internal compiler errors when compiling the C code generated by the 
+	 Mercury compiler.
+         <p>
+         Avoid GCC 2.96 (distributed with Red Hat Linux 7.x) and
+         other unofficial releases of GCC.  Also avoid versions of GCC less 
+	 than GCC 2.95.X.
+         <p>
+         It is also possible to use other C compilers, such as
+         <a href="http://www.cs.princeton.edu/software/lcc/">lcc</a>,
+         but we don't recommend that.
+         <p>
+    <li> GNU make (version 3.69 or higher).
+    </ol>
+
+    <p>
+
+<li> For Windows,<p>
+     <ol>
+     <li> You will need <a href=http://www.cygwin.com/>Cygwin</a>,
+          which you can download
+          <a href=http://www.cygwin.com/setup.exe>here</a>.
+          Cygwin includes GNU C and GNU Make.<p>
+     <li> You can optionally use
+          <a href="http://msdn.microsoft.com/visualc/default.asp">
+          Microsoft Visual C</a> rather than GNU C.<p>
+     <li> If you want to take a look at our preliminary support for .NET,
+          you also need 
+	  <ol>
+	      <li> the Microsoft .NET SDK version 1, available from
+                   <a href="http://msdn.microsoft.com/netframework/">
+		   MSDN</a>.
+	           If you are an MSDN Universal subscriber you can
+		   also order CDs as part of your subscription.
+	      <li> A Windows system suitable for development with
+	           Microsoft .NET, such as Windows XP.
+	  </ol>
+     </ol>
+</ul>
 
-The Mercury compiler is written in Mercury, and compiles Mercury into C
-code.  These releases contain the Mercury code and the generated C code
-for the compiler.  You need a C compiler (such as gcc) to build the
-compiler and runtime system.  Once built, the Mercury compiler is
-capable of generating its own C code (the process of getting a compiler
-to compile itself is called <em>bootstrapping</em>, because it is like
-the compiler lifting itself up by its own boot straps).
-<p>
-Numbered releases often have binary packages created, where even the
-C code has been pre-compiled, and you simply need to install the
-libraries and executables.
-If we have enough processing power, we may someday do the same for
-releases of the day, but at the moment you need to do the final step
-of compilation yourself.
 <p>
-Please treat ROTDs with caution -- although they are often very
-useful and reasonably stable, they are not widely tested, and
-may have unfinished features and rough edges.  We are still interested
-in feedback and bug reports on the ROTDs.
+
+<h3><a name="source">Source Distribution</a></h3>
+
+The main "mercury-compiler" source distribution includes the compiler, 
+standard library,
+debugger, profilers, and other tools.
+
+<p>
+
+There is also a "mercury-extras" distribution which contains a number
+of useful additional libraries.  This is distributed separately,
+mainly for copyright reasons (some of the additional libraries do
+not meet the Debian Free Software Guidelines).
+
+<p>
+
+Finally there is also a "mercury-tests" distribution which contains our
+test suite.  This may be useful if you are modifying the compiler,
+or porting it to a new system.
+
+<dl>
+<dt> Compiler
+<dd> 
+<? links_to_file("mercury-compiler-$rotd_version-unstable.tar.gz") ?>
+<p>
+
+<dt> Extras
+<dd>
+<? links_to_file("mercury-extras-$rotd_version-unstable.tar.gz") ?>
+<p>
+
+<dt> Tests
+<dd>
+<? links_to_file("mercury-tests-$rotd_version-unstable.tar.gz") ?>
+</dl>
 
Index: include/download.inc
===================================================================
RCS file: /home/mercury1/repository/w3/include/download.inc,v
retrieving revision 1.3
diff -u -r1.3 download.inc
--- include/download.inc	8 Sep 2005 09:35:35 -0000	1.3
+++ include/download.inc	30 Sep 2005 02:40:31 -0000
@@ -1,23 +1,46 @@
-<h3> How to get Mercury </h3>
+<H2>How to get Mercury</H2>
 
 The Mercury compiler is free software, and is distributed under the
-terms
-of the GNU General Public License. Binary distributions are available
-for several popular platforms, and a full source distribution is also 
-available. Included in the distribution is an extensive library,
-documentation, and programming environment support tools.
-
-<ul>
-        <li>
-        <a href = "download/release.html">
-        The current release of the Mercury system</a>
-
-        <li>
-        <a href = "download/rotd.html">
-        The current snapshot for the Mercury system</a>
-
-        <li>
-        <a href = "download/old-release.html">
-        Old releases of the Mercury system</a>
-</ul>
+terms of the GNU General Public License.
+<p>
+There are two main versions of Mercury available at any point in time.
 
+<H3> Current stable 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="download/release.html">current stable release</a>
+is version <? echo $current_release; ?>.
+
+<? if ($next_beta_version != "") { ?>
+	<H3> Beta release </H3>
+
+	A beta version of the next release is also available.
+	The current beta release is version <? echo $next_beta_version; ?>. 
+	The source distribution for this beta release is available for download
+	from: 
+	<ul>
+	<li> 
+	<A
+	HREF="<?
+		echo "http://$www_domain/download/files/beta-releases/";
+		echo "$next_beta_version/index.html";
+	?>"> the Mercury web site</A> or
+	<li> <A HREF="<?
+		echo "ftp://$ftp_domain/pub/mercury/beta-releases/";
+		echo "$next_beta_version";
+	?>">the Mercury ftp site</A>.
+	</ul>
+<? } ?>
+
+<H3> Release of the day </H3>
+<p>
+To cater for those who need access to the latest cutting edge features
+of Mercury, we release a daily snapshot of the development system.  This is
+called a "release of the day (ROTD)" and is given a version number
+"rotd-YYYY-MM-DD" according to the date it was built.  
+<p>
+The latest release of the day is available 
+<a href="http://<?echo $www_domain; ?>/cgi-bin/generate_rotd_page">here</a>.
Index: include/globals.inc.in
===================================================================
RCS file: /home/mercury1/repository/w3/include/globals.inc.in,v
retrieving revision 1.5
diff -u -r1.5 globals.inc.in
--- include/globals.inc.in	29 Sep 2005 10:19:49 -0000	1.5
+++ include/globals.inc.in	30 Sep 2005 02:40:31 -0000
@@ -2,6 +2,7 @@
 	$installed_path="/home/mercury5/installed_w3";
 	$current_release="<RELEASE_VERSION>";
 	$next_beta_version="<NEXT_BETA_VERSION>";
+	$rotd_version="<ROTD_VERSION>";
 	$release_doc_dir="$root/information/doc-release";
 	$latest_doc_dir="$root/information/doc-latest";
 	$ref_man_release="$release_doc_dir/mercury_ref/index.html";
@@ -14,4 +15,6 @@
 	$trans_guide_latest="$latest_doc_dir/mercury_trans_guide/index.html";
 	$faq_release="$release_doc_dir/mercury_faq/index.html";
 	$faq_latest="$latest_doc_dir/mercury_faq/index.html";
+	$ftp_domain="ftp.mercury.cs.mu.oz.au";
+	$www_domain="<WWW_DOMAIN>";
 ?>
Index: include/menubar.inc
===================================================================
RCS file: /home/mercury1/repository/w3/include/menubar.inc,v
retrieving revision 1.21
diff -u -r1.21 menubar.inc
--- include/menubar.inc	5 Aug 2005 07:50:38 -0000	1.21
+++ include/menubar.inc	30 Sep 2005 02:40:32 -0000
@@ -112,9 +112,12 @@
   <?
   }
   ?>
-    <a href="<?echo $root?>/download/rotd.html">Snapshot</a><BR>
-    <a href="<?echo $root?>/download/old-release.html">Old Releases
-    </a><BR>
+    <a 
+  href="http://<? echo $www_domain; ?>/cgi-bin/generate_rotd_page">Snapshot</a>
+  <BR>
+    <a 
+  href="<?echo $root?>/download/old-release.html">Old Releases</a>
+  <BR>
 </SMALL>
 <?
 }
Index: news/newsdb.inc
===================================================================
RCS file: /home/mercury1/repository/w3/news/newsdb.inc,v
retrieving revision 1.88
diff -u -r1.88 newsdb.inc
--- news/newsdb.inc	9 Sep 2005 05:20:08 -0000	1.88
+++ news/newsdb.inc	30 Sep 2005 02:40:38 -0000
@@ -47,7 +47,7 @@
 See the \"Type classes\" chapter of the
 <A HREF=\"$ref_man_latest\">Mercury Language Reference Manual</A>
 for details.
-The latest <A HREF=\"download/rotd.html\">release of the day</A>
+The latest <A HREF=\"http://$www_domain/cgi-bin/generate_rotd_page\">release of the day</A>
 includes support for this language feature."
 ),
 
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------