Merge of trunk revisions 1.1{6,7,8}.

1 files changed, 41 insertions, 28 deletions

diff --git a/Doc/Zsh/metafaq.yo b/Doc/Zsh/metafaq.yo
index 8dc003090..a3f5e9a0e 100644
--- a/Doc/Zsh/metafaq.yo
+++ b/Doc/Zsh/metafaq.yo
@@ -4,6 +4,7 @@ menu(Availability)
 menu(Mailing Lists)
 menu(The Zsh FAQ)
 menu(The Zsh Web Page)
+menu(The Zsh Userguide)
 menu(See Also)
 endmenu()
 texinode(Author)(Availability)()(Introduction)
@@ -11,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.auc.dk>).  The development is currently
+list tt(<zsh-workers@sunsite.dk>).  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.
@@ -31,18 +32,14 @@ tt(http://www.zsh.org/pub/zsh/))
 )
 item(Australia)(
 nofill(tt(ftp://ftp.zsh.org/pub/zsh/)
-tt(http://www.zsh.org/pub/zsh/)
-tt(ftp://ftp.ips.gov.au/pub/packages/zsh/)  em((H)))
+tt(http://www.zsh.org/pub/zsh/))
 )
 item(Denmark)(
-nofill(tt(ftp://sunsite.auc.dk/pub/unix/shells/zsh/))
+nofill(tt(ftp://sunsite.dk/pub/unix/shells/zsh/))
 )
 item(Finland)(
 nofill(tt(ftp://ftp.funet.fi/pub/unix/shells/zsh/))
 )
-item(France)(
-nofill(tt(ftp://ftp.cenatls.cena.dgac.fr/pub/shells/zsh/))
-)
 item(Germany)(
 nofill(tt(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/)  em((H))
 tt(ftp://ftp.gmd.de/packages/zsh/)
@@ -54,15 +51,17 @@ tt(http://www.cs.elte.hu/pub/zsh/)
 tt(ftp://ftp.kfki.hu/pub/packages/zsh/))
 )
 item(Israel)(
-nofill(tt(ftp://ftp.math.technion.ac.il/mirror/ftp.zsh.org/pub/zsh/)
-tt(http://www.math.technion.ac.il/mirror/ftp.zsh.org/pub/zsh/))
-)
-item(Italy)(
-nofill(tt(ftp://ftp.unina.it/pub/Unix/pkgs/shell/zsh/))
+nofill(tt(ftp://ftp.math.technion.ac.il/pub/zsh/)
+tt(http://www.math.technion.ac.il/pub/zsh/))
 )
 item(Japan)(
-nofill(tt(ftp://ftp.nisiq.net/pub/shells/zsh/)  em((H))
-tt(ftp://ftp.win.ne.jp/pub/shell/zsh/))
+nofill(tt(ftp://ftp.win.ne.jp/pub/shell/zsh/))
+)
+item(Korea)(
+nofill(tt(ftp://linux.sarang.net/mirror/system/shell/zsh/))
+)
+item(Netherlands)(
+nofill(tt(ftp://ftp.demon.nl/pub/mirrors/zsh/))
 )
 item(Norway)(
 nofill(tt(ftp://ftp.uit.no/pub/unix/shells/zsh/))
@@ -85,26 +84,27 @@ nofill(tt(ftp://ftp.net.lut.ac.uk/zsh/)
 tt(ftp://sunsite.org.uk/packages/zsh/))
 )
 item(USA)(
-nofill(tt(ftp://uiarchive.uiuc.edu/pub/packages/shells/zsh/)
-tt(ftp://ftp.rge.com/pub/shells/zsh/)
-tt(ftp://foad.org/pub/zsh/)
-tt(http://foad.org/zsh/))
+nofill(tt(http://zsh.open-mirror.com/))
 )
 enditem()
+
+The up-to-date source code is available via anonymous CVS from Sourceforge.
+See tt(http://sourceforge.net/projects/zsh/) for details.
+
 texinode(Mailing Lists)(The Zsh FAQ)(Availability)(Introduction)
 sect(Mailing Lists)
 cindex(mailing lists)
 Zsh has 3 mailing lists:
 
 startitem()
-item(tt(<zsh-announce@sunsite.auc.dk>))(
+item(tt(<zsh-announce@sunsite.dk>))(
 Announcements about releases, major changes in the shell and the
 monthly posting of the Zsh FAQ.  (moderated)
 )
-item(tt(<zsh-users@sunsite.auc.dk>))(
+item(tt(<zsh-users@sunsite.dk>))(
 User discussions.
 )
-item(tt(<zsh-workers@sunsite.auc.dk>))(
+item(tt(<zsh-workers@sunsite.dk>))(
 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.auc.dk>))
-list(tt(<zsh-users-subscribe@sunsite.auc.dk>))
-list(tt(<zsh-workers-subscribe@sunsite.auc.dk>))
+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-unsubscribe@sunsite.auc.dk>))
-list(tt(<zsh-users-unsubscribe@sunsite.auc.dk>))
-list(tt(<zsh-workers-unsubscribe@sunsite.auc.dk>))
+list(tt(<zsh-announce-unsubscribe@sunsite.dk>))
+list(tt(<zsh-users-unsubscribe@sunsite.dk>))
+list(tt(<zsh-workers-unsubscribe@sunsite.dk>))
 endlist()
 
 YOU ONLY NEED TO JOIN ONE OF THE MAILING LISTS AS THEY ARE NESTED.
@@ -143,8 +143,21 @@ newsgroup bf(comp.unix.shell) and the bf(zsh-announce) mailing list.
 The latest version can be found at any of the Zsh FTP sites, or at
 tt(http://www.zsh.org/FAQ/).  The contact address for FAQ-related matters
 is tt(<faqmaster@zsh.org>).
-texinode(The Zsh Web Page)(See Also)(The Zsh FAQ)(Introduction)
+texinode(The Zsh Web Page)(The Zsh Userguide)(The Zsh FAQ)(Introduction)
 sect(The Zsh Web Page)
 Zsh has a web page which is located at tt(http://www.zsh.org/).  This is
 maintained by Karsten Thygesen tt(<karthy@zsh.org>), of SunSITE Denmark.
 The contact address for web-related matters is tt(<webmaster@zsh.org>).
+texinode(The Zsh Userguide)(See Also)(The Zsh Web Page)(Introduction)
+sect(The Zsh Userguide)
+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
+dealing with startup files and their contents and the new completion system
+were essentially complete.
+sect(The Zsh Wiki)
+A `wiki' website for zsh has been created at tt(http://www.zshwiki.org/).
+This is a site which can be added to and modified directly by users without
+any special permission.  You can add your own zsh tips and configurations.