11 files changed, 53 insertions, 45 deletions
diff --git a/ChangeLog b/ChangeLog
index 809c648b6..4bb1855a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-22  Peter Stephenson  <pws@csr.com>
+
+	* unposted, c.f. 27313: INSTALL, NEWS, README, Doc/Zsh/contrib.yo,
+	Doc/Zsh/manual.yo, Doc/Zsh/metafaq.yo, Etc/CONTRIBUTORS,
+	Etc/FAQ.yo, Etc/changelog2html.pl,
+	Functions/Zle/history-beginning-search-menu,
+	Functions/Zle/insert-composed-char: mailing lists moved
+	to zsh.org and website to zsh.sourceforge.net.
+
 2009-10-18  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* Mikael: 27312: Completion/Unix/Command/_valgrind: option
@@ -12256,5 +12265,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4793 $
+* $Revision: 1.4794 $
 *****************************************************
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index 858128ab8..b7dd4a709 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -1265,7 +1265,7 @@ The set of accented characters is reasonably complete up to Unicode
 character U+0180, the set of special characters less so.  However, it it
 is very sporadic from that point.  Adding new characters is easy,
 however; see the function tt(define-composed-chars).  Please send any
-additions to tt(zsh-workers@sunsite.dk).
+additions to tt(zsh-workers@zsh.org).
 
 The codes for the second character when used to accent the first are as
 follows.  Note that not every character can take every accent.
diff --git a/Doc/Zsh/manual.yo b/Doc/Zsh/manual.yo
index f248e70d8..8d2531b07 100644
--- a/Doc/Zsh/manual.yo
+++ b/Doc/Zsh/manual.yo
@@ -184,7 +184,7 @@ produce a nicely formatted printed manual.
 item(The HTML manual)(
 An HTML version of this manual is available at the Zsh web site via:
 
-tt(http://zsh.sunsite.dk/Doc/).
+tt(http://zsh.sunsite.org/Doc/).
 
 (The HTML version is produced with bf(texi2html), which may be obtained
 from tt(http://www.nongnu.org/texi2html/). The command is
diff --git a/Doc/Zsh/metafaq.yo b/Doc/Zsh/metafaq.yo
index a3f5e9a0e..fa856a9d5 100644
--- a/Doc/Zsh/metafaq.yo
+++ b/Doc/Zsh/metafaq.yo
@@ -12,7 +12,7 @@ sect(Author)
 cindex(author)
 Zsh was originally written by Paul Falstad tt(<pf@zsh.org>).
 Zsh is now maintained by the members of the zsh-workers mailing
-list tt(<zsh-workers@sunsite.dk>).  The development is currently
+list tt(<zsh-workers@zsh.org>).  The development is currently
 coordinated by Peter Stephenson tt(<pws@zsh.org>).  The coordinator
 can be contacted at tt(<coordinator@zsh.org>), but matters relating to
 the code should generally go to the mailing list.
@@ -97,14 +97,14 @@ cindex(mailing lists)
 Zsh has 3 mailing lists:
 
 startitem()
-item(tt(<zsh-announce@sunsite.dk>))(
+item(tt(<zsh-announce@zsh.org>))(
 Announcements about releases, major changes in the shell and the
 monthly posting of the Zsh FAQ.  (moderated)
 )
-item(tt(<zsh-users@sunsite.dk>))(
+item(tt(<zsh-users@zsh.org>))(
 User discussions.
 )
-item(tt(<zsh-workers@sunsite.dk>))(
+item(tt(<zsh-workers@zsh.org>))(
 Hacking, development, bug reports and patches.
 )
 enditem()
@@ -113,13 +113,13 @@ To subscribe or unsubscribe, send mail
 to the associated administrative address for the mailing list.
 
 startlist()
-list(tt(<zsh-announce-subscribe@sunsite.dk>))
-list(tt(<zsh-users-subscribe@sunsite.dk>))
-list(tt(<zsh-workers-subscribe@sunsite.dk>))
+list(tt(<zsh-announce-subscribe@zsh.org>))
+list(tt(<zsh-users-subscribe@zsh.org>))
+list(tt(<zsh-workers-subscribe@zsh.org>))
 
-list(tt(<zsh-announce-unsubscribe@sunsite.dk>))
-list(tt(<zsh-users-unsubscribe@sunsite.dk>))
-list(tt(<zsh-workers-unsubscribe@sunsite.dk>))
+list(tt(<zsh-announce-unsubscribe@zsh.org>))
+list(tt(<zsh-users-unsubscribe@zsh.org>))
+list(tt(<zsh-workers-unsubscribe@zsh.org>))
 endlist()
 
 YOU ONLY NEED TO JOIN ONE OF THE MAILING LISTS AS THEY ARE NESTED.
@@ -154,7 +154,7 @@ A userguide is currently in preparation.  It is intended to complement the
 manual, with explanations and hints on issues where the manual can be
 cabbalistic, hierographic, or downright mystifying (for example, the word
 `hierographic' does not exist).  It can be viewed in its current state at
-tt(http://zsh.sunsite.dk/Guide/).  At the time of writing, chapters
+tt(http://zsh.sourceforge.net/Guide/).  At the time of writing, chapters
 dealing with startup files and their contents and the new completion system
 were essentially complete.
 sect(The Zsh Wiki)
diff --git a/Etc/CONTRIBUTORS b/Etc/CONTRIBUTORS
index 72d798511..7cb1b5580 100644
--- a/Etc/CONTRIBUTORS
+++ b/Etc/CONTRIBUTORS
@@ -4,7 +4,7 @@ ZSH CONTRIBUTORS
 
 Zsh was originally written by Paul Falstad <pf@zsh.org>.  Zsh is
 now maintained by the members of the zsh-workers mailing list
-<zsh-workers@sunsite.dk>.  The development is currently coordinated
+<zsh-workers@zsh.org>.  The development is currently coordinated
 by Peter Stephenson <pws@zsh.org>.
 
 This file credits only the major contributors to the current release.
@@ -13,7 +13,7 @@ patches.  Note that email addresses below and in the ChangeLog file
 are included for disambiguation purposes only, and are not guaranteed
 to be currently accurate.  If you feel that you or someone else have
 been unfairly omitted from this list please mail the list
-<zsh-workers@sunsite.dk>.
+<zsh-workers@zsh.org>.
 
 Version 4.3
 -----------
diff --git a/Etc/FAQ.yo b/Etc/FAQ.yo
index cac842eed..294b88372 100644
--- a/Etc/FAQ.yo
+++ b/Etc/FAQ.yo
@@ -151,21 +151,20 @@ sect(Sources of information)
 label(11)
 
   Information on zsh is available via the World Wide Web.  The URL
-  is url(http://sunsite.dk/zsh/)(http://sunsite.dk/zsh/) .
+  is url(http://zsh.sourceforge.net/)(http://zsh.sourceforge.net/) .
   The server provides this FAQ and much else and is
-  now maintained by Karsten Thygesen and others (mail \
-  email(zsh@sunsite.dk)
-  with any related messages).  The FAQ is at \
-url(http://sunsite.dk/zsh/FAQ/)(http://sunsite.dk/zsh/FAQ/) .
+  now maintained by the zsh workers (email email(zsh-workers@zsh.org)).
+  The FAQ is at \
+url(http://zsh.sourceforge.net/FAQ/)(http://zsh.sourceforge.net/FAQ/) .
   The site also contains some contributed zsh scripts and functions;
   we are delighted to add more, or simply links to your own collection.
 
   This document was originally written in YODL, allowing it to be converted
   easily into various other formats.  The master source file lives at
-  url(http://sunsite.dk/zsh/FAQ/zshfaq.yo)
-(http://sunsite.dk/zsh/FAQ/zshfaq.yo) and the plain text version
-  can be found at url(http://sunsite.dk/zsh/FAQ/zshfaq.txt)
-(http://sunsite.dk/zsh/FAQ/zshfaq.txt) .
+  url(http://zsh.sourceforge.net/FAQ/zshfaq.yo)
+(http://zsh.sourceforge.net/FAQ/zshfaq.yo) and the plain text version
+  can be found at url(http://zsh.sourceforge.net/FAQ/zshfaq.txt)
+(http://zsh.sourceforge.net/FAQ/zshfaq.txt) .
 
   Another useful source of information is the collection of FAQ articles
   posted frequently to the Usenet news groups comp.unix.questions,
@@ -194,7 +193,7 @@ email(mail-server@rtfm.mit.edu)
   I have put together a user guide to complement the manual by
   explaining the most useful features of zsh in a more easy to read way.
   This can be found at the zsh web site:
-    url(http://zsh.sunsite.dk/Guide/)(http://zsh.sunsite.dk/Guide/)
+    url(http://zsh.sourceforge.net/Guide/)(http://zsh.sourceforge.net/Guide/)
 
   (As a method of reading the following in Emacs, you can type tt(\M-2
   \C-x $) to make all the indented text vanish, then tt(\M-0 \C-x $)
@@ -382,7 +381,7 @@ label(16)
   Win32 API, and a pre-compiled version of zsh can be downloaded by
   the Cygwin installer.  You can find information about this at
   url(http://www.cygwin.com/)(http://www.cygwin.com/).  Please email
-  email(zsh-workers@sunsite.dk) if you have information about other ports.
+  email(zsh-workers@zsh.org) if you have information about other ports.
 
   Starting from mid-October 1997, there is an archive of patches sent
   to the maintainers' mailing list.  Note that these may not all be
@@ -393,8 +392,8 @@ label(16)
   link(1.1)(11)) at:
 
   description(
-    mydit()        url(http://sunsite.dk/zsh/Patches/)
-(http://sunsite.dk/zsh/Patches/)
+    mydit()        url(http://zsh.sourceforge.net/Patches/)
+(http://zsh.sourceforge.net/Patches/)
   )
 
 sect(I don't have root access: how do I make zsh my login shell?)
@@ -2195,7 +2194,7 @@ label(52)
   The shell is being maintained by various (entirely self-appointed)
   subscribers to the mailing list,
   verb(
-    zsh-workers@sunsite.dk
+    zsh-workers@zsh.org
   )
   so mail on any issues (bug reports, suggestions, complaints...)
   related to the development of the shell should be sent there.  If
@@ -2215,12 +2214,12 @@ label(52)
   Two progressively lower volume lists exist, one with messages
   concerning the use of zsh,
   verb(
-    zsh-users@sunsite.dk
+    zsh-users@zsh.org
   )
   and one just containing announcements:  about releases, about major
   changes in the shell, or this FAQ, for example,
   verb(
-    zsh-announce@sunsite.dk
+    zsh-announce@zsh.org
   )
   (posting to the last one is currently restricted).
 
@@ -2234,15 +2233,15 @@ label(52)
 
   To join zsh-workers, send email to
   verb(
-    zsh-workers-subscribe@sunsite.dk
+    zsh-workers-subscribe@zsh.org
   )
   (the actual content is unimportant).  Replace tt(subscribe) with
   tt(unsubscribe) to unsubscribe.  The mailing software (tt(ezlm)) has
   various bells and whistles: you can retrieve archived messages.
-  Mail email(zsh-workers-help@sunsite.dk) for detailed information.
+  Mail email(zsh-workers-help@zsh.org) for detailed information.
   Adminstrative matters are best sent to
-  email(zsh-workers-owner@sunsite.dk).  The list maintainer's
-  real name is email(Karsten Thygesen <karthy@kom.auc.dk>).
+  email(zsh-workers-owner@zsh.org).
+  real name is email(Geoff Wing <gcw@zsh.org>).
   
   An archive of mailings for the last few years can be found at
     url(http://www.zsh.org/mla/)(http://www.zsh.org/mla/)
@@ -2290,9 +2289,9 @@ Thanks to zsh-list, in particular Bart Schaefer, for suggestions
 regarding this document.  Zsh has been in the hands of archivists Jim
 Mattson, Bas de Bakker, Richard Coleman, Zoltan Hidvegi and Andrew
 Main, and the mailing list has been run by Peter Gray, Rick Ohnemus,
-Richard Coleman and Karsten Thygesen, all of whom deserve thanks.  The
-world is eternally in the debt of Paul Falstad for inventing zsh in
-the first place (though the wizzo extended completion is by Sven
+Richard Coleman, Karsten Thygesen and Geoff Wing, all of whom deserve
+thanks.  The world is eternally in the debt of Paul Falstad for inventing
+zsh in the first place (though the wizzo extended completion is by Sven
 Wischnowsky).
 
 
@@ -2309,4 +2308,4 @@ notice appears in all copies of this documentation.  Remember,
 however, that this document changes monthly and it may be more useful
 to provide a pointer to it rather than the entire text.  A suitable
 pointer is "information on the Z-shell can be obtained on the World
-Wide Web at URL http://sunsite.dk/zsh/".
+Wide Web at URL http://zsh.sourceforge.net/".
diff --git a/Etc/changelog2html.pl b/Etc/changelog2html.pl
index ec7c29a6f..82416bff9 100755
--- a/Etc/changelog2html.pl
+++ b/Etc/changelog2html.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 # This programme turns the ChangeLog into changelog.html for display
-# on the website.  That lives at http://zsh.sunsite.dk/Etc/changelog.html.
+# on the website.  That lives at http://zsh.sourceforge.net/Etc/changelog.html.
 
 my $out = "changelog.html";
 
diff --git a/Functions/Zle/insert-composed-char b/Functions/Zle/insert-composed-char
index 7978a7589..b218538f9 100644
--- a/Functions/Zle/insert-composed-char
+++ b/Functions/Zle/insert-composed-char
@@ -20,7 +20,7 @@
 # The set of accented characters is reasonably complete up to U+0180, the
 # set of special characters less so.  However, it mostly gives up at that
 # point.  Adding new Unicode characters is easy, however.  Please send any
-# additions to zsh-workers@sunsite.dk .
+# additions to zsh-workers@zsh.org .
 #
 # Some of the accent codes are a little more obscure than others.
 #  !   Grave
diff --git a/INSTALL b/INSTALL
index 19d788871..a5f1d5b6e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -338,7 +338,7 @@ module; depending on the configuration, the main shell may not require the
 additional functions.  As the integration of wide character support into
 ncurses is continuing, it is possible that on some systems attempting to
 use ncursesw may cause problems during building.  If so, please report this
-to the developers at zsh-workers@sunsite.dk and attempt to recompile with
+to the developers at zsh-workers@zsh.org and attempt to recompile with
 --with-term-lib="tinfo termcap ncurses curses" (see below).
 
 Note that use of ncurses requires the header ncurses.h, so this
diff --git a/NEWS b/NEWS
index b26617a60..2a85bc36a 100644
--- a/NEWS
+++ b/NEWS
@@ -405,7 +405,7 @@ Further enhancements to new completion system:
    styles
  - compctl library separated out (frozen but still supported)
  - User-friendly introduction available at zsh website
-   http://sunsite.auc.dk/zsh/
+   http://zsh.sourceforge.net/
 
 Additions to complist listing library (coloured completion and menu
 selection):
diff --git a/README b/README
index 796b5443b..f30b037f6 100644
--- a/README
+++ b/README
@@ -290,7 +290,7 @@ Zsh Maintenance and Bug Reports
 
 Zsh is currently maintained by the members of the zsh-workers mailing list
 and coordinated by Peter Stephenson <coordinator@zsh.org>.  Please send
-any feedback and bugs reports to <zsh-workers@sunsite.dk>.
+any feedback and bugs reports to <zsh-workers@zsh.org>.
 
 Reports are most helpful if you can reproduce the bug starting zsh with
 the -f option.  This skips the execution of local startup files except