Hi,
I've tried to update to URLs in all docs to reflect the changes needed for
the new website. Patches against 2.3 and 2.4 are attached.
Regards,
Simon
diff -Naur cyrus-imapd-2.3.16.orig/doc/index.html cyrus-imapd-2.3.16/doc/index.html
--- cyrus-imapd-2.3.16.orig/doc/index.html 2007-02-07 19:58:07.000000000 +0100
+++ cyrus-imapd-2.3.16/doc/index.html 2010-11-23 07:09:47.000000000 +0100
@@ -35,7 +35,7 @@
<h2>The Cyrus IMAP Server Distribution</h2>
-<p><a href="http://cyrusimap.web.cmu.edu/downloads.html#imap";><b>Cyrus IMAP
+<p><a href="http://www.cyrusimap.org/mediawiki/index.php/Downloads#IMAP_Server";><b>Cyrus IMAP
Server distribution</b></a></p>
<p><b>Documentation</b></p>
@@ -58,7 +58,7 @@
</ul>
<hr />
-<a href="http://cyrusimap.web.cmu.edu";>Go</a> to the Project Cyrus
+<a href="http://www.cyrusimap.org/";>Go</a> to the Project Cyrus
homepage.<br />
<a href="http://asg.web.cmu.edu";>Go</a> to the Andrew Systems Group
homepage.
diff -Naur cyrus-imapd-2.3.16.orig/doc/install-murder.html cyrus-imapd-2.3.16/doc/install-murder.html
--- cyrus-imapd-2.3.16.orig/doc/install-murder.html 2007-02-07 19:58:07.000000000 +0100
+++ cyrus-imapd-2.3.16/doc/install-murder.html 2010-11-23 07:17:28.000000000 +0100
@@ -23,7 +23,7 @@
<h3>Introduction & Assumptions</h3>
This document is intended to be a guide to the configuration of a Cyrus
IMAP Aggregator, aka Cyrus Murder. It is recommended that you review
-<A HREF=http://cyrusimap.web.cmu.edu/ag.html>this document</A> to be familliar
+<A HREF=http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Murder>this document</A> to be familliar
with the concepts at work. This document is a work in progress and is at this
point incomplete.<p>
This document assumes that you have successfully been able to setup atleast
@@ -344,8 +344,8 @@
</ul>
<p><h3>References</h3><ul>
-<li><A HREF=http://cyrusimap.web.cmu.edu/ag.html>Aggregator Overview</A></li>
-<li><A HREF=http://cyrusimap.web.cmu.edu/archives/mupdate.html>MUPDATE Protocol Reference</A></li>
+<li><A HREF=http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Murder>Aggregator Overview</A></li>
+<li><A HREF=http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Murder_Mupdate_Details>MUPDATE Protocol Reference</A></li>
</ul>
<P><HR>
diff -Naur cyrus-imapd-2.3.16.orig/doc/install-testing.html cyrus-imapd-2.3.16/doc/install-testing.html
--- cyrus-imapd-2.3.16.orig/doc/install-testing.html 2007-02-07 19:58:07.000000000 +0100
+++ cyrus-imapd-2.3.16/doc/install-testing.html 2010-11-23 07:17:28.000000000 +0100
@@ -11,7 +11,7 @@
To test the IMAP server, reboot and perform the following steps (all
of these samples use "<tt>foobar</tt>" as the IMAP server name). A
list of answers to common installation problems is maintained in <A
-HREF="http://cyrusimap.web.cmu.edu/twiki";>http://cyrusimap.web.cmu.edu/twiki</A>.
+HREF="http://www.cyrusimap.org/mediawiki/index.php/FAQ";>http://www.cyrusimap.org/mediawiki/index.php/FAQ</A>.
<ol>
<li>From your normal account, telnet to the IMAP port on the
diff -Naur cyrus-imapd-2.3.16.orig/doc/install-upgrade.html cyrus-imapd-2.3.16/doc/install-upgrade.html
--- cyrus-imapd-2.3.16.orig/doc/install-upgrade.html 2009-12-03 21:48:14.000000000 +0100
+++ cyrus-imapd-2.3.16/doc/install-upgrade.html 2010-11-23 07:17:28.000000000 +0100
@@ -41,8 +41,8 @@
<ul>
<li> You must install and configure Cyrus SASL version 2.1.17 or later
to use Cyrus IMAP 2.3.9 and later. You can download SASL at <a
-href="http://cyrusimap.web.cmu.edu/downloads.html#sasl";>
-http://cyrusimap.web.cmu.edu/downloads.html#sasl</a>.</li>
+href="http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library";>
+http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library</a>.</li>
<li>The default value of the <tt>allowplaintext</tt> option has been
changed to disabled (0). If you need to allow cleartext passwords on
@@ -309,8 +309,8 @@
<ul>
<li> You must install and configure Cyrus SASL version 2 to use Cyrus
IMAP 2.1 and later. You can download SASL at <a
-href="http://cyrusimap.web.cmu.edu/downloads.html#sasl";>
-http://cyrusimap.web.cmu.edu/downloads.html#sasl</a>.
+href="http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library";>
+http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library</a>.
<li> If you use <tt>timsieved</tt> to manage Sieve scripts, and have
enabled the alternate namespace and/or the Unix hierarchy separator,
diff -Naur cyrus-imapd-2.3.16.orig/doc/mailing-list.html cyrus-imapd-2.3.16/doc/mailing-list.html
--- cyrus-imapd-2.3.16.orig/doc/mailing-list.html 2007-02-07 19:58:07.000000000 +0100
+++ cyrus-imapd-2.3.16/doc/mailing-list.html 2010-11-23 07:10:22.000000000 +0100
@@ -27,8 +27,8 @@
imap://cyrus.andrew.cmu.edu/archive.info-cyrus</a>.
<p>A web archive is also available at
-<a href="http://cyrusimap.web.cmu.edu/archive/index.php?mailbox=archive.info-cyrus";>
-http://cyrusimap.web.cmu.edu/archive/index.php?mailbox=archive.info-cyrus</a>
+<a href="http://asg.web.cmu.edu/bb/archive.info-cyrus";>
+http://asg.web.cmu.edu/bb/archive.info-cyrus</a>
<p>If you are not subscribed to the list (or you are sending the
message from a different address than the one which you are subscribed
@@ -38,12 +38,12 @@
<p>There is also a developers list available at <tt>cyrus-devel@xxxxxxxxxxxxxxxxxxxx</tt>.
with similar <a href="mailto:cyrus-devel-subscribe@xxxxxxxxxxxxxxxxxxxx";>subscription</a>
-methods and <a href="http://cyrusimap.web.cmu.edu/archive/index.php?mailbox=archive.cyrus-devel";>
+methods and <a href="http://asg.web.cmu.edu/bb/archive.cyrus-devel";>
archive location</a>
<p>Detailed contact information can be found at <a
-href="http://cyrusimap.web.cmu.edu/lists.html";>
-http://cyrusimap.web.cmu.edu/lists.html</a>
+href="http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Mailing_Lists";>
+http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Mailing_Lists</a>
<P><HR>
last modified: $Date: 2007/02/07 18:58:07 $
diff -Naur cyrus-imapd-2.3.16.orig/doc/text/install-testing cyrus-imapd-2.3.16/doc/text/install-testing
--- cyrus-imapd-2.3.16.orig/doc/text/install-testing 2009-12-21 14:18:00.000000000 +0100
+++ cyrus-imapd-2.3.16/doc/text/install-testing 2010-11-23 07:17:58.000000000 +0100
@@ -3,7 +3,7 @@
To test the IMAP server, reboot and perform the following steps (all of
these samples use "foobar" as the IMAP server name). A list of answers
to common installation problems is maintained in
- http://cyrusimap.web.cmu.edu/twiki.
+ http://www.cyrusimap.org/mediawiki/index.php/FAQ.
1. From your normal account, telnet to the IMAP port on the server
you're setting up:
diff -Naur cyrus-imapd-2.3.16.orig/doc/text/install-upgrade cyrus-imapd-2.3.16/doc/text/install-upgrade
--- cyrus-imapd-2.3.16.orig/doc/text/install-upgrade 2009-12-21 14:18:00.000000000 +0100
+++ cyrus-imapd-2.3.16/doc/text/install-upgrade 2010-11-23 07:17:58.000000000 +0100
@@ -30,7 +30,7 @@
* You must install and configure Cyrus SASL version 2.1.17 or later
to use Cyrus IMAP 2.3.9 and later. You can download SASL at
- http://cyrusimap.web.cmu.edu/downloads.html#sasl.
+ http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library.
* The default value of the allowplaintext option has been changed to
disabled (0). If you need to allow cleartext passwords on the wire,
then you will have to explicitly enable the allowplaintext option
@@ -241,7 +241,7 @@
* You must install and configure Cyrus SASL version 2 to use Cyrus
IMAP 2.1 and later. You can download SASL at
- http://cyrusimap.web.cmu.edu/downloads.html#sasl.
+ http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library.
* If you use timsieved to manage Sieve scripts, and have enabled the
alternate namespace and/or the Unix hierarchy separator, run the
script "tools/translatesieve". This script will translate the
diff -Naur cyrus-imapd-2.3.16.orig/doc/text/mailing-list cyrus-imapd-2.3.16/doc/text/mailing-list
--- cyrus-imapd-2.3.16.orig/doc/text/mailing-list 2009-12-21 14:18:00.000000000 +0100
+++ cyrus-imapd-2.3.16/doc/text/mailing-list 2010-11-23 07:08:24.000000000 +0100
@@ -12,7 +12,7 @@
imap://cyrus.andrew.cmu.edu/archive.info-cyrus.
A web archive is also available at
- http://cyrusimap.web.cmu.edu/archive/index.php?mailbox=archive.info-cyrus
+ http://asg.web.cmu.edu/bb/archive.info-cyrus
If you are not subscribed to the list (or you are sending the message
from a different address than the one which you are subscribed under),
@@ -24,5 +24,5 @@
archive location
Detailed contact information can be found at
- http://cyrusimap.web.cmu.edu/lists.html
+ http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Mailing_Lists
diff -Naur cyrus-imapd-2.3.16.orig/imap/version.c cyrus-imapd-2.3.16/imap/version.c
--- cyrus-imapd-2.3.16.orig/imap/version.c 2009-04-23 19:10:07.000000000 +0200
+++ cyrus-imapd-2.3.16/imap/version.c 2010-11-23 06:42:49.000000000 +0100
@@ -101,7 +101,7 @@
"\"name\" \"Cyrus IMAPD\""
" \"version\" \"%s %s\""
" \"vendor\" \"Project Cyrus\""
- " \"support-url\" \"http://cyrusimap.web.cmu.edu\"";,
+ " \"support-url\" \"http://www.cyrusimap.org/\"";,
CYRUS_VERSION, CYRUS_CVSDATE);
/* add the os info */
diff -Naur cyrus-imapd-2.3.16.orig/README cyrus-imapd-2.3.16/README
--- cyrus-imapd-2.3.16.orig/README 2007-02-07 19:58:07.000000000 +0100
+++ cyrus-imapd-2.3.16/README 2010-11-23 07:09:09.000000000 +0100
@@ -26,7 +26,7 @@
read doc/readme.html first!).
* To obtain updates to this software, visit the web page
- http://cyrusimap.web.cmu.edu/downloads.html
+ http://www.cyrusimap.org/mediawiki/index.php/Downloads
or ftp directly from
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail
diff -Naur cyrus-imapd-2.4.4.orig/doc/index.html cyrus-imapd-2.4.4/doc/index.html
--- cyrus-imapd-2.4.4.orig/doc/index.html 2010-11-11 23:15:33.000000000 +0100
+++ cyrus-imapd-2.4.4/doc/index.html 2010-11-23 07:19:47.000000000 +0100
@@ -35,7 +35,7 @@
<h2>The Cyrus IMAP Server Distribution</h2>
-<p><a href="http://cyrusimap.web.cmu.edu/downloads.html#imap";><b>Cyrus IMAP
+<p><a href="http://www.cyrusimap.org/mediawiki/index.php/Downloads#IMAP_Server";><b>Cyrus IMAP
Server distribution</b></a></p>
<p><b>Documentation</b></p>
@@ -58,7 +58,7 @@
</ul>
<hr />
-<a href="http://cyrusimap.web.cmu.edu";>Go</a> to the Project Cyrus
+<a href="http://www.cyrusimap.org/";>Go</a> to the Project Cyrus
homepage.<br />
<a href="http://asg.web.cmu.edu";>Go</a> to the Andrew Systems Group
homepage.
diff -Naur cyrus-imapd-2.4.4.orig/doc/install-murder.html cyrus-imapd-2.4.4/doc/install-murder.html
--- cyrus-imapd-2.4.4.orig/doc/install-murder.html 2010-11-11 23:15:33.000000000 +0100
+++ cyrus-imapd-2.4.4/doc/install-murder.html 2010-11-23 07:19:47.000000000 +0100
@@ -23,7 +23,7 @@
<h3>Introduction & Assumptions</h3>
This document is intended to be a guide to the configuration of a Cyrus
IMAP Aggregator, aka Cyrus Murder. It is recommended that you review
-<A HREF=http://cyrusimap.web.cmu.edu/ag.html>this document</A> to be familliar
+<A HREF=http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Murder>this document</A> to be familliar
with the concepts at work. This document is a work in progress and is at this
point incomplete.<p>
This document assumes that you have successfully been able to setup atleast
@@ -344,8 +344,8 @@
</ul>
<p><h3>References</h3><ul>
-<li><A HREF=http://cyrusimap.web.cmu.edu/ag.html>Aggregator Overview</A></li>
-<li><A HREF=http://cyrusimap.web.cmu.edu/archives/mupdate.html>MUPDATE Protocol Reference</A></li>
+<li><A HREF=http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Murder>Aggregator Overview</A></li>
+<li><A HREF=http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Murder_Mupdate_Details>MUPDATE Protocol Reference</A></li>
</ul>
<P><HR>
diff -Naur cyrus-imapd-2.4.4.orig/doc/install-testing.html cyrus-imapd-2.4.4/doc/install-testing.html
--- cyrus-imapd-2.4.4.orig/doc/install-testing.html 2010-11-11 23:15:33.000000000 +0100
+++ cyrus-imapd-2.4.4/doc/install-testing.html 2010-11-23 07:19:47.000000000 +0100
@@ -11,7 +11,7 @@
To test the IMAP server, reboot and perform the following steps (all
of these samples use "<tt>foobar</tt>" as the IMAP server name). A
list of answers to common installation problems is maintained in <A
-HREF="http://cyrusimap.web.cmu.edu/twiki";>http://cyrusimap.web.cmu.edu/twiki</A>.
+HREF="http://www.cyrusimap.org/mediawiki/index.php/FAQ";>http://www.cyrusimap.org/mediawiki/index.php/FAQ</A>.
<ol>
<li>From your normal account, telnet to the IMAP port on the
diff -Naur cyrus-imapd-2.4.4.orig/doc/install-upgrade.html cyrus-imapd-2.4.4/doc/install-upgrade.html
--- cyrus-imapd-2.4.4.orig/doc/install-upgrade.html 2010-11-11 23:15:33.000000000 +0100
+++ cyrus-imapd-2.4.4/doc/install-upgrade.html 2010-11-23 07:19:47.000000000 +0100
@@ -149,8 +149,8 @@
<ul>
<li> You must install and configure Cyrus SASL version 2.1.17 or later
to use Cyrus IMAP 2.3.9 and later. You can download SASL at <a
-href="http://cyrusimap.web.cmu.edu/downloads.html#sasl";>
-http://cyrusimap.web.cmu.edu/downloads.html#sasl</a>.</li>
+href="http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library";>
+http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library</a>.</li>
<li>The default value of the <tt>allowplaintext</tt> option has been
changed to disabled (0). If you need to allow cleartext passwords on
@@ -417,8 +417,8 @@
<ul>
<li> You must install and configure Cyrus SASL version 2 to use Cyrus
IMAP 2.1 and later. You can download SASL at <a
-href="http://cyrusimap.web.cmu.edu/downloads.html#sasl";>
-http://cyrusimap.web.cmu.edu/downloads.html#sasl</a>.
+href="http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library";>
+http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library</a>.
<li> If you use <tt>timsieved</tt> to manage Sieve scripts, and have
enabled the alternate namespace and/or the Unix hierarchy separator,
diff -Naur cyrus-imapd-2.4.4.orig/doc/mailing-list.html cyrus-imapd-2.4.4/doc/mailing-list.html
--- cyrus-imapd-2.4.4.orig/doc/mailing-list.html 2010-11-11 23:15:33.000000000 +0100
+++ cyrus-imapd-2.4.4/doc/mailing-list.html 2010-11-23 07:19:47.000000000 +0100
@@ -27,8 +27,8 @@
imap://cyrus.andrew.cmu.edu/archive.info-cyrus</a>.
<p>A web archive is also available at
-<a href="http://cyrusimap.web.cmu.edu/archive/index.php?mailbox=archive.info-cyrus";>
-http://cyrusimap.web.cmu.edu/archive/index.php?mailbox=archive.info-cyrus</a>
+<a href="http://asg.web.cmu.edu/bb/archive.info-cyrus";>
+http://asg.web.cmu.edu/bb/archive.info-cyrus</a>
<p>If you are not subscribed to the list (or you are sending the
message from a different address than the one which you are subscribed
@@ -38,12 +38,12 @@
<p>There is also a developers list available at <tt>cyrus-devel@xxxxxxxxxxxxxxxxxxxx</tt>.
with similar <a href="mailto:cyrus-devel-subscribe@xxxxxxxxxxxxxxxxxxxx";>subscription</a>
-methods and <a href="http://cyrusimap.web.cmu.edu/archive/index.php?mailbox=archive.cyrus-devel";>
+methods and <a href="http://asg.web.cmu.edu/bb/archive.cyrus-devel";>
archive location</a>
<p>Detailed contact information can be found at <a
-href="http://cyrusimap.web.cmu.edu/lists.html";>
-http://cyrusimap.web.cmu.edu/lists.html</a>
+href="http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Mailing_Lists";>
+http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Mailing_Lists</a>
<P><HR>
last modified: $Date: 2010/01/06 17:01:29 $
diff -Naur cyrus-imapd-2.4.4.orig/doc/text/install-testing cyrus-imapd-2.4.4/doc/text/install-testing
--- cyrus-imapd-2.4.4.orig/doc/text/install-testing 2010-11-11 23:19:39.000000000 +0100
+++ cyrus-imapd-2.4.4/doc/text/install-testing 2010-11-23 07:19:47.000000000 +0100
@@ -3,7 +3,7 @@
To test the IMAP server, reboot and perform the following steps (all of
these samples use "foobar" as the IMAP server name). A list of answers
to common installation problems is maintained in
- http://cyrusimap.web.cmu.edu/twiki.
+ http://www.cyrusimap.org/mediawiki/index.php/FAQ.
1. From your normal account, telnet to the IMAP port on the server
you're setting up:
diff -Naur cyrus-imapd-2.4.4.orig/doc/text/install-upgrade cyrus-imapd-2.4.4/doc/text/install-upgrade
--- cyrus-imapd-2.4.4.orig/doc/text/install-upgrade 2010-11-11 23:19:39.000000000 +0100
+++ cyrus-imapd-2.4.4/doc/text/install-upgrade 2010-11-23 07:19:47.000000000 +0100
@@ -126,7 +126,7 @@
* You must install and configure Cyrus SASL version 2.1.17 or later
to use Cyrus IMAP 2.3.9 and later. You can download SASL at
- http://cyrusimap.web.cmu.edu/downloads.html#sasl.
+ http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library.
* The default value of the allowplaintext option has been changed to
disabled (0). If you need to allow cleartext passwords on the wire,
then you will have to explicitly enable the allowplaintext option
@@ -337,7 +337,7 @@
* You must install and configure Cyrus SASL version 2 to use Cyrus
IMAP 2.1 and later. You can download SASL at
- http://cyrusimap.web.cmu.edu/downloads.html#sasl.
+ http://www.cyrusimap.org/mediawiki/index.php/Downloads#SASL_Library.
* If you use timsieved to manage Sieve scripts, and have enabled the
alternate namespace and/or the Unix hierarchy separator, run the
script "tools/translatesieve". This script will translate the
diff -Naur cyrus-imapd-2.4.4.orig/doc/text/mailing-list cyrus-imapd-2.4.4/doc/text/mailing-list
--- cyrus-imapd-2.4.4.orig/doc/text/mailing-list 2010-11-11 23:19:39.000000000 +0100
+++ cyrus-imapd-2.4.4/doc/text/mailing-list 2010-11-23 07:19:47.000000000 +0100
@@ -12,7 +12,7 @@
imap://cyrus.andrew.cmu.edu/archive.info-cyrus.
A web archive is also available at
- http://cyrusimap.web.cmu.edu/archive/index.php?mailbox=archive.info-cyrus
+ http://asg.web.cmu.edu/bb/archive.info-cyrus
If you are not subscribed to the list (or you are sending the message
from a different address than the one which you are subscribed under),
@@ -24,5 +24,5 @@
archive location
Detailed contact information can be found at
- http://cyrusimap.web.cmu.edu/lists.html
+ http://www.cyrusimap.org/mediawiki/index.php/Cyrus_Mailing_Lists
diff -Naur cyrus-imapd-2.4.4.orig/imap/version.c cyrus-imapd-2.4.4/imap/version.c
--- cyrus-imapd-2.4.4.orig/imap/version.c 2010-11-11 23:15:33.000000000 +0100
+++ cyrus-imapd-2.4.4/imap/version.c 2010-11-23 07:20:29.000000000 +0100
@@ -117,7 +117,7 @@
"\"name\" \"Cyrus IMAPD\""
" \"version\" \"%s %s\""
" \"vendor\" \"Project Cyrus\""
- " \"support-url\" \"http://cyrusimap.web.cmu.edu\"";,
+ " \"support-url\" \"http://www.cyrusimap.org/\"";,
CYRUS_VERSION, CYRUS_GITVERSION);
/* add the os info */
diff -Naur cyrus-imapd-2.4.4.orig/README cyrus-imapd-2.4.4/README
--- cyrus-imapd-2.4.4.orig/README 2010-11-11 23:15:33.000000000 +0100
+++ cyrus-imapd-2.4.4/README 2010-11-23 07:19:47.000000000 +0100
@@ -26,7 +26,7 @@
read doc/readme.html first!).
* To obtain updates to this software, visit the web page
- http://cyrusimap.web.cmu.edu/downloads.html
+ http://www.cyrusimap.org/mediawiki/index.php/Downloads
or ftp directly from
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail
----
Cyrus Home Page: http://www.cyrusimap.org/
List Archives/Info: http://lists.andrew.cmu.edu/pipermail/info-cyrus/
