From c8c8627371b3f0ac1aa188fa2250899414025d8e Mon Sep 17 00:00:00 2001
From: Tim Bishop <tim@bishnet.net>
Date: Sun, 11 May 2003 18:02:59 +0000
Subject: [PATCH] Changed all i-scream.org.uk's to i-scream.org's. Also,
 changed any ukc.ac.uk links in to kent.ac.uk :-) This change will only appear
 on the new webserver as it is on a branch.

---
 www/bottom.inc                             |  6 +++---
 www/cms/documentation/gettingstarted.shtml |  4 ++--
 www/cms/documentation/gettingstarted.xhtml |  4 ++--
 www/cms/documentation/index.shtml          |  2 +-
 www/cms/documentation/index.xhtml          |  2 +-
 www/cms/downloads/index.shtml              |  4 ++--
 www/contents.inc                           | 24 +++++++++++-----------
 www/cvs.shtml                              | 20 +++++++++---------
 www/cvs.xhtml                              | 20 +++++++++---------
 www/cvsplot/index.html                     |  2 +-
 www/documentation/gettingstarted.shtml     |  4 ++--
 www/documentation/index.shtml              |  2 +-
 www/downloads/index.shtml                  |  4 ++--
 www/left.inc                               | 12 ++++-------
 www/mailinglists.shtml                     |  8 ++++----
 www/mailinglists.xhtml                     |  8 ++++----
 www/who.shtml                              | 18 ++++++++--------
 www/who.xhtml                              | 18 ++++++++--------
 18 files changed, 79 insertions(+), 83 deletions(-)

diff --git a/www/bottom.inc b/www/bottom.inc
index 4815618..66ac39f 100644
--- a/www/bottom.inc
+++ b/www/bottom.inc
@@ -8,9 +8,9 @@
     <p>&nbsp;</p>
     <p align="center">
      <font size="1" face="arial,sans-serif" color="#000066">
-     <a href="http://www.i-scream.org.uk">http://www.i-scream.org.uk</a><br>
-     Copyright 2001-2002 The i-scream Project<br>
-     dev@i-scream.org.uk     
+     <a href="http://www.i-scream.org">http://www.i-scream.org</a><br>
+     Copyright 2001-2003 The i-scream Project<br>
+     dev@i-scream.org     
      </font>
     </p>
     <p align="center">
diff --git a/www/cms/documentation/gettingstarted.shtml b/www/cms/documentation/gettingstarted.shtml
index f28efa0..9230179 100644
--- a/www/cms/documentation/gettingstarted.shtml
+++ b/www/cms/documentation/gettingstarted.shtml
@@ -40,7 +40,7 @@ this running. It should simply be a case of extracting and running.</p>
 <p>The first stage is to download and install the server application. The 
 latest versions of all i-scream applications can be found at the following 
 URL:</p>
-<p><a href="http://www.i-scream.org.uk/downloads">http://www.i-scream.org.uk/downloads</a></p>
+<p><a href="http://www.i-scream.org/downloads">http://www.i-scream.org/downloads</a></p>
 <p>Once downloaded, the archive should be extracted to a directory of your 
 choice. The server will run on most Java enabled platforms (including 
 Windows, Linux and FreeBSD).</p>
@@ -137,7 +137,7 @@ needs. You may wish to run the database section of the server on the same
 machine as the database, while running the rest on another machine.</p>
 <p>Some discussion about this is available in the server documentation.</p>
 <p>If you have any questions about any of the above, please don't hesitate to 
-contact us at <a href="mailto:dev@i-scream.org.uk">dev@i-scream.org.uk</a>. If you find we've missed something out, 
+contact us at <a href="mailto:dev@i-scream.org">dev@i-scream.org</a>. If you find we've missed something out, 
 again, please let us know.</p>
 <p>Finally, we'd like to thank you for trying this i-scream product. We realise 
 that it's still at an early stage, and we therefore appreciate you taking 
diff --git a/www/cms/documentation/gettingstarted.xhtml b/www/cms/documentation/gettingstarted.xhtml
index f28efa0..9230179 100644
--- a/www/cms/documentation/gettingstarted.xhtml
+++ b/www/cms/documentation/gettingstarted.xhtml
@@ -40,7 +40,7 @@ this running. It should simply be a case of extracting and running.</p>
 <p>The first stage is to download and install the server application. The 
 latest versions of all i-scream applications can be found at the following 
 URL:</p>
-<p><a href="http://www.i-scream.org.uk/downloads">http://www.i-scream.org.uk/downloads</a></p>
+<p><a href="http://www.i-scream.org/downloads">http://www.i-scream.org/downloads</a></p>
 <p>Once downloaded, the archive should be extracted to a directory of your 
 choice. The server will run on most Java enabled platforms (including 
 Windows, Linux and FreeBSD).</p>
@@ -137,7 +137,7 @@ needs. You may wish to run the database section of the server on the same
 machine as the database, while running the rest on another machine.</p>
 <p>Some discussion about this is available in the server documentation.</p>
 <p>If you have any questions about any of the above, please don't hesitate to 
-contact us at <a href="mailto:dev@i-scream.org.uk">dev@i-scream.org.uk</a>. If you find we've missed something out, 
+contact us at <a href="mailto:dev@i-scream.org">dev@i-scream.org</a>. If you find we've missed something out, 
 again, please let us know.</p>
 <p>Finally, we'd like to thank you for trying this i-scream product. We realise 
 that it's still at an early stage, and we therefore appreciate you taking 
diff --git a/www/cms/documentation/index.shtml b/www/cms/documentation/index.shtml
index a8d245e..6ff0e53 100644
--- a/www/cms/documentation/index.shtml
+++ b/www/cms/documentation/index.shtml
@@ -34,7 +34,7 @@ from this website. However, there may be changes in the CVS version which
 are not documented in the code. The link below shows what changes have been
 made since the project completion date.</p>
 
-<a href="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=since&date=2001/03/29&module=cms">
+<a href="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=since&date=2001/03/29&module=cms">
 Commits to the "cms" CVS module since project completion (29/03/2001)</a>
 
 <hr>
diff --git a/www/cms/documentation/index.xhtml b/www/cms/documentation/index.xhtml
index a8d245e..6ff0e53 100644
--- a/www/cms/documentation/index.xhtml
+++ b/www/cms/documentation/index.xhtml
@@ -34,7 +34,7 @@ from this website. However, there may be changes in the CVS version which
 are not documented in the code. The link below shows what changes have been
 made since the project completion date.</p>
 
-<a href="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=since&date=2001/03/29&module=cms">
+<a href="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=since&date=2001/03/29&module=cms">
 Commits to the "cms" CVS module since project completion (29/03/2001)</a>
 
 <hr>
diff --git a/www/cms/downloads/index.shtml b/www/cms/downloads/index.shtml
index a4b545d..4c19706 100644
--- a/www/cms/downloads/index.shtml
+++ b/www/cms/downloads/index.shtml
@@ -45,7 +45,7 @@
    more developed than the downloads you'll find below. We recommend you
    start here. This is the codebase from which we'll make a proper release
    sometime in the future.</p>
-   <p><a href="http://snapshots.i-scream.org.uk">Snapshot Server</a></p>
+   <p><a href="http://snapshots.i-scream.org">Snapshot Server</a></p>
    </font>
   </td>
  </tr>
@@ -66,7 +66,7 @@
    <p>You will be asked to enter some basic information before
    downloading, although this is purely optional.  We value feedback
    from people testing the i-scream products, so please feel free to
-   contact us at dev@i-scream.org.uk.</p>
+   contact us at dev@i-scream.org.</p>
    </font>
   </td>
  </tr>
diff --git a/www/contents.inc b/www/contents.inc
index 5922bd0..328fcb8 100644
--- a/www/contents.inc
+++ b/www/contents.inc
@@ -18,11 +18,11 @@
         These builds will have quite a few changes from the downloads
         currently available (a document detailing them will be
         released later on), so please give them a whirl. We would be
-        grateful if you <a href="mailto:dev@i-scream.org.uk">contacted</a>
+        grateful if you <a href="mailto:dev@i-scream.org">contacted</a>
         us with any questions or bugs.<br><br>
         The downloads will be available on our snapshot server :-<br>
-        <a href="http://snapshots.i-scream.org.uk/">
-        http://snapshots.i-scream.org.uk/</a>.
+        <a href="http://snapshots.i-scream.org/">
+        http://snapshots.i-scream.org/</a>.
        </p>
 
        <p align="justify">
@@ -32,7 +32,7 @@
         see an efficient native host! Credit goes to our new developer
         <a href="/who.shtml">Pete</a>. Until we update the downloads
         pages you can download the new ihost 
-        <a href="http://snapshots.i-scream.org.uk/ihost/ihost-1.0rc1.tar.gz">
+        <a href="http://snapshots.i-scream.org/ihost/ihost-1.0rc1.tar.gz">
         here</a>.
        </p>
 
@@ -44,7 +44,7 @@
         backend which took up far too many resources. This new system
         generates the graphs in a more realtime nature, allowing more
         flexible graphs to be generated. This is currently only available
-        through <a href="http://www.i-scream.org.uk/cgi-bin/cvs/viewcvs.cgi/cms/source/reports/rrdgraphing/">
+        through <a href="http://cvs.i-scream.org/cms/source/reports/rrdgraphing/">
         CVS</a>.
        </p>
 
@@ -69,7 +69,7 @@
         Java ACL (Access Control List) code has been added to the util
         package of the i-scream server. This code will ultimately allow
         the server to be more secure when exposed to the Internet. More
-        details can be found <a href="http://www.cs.ukc.ac.uk/people/staff/tdb/#acl">
+        details can be found <a href="http://www.cs.kent.ac.uk/people/staff/tdb/#acl">
         here</a> on the author's website.
        </p>
        
@@ -93,7 +93,7 @@
         <b><a href="documentation">documentation</a></b> page has details of
         installation, use and maintenance for the end user and developer.
         We value feedback and comments from you, so please drop us an e-mail
-        to <a href="mailto:dev@i-scream.org.uk">dev@i-scream.org.uk</a>.
+        to <a href="mailto:dev@i-scream.org">dev@i-scream.org</a>.
        </p>
        
        <p>&nbsp;</p>
@@ -138,8 +138,8 @@
        <p align="justify">
         <a href="screenshots/"><img border="0" src="screenshots/thumbnail-reports-raptor-latest-misc.gif" width="100" height="104" align="left"></a>
         The i-scream Distributed Central Monitoring System started off as
-        a final year project for a group of <a href="http://www.cs.ukc.ac.uk">
-        Computer Science</a> students at the <a href="http://www.ukc.ac.uk">
+        a final year project for a group of <a href="http://www.cs.kent.ac.uk">
+        Computer Science</a> students at the <a href="http://www.kent.ac.uk">
         University of Kent at Canterbury</a>, UK. The project was completed at
         4pm on 29 March 2001. It consisted of five lever-arch folders containing
         mostly source code and documentation. The CVS repository was tagged to
@@ -189,11 +189,11 @@
             <IMG SRC=http://www.google.com/logos/Logo_40wht.gif border=0 ALT=Google align=middle width="128" height="53"></A>
            </td>
            <td valign="middle">
-            <input type=hidden name=domains value="i-scream.org.uk">
-            <input type=hidden name=sitesearch value="i-scream.org.uk">
+            <input type=hidden name=domains value="i-scream.org">
+            <input type=hidden name=sitesearch value="i-scream.org">
             <INPUT TYPE=text name=q size=35 maxlength=255 value="">
             <INPUT type=submit name=sa VALUE="Search">
-            <INPUT type=hidden name=cof VALUE="T:#000066;LW:502;ALC:#3333cc;L:http://www.i-scream.org.uk/i-scream.gif;LC:#0000ff;LH:37;BGC:#ffffff;AH:left;VLC:#3333cc;AWFID:d646a9fd69e7d9cb;">
+            <INPUT type=hidden name=cof VALUE="T:#000066;LW:502;ALC:#3333cc;L:http://www.i-scream.org/i-scream.gif;LC:#0000ff;LH:37;BGC:#ffffff;AH:left;VLC:#3333cc;AWFID:d646a9fd69e7d9cb;">
            </td>
           </tr>
          </TABLE>
diff --git a/www/cvs.shtml b/www/cvs.shtml
index 1422e4b..6935dc8 100644
--- a/www/cvs.shtml
+++ b/www/cvs.shtml
@@ -40,15 +40,15 @@ visual frontend to the CVS Repository. It allows you to browse around the
 repository, viewing any version of a file, and the differences between different
 versions. There is also a link to download the latest version of any section.</p>
 
-<p><a href="http://www.i-scream.org.uk/cgi-bin/cvs/viewcvs.cgi">http://www.i-scream.org.uk/cgi-bin/cvs/viewcvs.cgi</a></p>
+<p><a href="http://cvs.i-scream.org/">http://cvs.i-scream.org/</a></p>
 
 <p>We also have a facility to allow people to keep tabs on what's changed
 recently. The following are available:</p>
 
-<p>Commits today: <a href="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=today">http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=today</a><br>
-Commits this week: <a href="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=thisweek">http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=thisweek</a><br>
-Commits in the past 7 days: <a href="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=days&days=7">http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=days&days=7</a><br>
-Commits made since 29/03/2001: <a href="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=since&date=2001/03/29">http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=since&date=2001/03/29</a></p>
+<p>Commits today: <a href="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=today">http://www.i-scream.org/cgi-bin/cvslog.cgi?period=today</a><br>
+Commits this week: <a href="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=thisweek">http://www.i-scream.org/cgi-bin/cvslog.cgi?period=thisweek</a><br>
+Commits in the past 7 days: <a href="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=days&days=7">http://www.i-scream.org/cgi-bin/cvslog.cgi?period=days&days=7</a><br>
+Commits made since 29/03/2001: <a href="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=since&date=2001/03/29">http://www.i-scream.org/cgi-bin/cvslog.cgi?period=since&date=2001/03/29</a></p>
 
 <h3>Anonymous CVS Access (read-only)</h3>
 
@@ -58,8 +58,8 @@ out a portion of the CVS repository. To see what is available it is recommended
 that you first look at the web frontend.</p>
 </font>
 
-<pre>cvs -d :pserver:anonymous@cvs.i-scream.org.uk:/cvs/i-scream login
-cvs -d :pserver:anonymous@cvs.i-scream.org.uk:/cvs/i-scream checkout [module]</pre>
+<pre>cvs -d :pserver:anonymous@cvs.i-scream.org:/cvs/i-scream login
+cvs -d :pserver:anonymous@cvs.i-scream.org:/cvs/i-scream checkout [module]</pre>
 
 <font face="Arial" size="2">
 <p>When asked for a password, simply press enter.
@@ -73,7 +73,7 @@ on most clients. First the following environment variables need to be set.</p>
 </font>
 
 <pre>CVS_RSH = ssh
-CVSROOT = :ext:username@cvs.i-scream.org.uk:/cvs/i-scream</pre>
+CVSROOT = :ext:username@cvs.i-scream.org:/cvs/i-scream</pre>
 
 <font face="Arial" size="2">
 <p>You should know your username and password
@@ -92,7 +92,7 @@ for maintaining an up-to-date local copy. You will probably want to create a
 supfile that looks something like this;</p>
 </font>
 
-<pre>*default host=cvsup.i-scream.org.uk
+<pre>*default host=cvsup.i-scream.org
 *default base=/home/user/sup
 *default prefix=/home/user/i-scream
 *default release=cvs
@@ -113,7 +113,7 @@ repository, generated by <a href="http://cvsstat.sourceforge.net/">cvsstat</a>,
 that allow you to see the progress of development. They're not that exciting,
 but do show when the work was done.</p>
 
-<p><a href="http://www.i-scream.org.uk/cvsstat">http://www.i-scream.org.uk/cvsstat</a></p>
+<p><a href="http://www.i-scream.org/cvsstat">http://www.i-scream.org/cvsstat</a></p>
 
 </font>
 
diff --git a/www/cvs.xhtml b/www/cvs.xhtml
index 1422e4b..6935dc8 100644
--- a/www/cvs.xhtml
+++ b/www/cvs.xhtml
@@ -40,15 +40,15 @@ visual frontend to the CVS Repository. It allows you to browse around the
 repository, viewing any version of a file, and the differences between different
 versions. There is also a link to download the latest version of any section.</p>
 
-<p><a href="http://www.i-scream.org.uk/cgi-bin/cvs/viewcvs.cgi">http://www.i-scream.org.uk/cgi-bin/cvs/viewcvs.cgi</a></p>
+<p><a href="http://cvs.i-scream.org/">http://cvs.i-scream.org/</a></p>
 
 <p>We also have a facility to allow people to keep tabs on what's changed
 recently. The following are available:</p>
 
-<p>Commits today: <a href="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=today">http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=today</a><br>
-Commits this week: <a href="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=thisweek">http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=thisweek</a><br>
-Commits in the past 7 days: <a href="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=days&days=7">http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=days&days=7</a><br>
-Commits made since 29/03/2001: <a href="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=since&date=2001/03/29">http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=since&date=2001/03/29</a></p>
+<p>Commits today: <a href="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=today">http://www.i-scream.org/cgi-bin/cvslog.cgi?period=today</a><br>
+Commits this week: <a href="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=thisweek">http://www.i-scream.org/cgi-bin/cvslog.cgi?period=thisweek</a><br>
+Commits in the past 7 days: <a href="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=days&days=7">http://www.i-scream.org/cgi-bin/cvslog.cgi?period=days&days=7</a><br>
+Commits made since 29/03/2001: <a href="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=since&date=2001/03/29">http://www.i-scream.org/cgi-bin/cvslog.cgi?period=since&date=2001/03/29</a></p>
 
 <h3>Anonymous CVS Access (read-only)</h3>
 
@@ -58,8 +58,8 @@ out a portion of the CVS repository. To see what is available it is recommended
 that you first look at the web frontend.</p>
 </font>
 
-<pre>cvs -d :pserver:anonymous@cvs.i-scream.org.uk:/cvs/i-scream login
-cvs -d :pserver:anonymous@cvs.i-scream.org.uk:/cvs/i-scream checkout [module]</pre>
+<pre>cvs -d :pserver:anonymous@cvs.i-scream.org:/cvs/i-scream login
+cvs -d :pserver:anonymous@cvs.i-scream.org:/cvs/i-scream checkout [module]</pre>
 
 <font face="Arial" size="2">
 <p>When asked for a password, simply press enter.
@@ -73,7 +73,7 @@ on most clients. First the following environment variables need to be set.</p>
 </font>
 
 <pre>CVS_RSH = ssh
-CVSROOT = :ext:username@cvs.i-scream.org.uk:/cvs/i-scream</pre>
+CVSROOT = :ext:username@cvs.i-scream.org:/cvs/i-scream</pre>
 
 <font face="Arial" size="2">
 <p>You should know your username and password
@@ -92,7 +92,7 @@ for maintaining an up-to-date local copy. You will probably want to create a
 supfile that looks something like this;</p>
 </font>
 
-<pre>*default host=cvsup.i-scream.org.uk
+<pre>*default host=cvsup.i-scream.org
 *default base=/home/user/sup
 *default prefix=/home/user/i-scream
 *default release=cvs
@@ -113,7 +113,7 @@ repository, generated by <a href="http://cvsstat.sourceforge.net/">cvsstat</a>,
 that allow you to see the progress of development. They're not that exciting,
 but do show when the work was done.</p>
 
-<p><a href="http://www.i-scream.org.uk/cvsstat">http://www.i-scream.org.uk/cvsstat</a></p>
+<p><a href="http://www.i-scream.org/cvsstat">http://www.i-scream.org/cvsstat</a></p>
 
 </font>
 
diff --git a/www/cvsplot/index.html b/www/cvsplot/index.html
index 914bc2e..5bab3c7 100644
--- a/www/cvsplot/index.html
+++ b/www/cvsplot/index.html
@@ -25,7 +25,7 @@ repository.</p>
 <h3>credits</h3>
 <p>These images were generated using the cvsstat program, which can be found <a href="http://cvsstat.sourceforge.net">here</a>.</p>
 <p>&nbsp;</p>
-<p>Page last updated, 18/06/01, <a href="mailto:dev@i-scream.org.uk">dev@i-scream.org.uk</a>.</p>
+<p>Page last updated, 18/06/01, <a href="mailto:dev@i-scream.org">dev@i-scream.org</a>.</p>
 
 </body>
 
diff --git a/www/documentation/gettingstarted.shtml b/www/documentation/gettingstarted.shtml
index f28efa0..9230179 100644
--- a/www/documentation/gettingstarted.shtml
+++ b/www/documentation/gettingstarted.shtml
@@ -40,7 +40,7 @@ this running. It should simply be a case of extracting and running.</p>
 <p>The first stage is to download and install the server application. The 
 latest versions of all i-scream applications can be found at the following 
 URL:</p>
-<p><a href="http://www.i-scream.org.uk/downloads">http://www.i-scream.org.uk/downloads</a></p>
+<p><a href="http://www.i-scream.org/downloads">http://www.i-scream.org/downloads</a></p>
 <p>Once downloaded, the archive should be extracted to a directory of your 
 choice. The server will run on most Java enabled platforms (including 
 Windows, Linux and FreeBSD).</p>
@@ -137,7 +137,7 @@ needs. You may wish to run the database section of the server on the same
 machine as the database, while running the rest on another machine.</p>
 <p>Some discussion about this is available in the server documentation.</p>
 <p>If you have any questions about any of the above, please don't hesitate to 
-contact us at <a href="mailto:dev@i-scream.org.uk">dev@i-scream.org.uk</a>. If you find we've missed something out, 
+contact us at <a href="mailto:dev@i-scream.org">dev@i-scream.org</a>. If you find we've missed something out, 
 again, please let us know.</p>
 <p>Finally, we'd like to thank you for trying this i-scream product. We realise 
 that it's still at an early stage, and we therefore appreciate you taking 
diff --git a/www/documentation/index.shtml b/www/documentation/index.shtml
index a8d245e..6ff0e53 100644
--- a/www/documentation/index.shtml
+++ b/www/documentation/index.shtml
@@ -34,7 +34,7 @@ from this website. However, there may be changes in the CVS version which
 are not documented in the code. The link below shows what changes have been
 made since the project completion date.</p>
 
-<a href="http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=since&date=2001/03/29&module=cms">
+<a href="http://www.i-scream.org/cgi-bin/cvslog.cgi?period=since&date=2001/03/29&module=cms">
 Commits to the "cms" CVS module since project completion (29/03/2001)</a>
 
 <hr>
diff --git a/www/downloads/index.shtml b/www/downloads/index.shtml
index a4b545d..4c19706 100644
--- a/www/downloads/index.shtml
+++ b/www/downloads/index.shtml
@@ -45,7 +45,7 @@
    more developed than the downloads you'll find below. We recommend you
    start here. This is the codebase from which we'll make a proper release
    sometime in the future.</p>
-   <p><a href="http://snapshots.i-scream.org.uk">Snapshot Server</a></p>
+   <p><a href="http://snapshots.i-scream.org">Snapshot Server</a></p>
    </font>
   </td>
  </tr>
@@ -66,7 +66,7 @@
    <p>You will be asked to enter some basic information before
    downloading, although this is purely optional.  We value feedback
    from people testing the i-scream products, so please feel free to
-   contact us at dev@i-scream.org.uk.</p>
+   contact us at dev@i-scream.org.</p>
    </font>
   </td>
  </tr>
diff --git a/www/left.inc b/www/left.inc
index b0109fb..c9755af 100644
--- a/www/left.inc
+++ b/www/left.inc
@@ -44,10 +44,10 @@
        <p>
        <hr noshade size="1" color="#000000">
        <h5>other projects</h5>
-       <a href="http://vrmlgraph.i-scream.org.uk">3-D VRML graph drawing</a><br>
+       <a href="http://vrmlgraph.i-scream.org">3-D VRML graph drawing</a><br>
        <a href="http://www.jibble.org/pircbot.php">PircBot IRC Bot</a><br>
        <a href="http://www.jibble.org/jibblewebserver.php">Jibble Web Server</a><br>
-       <a href="http://www.cs.ukc.ac.uk/people/staff/tdb/#acl">Java ACL's for TCP/UDP</a><br>
+       <a href="http://www.cs.kent.ac.uk/people/staff/tdb/#acl">Java ACL's for TCP/UDP</a><br>
        <p>
        <hr noshade size="1" color="#000000">
        <h5>internal papers</h5>
@@ -64,19 +64,15 @@
        <hr noshade size="1" color="#000000">
        <h5>links</h5>
        <a href="http://www.jacorb.org/">JacORB</a><br>
-       <a href="http://www.cs.ukc.ac.uk/">UKC - Computer Science</a><br>
+       <a href="http://www.cs.kent.ac.uk/">UKC - Computer Science</a><br>
        <a href="http://www.w3.org/XML/">W3 XML Information</a><br>
        <a href="http://java.sun.com/xml/download.html">JAXP</a>
        <p>
        <hr noshade size="1" color="#000000">
        <h5>contact us</h5>
-       <a href="mailto:dev@i-scream.org.uk">dev@i-scream.org.uk</a>
+       <a href="mailto:dev@i-scream.org">dev@i-scream.org</a>
        <p>
        <hr noshade size="1" color="#000000">
-       <a href="http://www.toucan-online.co.uk/">
-        <img border="0" src="/toucan.gif" width="88" height="31">
-       </a>
-       <br>
        <a href="http://sourceforge.net">
         <img src="http://sourceforge.net/sflogo.php?group_id=24439" width="88" height="31" border="0" alt="SourceForge Logo">
        </a>
diff --git a/www/mailinglists.shtml b/www/mailinglists.shtml
index 8319eb2..1de0279 100644
--- a/www/mailinglists.shtml
+++ b/www/mailinglists.shtml
@@ -32,19 +32,19 @@ users of i-scream products. At the present time the lists are generic to all
 products, but if the volume of e-mail rises it may become necessary to create
 per-project mailing lists. Here are a current lists.</p>
 
-<h3>dev@i-scream.org.uk</h3>
+<h3>dev@i-scream.org</h3>
 
 <p>State: Closed<br>
 Purpose: A discussion forum for developers only. This can also be used to
 contact the development team as a whole.</p>
 
-<h3>commits@i-scream.org.uk</h3>
+<h3>commits@i-scream.org</h3>
 
 <p>State: Open for subscription, but no posts should be sent here.<br>
 Purpose: Daily commit logs from the i-scream CVS repository are sent to this
 list. If you wish to keep up on development, join this list.</p>
 
-<h3>users@i-scream.org.uk</h3>
+<h3>users@i-scream.org</h3>
 
 <p>State: Open for subscription and posts.<br>
 Purpose: For discussion between users, developers, and anyone else. This is the
@@ -52,7 +52,7 @@ place to ask questions and get support.</p>
 
 <h3>Subscribing</h3>
 
-<p>If you wish to join one of the open lists, send a subscribe e-mail to <a href="mailto:majordomo@i-scream.org.uk">majordomo@i-scream.org.uk</a>
+<p>If you wish to join one of the open lists, send a subscribe e-mail to <a href="mailto:majordomo@i-scream.org">majordomo@i-scream.org</a>
 and your subscription will automatically be processed. If you send
 &quot;help&quot; to the same address, you will be given a list of supported
 operations.</p>
diff --git a/www/mailinglists.xhtml b/www/mailinglists.xhtml
index 8319eb2..1de0279 100644
--- a/www/mailinglists.xhtml
+++ b/www/mailinglists.xhtml
@@ -32,19 +32,19 @@ users of i-scream products. At the present time the lists are generic to all
 products, but if the volume of e-mail rises it may become necessary to create
 per-project mailing lists. Here are a current lists.</p>
 
-<h3>dev@i-scream.org.uk</h3>
+<h3>dev@i-scream.org</h3>
 
 <p>State: Closed<br>
 Purpose: A discussion forum for developers only. This can also be used to
 contact the development team as a whole.</p>
 
-<h3>commits@i-scream.org.uk</h3>
+<h3>commits@i-scream.org</h3>
 
 <p>State: Open for subscription, but no posts should be sent here.<br>
 Purpose: Daily commit logs from the i-scream CVS repository are sent to this
 list. If you wish to keep up on development, join this list.</p>
 
-<h3>users@i-scream.org.uk</h3>
+<h3>users@i-scream.org</h3>
 
 <p>State: Open for subscription and posts.<br>
 Purpose: For discussion between users, developers, and anyone else. This is the
@@ -52,7 +52,7 @@ place to ask questions and get support.</p>
 
 <h3>Subscribing</h3>
 
-<p>If you wish to join one of the open lists, send a subscribe e-mail to <a href="mailto:majordomo@i-scream.org.uk">majordomo@i-scream.org.uk</a>
+<p>If you wish to join one of the open lists, send a subscribe e-mail to <a href="mailto:majordomo@i-scream.org">majordomo@i-scream.org</a>
 and your subscription will automatically be processed. If you send
 &quot;help&quot; to the same address, you will be given a list of supported
 operations.</p>
diff --git a/www/who.shtml b/www/who.shtml
index f458d70..a27e598 100644
--- a/www/who.shtml
+++ b/www/who.shtml
@@ -33,7 +33,7 @@
        <center><h3>Who We Are</h3></center>
 
        <p align="left">
-        We were a group of four 3rd year <a href="http://www.cs.ukc.ac.uk">
+        We were a group of four 3rd year <a href="http://www.cs.kent.ac.uk">
         Computer Science</a> students at the University of Kent. As
         part of our final year we had to undertake a project that
         was worth a quarter of our final year mark. We now continue
@@ -44,36 +44,36 @@
 
      
        <p align="left">
-        <b>Tim Bishop</b> - tim&#64;i-scream.org.uk
+        <b>Tim Bishop</b> - tim&#64;i-scream.org
         <ul>
          <li><a href="http://www.bishnet.net/tim/">Homepage</a>
-         <li><a href="http://www.cs.ukc.ac.uk/people/staff/tdb/">Work</a>
+         <li><a href="http://www.cs.kent.ac.uk/people/staff/tdb/">Work</a>
          <li><a href="http://www.bishnet.net/tim/cv.shtml">View my C.V.</a>
         </ul>
        </p>
        
        <p align="left">
-        <b>Alex Moore</b> - aj&#64;i-scream.org.uk
+        <b>Alex Moore</b> - aj&#64;i-scream.org
        </p>
        
        <p align="left">
-        <b>Paul Mutton</b> - paul&#64;i-scream.org.uk
+        <b>Paul Mutton</b> - paul&#64;i-scream.org
         <ul>
          <li><a href="http://www.jibble.org/">Homepage</a>
          <li><a href="http://www.jibble.org/cv.php">View my C.V.</a>
-         <li><a href="http://www.cs.ukc.ac.uk/people/rpg/pjm2/">Research</a>
+         <li><a href="http://www.cs.kent.ac.uk/people/rpg/pjm2/">Research</a>
         </ul>
        </p>
 
        <p align="left">
-        <b>Pete Saunders</b> - pajs&#64;i-scream.org.uk
+        <b>Pete Saunders</b> - pajs&#64;i-scream.org
         <ul>
-         <li><a href="http://www.cs.ukc.ac.uk/people/staff/pajs/">Work</a>
+         <li><a href="http://www.cs.kent.ac.uk/people/staff/pajs/">Work</a>
         </ul>
        </p>
        
        <p align="left">
-        Group Mailing List - <a href="mailto:dev@i-scream.org.uk">dev@i-scream.org.uk</a>
+        Group Mailing List - <a href="mailto:dev@i-scream.org">dev@i-scream.org</a>
        </p>
        
        </font>
diff --git a/www/who.xhtml b/www/who.xhtml
index f458d70..a27e598 100644
--- a/www/who.xhtml
+++ b/www/who.xhtml
@@ -33,7 +33,7 @@
        <center><h3>Who We Are</h3></center>
 
        <p align="left">
-        We were a group of four 3rd year <a href="http://www.cs.ukc.ac.uk">
+        We were a group of four 3rd year <a href="http://www.cs.kent.ac.uk">
         Computer Science</a> students at the University of Kent. As
         part of our final year we had to undertake a project that
         was worth a quarter of our final year mark. We now continue
@@ -44,36 +44,36 @@
 
      
        <p align="left">
-        <b>Tim Bishop</b> - tim&#64;i-scream.org.uk
+        <b>Tim Bishop</b> - tim&#64;i-scream.org
         <ul>
          <li><a href="http://www.bishnet.net/tim/">Homepage</a>
-         <li><a href="http://www.cs.ukc.ac.uk/people/staff/tdb/">Work</a>
+         <li><a href="http://www.cs.kent.ac.uk/people/staff/tdb/">Work</a>
          <li><a href="http://www.bishnet.net/tim/cv.shtml">View my C.V.</a>
         </ul>
        </p>
        
        <p align="left">
-        <b>Alex Moore</b> - aj&#64;i-scream.org.uk
+        <b>Alex Moore</b> - aj&#64;i-scream.org
        </p>
        
        <p align="left">
-        <b>Paul Mutton</b> - paul&#64;i-scream.org.uk
+        <b>Paul Mutton</b> - paul&#64;i-scream.org
         <ul>
          <li><a href="http://www.jibble.org/">Homepage</a>
          <li><a href="http://www.jibble.org/cv.php">View my C.V.</a>
-         <li><a href="http://www.cs.ukc.ac.uk/people/rpg/pjm2/">Research</a>
+         <li><a href="http://www.cs.kent.ac.uk/people/rpg/pjm2/">Research</a>
         </ul>
        </p>
 
        <p align="left">
-        <b>Pete Saunders</b> - pajs&#64;i-scream.org.uk
+        <b>Pete Saunders</b> - pajs&#64;i-scream.org
         <ul>
-         <li><a href="http://www.cs.ukc.ac.uk/people/staff/pajs/">Work</a>
+         <li><a href="http://www.cs.kent.ac.uk/people/staff/pajs/">Work</a>
         </ul>
        </p>
        
        <p align="left">
-        Group Mailing List - <a href="mailto:dev@i-scream.org.uk">dev@i-scream.org.uk</a>
+        Group Mailing List - <a href="mailto:dev@i-scream.org">dev@i-scream.org</a>
        </p>
        
        </font>
-- 
2.44.0