(webjump-sample-sites): Update URLs.

1 files changed, 152 insertions, 72 deletions

diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index fc7b23ae1ba..4a3baea4f41 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -72,104 +72,184 @@
 
 (defvar webjump-sample-sites
   '(
-
     ;; FSF, not including Emacs-specific.
     ("GNU Project FTP Archive" .
+     ;; GNU FTP Mirror List from http://www.gnu.org/order/ftp.html
      [mirrors "ftp://ftp.gnu.org/pub/gnu/"
-              ;; ASIA:
-              "ftp://ftp.cs.titech.ac.jp"
-              "ftp://tron.um.u-tokyo.ac.jp/pub/GNU/prep"
-              "ftp://cair-archive.kaist.ac.kr/pub/gnu"
-              "ftp://ftp.nectec.or.th/pub/mirrors/gnu"
-              ;; AUSTRALIA:
-              "ftp://archie.au/gnu"
-              "ftp://archie.oz/gnu"
-              "ftp://archie.oz.au/gnu"
-              ;; AFRICA:
-              "ftp://ftp.sun.ac.za/pub/gnu"
-              ;; MIDDLE-EAST:
-              "ftp://ftp.technion.ac.il/pub/unsupported/gnu"
-              ;; EUROPE:
-              "ftp://irisa.irisa.fr/pub/gnu"
-              "ftp://ftp.univ-lyon1.fr/pub/gnu"
-              "ftp://ftp.mcc.ac.uk"
-              "ftp://unix.hensa.ac.uk/mirrors/uunet/systems/gnu"
-              "ftp://src.doc.ic.ac.uk/gnu"
-              "ftp://ftp.ieunet.ie/pub/gnu"
-              "ftp://ftp.eunet.ch"
-              "ftp://nic.switch.ch/mirror/gnu"
-              "ftp://ftp.informatik.rwth-aachen.de/pub/gnu"
-              "ftp://ftp.informatik.tu-muenchen.de"
+              ;; United States
+              "ftp://mirrors.kernel.org/gnu"
+              "ftp://gatekeeper.dec.com/pub/GNU/"
+              "ftp://ftp.keystealth.org/pub/gnu/"
+              "ftp://mirrors.usc.edu/pub/gnu/"
+              "ftp://cudlug.cudenver.edu/pub/mirrors/ftp.gnu.org/"
+              "ftp://ftp.cise.ufl.edu/pub/mirrors/GNU/"
+              "ftp://uiarchive.cso.uiuc.edu/pub/ftp/ftp.gnu.org/gnu/"
+              "ftp://gnu.cs.lewisu.edu/gnu/"
+              "ftp://ftp.in-span.net/pub/mirrors/ftp.gnu.org/"
+              "ftp://gnu.ms.uky.edu/pub/mirrors/gnu/"
+              "ftp://ftp.algx.net/pub/gnu/"
+              "ftp://aeneas.mit.edu/pub/gnu/"
+              "ftp://ftp.egr.msu.edu/pub/gnu/"
+              "ftp://ftp.wayne.edu/pub/gnu/"
+              "ftp://wuarchive.wustl.edu/mirrors/gnu/"
+              "ftp://gnu.teleglobe.net/ftp.gnu.org/"
+              "ftp://ftp.cs.columbia.edu/archives/gnu/prep/"
+              "ftp://ftp.ece.cornell.edu/pub/mirrors/gnu/"
+              "ftp://ftp.ibiblio.org/pub/mirrors/gnu/"
+              "ftp://ftp.cis.ohio-state.edu/mirror/gnu/"
+              "ftp://ftp.club.cc.cmu.edu/gnu/"
+              "ftp://ftp.sunsite.utk.edu/pub/gnu/ftp/"
+              "ftp://thales.memphis.edu/pub/gnu/"
+              "ftp://gnu.wwc.edu"
+              "ftp://ftp.twtelecom.net/pub/GNU/"
+              ;; Africa
+              "ftp://ftp.sun.ac.za/mirrorsites/ftp.gnu.org"
+              ;; The Americas
+              "ftp://ftp.unicamp.br/pub/gnu/"
+              "ftp://master.softaplic.com.br/pub/gnu/"
+              "ftp://ftp.matrix.com.br/pub/gnu/"
+              "ftp://ftp.pucpr.br/gnu"
+              "ftp://ftp.linorg.usp.br/gnu"
+              "ftp://ftp.cs.ubc.ca/mirror2/gnu/"
+              "ftp://cs.ubishops.ca/pub/ftp.gnu.org/"
+              "ftp://ftp.inf.utfsm.cl/pub/gnu/"
+              "ftp://sunsite.ulatina.ac.cr/Mirrors/GNU/"
+              "ftp://www.gnu.unam.mx/pub/gnu/software/"
+              "ftp://gnu.cem.itesm.mx/pub/mirrors/gnu.org/"
+              "ftp://ftp.azc.uam.mx/mirrors/gnu/"
+              ;; Australia
+              "ftp://mirror.aarnet.edu.au/pub/gnu/"
+              "ftp://gnu.mirror.pacific.net.au/gnu/"
+              ;; Asia
+              "ftp://ftp.cs.cuhk.edu.hk/pub/gnu/gnu/"
+              "ftp://sunsite.ust.hk/pub/gnu/"
+              "ftp://ftp.gnupilgrims.org/pub/gnu"
+              "ftp://www.imtech.res.in/mirror/gnuftp/"
+              "ftp://kambing.vlsm.org/gnu"
+              "ftp://ftp.cs.huji.ac.il/mirror/GNU/"
+              "ftp://tron.um.u-tokyo.ac.jp/pub/GNU/"
+              "ftp://core.ring.gr.jp/pub/GNU/"
+              "ftp://ftp.ring.gr.jp/pub/GNU/"
+              "ftp://mirrors.hbi.co.jp/gnu/"
+              "ftp://ftp.cs.titech.ac.jp/pub/gnu/"
+              "ftp://ftpmirror.hanyang.ac.kr/GNU/"
+              "ftp://ftp.linux.sarang.net/mirror/gnu/gnu/"
+              "ftp://ftp.xgate.co.kr/pub/mirror/gnu/"
+              "ftp://ftp://gnu.xinicks.com/"
+              "ftp://ftp.isu.net.sa/pub/gnu/"
+              "ftp://ftp.nctu.edu.tw/UNIX/gnu/"
+              "ftp://coda.nctu.edu.tw/UNIX/gnu/"
+              "ftp://ftp1.sinica.edu.tw/pub3/GNU/gnu/"
+              "ftp://gnu.cdpa.nsysu.edu.tw/gnu"
+              "ftp://ftp.nectec.or.th/pub/mirrors/gnu/"
+              ;; Europe
+              "ftp://ftp.gnu.vbs.at/"
+              "ftp://ftp.univie.ac.at/packages/gnu/"
+              "ftp://gd.tuwien.ac.at/gnu/gnusrc/"
+              "ftp://ftp.belnet.be/mirror/ftp.gnu.org/"
+              "ftp://gnu.blic.net/pub/gnu/"
+              "ftp://ftp.fi.muni.cz/pub/gnu/"
+              "ftp://ftp.dkuug.dk/pub/gnu/"
+              "ftp://sunsite.dk/mirrors/gnu"
+              "ftp://ftp.funet.fi/pub/gnu/prep/"
+              "ftp://ftp.irisa.fr/pub/gnu/"
+              "ftp://ftp.cs.univ-paris8.fr/mirrors/ftp.gnu.org/"
+              "ftp://ftp.cs.tu-berlin.de/pub/gnu/"
+              "ftp://ftp.leo.org/pub/comp/os/unix/gnu/"
+              "ftp://ftp.informatik.rwth-aachen.de/pub/gnu/"
+              "ftp://ftp.de.uu.net/pub/gnu/"
+              "ftp://ftp.freenet.de/pub/ftp.gnu.org/gnu/"
+              "ftp://ftp.cs.uni-bonn.de/pub/gnu/"
+              "ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/"
+              "ftp://ftp.stw-bonn.de/pub/mirror/ftp.gnu.org/"
+              "ftp://ftp.math.uni-bremen.de/pub/gnu"
+              "ftp://ftp.forthnet.gr/pub/gnu/"
+              "ftp://ftp.ntua.gr/pub/gnu/"
+              "ftp://ftp.duth.gr/pub/gnu/"
+              "ftp://ftp.physics.auth.gr/pub/gnu/"
+              "ftp://ftp.esat.net/pub/gnu/"
+              "ftp://ftp.heanet.ie/mirrors/ftp.gnu.org"
+              "ftp://ftp.lugroma2.org/pub/gnu/"
+              "ftp://ftp.gnu.inetcosmos.org/pub/gnu/"
+              "ftp://ftp.digitaltrust.it/pub/gnu"
+              "ftp://ftp://rm.mirror.garr.it/mirrors/gnuftp"
+              "ftp://ftp.nluug.nl/pub/gnu/"
+              "ftp://ftp.mirror.nl/pub/mirror/gnu/"
+              "ftp://ftp.nl.uu.net/pub/gnu/"
+              "ftp://mirror.widexs.nl/pub/gnu/"
+              "ftp://ftp.easynet.nl/mirror/GNU/"
               "ftp://ftp.win.tue.nl/pub/gnu"
-              "ftp://ftp.nl.net"
-              "ftp://ftp.etsimo.uniovi.es/pub/gnu"
-              "ftp://ftp.funet.fi/pub/gnu"
-              "ftp://ftp.denet.dk"
-              "ftp://ftp.stacken.kth.se"
-              "ftp://isy.liu.se"
-              "ftp://ftp.luth.se/pub/unix/gnu"
-              "ftp://ftp.sunet.se/pub/gnu"
-              "ftp://archive.eu.net"
-              ;; SOUTH AMERICA:
-              "ftp://ftp.inf.utfsm.cl/pub/gnu"
-              "ftp://ftp.unicamp.br/pub/gnu"
-              ;; WESTERN CANADA:
-              "ftp://ftp.cs.ubc.ca/mirror2/gnu"
-              ;; USA:
-              "ftp://wuarchive.wustl.edu/systems/gnu"
-              "ftp://labrea.stanford.edu"
-              "ftp://ftp.digex.net/pub/gnu"
-              "ftp://ftp.kpc.com/pub/mirror/gnu"
-              "ftp://f.ms.uky.edu/pub3/gnu"
-              "ftp://jaguar.utah.edu/gnustuff"
-              "ftp://ftp.hawaii.edu/mirrors/gnu"
-              "ftp://uiarchive.cso.uiuc.edu/pub/gnu"
-              "ftp://ftp.cs.columbia.edu/archives/gnu/prep"
-              "ftp://gatekeeper.dec.com/pub/GNU"
-              "ftp://ftp.uu.net/systems/gnu"])
+              "ftp://gnu.mirror.vuurwerk.net/pub/GNU/"
+              "ftp://gnu.kookel.org/pub/ftp.gnu.org/"
+              "ftp://ftp.uninett.no/pub/gnu/"
+              "ftp://ftp.task.gda.pl/pub/gnu/"
+              "ftp://sunsite.icm.edu.pl/pub/gnu/"
+              "ftp://ftp.man.poznan.pl/pub/gnu"
+              "ftp://ftp.ist.utl.pt/pub/GNU/gnu/"
+              "ftp://ftp.telepac.pt/pub/gnu/"
+              "ftp://ftp.timisoara.roedu.net/mirrors/ftp.gnu.org/pub/gnu"
+              "ftp://ftp.chg.ru/pub/gnu/"
+              "ftp://gnuftp.axitel.ru/"
+              "ftp://ftp.arnes.si/software/gnu/"
+              "ftp://ftp.etsimo.uniovi.es/pub/gnu/"
+              "ftp://ftp.rediris.es/pub/gnu/"
+              "ftp://ftp.chl.chalmers.se/pub/gnu/"
+              "ftp://ftp.isy.liu.se/pub/gnu/"
+              "ftp://ftp.luth.se/pub/unix/gnu/"
+              "ftp://ftp.stacken.kth.se/pub/gnu/"
+              "ftp://ftp.sunet.se/pub/gnu/"
+              "ftp://sunsite.cnlab-switch.ch/mirror/gnu/"
+              "ftp://ftp.ulak.net.tr/gnu/"
+              "ftp://ftp.gnu.org.ua"
+              "ftp://ftp.mcc.ac.uk/pub/gnu/"
+              "ftp://ftp.mirror.ac.uk/sites/ftp.gnu.org/gnu/"
+              "ftp://ftp.warwick.ac.uk/pub/gnu/"
+              "ftp://ftp.hands.com/ftp.gnu.org/"
+              "ftp://gnu.teleglobe.net/ftp.gnu.org/"])
     ("GNU Project Home Page" . "www.gnu.org")
 
     ;; Emacs.
-    ("Emacs Lisp Archive" .
-     "ftp://ftp.emacs.org/pub/")
+    ("Emacs Home Page" .
+     "www.gnu.org/software/emacs/emacs.html")
+    ("Savannah Emacs page" .
+     "savannah.gnu.org/projects/emacs")
+    ("Emacs Lisp List" .
+     "www.damtp.cam.ac.uk/user/eglen/emacs/ell.html")
+    ("Emacs Wiki" .
+     [simple-query "www.emacswiki.org"
+		   "www.emacswiki.org/cgi-bin/wiki/" ""])
 
     ;; Internet search engines.
-    ("AltaVista" .
-     [simple-query
-      "www.altavista.digital.com"
-      "www.altavista.digital.com/cgi-bin/query?pg=aq&what=web&fmt=.&q="
-      "&r=&d0=&d1="])
-    ("Archie" .
-     [simple-query "hoohoo.ncsa.uiuc.edu/cgi-bin/AA.pl"
-		   "hoohoo.ncsa.uiuc.edu/cgi-bin/AA.pl?query=" ""])
-    ("Lycos" .
-     [simple-query "www.lycos.com"
-                   "www.lycos.com/cgi-bin/pursuit?cat=lycos&query=" ""])
+    ("Google" .
+     [simple-query "www.google.com"
+		   "www.google.com/search?q=" ""])
+    ("Google Groups" .
+     [simple-query "groups.google.com"
+		   "groups.google.com/groups?q=" ""])
     ("Yahoo" .
-     [simple-query "www.yahoo.com" "search.yahoo.com/bin/search?p=" ""])
+     [simple-query "www.yahoo.com" "search.yahoo.com/search?p=" ""])
+    ("Yahoo: Reference" . "www.yahoo.com/Reference/")
 
     ;; Misc. general interest.
     ("Interactive Weather Information Network" . webjump-to-iwin)
     ("Usenet FAQs" .
-     [simple-query "www.cis.ohio-state.edu/hypertext/faq/usenet/FAQ-List.html"
-		   "www.cis.ohio-state.edu/htbin/search-usenet-faqs/form?find="
-		   ""])
+     "www.faqs.org/faqs/")
     ("RTFM Usenet FAQs by Group" .
      "ftp://rtfm.mit.edu/pub/usenet-by-group/")
     ("RTFM Usenet FAQs by Hierachy" .
      "ftp://rtfm.mit.edu/pub/usenet-by-hierarchy/")
     ("X Consortium Archive" . "ftp.x.org")
-    ("Yahoo: Reference" . "www.yahoo.com/Reference/")
 
     ;; Computer social issues, privacy, professionalism.
     ("Association for Computing Machinery" . "www.acm.org")
-    ("Computer Professionals for Social Responsibility" . "www.cpsr.org/dox/")
+    ("Computer Professionals for Social Responsibility" . "www.cpsr.org")
     ("Electronic Frontier Foundation" . "www.eff.org")
     ("IEEE Computer Society" . "www.computer.org")
     ("Risks Digest" . webjump-to-risks)
 
-    ;; Fun.
-    ("Bastard Operator from Hell" . "www.replay.com/bofh/")
+    ;; More.
+    ("Supplemental Web site list for webjump" .
+     "www.neilvandyke.org/webjump/")
 
     )
   "Sample hotlist for WebJump.  See the documentation for the `webjump'