Remove proofgeneral.org domain.

9 files changed, 22 insertions, 24 deletions

diff --git a/html/devel.html b/html/devel.html
index c25bc7af..1d81dc3e 100644
--- a/html/devel.html
+++ b/html/devel.html
@@ -124,7 +124,7 @@ about any development issues.
 
 <p>
 We have a mailing list for developers, at
-<a href="mailto:devel@proofgeneral.org">devel@proofgeneral.org</a>.
+<a href="mailto:proofgeneral-devel@inf.ed.ac.uk">proofgeneral-devel@inf.ed.ac.uk</a>.
 <br>
 Posting is restricted to list members.
 To subscribe (or unsubscribe), 
diff --git a/html/eeproof.php b/html/eeproof.php
index 3388bee5..445fead7 100644
--- a/html/eeproof.php
+++ b/html/eeproof.php
@@ -23,7 +23,7 @@ page about the next stages of development for Proof General.
 <p>
 <h3>Collaborations</h3>
 Collaborations on this work are being sought.  If you are interested in collaborating, or have ideas or suggestions to contribute, please send a note to
-<a href="mailto:eeproof@proofgeneral.org"><tt>eeproof@proofgeneral.org</tt></a>
+<a href="mailto:da+pg-eeproof@inf.ed.ac.uk"><tt>da+pg-eeproof@inf.ed.ac.uk</tt></a>
 </p>
 
 <?php
diff --git a/html/functions.php3 b/html/functions.php3
index 1a3a1457..78610cc3 100644
--- a/html/functions.php3
+++ b/html/functions.php3
@@ -15,9 +15,9 @@
 
 // Project configuration
 
-$project_email = "feedback@proofgeneral.org";
-$project_list  = "users@proofgeneral.org";
-$project_feedback = "feedback@proofgeneral.org";
+$project_email = "da+pg-feedback@inf.ed.ac.uk";
+$project_list  = "da+pg-users@inf.ed.ac.uk";
+$project_feedback = "da+pg-feedback@inf.ed.ac.uk";
 
 // Disable when free parking forwarding is broken
 // $proofgenatdcs = "proofgen@dcs.ed.ac.uk";
diff --git a/html/kit.php b/html/kit.php
index b41317c9..3dd96cca 100644
--- a/html/kit.php
+++ b/html/kit.php
@@ -7,7 +7,7 @@
 The Proof General Kit project is in an early experimental stage at
 the moment.  If you are interested in collaborating, or have ideas
 or suggestions to contribute, please send a note to
-<a href="mailto:kit@proofgeneral.org"><tt>kit@proofgeneral.org</tt></a>
+<a href="mailto:da+pg-kit@inf.ed.ac.uk"><tt>da+pg-kit@inf.ed.ac.uk</tt></a>
 </p>
 
 <h3>Planning</h3>
diff --git a/html/mailinglist b/html/mailinglist
index 3f2e387f..d957589e 100644
--- a/html/mailinglist
+++ b/html/mailinglist
@@ -11,7 +11,7 @@ discussions amongst users.
 <p>
 This list is <i>not</i> for those having problems with the
 software: please contact 
-<a href="mailto:support@proofgeneral.org">support@proofgeneral.org</a>
+<a href="mailto:da+pg-support@inf.ed.ac.uk">da+pg-support@inf.ed.ac.uk</a>
 in the first instance.
 </p>
 
@@ -33,7 +33,7 @@ in the message body.
 <h3>Posting</h3>
 <p>
 The canonical mailing list address is 
-<a href="mailto:users@proofgeneral.org"><tt>users@proofgeneral.org</tt></a>.
+<a href="mailto:da+pg-users@inf.ed.ac.uk"><tt>da+pg-users@inf.ed.ac.uk</tt></a>.
 <br>
 This is an alias for
 <tt>proofgeneral@informatics.ed.ac.uk</tt>.
@@ -53,7 +53,7 @@ Archives of the list (since July 2002) are kept
 <p>
 There is a separate mailing list for those interested in the
 development of Proof General.  The canonical address
-for this list is <a href="mailto:devel@proofgeneral.org"><tt>devel@proofgeneral.org</tt></a>.
+for this list is <a href="mailto:da+pg-devel@inf.ed.ac.uk"><tt>da+pg-devel@inf.ed.ac.uk</tt></a>.
 Again, posting is restricted to list members.
 Please visit the <a href="http://lists.informatics.ed.ac.uk/mailman/listinfo/proofgeneral-devel">Mailman web page</a> for subscription details.
 </p>
diff --git a/html/news.html b/html/news.html
index bc67d6b6..d9980999 100644
--- a/html/news.html
+++ b/html/news.html
@@ -1,6 +1,17 @@
 <h2>News about Proof General</h2>
 
 <ul>
+<l><b>11th December 2003</b>
+<p>
+Please <b>update your links!</b>.  The server <tt>zermelo.dcs.ed.ac.uk</tt>
+hosting Proof General for the last 5 years has now been retired.
+Moroever, the Proof General .org domain has been poached from us. 
+Please refer to the web site using the URL
+<b><a href="http://proofgeneral.inf.ed.ac.uk">proofgeneral.inf.ed.ac.uk</a></b>
+and do not send any email to the old .org addresses (contact 
+David Aspinall directly).
+</p>
+
 <li><b>25th September 2003</b>
 <p>
 There is a new <a href="develdownload">development</a> version of
@@ -16,12 +27,6 @@ updated to mention current development efforts.
 Anonymous access to the Proof General CVS repository is now available!
 Details are <a href="devel">here</a>.
 </p>
-<p>
-Please <b>update your links!</b>.  The server <tt>zermelo.dcs.ed.ac.uk</tt>
-hosting Proof General for the last 5 years will be retired soon.
-Please refer to the web site using the URL
-<b><a href="http://www.proofgeneral.org">www.proofgeneral.org</a></b>.
-</p>
 
 <li><b>29th August 2002</b>
 <p>
@@ -29,7 +34,7 @@ Please refer to the web site using the URL
 <br>
 Go to the <a href="download">download page</a> to get it.
 <br>
-Please report any problems to <a href="mailto:support@proofgeneral.org"><tt>support@proofgeneral.org</tt></a>.
+Please report any problems to <a href="mailto:da+pg-support@inf.ed.ac.uk"><tt>da+pg-support@inf.ed.ac.uk</tt></a>.
 </p>
 <li><b>1st July 2002</b>
 <p>
diff --git a/html/oldnews.html b/html/oldnews.html
index 510f0904..47d7ebd7 100644
--- a/html/oldnews.html
+++ b/html/oldnews.html
@@ -125,12 +125,6 @@ running as root (likely an operating system configuration problem).
 Thanks to Markus Wenzel and Pierre Lescanne for reporting problems.
 </p>
 </li>
-<li><b>9th May 2000</b>
-<p>
-New! For developers, a web-browsable
-mirror of the Proof General cvs is available
-<a href="http://www.proofgeneral.org/cgi-bin/cvsweb.cgi">here</a>.
-</p>
 <li><b>5th May 2000</b>
 <p>
 New!  
diff --git a/html/register b/html/register
index 515d44bd..5b5f0507 100644
--- a/html/register
+++ b/html/register
@@ -106,4 +106,3 @@ again, so return to <a href="download#prereq">the download page</a>.
    footer();
  endif;
 ?>
-
diff --git a/html/register.html b/html/register.html
index 2b8ed157..4fe35617 100644
--- a/html/register.html
+++ b/html/register.html
@@ -78,7 +78,7 @@ again, so return to <a href="download#prereq">the download page</a>.
 	    . "\nEmail:\t\t " . $email
 	    . "\nSite:\t\t " . $site
 	    . "\nSubmitted:\t" . date("h:ia D jS F Y");
-   mail("register@proofgeneral.org",
+   mail("da+pg-register@inf.ed.ac.uk",
 	"[Registration form from ~proofgen]",
 	 $message);