Update my email and web

5 files changed, 14 insertions, 14 deletions

diff --git a/html/doc.html b/html/doc.html
index b06b6dd2..b4e0e5ee 100644
--- a/html/doc.html
+++ b/html/doc.html
@@ -76,21 +76,21 @@ available <a href="http://www.xemacs.org/Documentation/index.html">here</a> (xem
 <p> Ideas for the future of Proof General are given here:
 </p>
 <ul>
-<li><a href="http://zermelo.dcs.ed.ac.uk/~da">David Aspinall</a>.
+<li><a href="http://homepages.inf.ed.ac.uk/da">David Aspinall</a>.
     <b><i>Protocols for Interactive e-Proof</i></b>.
     Draft version, see 
-    <a href="http://zermelo.dcs.ed.ac.uk/~da/drafts/#eproof">here</a>.
+    <a href="http://homepages.inf.ed.ac.uk/da/drafts/#eproof">here</a>.
 </li>
-<li><a href="http://www.dcs.ed.ac.uk/home/da">David Aspinall</a>.
+<li><a href="http://homepages.inf.ed.ac.uk/da">David Aspinall</a>.
     <b><i>Proof General Kit (white paper)</i></b>.
     Draft version, see 
-    <a href="http://zermelo.dcs.ed.ac.uk/home/da/drafts/#white">here</a>.
+    <a href="http://homepages.inf.ed.ac.uk/da/drafts/#white">here</a>.
 </li>
 </ul>
 <p> A technology overview of Proof General is given here:
 </p>
 <ul>
-<li> <a href="http://www.dcs.ed.ac.uk/home/da">David Aspinall</a>.
+<li> <a href="http://homepages.inf.ed.ac.uk/da">David Aspinall</a>.
     <a href="papers/pgoutline.ps.gz">Proof General: A Generic Tool for
      Proof Development</a>.
      <i>Tools and Algorithms for the Construction and 
diff --git a/html/kit.php b/html/kit.php
index 4612071e..0aa4015e 100644
--- a/html/kit.php
+++ b/html/kit.php
@@ -15,15 +15,15 @@ or suggestions to contribute, please send a note to
 Ideas for the future of Proof General are described in these papers:
 </p>
 <ul>
-<li><a href="http://zermelo.dcs.ed.ac.uk/~da">David Aspinall</a>.
+<li><a href="http://homepages.inf.ed.ac.uk/da">David Aspinall</a>.
     <b><i>Protocols for Interactive e-Proof</i></b>.
     Draft version, see 
-    <a href="http://zermelo.dcs.ed.ac.uk/~da/drafts/#eproof">here</a>.
+    <a href="http://homepages.inf.ed.ac.uk/da/papers/drafts/#eproof">here</a>.
 </li>
-<li><a href="http://www.dcs.ed.ac.uk/home/da">David Aspinall</a>.
+<li><a href="http://homepages.inf.ed.ac.uk/da">David Aspinall</a>.
     <b><i>Proof General Kit (white paper)</i></b>.
     Draft version, see 
-    <a href="http://zermelo.dcs.ed.ac.uk/home/da/drafts/#white">here</a>.
+    <a href="http://homepages.inf.ed.ac.uk/da/papers/drafts/#white">here</a>.
 </li>
 </ul>
 
diff --git a/html/main.html b/html/main.html
index 499f7429..f1b44eda 100644
--- a/html/main.html
+++ b/html/main.html
@@ -43,7 +43,7 @@ assistants:</p>
       <br>
        <div style="font-size: smaller">
        By 
-      <a href="http://zermelo.dcs.ed.ac.uk/~da">David Aspinall</a>
+      <a href="http://homepages.inf.ed.ac.uk/da">David Aspinall</a>
        and
        Markus Wenzel.
        </div>
@@ -95,7 +95,7 @@ assistants:</p>
        <br>
        <div style="font-size: smaller">
        By Thomas Kleymann, Dilip Sequeira, 
-       <a href="http://zermelo.dcs.ed.ac.uk/~da">David Aspinall</a>
+       <a href="http://homepages.inf.ed.ac.uk/da">David Aspinall</a>
        and
        <a href="http://www.dur.ac.uk/p.c.callaghan/">Paul Callaghan</a>.
        </div>
diff --git a/html/news.html b/html/news.html
index 774c0359..5ef51adc 100644
--- a/html/news.html
+++ b/html/news.html
@@ -18,7 +18,7 @@ allowing packaging and distribution of the code by others.
 </p>
 </ul>
 <!-- da: Put this line in instead if you're not me -->
-<!-- <i>(News items entered by <a href="http://www.dcs.ed.ac.uk/~da">David Aspinall</a> -->
+<!-- <i>(News items entered by <a href="http://homepages.inf.ed.ac.uk/da">David Aspinall</a> -->
 <!--     unless noted.)</i> -->
-<i>News items by <a href="http://zermelo.dcs.ed.ac.uk/~da">David Aspinall</a>.</i>
+<i>News items by <a href="http://homepages.inf.ed.ac.uk/da">David Aspinall</a>.</i>
 <i>Click <a href="oldnews.html">here</a> for old news.</i>
diff --git a/html/projects.html b/html/projects.html
index f1201caf..9f1c274d 100644
--- a/html/projects.html
+++ b/html/projects.html
@@ -61,7 +61,7 @@ has a powerful source-level debugger, <i>edebug</i>.
 <!-- <b>Skills:</b> -->
 <!-- </p><p> -->
 <!-- <b>Proposer:</b> -->
-<!-- <a href="http://zermelo.dcs.ed.ac.uk/~da">David Aspinall</a>. -->
+<!-- <a href="http://homepages.inf.ed.ac.uk/da">David Aspinall</a>. -->
 <!-- </p> -->
 
 <p>