diff -r fa97295ee307 -r 7b3e8b8d392e config/global/download.in
--- a/config/global/download.in	Fri Oct 31 12:46:59 2008 +0000
+++ b/config/global/download.in	Fri Oct 31 18:27:27 2008 +0000
@@ -156,7 +156,7 @@
     default "socks4"    if PROXY_TYPE_SOCKS_4
     default "socks5"    if PROXY_TYPE_SOCKS_5
 
-menuconfig USE_LAN_MIRROR
+menuconfig USE_MIRROR
     bool
     prompt "Use LAN mirror"
     default n
@@ -171,46 +171,54 @@
       Obviously, nothing prevents you from using a mirror that is in fact
       *not* on your LAN, for example on another subnet of your company's
       network, or a mirror on the Internet.
+      
+      I (Yann E. MORIN) have set up such a mirror to host snapshots of
+      some components, when those snapshots are volatile on the upstream
+      servers. The mirror is *slow*, because it is hosted behind an ADSL
+      line. For the time being, I haven't set up bandwidth limitations,
+      but should the mirror be abused, I will. Please avoid using my
+      machine when you can...
+      The mirror is available as (fill in those values in the fields
+      below):
+        host name: ymorin.is-a-geek.org
+        base dir : /mirrors
 
-if USE_LAN_MIRROR
+if USE_MIRROR
 
-config LAN_MIRROR_USE_PROXY
+config PREFER_MIRROR
     bool
-    prompt "Use the proxy"
+    prompt "Prefer the LAN mirror"
     default n
-    depends on USE_PROXY
     help
-      Say 'Y' here if you need to use the proxy to connect to the LAN mirror.
-      
-      You'll need to say 'Y' if the LAN mirror is not really on your LAN.
+      Say 'Y' here if you prefer the LAN miror over the upstream sources.
 
 choice
     bool
     prompt "Server type:"
 
-config LAN_MIRROR_HTTP
+config MIRROR_HTTP
     bool
     prompt "http"
 
-config LAN_MIRROR_FTP
+config MIRROR_FTP
     bool
     prompt "ftp"
 
 endchoice # Server type
 
-config LAN_MIRROR_SCHEME
+config MIRROR_SCHEME
     string
-    default "http"  if LAN_MIRROR_HTTP
-    default "ftp"   if LAN_MIRROR_FTP
+    default "http"  if MIRROR_HTTP
+    default "ftp"   if MIRROR_FTP
 
-config LAN_MIRROR_HOSTNAME
+config MIRROR_HOSTNAME
     string
     prompt "hostname"
     default ""
     help
       Enter here the hostname on your LAN mirror.
 
-config LAN_MIRROR_BASE
+config MIRROR_BASE
     string
     prompt "Base directory"
     default ""
@@ -223,7 +231,7 @@
       
       where <name> is replaced with the actual package name.
 
-config LAN_MIRROR_LS_R
+config MIRROR_LS_R
     bool
 #    prompt "Use ls-lR et al."
     depends on EXPERIMENTAL
@@ -238,7 +246,7 @@
         find.txt        (ditto)
         ls-lR
 
-endif # USE_LAN_MIRROR
+endif # USE_MIRROR
 
 config CONNECT_TIMEOUT
     int