Simon Ruderich: 29004: update archive list

4 files changed, 24 insertions, 68 deletions

diff --git a/ChangeLog b/ChangeLog
index 7022783e5..e8caf4a6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-18  Peter Stephenson  <pws@csr.com>
+
+	* Simon Ruderich: 29004: M Doc/Zsh/compsys.yo,
+	Doc/Zsh/metafaq.yo, Etc/FAQ.yo: update archive list.
+
 2011-04-15  Wayne Davison  <wayned@users.sourceforge.net>
 
 	* Unposted: Src/Zle/computil.c: Fix compiler warning caused by
@@ -14466,5 +14471,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5250 $
+* $Revision: 1.5251 $
 *****************************************************
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 1eefbcdc8..0fdd6d017 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -2686,11 +2686,11 @@ descend as deep as necessary.
 For example, 
 
 example(zstyle ':completion:*' urls ~/.urls
-mkdir -p ~/.urls/ftp/ftp.zsh.org/pub/development
+mkdir -p ~/.urls/ftp/ftp.zsh.org/pub
 )
 
 allows completion of all the components of the URL
-tt(ftp://ftp.zsh.org/pub/development) after suitable commands such as
+tt(ftp://ftp.zsh.org/pub) after suitable commands such as
 `tt(netscape)' or `tt(lynx)'.  Note, however, that access methods and
 files are completed separately, so if the tt(hosts) style is set hosts
 can be completed without reference to the tt(urls) style.
diff --git a/Doc/Zsh/metafaq.yo b/Doc/Zsh/metafaq.yo
index 838c93815..de7edfeba 100644
--- a/Doc/Zsh/metafaq.yo
+++ b/Doc/Zsh/metafaq.yo
@@ -27,62 +27,31 @@ cindex(acquiring zsh by FTP)
 cindex(availability of zsh)
 startitem()
 item(Primary site)(
-nofill(tt(ftp://ftp.zsh.org/pub/zsh/)
-tt(http://www.zsh.org/pub/zsh/))
+nofill(tt(ftp://ftp.zsh.org/pub/)
+tt(http://www.zsh.org/pub/))
 )
 item(Australia)(
-nofill(tt(ftp://ftp.zsh.org/pub/zsh/)
-tt(http://www.zsh.org/pub/zsh/))
+nofill(tt(ftp://ftp.zsh.org/pub/)
+tt(http://www.zsh.org/pub/))
+)
+item(Denmark)(
+nofill(tt(ftp://mirrors.dotsrc.org/zsh/))
 )
 item(Finland)(
 nofill(tt(ftp://ftp.funet.fi/pub/unix/shells/zsh/))
 )
+item(France)(
+nofill(tt(ftp://nephtys.lip6.fr/pub/unix/shells/zsh/))
+)
 item(Germany)(
-nofill(tt(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/)  em((H))
-tt(ftp://ftp.gmd.de/packages/zsh/)
-tt(ftp://ftp.uni-trier.de/pub/unix/shell/zsh/))
+nofill(tt(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/))
 )
 item(Hungary)(
-nofill(tt(ftp://ftp.cs.elte.hu/pub/zsh/)
-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/pub/zsh/)
-tt(http://www.math.technion.ac.il/pub/zsh/))
-)
-item(Japan)(
-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/))
+nofill(tt(ftp://ftp.kfki.hu/pub/packages/zsh/))
 )
 item(Poland)(
 nofill(tt(ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/))
 )
-item(Romania)(
-nofill(tt(ftp://ftp.roedu.net/pub/mirrors/ftp.zsh.org/pub/zsh/)
-tt(ftp://ftp.kappa.ro/pub/mirrors/ftp.zsh.org/pub/zsh/))
-)
-item(Slovenia)(
-nofill(tt(ftp://ftp.siol.net/mirrors/zsh/))
-)
-item(Sweden)(
-nofill(tt(ftp://ftp.lysator.liu.se/pub/unix/zsh/))
-)
-item(UK)(
-nofill(tt(ftp://ftp.net.lut.ac.uk/zsh/)
-tt(ftp://sunsite.org.uk/packages/zsh/))
-)
-item(USA)(
-nofill(tt(http://zsh.open-mirror.com/))
-)
 enditem()
 
 The up-to-date source code is available via anonymous CVS and Git from
diff --git a/Etc/FAQ.yo b/Etc/FAQ.yo
index a74d62ac5..3663a68b8 100644
--- a/Etc/FAQ.yo
+++ b/Etc/FAQ.yo
@@ -335,9 +335,9 @@ label(16)
   url(http://www.zsh.org/)(http://www.zsh.org/) .
 
   description(
-    mydit(Home site) url(ftp://ftp.zsh.org/)(ftp://ftp.zsh.org/)
-    mydit()          (also url(http://www.zsh.org/pub/zsh/)
-(http://www.zsh.org/pub/zsh/))
+    mydit(Home site) url(ftp://ftp.zsh.org/pub/)(ftp://ftp.zsh.org/pub/)
+    mydit()          (also url(http://www.zsh.org/pub/)
+(http://www.zsh.org/pub/))
     mydit(Denmark)   url(ftp://mirrors.dotsrc.org/zsh/)
 (ftp://mirrors.dotsrc.org/zsh/)
     mydit()          (also url(http://mirrors.dotsrc.org/zsh/)
@@ -348,28 +348,10 @@ label(16)
 (ftp://nephtys.lip6.fr/pub/unix/shells/zsh/)
     mydit(Germany)   url(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/)
 (ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/)
-    mydit(Hungary)   url(ftp://ftp.cs.elte.hu/pub/zsh/)
-(ftp://ftp.cs.elte.hu/pub/zsh/)
-    mydit()          (also url(http://www.cs.elte.hu/pub/zsh/)
-(http://www.cs.elte.hu/pub/zsh/))
-    mydit()          url(ftp://ftp.kfki.hu/pub/packages/zsh/)
+    mydit(Hungary)   url(ftp://ftp.kfki.hu/pub/packages/zsh/)
 (ftp://ftp.kfki.hu/pub/packages/zsh/)
-    mydit(Israel)    url(ftp://ftp.math.technion.ac.il/pub/zsh/)
-(ftp://ftp.math.technion.ac.il/pub/zsh/)
-    mydit()          (also url(http://www.math.technion.ac.il/pub/zsh/)
-(http://www.math.technion.ac.il/pub/zsh/))
-    mydit(Netherlands) url(ftp://ftp.demon.nl/pub/mirrors/zsh/)
-(ftp://ftp.demon.nl/pub/mirrors/zsh/)
     mydit(Poland)    url(ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/)
 (ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/)
-    mydit(Romania)   url(ftp://ftp.kappa.ro/pub/mirrors/ftp.zsh.org/pub/zsh/)
-(ftp://ftp.kappa.ro/pub/mirrors/ftp.zsh.org/pub/zsh/)
-    mydit(Sweden)    url(ftp://ftp.lysator.liu.se/pub/unix/zsh/)
-(ftp://ftp.lysator.liu.se/pub/unix/zsh/)
-    mydit(UK)        url(ftp://sunsite.org.uk/packages/zsh/)
-(ftp://sunsite.org.uk/packages/zsh/)
-    mydit(USA)       url(http://zsh.open-mirror.com/)
-(http://zsh.open-mirror.com/)
   )
 
   A Windows port was created by Amol Deshpandem based on 3.0.5 (which