Update download links (drop "merged-usr")

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

5 files changed, 14 insertions, 14 deletions

diff --git a/_includes/downloads/amd64-advanced.html b/_includes/downloads/amd64-advanced.html
index fd7475b..7599ecb 100644
--- a/_includes/downloads/amd64-advanced.html
+++ b/_includes/downloads/amd64-advanced.html
@@ -18,19 +18,19 @@
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-openrc" title="Stage 3" tag="openrc" %}
     {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-desktop-openrc" title="Stage 3" tag="desktop profile | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-systemd-mergedusr" title="Stage 3" tag="systemd | merged usr" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-desktop-systemd-mergedusr" title="Stage 3" tag="desktop profile | systemd | merged usr" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-systemd" title="Stage 3" tag="systemd" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-desktop-systemd" title="Stage 3" tag="desktop profile | systemd" %}
     {% 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-mergedusr" title="Stage 3" tag="no multilib | systemd | merged usr" %}
+    {% 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="x32-systemd-mergedusr" title="Stage 3" tag="x32 | systemd | merged usr" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="x32-systemd" title="Stage 3" tag="x32 | systemd" %}
   </div>
 </div>
 <div class="col-xs-12 col-md-6">
   <h4>LLVM-based stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-llvm-openrc" title="Stage 3" tag="llvm | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-llvm-systemd-mergedusr" title="Stage 3" tag="llvm | systemd | merged usr" %}
+    {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-llvm-systemd" title="Stage 3" tag="llvm | systemd" %}
   </div>
 
   <h4>Hardened stage archives</h4>
diff --git a/_includes/downloads/amd64.html b/_includes/downloads/amd64.html
index 0e8891b..67d6307 100644
--- a/_includes/downloads/amd64.html
+++ b/_includes/downloads/amd64.html
@@ -7,9 +7,9 @@
 <h4>Stage archives</h4>
 <div class="list-group">
   {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-openrc" title="Stage 3" tag="openrc" %}
-  {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-systemd-mergedusr" title="Stage 3" tag="systemd | merged usr" %}
+  {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-systemd" title="Stage 3" tag="systemd" %}
   {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-desktop-openrc" title="Stage 3" tag="desktop profile | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-desktop-systemd-mergedusr" title="Stage 3" tag="desktop profile | systemd | merged usr" %}
+  {% include partials/download-link.html type="stage3" arch="amd64" id="amd64-desktop-systemd" title="Stage 3" tag="desktop profile | systemd" %}
 </div>
 
 <h4>Details (contents, hashes, and signatures)</h4>
diff --git a/_includes/downloads/arm64-advanced.html b/_includes/downloads/arm64-advanced.html
index 99720d8..b43d7e3 100644
--- a/_includes/downloads/arm64-advanced.html
+++ b/_includes/downloads/arm64-advanced.html
@@ -8,14 +8,14 @@
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-openrc" title="Stage 3" tag="openrc" %}
     {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-desktop-openrc" title="Stage 3" tag="desktop profile | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-systemd-mergedusr" title="Stage 3" tag="systemd | merged usr" %}
-    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-desktop-systemd-mergedusr" title="Stage 3" tag="desktop profile | systemd | merged usr" %}
+    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-systemd" title="Stage 3" tag="systemd" %}
+    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-desktop-systemd" title="Stage 3" tag="desktop profile | systemd" %}
   </div>
 
   <h4>LLVM-based stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-llvm-openrc" title="Stage 3" tag="llvm | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-llvm-systemd-mergedusr" title="Stage 3" tag="llvm | systemd | merged usr" %}
+    {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-llvm-systemd" title="Stage 3" tag="llvm | systemd" %}
   </div>
 </div>
 <div class="col-xs-12 col-md-6">
@@ -29,7 +29,7 @@
   <h4>Big-Endian Stage archives</h4>
   <div class="list-group">
     {% include partials/download-link.html type="stage3" arch="arm64" id="aarch64_be-openrc" title="Stage 3" tag="eb | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="arm64" id="aarch64_be-systemd-mergedusr" title="Stage 3" tag="eb | systemd | merged usr" %}
+    {% include partials/download-link.html type="stage3" arch="arm64" id="aarch64_be-systemd" title="Stage 3" tag="eb | systemd" %}
   </div>
 
   <div class="alert alert-info">
diff --git a/_includes/downloads/arm64.html b/_includes/downloads/arm64.html
index bc5aeab..5ade14a 100644
--- a/_includes/downloads/arm64.html
+++ b/_includes/downloads/arm64.html
@@ -7,9 +7,9 @@
 <h4>Stage archives</h4>
 <div class="list-group">
   {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-openrc" title="Stage 3" tag="openrc" %}
-  {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-systemd-mergedusr" title="Stage 3" tag="systemd | merged usr" %}
+  {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-systemd" title="Stage 3" tag="systemd" %}
   {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-desktop-openrc" title="Stage 3" tag="desktop profile | openrc" %}
-  {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-desktop-systemd-mergedusr" title="Stage 3" tag="desktop profile | systemd | merged usr" %}
+  {% include partials/download-link.html type="stage3" arch="arm64" id="arm64-desktop-systemd" title="Stage 3" tag="desktop profile | systemd" %}
 </div>
 
 <h4>Details (contents, hashes, and signatures)</h4>
diff --git a/_includes/downloads/s390.html b/_includes/downloads/s390.html
index 13d5040..6ac5685 100644
--- a/_includes/downloads/s390.html
+++ b/_includes/downloads/s390.html
@@ -12,7 +12,7 @@
     {% include partials/download-link.html type="stage3" arch="s390" id="s390-openrc" title="Stage 3" tag="s390 | openrc" %}
     {% include partials/download-link.html type="stage3" arch="s390" id="s390-systemd-mergedusr" title="Stage 3" tag="s390 | systemd | merged usr" %}
     {% include partials/download-link.html type="stage3" arch="s390" id="s390x-openrc" title="Stage 3" tag="s390x | openrc" %}
-    {% include partials/download-link.html type="stage3" arch="s390" id="s390x-systemd-mergedusr" title="Stage 3" tag="s390x | systemd | merged usr" %}
+    {% include partials/download-link.html type="stage3" arch="s390" id="s390x-systemd" title="Stage 3" tag="s390x | systemd" %}
   </div>
 </div>