1 files changed, 170 insertions, 177 deletions

diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 1f55d5570..245ef6490 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -15,13 +15,6 @@
       'city' => 'Stellenbosch',
       'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
     ),
-    2 => 
-    array (
-      'zone' => 'ZA',
-      'country' => 'ZA',
-      'city' => 'Stellenbosch',
-      'url' => 'https://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
-    ),
   ),
   '_C:AS' => 
   array (
@@ -30,71 +23,71 @@
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Beijing',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
+      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     1 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+      'city' => 'Beijing',
+      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
     ),
     2 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
     ),
     3 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Nanjing',
-      'url' => 'http://mirrors.nju.edu.cn/mageia',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
     ),
     4 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
-      'city' => 'Nanjing',
-      'url' => 'https://mirrors.nju.edu.cn/mageia',
+      'city' => 'Shanghai',
+      'url' => 'http://ftp.sjtu.edu.cn/mageia',
     ),
     5 => 
     array (
       'zone' => 'CN',
       'country' => 'CN',
       'city' => 'Shanghai',
-      'url' => 'http://ftp.sjtu.edu.cn/mageia',
+      'url' => 'https://ftp.sjtu.edu.cn/mageia',
     ),
     6 => 
     array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'https://ftp.sjtu.edu.cn/mageia',
+      'zone' => 'IN',
+      'country' => 'IN',
+      'city' => 'Jaipur',
+      'url' => 'http://mirrors.nju.edu.cn/mageia',
     ),
     7 => 
     array (
+      'zone' => 'IN',
+      'country' => 'IN',
+      'city' => 'Jaipur',
+      'url' => 'https://mirrors.nju.edu.cn/mageia',
+    ),
+    8 => 
+    array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    8 => 
+    9 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    9 => 
-    array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'ftp://mirror.rise.ph/mageia',
-    ),
     10 => 
     array (
       'zone' => 'PH',
@@ -156,284 +149,284 @@
   array (
     0 => 
     array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Brussels',
+      'url' => 'http://ftp.belnet.be/mirror/mageia/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'BE',
+      'country' => 'BE',
+      'city' => 'Brussels',
+      'url' => 'https://ftp.belnet.be/mirror/mageia/mageia',
+    ),
+    2 => 
+    array (
+      'zone' => 'BG',
+      'country' => 'BG',
+      'city' => 'Sofia',
+      'url' => 'ftp://mirrors.neterra.net/mageia',
+    ),
+    3 => 
+    array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'ftp://mirrors.netix.net/mageia',
     ),
-    1 => 
+    4 => 
+    array (
+      'zone' => 'BG',
+      'country' => 'BG',
+      'city' => 'Sofia',
+      'url' => 'http://mirrors.neterra.net/mageia',
+    ),
+    5 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'http://mirrors.netix.net/mageia',
     ),
-    2 => 
+    6 => 
+    array (
+      'zone' => 'BG',
+      'country' => 'BG',
+      'city' => 'Sofia',
+      'url' => 'https://mirrors.neterra.net/mageia',
+    ),
+    7 => 
     array (
       'zone' => 'BG',
       'country' => 'BG',
       'city' => 'Sofia',
       'url' => 'https://mirrors.netix.net/mageia',
     ),
-    3 => 
+    8 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    4 => 
+    9 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    5 => 
+    10 => 
     array (
       'zone' => 'BY',
       'country' => 'BY',
       'city' => 'Minsk',
       'url' => 'https://mirror.datacenter.by/pub/mirrors/mageia.org',
     ),
-    6 => 
+    11 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    7 => 
+    12 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    8 => 
+    13 => 
     array (
       'zone' => 'CZ',
       'country' => 'CZ',
       'city' => 'Brno',
       'url' => 'https://ftp.fi.muni.cz/pub/linux/mageia',
     ),
-    9 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Düsseldorf',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
-    ),
-    10 => 
-    array (
-      'zone' => 'DE',
-      'country' => 'DE',
-      'city' => 'Düsseldorf',
-      'url' => 'http://mirror.tuxinator.org/mageia',
-    ),
-    11 => 
+    14 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Düsseldorf',
-      'url' => 'https://mirror.tuxinator.org/mageia',
+      'city' => 'Erlangen',
+      'url' => 'http://ftp.fau.de/mageia',
     ),
-    12 => 
+    15 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Erlangen',
-      'url' => 'ftp://ftp.fau.de/mageia',
+      'url' => 'https://ftp.fau.de/mageia',
     ),
-    13 => 
+    16 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Erlangen',
-      'url' => 'http://ftp.fau.de/mageia',
+      'city' => 'Falkenstein',
+      'url' => 'http://mirrors.cicku.me/mageia',
     ),
-    14 => 
+    17 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
-      'city' => 'Erlangen',
-      'url' => 'https://ftp.fau.de/mageia',
+      'city' => 'Falkenstein',
+      'url' => 'https://mirrors.cicku.me/mageia',
     ),
-    15 => 
+    18 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein/Vogtl.',
       'url' => 'ftp://mirror2.tuxinator.org/mageia',
     ),
-    16 => 
+    19 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein/Vogtl.',
       'url' => 'http://mirror2.tuxinator.org/mageia',
     ),
-    17 => 
+    20 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Falkenstein/Vogtl.',
       'url' => 'https://mirror2.tuxinator.org/mageia',
     ),
-    18 => 
+    21 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    19 => 
+    22 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    20 => 
+    23 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Göttingen',
       'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
     ),
-    21 => 
+    24 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    22 => 
+    25 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    23 => 
+    26 => 
     array (
       'zone' => 'DE',
       'country' => 'DE',
       'city' => 'Schneverdingen',
       'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
-    24 => 
-    array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU, Lyngby',
-      'url' => 'http://ftp.klid.dk/ftp/mageia',
-    ),
-    25 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    26 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    27 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'ftp://geex.freeboxos.fr',
     ),
-    28 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Ons-en-Bray',
       'url' => 'http://geex.freeboxos.fr',
     ),
-    29 => 
-    array (
-      'zone' => 'FR',
-      'country' => 'FR',
-      'city' => 'Ons-en-Bray',
-      'url' => 'https://geex.freeboxos.fr',
-    ),
-    30 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    31 => 
+    32 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
+      'url' => 'ftp://ftp.proxad.net/mirrors/mageia.org',
     ),
-    32 => 
+    33 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    33 => 
+    34 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    34 => 
+    35 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
-      'url' => 'http://ftp.free.fr/mirrors/mageia.org',
+      'url' => 'http://ftp.proxad.net/mirrors/mageia.org',
     ),
-    35 => 
+    36 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    36 => 
+    37 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    37 => 
+    38 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    38 => 
+    39 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    39 => 
-    array (
-      'zone' => 'GR',
-      'country' => 'GR',
-      'city' => '-',
-      'url' => 'http://ftp.cc.uoc.gr/pub/linux/mageia',
-    ),
     40 => 
     array (
       'zone' => 'HU',
@@ -452,163 +445,177 @@
     array (
       'zone' => 'IT',
       'country' => 'IT',
-      'city' => '-',
-      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
+      'city' => 'Milan',
+      'url' => 'http://vodka.sublink.org/mageia',
     ),
     43 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
-      'city' => '-',
-      'url' => 'https://mageia.mirror.garr.it/mageia',
+      'city' => 'Roma',
+      'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
     44 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
-      'city' => 'Milan',
-      'url' => 'ftp://vodka.sublink.org/mageia',
+      'city' => 'Roma',
+      'url' => 'https://mageia.mirror.garr.it/mageia',
     ),
     45 => 
     array (
-      'zone' => 'IT',
-      'country' => 'IT',
-      'city' => 'Milan',
-      'url' => 'http://vodka.sublink.org/mageia',
-    ),
-    46 => 
-    array (
-      'zone' => 'MC',
-      'country' => 'MC',
-      'city' => 'Monaco',
-      'url' => 'http://mirrors.qontinuum.space/mageia',
-    ),
-    47 => 
-    array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    48 => 
+    46 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    49 => 
+    47 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    50 => 
+    48 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Den Haag',
+      'url' => 'http://mirror.serverion.com/mageia',
+    ),
+    49 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    51 => 
+    50 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    52 => 
+    51 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    53 => 
+    52 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    55 => 
+    54 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    56 => 
+    55 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    57 => 
+    56 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    58 => 
+    57 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://mirror.accum.se/mirror/mageia',
     ),
-    59 => 
+    58 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://mirror.accum.se/mirror/mageia',
     ),
+    59 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Kyiv',
+      'url' => 'http://distrohub.kyiv.ua/mageia',
+    ),
     60 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
+      'city' => 'Kyiv',
+      'url' => 'https://distrohub.kyiv.ua/mageia',
+    ),
+    61 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    61 => 
+    62 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    62 => 
+    63 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    63 => 
+    64 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    64 => 
+    65 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
+    66 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'https://mageia.ip-connect.vn.ua',
+    ),
   ),
   '_C:NA' => 
   array (
@@ -630,10 +637,24 @@
     array (
       'zone' => 'US',
       'country' => 'US',
+      'city' => 'Las Vegas',
+      'url' => 'ftp://ftp.mageia-highland.us',
+    ),
+    3 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Las Vegas',
+      'url' => 'http://ftp.mageia-highland.us/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
@@ -669,61 +690,33 @@
   array (
     0 => 
     array (
-      'zone' => 'AR',
-      'country' => 'AR',
-      'city' => 'Buenos Aires',
-      'url' => 'http://mageia.zero.com.ar',
-    ),
-    1 => 
-    array (
-      'zone' => 'AR',
-      'country' => 'AR',
-      'city' => 'Buenos Aires',
-      'url' => 'https://mageia.zero.com.ar',
-    ),
-    2 => 
-    array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => '-',
       'url' => 'http://mageia.c3sl.ufpr.br',
     ),
-    3 => 
-    array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => 'Brasilia',
-      'url' => 'ftp://mageia.fis.unb.br/pub/linux/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'BR',
-      'country' => 'BR',
-      'city' => 'Brasilia',
-      'url' => 'http://mageia.fis.unb.br',
-    ),
-    5 => 
+    1 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
-      'city' => 'Brasilia',
-      'url' => 'https://mageia.fis.unb.br',
+      'city' => '-',
+      'url' => 'https://mageia.c3sl.ufpr.br',
     ),
-    6 => 
+    2 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    7 => 
+    3 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
-    8 => 
+    4 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',