mirror: Stop differentiating between primary and secondary mirrors

We still have ftp.CC.debian.org -- country code mirrors -- and the rest,
but those aren't any worse which "secondary" somewhat implies.

2 files changed, 17 insertions, 19 deletions

diff --git a/english/mirror/list.wml b/english/mirror/list.wml
index 3de243588ec..cbd432e1c2d 100644
--- a/english/mirror/list.wml
+++ b/english/mirror/list.wml
@@ -5,26 +5,24 @@ servers on the Internet. Using a nearby server will probably speed up
 your download, and also reduce the load on our central servers and
 on the Internet as a whole.</p>
 
-<p>Debian mirrors can be primary and secondary. The definitions are
-as follows:</p>
-
 <p class="centerblock">
-  A <strong>primary mirror</strong> site has good bandwidth and is
-  syncing directly from Debian's internal syncproxy network.
-  Some primary mirrors have aliases of the form
-  <code>ftp.&lt;country&gt;.debian.org</code> so they are easier
-  to remember for users.
-  They usually carry all architectures.
+  Debian mirrors exist in many countries, and for some we have
+  added a <code>ftp.&lt;country&gt;.debian.org</code> alias.  This
+  alias usually points to a mirror that syncs regularly and quickly
+  and carries all of Debian's architectures.  The debian archive
+  is always available via <code>HTTP</code> at the <code>/debian</code>
+  location on the server.
 </p>
 
 <p class="centerblock">
-  A <strong>secondary mirror</strong> site may have restrictions on what
-  they mirror (due to space restrictions).
-  Just because a site is secondary doesn't necessarily mean it'll be
-  any slower or less up to date than a primary site.  In fact, a secondary
-  mirror that carries your architecture and is closer to you as the user and,
-  therefore, faster, is almost always preferable to a primary that is farther
-  away.
+  Other <strong>mirror sites</strong> may have restrictions on what
+  they mirror (due to space restrictions).  Just because a site is not the
+  country's <code>ftp.&lt;country&gt;.debian.org</code> does not necessarily
+  mean that it is any slower or less up to date than the
+  <code>ftp.&lt;country&gt;.debian.org</code> mirror.
+  In fact, a mirror that carries your architecture and is closer to you as the
+  user and, therefore, faster, is almost always preferable to other mirrors
+  that are farther away.
 </p>
 
 <p>Use the site closest to you for the fastest downloads possible
@@ -54,7 +52,7 @@ Everything else you want to know about Debian mirrors:
 <url "https://www.debian.org/mirror/">.
 </p>
 
-<h2 class="center">Primary Debian mirror sites</h2>
+<h2 class="center">Debian per-country mirror aliases</h2>
 
 <table border="0" class="center">
 <tr>
@@ -65,7 +63,7 @@ Everything else you want to know about Debian mirrors:
 #include "$(ENGLISHDIR)/mirror/list-primary.inc"
 </table>
 
-<h2 class="center">Secondary mirrors of the Debian archive</h2>
+<h2 class="center">List of mirrors of the Debian archive</h2>
 
 <table border="0" class="center">
 <tr>
diff --git a/english/mirror/mirror_list.pl b/english/mirror/mirror_list.pl
index cb2aa9b3f72..046ebe736a9 100755
--- a/english/mirror/mirror_list.pl
+++ b/english/mirror/mirror_list.pl
@@ -152,7 +152,7 @@ sub secondary_mirrors {
   if ($html || $text) {
     print "<h2 align=\"center\">" if $html;
     print "\n\n                   " if $text;
-    print "Secondary mirrors of the Debian archive";
+    print "List of mirrors of the Debian archive";
     print "\n                   ---------------------------------------\n\n" if $text;
     print "</h2>\n\n" if $html;
     if ($html) {