Changed URLs as appropriate

diff --git a/docs.html b/docs.html
index db56f98136dc29a057eb3592b400a74081e54a18..42c1514b5cc7fc562484e6b006f7029a6c1f38d7 100644 (file)
--- a/docs.html
+++ b/docs.html
@@ -20,7 +20,7 @@
 
     <p>New user documentation can be found at the <a href="http://www.exim-new-users.co.uk/">Exim New Users site</a></p>
 
-    <p>User supported documentation, FAQs and hints can be found in the <a href="http://www.exim.org/eximwiki/">wiki</a>.</p>
+    <p>User supported documentation, FAQs and hints can be found in the <a href="http://wiki.exim.org/">wiki</a>.</p>
 
     <p>There are 3 main sets of documentation for exim, all of which
     are also available below in html form.</p>
@@ -66,9 +66,9 @@
     </ul>
     <h2>Frequently Asked Questions - FAQ</h2>
 
-    <p>The wikified <a href="http://www.exim.org/eximwiki/FAQ">FAQ for Exim
+    <p>The wikified <a href="http://wiki.exim.org/FAQ">FAQ for Exim
     4</a> can be found <a
-    href="http://www.exim.org/eximwiki/FAQ">here</a> with the old static
+    href="http://wiki.exim.org/FAQ">here</a> with the old static
     version <a href="exim-html-4.66/doc/html/FAQ-html/FAQ.html">here</a>.
     The FAQ for the
     obsolete Exim 3 releases can be found on the <a

diff --git a/home.html b/home.html
index c4736f73fa7e05df8ff77c8486b396ea64a48500..d387ea8e5d40969cc37ad7d32e30fd9acfc5a0cc 100644 (file)
--- a/home.html
+++ b/home.html
@@ -35,7 +35,7 @@ the <a href="http://www.exim-new-users.co.uk/">Exim New Users site</a> to
 be useful.</p>
 
 <p>There is an extensive set of <a href="docs.html">main documentation</a> and a
-<a href="http://www.exim.org/eximwiki/">Wiki</a> for user supported documentation
+<a href="http://wiki.exim.org/">Wiki</a> for user supported documentation
 and hints</p>
 
     <h2>Current Versions</h2>
@@ -45,7 +45,7 @@ and hints</p>
     </p>
 
     <p>Exim 3 and previous versions are now considered obsolete. See
-      the wiki article <a href="http://www.exim.org/eximwiki/Exim3Status" target="_top">Exim3Status</a> for details.</p>
+      the wiki article <a href="http://wiki.exim.org/Exim3Status" target="_top">Exim3Status</a> for details.</p>
 
     <h2>Exim Bugzilla</h2>
 

diff --git a/maillist.html b/maillist.html
index 9c8956fb162cf1b2c47230ba397b1eeb21721fdb..56cec21257b9fa20f9762977a33cae24c99d41eb 100644 (file)
--- a/maillist.html
+++ b/maillist.html
@@ -11,30 +11,27 @@
       these is via a web form.  The three lists are:-</p>
     <dl>
       <dt><b><a
-     href="http://www.exim.org/mailman/listinfo/exim-announce">exim-announce</a></b></dt>
+     href="http://lists.exim.org/mailman/listinfo/exim-announce">exim-announce</a></b></dt>
       <dd>which is a low volume moderated list consisting of
  announcements only of things of interest to exim users
- (typically new releases).  There is an <a href="http://www.exim.org/mail-archives/exim-announce/">archive</a> of messages
+ (typically new releases).  There is an <a href="http://lists.exim.org/lurker/list/exim-announce.html">archive</a> of messages
  since July 1999.</dd>
       <dt><b><a
-     href="http://www.exim.org/mailman/listinfo/exim-dev">exim-dev</a></b></dt>
+     href="http://lists.exim.org/mailman/listinfo/exim-dev">exim-dev</a></b></dt>
 
       <dd>which is a list dedicated to the ongoing development process
       for exim.  It is not the grown-up version of the users list.
       There are searchable <a
-      href="http://www.exim.org/mail-archives/exim-dev/">archives</a>
+      href="http://lists.exim.org/lurker/list/exim-dev.html">archives</a>
       covering postings back to 2004.
       </dd>
 
       <dt><b><a
-     href="http://www.exim.org/mailman/listinfo/exim-users">exim-users</a></b></dt>
+     href="http://lists.exim.org/mailman/listinfo/exim-users">exim-users</a></b></dt>
       <dd>which is a discussion list about exim covering use and
       development of the software.  This also has a searchable <a
-      href="http://www.exim.org/mail-archives/exim-users/">archive</a>
-      covering postings back to 2002.  An older <a
-      href="http://www.exim.org/pipermail/exim-users/">archive</a> of
-      messages from 1996 to 2002 is also kept to allow old quoted URLs
-      to still work.  Please have the courtesy to check the list
+      href="http://lists.exim.org/lurker/list/exim-users.html">archive</a>
+      covering postings back to 1996.  Please have the courtesy to check the list
       before posting basic queries, the <a
       href="exim-html-4.40/doc/html/FAQ.html">FAQ</a> also covers many
       things that get asked regularly on the list.</dd>
@@ -44,10 +41,10 @@
       discussion of the future of Exim:</p>
     <dl>
      <dt><b><a
-     href="http://www.exim.org/mailman/listinfo/exim-future">exim-future</a></b></dt>
+     href="http://lists.exim.org/mailman/listinfo/exim-future">exim-future</a></b></dt>
      <dd>This list is intended for discussions of future development methodology
      and features aimed at Exim 5 onwards - i.e. anything that involves
-     architectural changes. There are additionally some <a href="http://www.exim.org/eximwiki/Exim5">wiki pages</a> recording
+     architectural changes. There are additionally some <a href="http://wiki.exim.org/Exim5">wiki pages</a> recording
      ideas as they get fleshed out (which may involve several alternatives).</dd>
     </dl>
     <hr>

diff --git a/mirrors.html b/mirrors.html
index 431f9f436dffb7d5493ab34df1b68dfb5f091b35..4a80051a85119b25df79fffce85115d568ecec1b 100644 (file)
--- a/mirrors.html
+++ b/mirrors.html
@@ -11,7 +11,7 @@
     supplied on some GNU CDs or with other software distributions.
     Further information on the binary and OS distributions can be
     found in the <a
-    href="http://www.exim.org/eximwiki/ObtainingExim" target="_top">Exim
+    href="http://wiki.exim.org/ObtainingExim" target="_top">Exim
     Wiki</a>.</p>
 
     <h2>Exim Mirror Sites</h2>