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

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

1 files changed, 23 insertions, 6 deletions

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>