--- web/www/mirrors.xhtml	2005/09/24 13:50:37	1.6
+++ web/www/mirrors.xhtml	2006/03/20 10:13:30	1.13
@@ -17,7 +17,7 @@
             This is a list of mirrors containing i-scream downloads.
             Please choose a mirror, preferably near you, rather than
             the master site. If you want to mirror i-scream please
-            <a href="mailto:dev@i-scream.org">contact</a> us with
+            <a href="mailto:support@i-scream.org">contact</a> us with
             details.
           </p>
           <h2>
@@ -36,15 +36,17 @@
             <li>
               <a href="ftp://ftp.uk.i-scream.org/pub/i-scream/">
                 ftp://ftp.uk.i-scream.org/pub/i-scream/</a>
-              - Provided by <a href="http://www.mirrorservice.org">The
+              - Provided by <a href="http://www.mirrorservice.org/">The
                 UK Mirror Service</a>.
             </li>
+            <!--
             <li>
-              <a href="ftp://ftp2.uk.i-scream.org/sites/ftp.i-scream.org/pub/i-scream/">
-                ftp://ftp2.uk.i-scream.org/sites/ftp.i-scream.org/pub/i-scream/</a>
-              - Provided by <a href="http://www.mirror.ac.uk">The
+              <a href="ftp://ftp2.uk.i-scream.org/mirror/ftp.i-scream.org/pub/i-scream/">
+                ftp://ftp2.uk.i-scream.org/mirror/ftp.i-scream.org/pub/i-scream/</a>
+              - Provided by <a href="http://www.mirror.ac.uk/">The
                 JISC National Mirror Service</a>.
             </li>
+            -->
           </ul>
           <h2>
             HTTP Mirrors
@@ -62,16 +64,30 @@
             <li>
               <a href="http://ftp.uk.i-scream.org/pub/i-scream/">
                 http://ftp.uk.i-scream.org/pub/i-scream/</a>
-              - Provided by <a href="http://www.mirrorservice.org">The
+              - Provided by <a href="http://www.mirrorservice.org/">The
                 UK Mirror Service</a>.
             </li>
+            <!--
             <li>
-              <a href="http://ftp2.uk.i-scream.org/sites/ftp.i-scream.org/pub/i-scream/">
-                http://ftp2.uk.i-scream.org/sites/ftp.i-scream.org/pub/i-scream/</a>
-              - Provided by <a href="http://www.mirror.ac.uk">The
+              <a href="http://ftp2.uk.i-scream.org/mirror/ftp.i-scream.org/pub/i-scream/">
+                http://ftp2.uk.i-scream.org/mirror/ftp.i-scream.org/pub/i-scream/</a>
+              - Provided by <a href="http://www.mirror.ac.uk/">The
                 JISC National Mirror Service</a>.
             </li>
+            -->
           </ul>
+          <!--
+          <h3>
+            US Mirrors
+          </h3>
+          <ul>
+            <li>
+              <a href="http://www.mirrorgeek.com/i-scream/">
+                http://www.mirrorgeek.com/i-scream/</a>
+              - Provided by <a href="http://www.mirrorgeek.com/">Mirror Geek</a>.
+            </li>
+          </ul>
+          -->
           <h2>
             RSYNC Mirrors
           </h2>
@@ -88,15 +104,17 @@
             <li>
               <a href="rsync://rsync.uk.i-scream.org/ftp.i-scream.org/pub/i-scream/">
                 rsync://rsync.uk.i-scream.org/ftp.i-scream.org/pub/i-scream/</a>
-              - Provided by <a href="http://www.mirrorservice.org">The
+              - Provided by <a href="http://www.mirrorservice.org/">The
                 UK Mirror Service</a>.
             </li>
+            <!--
             <li>
-              <a href="rsync://rsync2.uk.i-scream.org/ftp.i-scream.org/">
-                rsync://rsync2.uk.i-scream.org/ftp.i-scream.org/</a>
-              - Provided by <a href="http://www.mirror.ac.uk">The
+              <a href="rsync://rsync2.uk.i-scream.org/ftp.i-scream.org/pub/i-scream/">
+                rsync://rsync2.uk.i-scream.org/ftp.i-scream.org/pub/i-scream/</a>
+              - Provided by <a href="http://www.mirror.ac.uk/">The
                 JISC National Mirror Service</a>.
             </li>
+            -->
           </ul>
           <h2>
             Snapshot Mirrors