Merge branch 'master' of git://git.mageia.org/web/www

3 files changed, 43 insertions, 85 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index 37cf0b3a6..1d3af95ee 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -163,6 +163,13 @@
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
+      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+    ),
+    20 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'Taipei',
       'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
   ),
@@ -607,88 +614,67 @@
   array (
     0 => 
     array (
-      'zone' => 'CA',
-      'country' => 'CA',
-      'city' => 'Beauharnois',
-      'url' => 'https://mirror.softiternity.com/Mageia',
-    ),
-    1 => 
-    array (
       'zone' => 'US',
       'country' => 'US',
       'city' => '-',
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
-    2 => 
+    1 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => '-',
       'url' => 'https://mirrors.kernel.org/mageia',
     ),
-    3 => 
+    2 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Durham',
       'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Durham',
       'url' => 'https://distro.ibiblio.org/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'http://mirror.dacentec.com/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'https://mirror.dacentec.com/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    9 => 
+    8 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-    10 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'http://mageia.jameswhitby.net',
-    ),
-    11 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'https://mageia.jameswhitby.net',
-    ),
   ),
   '_C:OC' => 
   array (
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 723b85597..a5fd69671 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -149,6 +149,13 @@
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
+      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+    ),
+    18 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'Taipei',
       'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
   ),
@@ -593,74 +600,53 @@
   array (
     0 => 
     array (
-      'zone' => 'CA',
-      'country' => 'CA',
-      'city' => 'Beauharnois',
-      'url' => 'https://mirror.softiternity.com/Mageia',
-    ),
-    1 => 
-    array (
       'zone' => 'US',
       'country' => 'US',
       'city' => '-',
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
-    2 => 
+    1 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => '-',
       'url' => 'https://mirrors.kernel.org/mageia',
     ),
-    3 => 
+    2 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'http://mirror.dacentec.com/mageia',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'https://mirror.dacentec.com/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-    8 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'http://mageia.jameswhitby.net',
-    ),
-    9 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'https://mageia.jameswhitby.net',
-    ),
   ),
   '_C:OC' => 
   array (
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 503eb1896..84192a009 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -163,6 +163,13 @@
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
+      'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
+    ),
+    20 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'Taipei',
       'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
     ),
   ),
@@ -607,88 +614,67 @@
   array (
     0 => 
     array (
-      'zone' => 'CA',
-      'country' => 'CA',
-      'city' => 'Beauharnois',
-      'url' => 'https://mirror.softiternity.com/Mageia',
-    ),
-    1 => 
-    array (
       'zone' => 'US',
       'country' => 'US',
       'city' => '-',
       'url' => 'http://mirrors.kernel.org/mageia',
     ),
-    2 => 
+    1 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => '-',
       'url' => 'https://mirrors.kernel.org/mageia',
     ),
-    3 => 
+    2 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Durham',
       'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
-    4 => 
+    3 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Durham',
       'url' => 'https://distro.ibiblio.org/mageia',
     ),
-    5 => 
+    4 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'http://mirror.dacentec.com/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'https://mirror.dacentec.com/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    9 => 
+    8 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-    10 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'http://mageia.jameswhitby.net',
-    ),
-    11 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'https://mageia.jameswhitby.net',
-    ),
   ),
   '_C:OC' => 
   array (