diff -r 546d2ed3410b -r 6fe8df60cfa4 config/global/download.in
--- a/config/global/download.in	Sun Apr 19 16:34:59 2009 +0000
+++ b/config/global/download.in	Sun Apr 19 16:58:21 2009 +0000
@@ -42,65 +42,33 @@
       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.
+
+if USE_MIRROR
+
+config PREFER_MIRROR
+    bool
+    prompt "Prefer the mirror"
+    default n
+    help
+      Say 'Y' here if you prefer the LAN miror over the upstream sources.
+
+config MIRROR_BASE_URL
+    string
+    prompt "Base URL"
+    default ""
+    help
+      This is the base URL searched in for tarballs.
       
       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_MIRROR
-
-config PREFER_MIRROR
-    bool
-    prompt "Prefer the LAN mirror"
-    default n
-    help
-      Say 'Y' here if you prefer the LAN miror over the upstream sources.
-
-choice
-    bool
-    prompt "Server type:"
-
-config MIRROR_HTTP
-    bool
-    prompt "http"
-
-config MIRROR_FTP
-    bool
-    prompt "ftp"
-
-endchoice # Server type
-
-config MIRROR_SCHEME
-    string
-    default "http"  if MIRROR_HTTP
-    default "ftp"   if MIRROR_FTP
-
-config MIRROR_HOSTNAME
-    string
-    prompt "hostname"
-    default ""
-    help
-      Enter here the hostname on your LAN mirror.
-
-config MIRROR_BASE
-    string
-    prompt "Base directory"
-    default ""
-    help
-      This is the base directory searched for for tarballs. If you enter
-      /mirror, then the search is performed in the following directories
-      on the server:
-        /mirror/<name>/
-        /mirror/
+      machine when you can... Also, no guarantee is made as to its
+      availability. Use at your own risks.
       
-      where <name> is replaced with the actual package name.
+      The mirror is available at:
+        http://ymorin.is-a-geek.org/mirrors/
 
 config MIRROR_LS_R
     bool