Add warning about musl overlay, re-arrange and unify layout

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

5 files changed, 69 insertions, 35 deletions

diff --git a/_includes/downloads/amd64-advanced.html b/_includes/downloads/amd64-advanced.html
index f695ed9..ef9080f 100644
--- a/_includes/downloads/amd64-advanced.html
+++ b/_includes/downloads/amd64-advanced.html
@@ -12,15 +12,15 @@
     {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-nomultilib-openrc" title="Stage 3" tag="no multilib | openrc" %}
     {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-nomultilib-systemd" title="Stage 3" tag="no multilib | systemd" %}
     {% include partials/download-link.html type="stage3" arch="amd64" id="x32-openrc" title="Stage 3" tag="x32 | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-musl" title="Stage 3" tag="musl | openrc" %}
   </div>
 
-  <h4>Details (contents, hashes, and signatures)</h4>
-  <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/current-install-amd64-minimal/">Minimal Installation CD</a></li>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/current-stage3-amd64-openrc/">Stage 3</a></li>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/">All stages</a></li>
-  </ul>
+  <h4>Hardened stage archives</h4>
+  <div class="list-group">
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-openrc" title="Hardened stage 3" tag="openrc" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-nomultilib-openrc" title="Hardened stage 3" tag="no multilib | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-selinux-openrc" title="H/SELinux stage 3" tag="openrc" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-nomultilib-selinux-openrc" title="H/SELinux stage 3" tag="no multilib | openrc" %}
+  </div>
 </div>
 <div class="col-xs-12 col-md-6">
   <h4>Processor compatibility</h4>
@@ -31,16 +31,23 @@
     </p>
   </div>
   
-  <h4>Hardened stage archives</h4>
+  <h4>Musl stage archives</h4>
   <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-openrc" title="Hardened stage 3" tag="openrc" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-nomultilib-openrc" title="Hardened stage 3" tag="no multilib | openrc" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-musl" title="Stage 3" tag="musl | openrc" %}
     {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-musl-hardened" title="Hardened stage 3" tag="musl | openrc" %}
   </div>
-
-  <h4>Hardened/SELinux stage archives</h4>
-  <div class="list-group">
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-selinux-openrc" title="H/SELinux stage 3" tag="openrc" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-hardened-nomultilib-selinux-openrc" title="H/SELinux stage 3" tag="no multilib | openrc" %}
+  <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>
+
+  <h4>Details (contents, hashes, and signatures)</h4>
+  <ul>
+    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/current-install-amd64-minimal/">Minimal Installation CD</a></li>
+    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/current-stage3-amd64-openrc/">Stage 3</a></li>
+    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/amd64/autobuilds/">All stages</a></li>
+  </ul>
 </div>
diff --git a/_includes/downloads/ia64.html b/_includes/downloads/ia64.html
index 8645d1c..4ba96bc 100644
--- a/_includes/downloads/ia64.html
+++ b/_includes/downloads/ia64.html
@@ -7,16 +7,17 @@
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="ia64" id="ia64" title="Stage 3" tag="openrc" %}
   </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/ia64/autobuilds/current-iso/">Minimal Installation CD</a></li>
     <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/ia64/autobuilds/current-stage3/">Stage 3</a></li>
   </ul>
-
-  <div class="alert alert-warning">
-    <strong><i class="fa fa-fw fa-warning"></i> Confirm processor compatibility</strong>
+</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>
       The <em>ia64</em> architecture is intended for use on <strong>Intel Itanium</strong> processors only.<br />
       If you have a 64-bit <strong>Intel Pentium/Core/Xeon</strong> processor, you need to use the <a href="#amd64" class="alert-link"><em>amd64</em></a> architecture.
diff --git a/_includes/downloads/ppc.html b/_includes/downloads/ppc.html
index 505480a..6a03798 100644
--- a/_includes/downloads/ppc.html
+++ b/_includes/downloads/ppc.html
@@ -13,11 +13,17 @@
     {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-openrc" title="PPC64LE stage 3" tag="openrc | power9" %}
     {% include partials/download-link.html type="stage3" arch="ppc" id="power9le-systemd" title="PPC64LE stage 3" tag="systemd | power9" %}
   </div>
+
+  <h4>Details (contents, hashes, and signatures)</h4>
+  <ul>
+    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/ppc/autobuilds/current-iso/">Minimal Installation CD</a></li>
+    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/ppc/autobuilds/">All files</a></li>
+  </ul>
 </div>
 <div class="col-xs-12 col-md-6">
   <h4>Processor compatibility</h4>
-  <div class="alert alert-warning">
-      <strong><i class="fa fa-fw fa-warning"></i> Confirm processor compatibility</strong>
+  <div class="alert alert-info">
+    <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
       <p>
       	PowerPC CPUs can operate in two modes: <em>big-endian</em> and <em>little-endian</em>.
         <ul>
@@ -27,14 +33,17 @@
         </ul>
       </p>
   </div>
-  <h4>Hardened stage archives</h4>
+  <h4>Hardened / musl stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64-musl-hardened-openrc" title="PPC64 stage 3" tag="musl | openrc" %}
     {% include partials/download-link.html type="stage3" arch="ppc" id="ppc64le-musl-hardened-openrc" title="PPC64LE stage 3" tag="musl | openrc" %}
   </div>
-  <h4>Details (contents, hashes, and signatures)</h4>
-  <ul>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/ppc/autobuilds/current-iso/">Minimal Installation CD</a></li>
-    <li><a href="https://bouncer.gentoo.org/fetch/root/all/releases/ppc/autobuilds/">All files</a></li>
-  </ul>
+
+  <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/riscv.html b/_includes/downloads/riscv.html
index dbc6a83..6509b4d 100644
--- a/_includes/downloads/riscv.html
+++ b/_includes/downloads/riscv.html
@@ -14,7 +14,7 @@
 </div>
 
 <div class="col-xs-12 col-md-6">
-<h4>Hardware compatibility</h4>
+<h4>Processor compatibility</h4>
   <div class="alert alert-info">
     <strong><span class="fa fa-fw fa-info-circle"></span> Processor compatibility</strong>
     <p>
diff --git a/_includes/downloads/x86-advanced.html b/_includes/downloads/x86-advanced.html
index d59af66..3f015c3 100644
--- a/_includes/downloads/x86-advanced.html
+++ b/_includes/downloads/x86-advanced.html
@@ -10,22 +10,39 @@
     {% 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" %}
-    {% include partials/download-link.html type="stage3" arch="x86" id="i686-musl" title="Stage 3" tag="i686 | openrc | musl" %}
+  </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>
-</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/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 class="alert alert-warning">
-    <strong><i class="fa fa-fw fa-warning"></i> Confirm processor compatibility</strong>
+</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>