From 436e5671ed66121185308a687b8828b93df8a7c4 Mon Sep 17 00:00:00 2001 From: Tim Bishop Date: Thu, 15 May 2003 20:48:02 +0000 Subject: [PATCH] Merge in changes from branch created for new server. The old server is now history... so we can make the new server use HEAD. --- cgi-bin/cvslog.cgi | 52 +++++++++++++--------- cgi-bin/docs.cgi | 10 ++--- cgi-bin/download.cgi | 6 +-- 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 | 22 ++++----- www/cvs.xhtml | 22 ++++----- www/cvsplot/index.html | 6 +-- 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 ++++---- 21 files changed, 121 insertions(+), 117 deletions(-) diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi index c9c2bc7..5d542c7 100755 --- a/cgi-bin/cvslog.cgi +++ b/cgi-bin/cvslog.cgi @@ -14,17 +14,18 @@ if($period eq "days") { if ($days < 1) {$days = 1}; $heading = "i-scream CVS$moduleext commits in the past $days day(s)"; $days--; - $firstdate = ">" . `date --date \"$days days ago\" \"+%Y/%m/%d\"`; + $days .= "d"; # because we can't write "$daysd" below :-) + $firstdate = ">" . `/bin/date -v-$days +%Y/%m/%d`; } elsif($period eq "date") { my($date)=$query->param('date'); - $date = `/bin/date \"+%Y/%m/%d\"` unless defined $date; + $date = `/bin/date +%Y/%m/%d` unless defined $date; $heading = "i-scream CVS$moduleext commits on $date"; $firstdate = "$date 00:00<$date 23:59" } elsif($period eq "since") { my($date)=$query->param('date'); - $date = `/bin/date \"+%Y/%m/%d\"` unless defined $date; + $date = `/bin/date +%Y/%m/%d` unless defined $date; $heading = "i-scream CVS$moduleext commits since $date"; $firstdate = ">$date"; } @@ -34,7 +35,7 @@ elsif($period eq "thisweek") { } else { # default to "today only" - $firstdate = ">" . `/bin/date \"+%Y/%m/%d\"`; + $firstdate = ">" . `/bin/date +%Y/%m/%d`; $heading = "Today's i-scream CVS$moduleext commits"; } @@ -43,15 +44,14 @@ my($cvsroot) = "/cvs/i-scream"; $modulelist = `ls $cvsroot` unless defined $modulelist; $modulelist =~ s/[\r\n]/ /gm; -my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl2.pl"; -#my($cvs2clargs) = "--stdout --no-wrap -r -b -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; +my($cvs2clpath) = "/usr/local/bin/cvs2cl"; my($cvs2clargs) = "--stdout --no-wrap -r -t -w -S -U $cvsroot/CVSROOT/users -l \"-d'$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\""; -my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist"; -my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs"; +my($updatecmd) = "/home/iscream/bin/fullcvsupdate.sh $modulelist"; +my($logcmd) = "cd /tmp/i-scream/cvstmp && $cvs2clpath $cvs2clargs"; -my ($left) = "../left.inc" ; -my ($title) = "../title.inc"; -my ($bottom) = "../bottom.inc"; +my ($left) = "../htdocs/left.inc" ; +my ($title) = "../htdocs/title.inc"; +my ($bottom) = "../htdocs/bottom.inc"; print "Content-type: text/html\n\n"; @@ -91,7 +91,7 @@ my(@modules) = split (/\s+/, $modulelist); foreach my $module (@modules) { print "\n\n"; - print "\n\n"; + print "\n\n"; print " @@ -66,7 +66,7 @@

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.

+ contact us at dev@i-scream.org.

diff --git a/www/contents.inc b/www/contents.inc index 5922bd0..73beeac 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 contacted + grateful if you contacted us with any questions or bugs.

The downloads will be available on our snapshot server :-
- - http://snapshots.i-scream.org.uk/. + + http://snapshots.i-scream.org/.

@@ -32,7 +32,7 @@ see an efficient native host! Credit goes to our new developer Pete. Until we update the downloads pages you can download the new ihost - + here.

@@ -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 + through CVS.

@@ -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 + details can be found here on the author's website.

@@ -93,7 +93,7 @@ documentation 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 dev@i-scream.org.uk. + to dev@i-scream.org.

 

@@ -138,8 +138,8 @@

The i-scream Distributed Central Monitoring System started off as - a final year project for a group of - Computer Science students at the + a final year project for a group of + Computer Science students at the University of Kent at Canterbury, 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 @@ Google

\n$module module\n
\n$module module\n
\n"; my(@lines) = `$logcmd $module 2>&1`; @@ -118,22 +118,32 @@ foreach my $module (@modules) { print "\n\n" } elsif($line =~ /(\S+) (\(\S+\))([,:])/ || $line =~ /(\S+) (\(\S+,\s+\S+\))([,:])/) { - #chop $line; my ($file, $rest, $ext) = ($1, $2, $3); print ""; - print ""; + print ""; print HTML_encode($file); print " "; if($rest =~ /\((\S+)\.(\d+)(.*)\)/) { - my $newrev = "$1.$2"; - my $oldminver = $2-1; - my $oldrev = "$1.$oldminver"; - if($2 != 1) { + my $start = $1; + my $end = $2; + my $other = $3; + my $newrev = "$start.$end"; + my $oldrev; + if($end != 1) { + my $oldminver = $end-1; + $oldrev = "$start.$oldminver"; + } + elsif($start =~ /^((\d+\.)+)(\d+)$/) { + $oldrev = $1; + # take trailing . off old revision + chop $oldrev; + } + if(defined $oldrev) { my $diff = ".diff?r1=$oldrev&r2=$newrev"; - print "("; - print HTML_encode("$1.$2"); + print "("; + print HTML_encode("$start.$end"); print ""; - print HTML_encode("$3)"); + print HTML_encode("$other)"); } else { print HTML_encode($rest); diff --git a/cgi-bin/docs.cgi b/cgi-bin/docs.cgi index 0336e4c..8c60667 100755 --- a/cgi-bin/docs.cgi +++ b/cgi-bin/docs.cgi @@ -13,9 +13,9 @@ use CGI; $| = 1; # Settings -my ($left) = "../left.inc" ; -my ($title) = "../title.inc"; -my ($bottom) = "../bottom.inc"; +my ($left) = "../htdocs/left.inc" ; +my ($title) = "../htdocs/title.inc"; +my ($bottom) = "../htdocs/bottom.inc"; my ($query) = new CGI; @@ -34,10 +34,10 @@ unless (defined $doc) { # Prevent hackers from supplying a malformed document string. # I.e. only allow normal characters, slashes and dots. unless ($doc =~ /^[a-zA-Z_\-0-9\.\/]+$/) { - print "Go Away, you nasty hax0r!"; + print "Malformed request"; exit; } -$doc = "../documentation/".$doc; +$doc = "../htdocs/documentation/".$doc; print <<"END"; diff --git a/cgi-bin/download.cgi b/cgi-bin/download.cgi index a51abad..51727ec 100755 --- a/cgi-bin/download.cgi +++ b/cgi-bin/download.cgi @@ -21,9 +21,9 @@ $| = 1; #-------------------------------------------------------------- my ($build_dir) = "/downloads"; my ($log_file) = "download_log"; -my ($left) = "../left.inc" ; -my ($title) = "../title.inc"; -my ($bottom) = "../bottom.inc"; +my ($left) = "../htdocs/left.inc" ; +my ($title) = "../htdocs/title.inc"; +my ($bottom) = "../htdocs/bottom.inc"; #-------------------------------------------------------------- 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 @@

 

- http://www.i-scream.org.uk
- Copyright 2001-2002 The i-scream Project
- dev@i-scream.org.uk + http://www.i-scream.org
+ Copyright 2001-2003 The i-scream Project
+ dev@i-scream.org

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.

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:

-

http://www.i-scream.org.uk/downloads

+

http://www.i-scream.org/downloads

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).

@@ -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.

Some discussion about this is available in the server documentation.

If you have any questions about any of the above, please don't hesitate to -contact us at dev@i-scream.org.uk. If you find we've missed something out, +contact us at dev@i-scream.org. If you find we've missed something out, again, please let us know.

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.

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:

-

http://www.i-scream.org.uk/downloads

+

http://www.i-scream.org/downloads

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).

@@ -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.

Some discussion about this is available in the server documentation.

If you have any questions about any of the above, please don't hesitate to -contact us at dev@i-scream.org.uk. If you find we've missed something out, +contact us at dev@i-scream.org. If you find we've missed something out, again, please let us know.

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.

- + Commits to the "cms" CVS module since project completion (29/03/2001)
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.

- + Commits to the "cms" CVS module since project completion (29/03/2001)
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.

-

Snapshot Server

+

Snapshot Server
- - + + - +
diff --git a/www/cvs.shtml b/www/cvs.shtml index 1422e4b..90ff671 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.

-

http://www.i-scream.org.uk/cgi-bin/cvs/viewcvs.cgi

+

http://cvs.i-scream.org/

We also have a facility to allow people to keep tabs on what's changed recently. The following are available:

-

Commits today: http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=today
-Commits this week: http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=thisweek
-Commits in the past 7 days: http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=days&days=7
-Commits made since 29/03/2001: http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=since&date=2001/03/29

+

Commits today: http://www.i-scream.org/cgi-bin/cvslog.cgi?period=today
+Commits this week: http://www.i-scream.org/cgi-bin/cvslog.cgi?period=thisweek
+Commits in the past 7 days: http://www.i-scream.org/cgi-bin/cvslog.cgi?period=days&days=7
+Commits made since 29/03/2001: http://www.i-scream.org/cgi-bin/cvslog.cgi?period=since&date=2001/03/29

Anonymous CVS Access (read-only)

@@ -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.

-
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]
+
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]

When asked for a password, simply press enter. @@ -73,7 +73,7 @@ on most clients. First the following environment variables need to be set.

 
CVS_RSH = ssh
-CVSROOT = :ext:username@cvs.i-scream.org.uk:/cvs/i-scream
+CVSROOT = :ext:username@cvs.i-scream.org:/cvs/i-scream

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;

 -
*default host=cvsup.i-scream.org.uk
+
*default host=cvsup.i-scream.org
 *default base=/home/user/sup
 *default prefix=/home/user/i-scream
 *default release=cvs
@@ -109,11 +109,11 @@ given above, which gets the latest copy of the i-scream source code.

 
CVS Statistics

 
 
There are some statistics available on the cms module of the CVS
-repository, generated by cvsstat,
+repository, generated by cvsplot,
 that allow you to see the progress of development. They're not that exciting,
 but do show when the work was done.

 
-
http://www.i-scream.org.uk/cvsstat

+
http://www.i-scream.org/cvsplot

 
 
 
diff --git a/www/cvs.xhtml b/www/cvs.xhtml
index 1422e4b..90ff671 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.

 
-
http://www.i-scream.org.uk/cgi-bin/cvs/viewcvs.cgi

+
http://cvs.i-scream.org/

 
 
We also have a facility to allow people to keep tabs on what's changed
 recently. The following are available:

 
-
Commits today: http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=today

-Commits this week: http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=thisweek

-Commits in the past 7 days: http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=days&days=7

-Commits made since 29/03/2001: http://www.i-scream.org.uk/cgi-bin/cvslog.cgi?period=since&date=2001/03/29

+
Commits today: http://www.i-scream.org/cgi-bin/cvslog.cgi?period=today

+Commits this week: http://www.i-scream.org/cgi-bin/cvslog.cgi?period=thisweek

+Commits in the past 7 days: http://www.i-scream.org/cgi-bin/cvslog.cgi?period=days&days=7

+Commits made since 29/03/2001: http://www.i-scream.org/cgi-bin/cvslog.cgi?period=since&date=2001/03/29

 
 
Anonymous CVS Access (read-only)

 
@@ -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.

 
 
-
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]

+
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]

 
 
 
When asked for a password, simply press enter.
@@ -73,7 +73,7 @@ on most clients. First the following environment variables need to be set.

 
 
 
CVS_RSH = ssh
-CVSROOT = :ext:username@cvs.i-scream.org.uk:/cvs/i-scream

+CVSROOT = :ext:username@cvs.i-scream.org:/cvs/i-scream

 
 
 
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;

 
 
-
*default host=cvsup.i-scream.org.uk
+
*default host=cvsup.i-scream.org
 *default base=/home/user/sup
 *default prefix=/home/user/i-scream
 *default release=cvs
@@ -109,11 +109,11 @@ given above, which gets the latest copy of the i-scream source code.

 
CVS Statistics

 
 
There are some statistics available on the cms module of the CVS
-repository, generated by cvsstat,
+repository, generated by cvsplot,
 that allow you to see the progress of development. They're not that exciting,
 but do show when the work was done.

 
-
http://www.i-scream.org.uk/cvsstat

+
http://www.i-scream.org/cvsplot

 
 
 
diff --git a/www/cvsplot/index.html b/www/cvsplot/index.html
index 914bc2e..8fbf0f3 100644
--- a/www/cvsplot/index.html
+++ b/www/cvsplot/index.html
@@ -12,7 +12,7 @@
 count for the source files.

 Only the files in the cms module of cvs are listed.
 This page is updated at 7am daily.

-
You can also browse the cvs
+
You can also browse the cvs
 repository.

 
file count

 
Count of the number of files since the start of the project.

@@ -23,9 +23,7 @@ repository.

 
Textual representation: linedata.txt

 

 
credits

-
These images were generated using the cvsstat program, which can be found here.

-
 

-
Page last updated, 18/06/01, dev@i-scream.org.uk.

+
These images were generated using the cvsplot program, which can be found here.

 
 
 
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.

 
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:

-
http://www.i-scream.org.uk/downloads

+
http://www.i-scream.org/downloads

 
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).

@@ -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.

 
Some discussion about this is available in the server documentation.

 
If you have any questions about any of the above, please don't hesitate to 
-contact us at dev@i-scream.org.uk. If you find we've missed something out, 
+contact us at dev@i-scream.org. If you find we've missed something out, 
 again, please let us know.

 
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.

 
-
+
 Commits to the "cms" CVS module since project completion (29/03/2001)
 
 

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.

-   
Snapshot Server

+   
Snapshot Server

    
   
  
@@ -66,7 +66,7 @@
    
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.

+   contact us at dev@i-scream.org.

    
   
  
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 @@
        

        

        
other projects

-       3-D VRML graph drawing

+       3-D VRML graph drawing

        PircBot IRC Bot

        Jibble Web Server

-       Java ACL's for TCP/UDP

+       Java ACL's for TCP/UDP

        

        

        
internal papers

@@ -64,19 +64,15 @@
        

        
links

        JacORB

-       UKC - Computer Science

+       UKC - Computer Science

        W3 XML Information

        JAXP
        

        

        
contact us

-       dev@i-scream.org.uk
+       dev@i-scream.org
        

        

-       
-        
-       
-       

        
         SourceForge Logo
        
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.

 
-
dev@i-scream.org.uk

+
dev@i-scream.org

 
 
State: Closed

 Purpose: A discussion forum for developers only. This can also be used to
 contact the development team as a whole.

 
-
commits@i-scream.org.uk

+
commits@i-scream.org

 
 
State: Open for subscription, but no posts should be sent here.

 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.

 
-
users@i-scream.org.uk

+
users@i-scream.org

 
 
State: Open for subscription and posts.

 Purpose: For discussion between users, developers, and anyone else. This is the
@@ -52,7 +52,7 @@ place to ask questions and get support.

 
 
Subscribing

 
-
If you wish to join one of the open lists, send a subscribe e-mail to majordomo@i-scream.org.uk
+
If you wish to join one of the open lists, send a subscribe e-mail to majordomo@i-scream.org
 and your subscription will automatically be processed. If you send
 "help" to the same address, you will be given a list of supported
 operations.

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.

 
-
dev@i-scream.org.uk

+
dev@i-scream.org

 
 
State: Closed

 Purpose: A discussion forum for developers only. This can also be used to
 contact the development team as a whole.

 
-
commits@i-scream.org.uk

+
commits@i-scream.org

 
 
State: Open for subscription, but no posts should be sent here.

 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.

 
-
users@i-scream.org.uk

+
users@i-scream.org

 
 
State: Open for subscription and posts.

 Purpose: For discussion between users, developers, and anyone else. This is the
@@ -52,7 +52,7 @@ place to ask questions and get support.

 
 
Subscribing

 
-
If you wish to join one of the open lists, send a subscribe e-mail to majordomo@i-scream.org.uk
+
If you wish to join one of the open lists, send a subscribe e-mail to majordomo@i-scream.org
 and your subscription will automatically be processed. If you send
 "help" to the same address, you will be given a list of supported
 operations.

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 @@
        
Who We Are

 
        

-        We were a group of four 3rd year 
+        We were a group of four 3rd year 
         Computer Science 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 @@
 
      
        

-        Tim Bishop - tim@i-scream.org.uk
+        Tim Bishop - tim@i-scream.org
         

        

        
        

-        Alex Moore - aj@i-scream.org.uk
+        Alex Moore - aj@i-scream.org
        

        
        

-        Paul Mutton - paul@i-scream.org.uk
+        Paul Mutton - paul@i-scream.org
         

        

 
        

-        Pete Saunders - pajs@i-scream.org.uk
+        Pete Saunders - pajs@i-scream.org
         

        

        
        

-        Group Mailing List - dev@i-scream.org.uk
+        Group Mailing List - dev@i-scream.org
        

        
        
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 @@
        
Who We Are

 
        

-        We were a group of four 3rd year 
+        We were a group of four 3rd year 
         Computer Science 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 @@
 
      
        

-        Tim Bishop - tim@i-scream.org.uk
+        Tim Bishop - tim@i-scream.org
         

        

        
        

-        Alex Moore - aj@i-scream.org.uk
+        Alex Moore - aj@i-scream.org
        

        
        

-        Paul Mutton - paul@i-scream.org.uk
+        Paul Mutton - paul@i-scream.org
         

        

 
        

-        Pete Saunders - pajs@i-scream.org.uk
+        Pete Saunders - pajs@i-scream.org
         

        

        
        

-        Group Mailing List - dev@i-scream.org.uk
+        Group Mailing List - dev@i-scream.org
        

        
        
-- 
2.44.0