fixes typo in donations, new layout for the mirror pages

2 files changed, 45 insertions, 47 deletions

diff --git a/english/mirror/index.wml b/english/mirror/index.wml
index 58fa33447d3..89c8dd55668 100644
--- a/english/mirror/index.wml
+++ b/english/mirror/index.wml
@@ -1,37 +1,34 @@
-#use wml::debian::template title="Debian mirrors" BARETITLE="true"
+#use wml::debian::template title="Debian Mirrors" MAINPAGE="true"
 
-<p>Debian is distributed all around the world using mirrors
-in order to provide users with better access to our archive.</p>
+<link href="$(HOME)/font-awesome.css" rel="stylesheet" type="text/css">
 
-<p>The following Debian archives are mirrored:</p>
+<aside>
+<p><span class="fas fa-caret-right fa-3x"></span> Debian mirrors are maintained by volunteers. If you are in the position to donate disk space and connectivity, please consider creating a mirror to make Debian more accessible. For more information, please visit <a href="ftpmirror">this page</a>.<p>
+</aside>
+
+<p>Debian is distributed (aka mirrored) on hundreds of servers worldwide, all offering the same content.
+This way we can provide better access to our archive.</p>
+
+<p>You can find the following content on our mirror servers:</p>
 
 <dl>
-<dt><strong>Debian packages</strong> (<code>debian/</code>)</dt>
-  <dd>The Debian package pool -- this includes the vast majority of .deb
-      packages, the installation materials and the sources.
+<dt><strong>Debian Packages</strong> (<code>debian/</code>)</dt>
+  <dd>The Debian package pool: this includes the vast majority of <code>.deb</code>
+      packages, installation material, and the sources.
       <br>
-      See the list of <a href="list">Debian mirrors that include the
-      <code>debian/</code> archive</a>.
+      See the list of <a href="list">Debian mirrors</a> that include the
+      <code>debian/</code> archive.
   </dd>
-<dt><strong>CD images</strong> (<code>debian-cd/</code>)</dt>
+<dt><strong>CD Images</strong> (<code>debian-cd/</code>)</dt>
   <dd>The repository of CD images: Jigdo files and ISO image files.
       <br>
-      See the list of <a href="$(HOME)/CD/http-ftp/#mirrors">Debian mirrors that
-      include the <code>debian-cd/</code> archive</a>.
+      See the list of <a href="$(HOME)/CD/http-ftp/#mirrors">Debian mirrors</a> that
+      include the <code>debian-cd/</code> archive.
   </dd>
-<dt><strong>Old releases</strong> (<code>debian-archive/</code>)</dt>
-  <dd>The archive of old released versions of Debian.
+<dt><strong>Old Releases</strong> (<code>debian-archive/</code>)</dt>
+  <dd>The archive of older Debian versions, released in the past.
       <br>
-      See <a href="$(HOME)/distrib/archive">Distribution Archives</a>
+      See <a href="$(HOME)/distrib/archive">Distribution archives</a>
       for more information.
   </dd>
 </dl>
-
-<h2>Information for mirror owners</h2>
-
-<p>Debian mirrors are maintained by volunteers, so if there are no good mirrors
-near you and you are in a position to donate disk space and connectivity,
-consider creating a mirror and contribute to making Debian more accessible.
-See the pages on <a href="ftpmirror">setting up a mirror of the Debian
-archive</a> for more information about mirroring.</p>
-
diff --git a/english/mirror/list.wml b/english/mirror/list.wml
index 24811ad7440..c674426c34b 100644
--- a/english/mirror/list.wml
+++ b/english/mirror/list.wml
@@ -1,35 +1,41 @@
-#use wml::debian::template title="Debian worldwide mirror sites" BARETITLE=true
+#use wml::debian::template title="Debian Mirrors (worldwide)" MAINPAGE="true"
 
-<p>Debian is distributed (<em>mirrored</em>) on hundreds of
-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>
+<link href="$(HOME)/font-awesome.css" rel="stylesheet" type="text/css">
+
+<ul class="toc">
+  <li><a href="#per-country">Debian Mirrors per Country</a></li>
+  <li><a href="#complete-list">Complete List of Mirrors</a></li>
+</ul>
+
+<aside>
+<p><span class="fas fa-caret-right fa-3x"></span> Debian is distributed (<a href="https://www.debian.org/mirror/">mirrored</a>) on hundreds of servers. If you're planning to <a href="../download">download</a> Debian, try a server nearby first. This will probably be faster and also reduce the load on our central servers.<p>
+</aside>
 
 <p class="centerblock">
-  Debian mirrors exist in many countries, and for some we have
-  added a <code>ftp.&lt;country&gt;.debian.org</code> alias.  This
+  Debian mirrors exist in many countries, and for some of them 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>
+  and carries all of Debian's architectures.  The Debian archive
+  is always available via HTTP at the <code>/debian</code>
   location on the server.
 </p>
 
 <p class="centerblock">
-  Other <strong>mirror sites</strong> may have restrictions on what
+  Other mirror sites 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
+  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
+<p>Use the site closest to you for the fastest downloads possible—
 whether it is a per-country mirror alias or not.
 The program
 <a href="https://packages.debian.org/stable/net/netselect">\
-<em>netselect</em></a> can be used to
+<code>netselect</code></a> can be used to
 determine the site with the least latency; use a download program such as
 <a href="https://packages.debian.org/stable/web/wget">\
 <em>wget</em></a> or
@@ -43,15 +49,10 @@ If your system moves around a lot, you may be best served by a "mirror"
 that is backed by a global <abbr title="Content Delivery Network">CDN</abbr>.
 The Debian project maintains
 <code>deb.debian.org</code> for this
-purpose and you can use this in your apt sources.list &mdash; consult
-<a href="http://deb.debian.org/">the service's website for details</a>.
-
-<p>
-Everything else you want to know about Debian mirrors:
-<url "https://www.debian.org/mirror/">.
-</p>
+purpose, and you can use this in your <code>sources.list</code>—consult
+the service's <a href="http://deb.debian.org/">website</a> for details.
 
-<h2 class="center">Debian per-country mirror aliases</h2>
+<h2 id="per-country">Debian Mirrors per Country</h2>
 
 <table border="0" class="center">
 <tr>
@@ -62,7 +63,7 @@ Everything else you want to know about Debian mirrors:
 #include "$(ENGLISHDIR)/mirror/list-primary.inc"
 </table>
 
-<h2 class="center">List of mirrors of the Debian archive</h2>
+<h2 id="complete-list">Complete List of Mirrors</h2>
 
 <table border="0" class="center">
 <tr>