Merge in changes from branch created for new server. The old server is now

[www.i-scream.org.git] / www / contents.inc

diff --git a/www/contents.inc b/www/contents.inc
index 5922bd06a215ca7c7cd64baa0c7e7387b553c95f..73beeacd683273342ca78e26014f6cd117d320ea 100644 (file)
--- 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/">
         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>