Downloads: Swap x86 with arm64

Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

5 files changed, 89 insertions, 89 deletions

diff --git a/_includes/downloads/arm64-advanced.html b/_includes/downloads/arm64-advanced.html
new file mode 100644
index 0000000..9f4d723
--- /dev/null
+++ b/_includes/downloads/arm64-advanced.html
@@ -0,0 +1,18 @@
+<div class="col-xs-12 col-md-6">
+  <h4>Boot media</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="iso" arch="arm64" id="minimal" title="Minimal Installation CD" tag="EFI" %}
+  </div>
+
+  <h4>Stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64" title="Stage 3" tag="openrc" %}
+    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-systemd" title="Stage 3" tag="systemd" %}
+  </div>
+</div>
+<div class="col-xs-12 col-md-6">
+  <h4>Details (contents, hashes, and signatures)</h4>
+  <ul>
+    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/arm64/autobuilds/">Stage 3</a></li>
+  </ul>
+</div>
diff --git a/_includes/downloads/arm64.html b/_includes/downloads/arm64.html
index 9f4d723..48291b4 100644
--- a/_includes/downloads/arm64.html
+++ b/_includes/downloads/arm64.html
@@ -1,18 +1,16 @@
-<div class="col-xs-12 col-md-6">
-  <h4>Boot media</h4>
-  <div class="list-group">
-    {% include partials/download-link.html type="iso" arch="arm64" id="minimal" title="Minimal Installation CD" tag="EFI" %}
-  </div>
-
-  <h4>Stage archives</h4>
-  <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64" title="Stage 3" tag="openrc" %}
-    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-systemd" title="Stage 3" tag="systemd" %}
-  </div>
+<h4>Boot media</h4>
+<div class="list-group">
+  {% include partials/download-link.html type="iso" arch="arm64" id="minimal" title="Minimal Installation CD" %}
 </div>
-<div class="col-xs-12 col-md-6">
-  <h4>Details (contents, hashes, and signatures)</h4>
-  <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/arm64/autobuilds/">Stage 3</a></li>
-  </ul>
+
+<h4>Stage archives</h4>
+<div class="list-group">
+  {% include partials/download-link.html type="stage3" arch="arm64" id="arm64" title="Stage 3" tag="openrc" %}
+  {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-systemd" title="Stage 3" tag="systemd" %}
 </div>
+
+<h4>Details (contents, hashes, and signatures)</h4>
+<p>
+  <a href="https://bouncer.gentoo.org/fetch/root/all/releases/arm64/autobuilds/current-install-arm64-minimal/">Minimal Installation CD</a>,
+  <a href="https://bouncer.gentoo.org/fetch/root/all/releases/arm64/autobuilds/current-stage3-arm64/">Stage 3</a>
+</p>
diff --git a/_includes/downloads/x86-advanced.html b/_includes/downloads/x86-advanced.html
deleted file mode 100644
index 3f015c3..0000000
--- a/_includes/downloads/x86-advanced.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<div class="col-xs-12 col-md-6">
-  <h4>Boot media</h4>
-  <div class="list-group">
-    {% include partials/download-link.html type="iso" arch="x86" id="minimal" title="Minimal Installation CD" %}
-    {% include partials/download-link.html type="iso" arch="x86" id="admincd-x86" title="Admin CD" %}
-  </div>
-
-  <h4>Stage archives</h4>
-  <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="x86" id="i686-openrc" title="Stage 3" tag="i686 | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="x86" id="i686-systemd" title="Stage 3" tag="i686 | systemd" %}
-    {% include partials/download-link.html type="stage3" arch="x86" id="i486-openrc" title="Stage 3" tag="i486 | openrc" %}
-  </div>
-
-  <h4>Hardened stage archives</h4>
-  <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="x86" id="i686-hardened-openrc" title="Hardened stage 3" tag="i686 | openrc" %}
-  </div>
-
-  <h4>Details (contents, hashes, and signatures)</h4>
-  <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/x86/autobuilds/current-install-x86-minimal/">Minimal Installation CD</a></li>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/x86/autobuilds/current-stage3-i686-openrc/">Stage 3</a></li>
-  </ul>
-</div>
-<div class="col-xs-12 col-md-6">
-  <h4>Processor compatibility</h4>
-  <div class="alert alert-info">
-    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
-    <p>
-      There are two builds of the <em>x86</em> architecture: <em>i486</em> and <em>i686</em>.<br />
-      Processors prior to the <strong>Intel Pentium Pro</strong> or <strong>Pentium II</strong> require the <em>i486</em> variant to be used.
-    </p>
-  </div>
-
-  <h4>Musl stage archives</h4>
-  <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="x86" id="i686-musl" title="Stage 3" tag="i686 | openrc | musl" %}
-  </div>
-
-  <div class="alert alert-warning">
-    <strong><i class="fa fa-fw fa-warning"></i> Musl stages require the musl overlay</strong>
-    <p>
-      If you want to use the musl stages, you must add the <a href="https://gitweb.gentoo.org/proj/musl.git/">musl overlay</a> to your installation.
-      Instructions how to do this can be found on the <a href="https://wiki.gentoo.org/wiki/Project:Hardened_musl">page of the Hardened musl project</a>.
-    </p>
-  </div>
-</div>
diff --git a/_includes/downloads/x86.html b/_includes/downloads/x86.html
index 3f281fc..3f015c3 100644
--- a/_includes/downloads/x86.html
+++ b/_includes/downloads/x86.html
@@ -1,16 +1,48 @@
-<h4>Boot media</h4>
-<div class="list-group">
-  {% include partials/download-link.html type="iso" arch="x86" id="minimal" title="Minimal Installation CD" %}
-</div>
+<div class="col-xs-12 col-md-6">
+  <h4>Boot media</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="iso" arch="x86" id="minimal" title="Minimal Installation CD" %}
+    {% include partials/download-link.html type="iso" arch="x86" id="admincd-x86" title="Admin CD" %}
+  </div>
+
+  <h4>Stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="x86" id="i686-openrc" title="Stage 3" tag="i686 | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="x86" id="i686-systemd" title="Stage 3" tag="i686 | systemd" %}
+    {% include partials/download-link.html type="stage3" arch="x86" id="i486-openrc" title="Stage 3" tag="i486 | openrc" %}
+  </div>
+
+  <h4>Hardened stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="x86" id="i686-hardened-openrc" title="Hardened stage 3" tag="i686 | openrc" %}
+  </div>
 
-<h4>Stage archives</h4>
-<div class="list-group">
-  {% include partials/download-link.html type="stage3" arch="x86" id="i686-openrc" title="Stage 3" tag="i686 | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="x86" id="i686-systemd" title="Stage 3" tag="i686 | systemd" %}
+  <h4>Details (contents, hashes, and signatures)</h4>
+  <ul>
+    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/x86/autobuilds/current-install-x86-minimal/">Minimal Installation CD</a></li>
+    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/x86/autobuilds/current-stage3-i686-openrc/">Stage 3</a></li>
+  </ul>
 </div>
+<div class="col-xs-12 col-md-6">
+  <h4>Processor compatibility</h4>
+  <div class="alert alert-info">
+    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
+    <p>
+      There are two builds of the <em>x86</em> architecture: <em>i486</em> and <em>i686</em>.<br />
+      Processors prior to the <strong>Intel Pentium Pro</strong> or <strong>Pentium II</strong> require the <em>i486</em> variant to be used.
+    </p>
+  </div>
 
-<h4>Details (contents, hashes, and signatures)</h4>
-<p>
-  <a href="https://bouncer.gentoo.org/fetch/root/all/releases/x86/autobuilds/current-install-x86-minimal/">Minimal Installation CD</a>,
-  <a href="https://bouncer.gentoo.org/fetch/root/all/releases/x86/autobuilds/current-stage3-i686-openrc/">Stage 3</a>
-</p>
+  <h4>Musl stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="x86" id="i686-musl" title="Stage 3" tag="i686 | openrc | musl" %}
+  </div>
+
+  <div class="alert alert-warning">
+    <strong><i class="fa fa-fw fa-warning"></i> Musl stages require the musl overlay</strong>
+    <p>
+      If you want to use the musl stages, you must add the <a href="https://gitweb.gentoo.org/proj/musl.git/">musl overlay</a> to your installation.
+      Instructions how to do this can be found on the <a href="https://wiki.gentoo.org/wiki/Project:Hardened_musl">page of the Hardened musl project</a>.
+    </p>
+  </div>
+</div>
diff --git a/downloads/index.html b/downloads/index.html
index 58719c2..94f974a 100644
--- a/downloads/index.html
+++ b/downloads/index.html
@@ -25,9 +25,9 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });"
   <div class="col-xs-12 col-md-6">
     <div class="panel panel-default featured-panel">
       <div class="panel-body">
-        <h2 class="stick-top" id="x86">x86</h2>
+        <h2 class="stick-top" id="arm64">arm64 <small>aka AArch64</small></h2>
 
-        {% include downloads/x86.html %}
+        {% include downloads/arm64.html %}
       </div>
     </div>
   </div>
@@ -54,15 +54,15 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });"
 
     <ul class="nav nav-tabs nav-justified" id="other-arches">
       <li><a href="#amd64-advanced" data-toggle="tab"><strong>amd64</strong></a></li>
-      <li><a href="#x86-advanced" data-toggle="tab"><strong>x86</strong></a></li>
       <li><a href="#alpha" data-toggle="tab"><strong>alpha</strong></a></li>
       <li><a href="#arm" data-toggle="tab"><strong>arm</strong></a></li>
-      <li><a href="#arm64" data-toggle="tab"><strong>arm64</strong></a></li>
+      <li><a href="#arm64-advanced" data-toggle="tab"><strong>arm64</strong></a></li>
       <li><a href="#hppa" data-toggle="tab"><strong>hppa</strong></a></li>
       <li><a href="#ia64" data-toggle="tab"><strong>ia64</strong></a></li>
       <li><a href="#ppc" data-toggle="tab"><strong>ppc</strong></a></li>
       <li><a href="#riscv" data-toggle="tab"><strong>riscv</strong></a></li>
       <li><a href="#sparc" data-toggle="tab"><strong>sparc</strong></a></li>
+      <li><a href="#x86" data-toggle="tab"><strong>x86</strong></a></li>
       <li><a href="#experimental" data-toggle="tab"><strong>(experimental)</strong></a></li>
     </ul>
 
@@ -73,12 +73,6 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });"
           {% include downloads/amd64-advanced.html %}
         </div>
       </div>
-      <div class="tab-pane active" id="x86-advanced">
-        <h3>x86 &ndash; Advanced choices</h3>
-        <div class="row">
-          {% include downloads/x86-advanced.html %}
-        </div>
-      </div>
       <div class="tab-pane active" id="alpha">
         <h3>alpha</h3>
         <div class="row">
@@ -91,10 +85,10 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });"
           {% include downloads/arm.html %}
         </div>
       </div>
-      <div class="tab-pane active" id="arm64">
+      <div class="tab-pane active" id="arm64-advanced">
         <h3>arm64</h3>
         <div class="row">
-          {% include downloads/arm64.html %}
+          {% include downloads/arm64-advanced.html %}
         </div>
       </div>
       <div class="tab-pane active" id="hppa">
@@ -127,6 +121,12 @@ inlinejs: "$(function() { $('#other-arches a:first').tab('show'); });"
           {% include downloads/sparc.html %}
         </div>
       </div>
+      <div class="tab-pane active" id="x86">
+        <h3>x86</h3>
+        <div class="row">
+          {% include downloads/x86.html %}
+        </div>
+      </div>
       <div class="tab-pane active" id="experimental">
         <h3>Experimental architectures</h3>
         <div class="row">