[m-rev.] For post-commit review: Fix mailing list search URLs on the website.

[Paul Bone]

For post-commit review by anyone.

---

Fix the search mailing lists function on the Mercury website.

Earlier I submitted a patch to fix the search function on the website since the
URL had changed.  I neglected to do the same for searching the mailing list
archives.  This patch corrects this and places a note in both locations to warn
developers against the same mistake.

Also update the domain name parts of the mailing list addresses.

include/search.inc:
    Include warning pointing developers to mailing-lists/include/mailing-lists.inc

mailing-lists/include/mailing-lists.inc:
    Update URLs in the search forms.

    Update Mailing list URLs.

    Include warning pointing developers to include/search.inc

Index: include/search.inc
===================================================================
RCS file: /home/mercury1/repository/w3/include/search.inc,v
retrieving revision 1.7
diff -u -p -b -r1.7 search.inc
--- include/search.inc	7 Jun 2010 04:01:07 -0000	1.7
+++ include/search.inc	12 Jul 2010 05:52:44 -0000
@@ -10,6 +10,12 @@
 align=middle></A>
 </td>
 <td>
+<?php
+/*
+ * NOTE: When updating the URLs here be sure to also update the URLs in
+ * mailing-lists/include/mailing-lists.inc
+ */
+?>
 <INPUT TYPE=text name=q size=31 maxlength=255 value="">
 <INPUT type=submit name=sa VALUE="Google Search">
 <input type=hidden name=domains
Index: mailing-lists/include/mailing-lists.inc
===================================================================
RCS file: /home/mercury1/repository/w3/mailing-lists/include/mailing-lists.inc,v
retrieving revision 1.8
diff -u -p -b -r1.8 mailing-lists.inc
--- mailing-lists/include/mailing-lists.inc	28 Sep 2009 07:13:20 -0000	1.8
+++ mailing-lists/include/mailing-lists.inc	12 Jul 2010 06:00:07 -0000
@@ -40,13 +40,19 @@ It is <A HREF="mercury-reviews/list.html
 
 <h3>Search</h3>
 
+<?php
+/*
+ * NOTE: When updating the URLs here be sure to also update the URLs in
+ * include/search.inc.
+ */
+?>
 <ul>
 <li>
 <form method="get" action="http://www.google.com/search">
 mercury-users:
 <input type="text" name="q" size="31" value="" />
 <input type="submit" value="Google Search" />
-<input type="hidden" name="sitesearch" value="www.cs.mu.oz.au/research/mercury/mailing-lists/mercury-users"/>
+<input type="hidden" name="sitesearch" value="www.mercury.csse.unimelb.edu.au/mailing-lists/mercury-users"/>
 </form>
 
 <li>
@@ -54,7 +60,7 @@ mercury-users:
 mercury-developers:
 <input type="text" name="q" size="31" value="" />
 <input type="submit" value="Google Search" />
-<input type="hidden" name="sitesearch" value="www.cs.mu.oz.au/research/mercury/mailing-lists/mercury-developers"/>
+<input type="hidden" name="sitesearch" value="www.mercury.csse.unimelb.edu.au/mailing-lists/mercury-developers"/>
 </form>
 
 <li>
@@ -62,7 +68,7 @@ mercury-developers:
 mercury-reviews:
 <input type="text" name="q" size="31" value="" />
 <input type="submit" value="Google Search" />
-<input type="hidden" name="sitesearch" value="www.cs.mu.oz.au/research/mercury/mailing-lists/mercury-reviews"/>
+<input type="hidden" name="sitesearch" value="www.mercury.csse.unimelb.edu.au/mailing-lists/mercury-reviews"/>
 </form>
 </ul>
 
@@ -74,16 +80,16 @@ send email with "subscribe" or "unsubscr
 to the corresponding "-request" address:
 
 <ul>
-<li> <a href = "mailto:mercury-announce-request at cs.mu.oz.au">
-mercury-announce-request at cs.mu.oz.au</a>
-<li> <a href = "mailto:mercury-users-request at cs.mu.oz.au">
-mercury-users-request at cs.mu.oz.au</a>
-<li> <a href = "mailto:mercury-ads-request at cs.mu.oz.au">
-mercury-ads-request at cs.mu.oz.au</a>
-<li> <a href = "mailto:mercury-developers-request at cs.mu.oz.au">
-mercury-developers-request at cs.mu.oz.au</a>
-<li> <a href = "mailto:mercury-reviews-request at cs.mu.oz.au">
-mercury-reviews-request at cs.mu.oz.au</a>
+<li> <a href = "mailto:mercury-announce-request at csse.unimelb.edu.au">
+mercury-announce-request at csse.unimelb.edu.au</a>
+<li> <a href = "mailto:mercury-users-request at csse.unimelb.edu.au">
+mercury-users-request at csse.unimelb.edu.au</a>
+<li> <a href = "mailto:mercury-ads-request at csse.unimelb.edu.au">
+mercury-ads-request at csse.unimelb.edu.au</a>
+<li> <a href = "mailto:mercury-developers-request at csse.unimelb.edu.au">
+mercury-developers-request at csse.unimelb.edu.au</a>
+<li> <a href = "mailto:mercury-reviews-request at csse.unimelb.edu.au">
+mercury-reviews-request at csse.unimelb.edu.au</a>
 </ul>
 
 <h3>Posting articles</h3>
@@ -92,12 +98,12 @@ To submit articles to one of these lists
 without the "-request" part:
 
 <ul>
-<li> <a href = "mailto:mercury-users at cs.mu.oz.au">
-mercury-users at cs.mu.oz.au</a>
-<li> <a href = "mailto:mercury-ads at cs.mu.oz.au">
-mercury-ads at cs.mu.oz.au</a>
-<li> <a href = "mailto:mercury-developers at cs.mu.oz.au">
-mercury-developers at cs.mu.oz.au</a>
-<li> <a href = "mailto:mercury-reviews at cs.mu.oz.au">
-mercury-reviews at cs.mu.oz.au</a>
+<li> <a href = "mailto:mercury-users at csse.unimelb.edu.au">
+mercury-users at csse.unimelb.edu.au</a>
+<li> <a href = "mailto:mercury-ads at csse.unimelb.edu.au">
+mercury-ads at csse.unimelb.edu.au</a>
+<li> <a href = "mailto:mercury-developers at csse.unimelb.edu.au">
+mercury-developers at csse.unimelb.edu.au</a>
+<li> <a href = "mailto:mercury-reviews at csse.unimelb.edu.au">
+mercury-reviews at csse.unimelb.edu.au</a>
 </ul>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 489 bytes
Desc: Digital signature
URL: <http://lists.mercurylang.org/archives/reviews/attachments/20100712/4ea251af/attachment.sig>