From 854db2b1ccf4809d8c7255d514d5358a5b348a4e Mon Sep 17 00:00:00 2001
From: veon <veon@fedoraproject.org>
Date: Feb 13 2017 22:06:57 +0000
Subject: [PATCH 1/39] issue #636 - create lxqt row, add pre-banner and slogan


---

diff --git a/spins.fedoraproject.org/data/content/prerelease.html b/spins.fedoraproject.org/data/content/prerelease.html
index d86578f..8e91a9a 100644
--- a/spins.fedoraproject.org/data/content/prerelease.html
+++ b/spins.fedoraproject.org/data/content/prerelease.html
@@ -103,6 +103,28 @@
        </div>
 
        <div class="high">
+        <div class="row top-margin bottom-space">
+         <div class="col-xs-12 pre-box">
+          <div class="col-xs-12 col-sm-4 text-center no-leftpadding">
+            <img class="screenshot image-responsive" src="${path}/static/images/screenshots/screenshot-lxqt.jpg" alt="LXQt Screenshot" />
+          </div>
+          <div class="col-xs-12 col-sm-8 text-left">
+            <p class="screenshot"><img src="${path}/static/images/lxqt-pre-banner.png" alt="LXQt banner" /><br />
+            <span class="grey">${_('A complete and lightweight Qt-based desktop experience.')}</span></p>
+              <div class="col-xs-6 text-center">
+                <a class="btn btn-success btn-pre" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/x86_64/iso/Fedora-LXQt-Live-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">64-bit image</a>
+                <h5>${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Soas']}</h5>
+              </div>
+              <div class="col-xs-6 text-center">
+              <a class="btn btn-success btn-pre" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-SoaS-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
+                <h5>${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_i686_Live_Soas']}</h5>
+              </div>
+            </div>
+           </div>
+          </div>
+       </div>
+
+       <div class="high">
     	  <div class="row top-margin">
     	   <div class="col-xs-12 pre-box">
     	  	<div class="col-xs-12 col-sm-4 text-center no-leftpadding">
diff --git a/spins.fedoraproject.org/static/images/lxqt-pre-banner.png b/spins.fedoraproject.org/static/images/lxqt-pre-banner.png
new file mode 100644
index 0000000..3823273
Binary files /dev/null and b/spins.fedoraproject.org/static/images/lxqt-pre-banner.png differ

From c1f8a78d5d9c65ccacd1379889b161e4195fd230 Mon Sep 17 00:00:00 2001
From: veon <veon@fedoraproject.org>
Date: Feb 13 2017 22:43:52 +0000
Subject: [PATCH 2/39] issue #636 - add iso var and fixed margin row


---

diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index 813097f..e31d5c8 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -120,7 +120,7 @@ iso_size={
     'x86_64_raw':          '117',       # In MB
     # These variables are only necessary to keep fedoraproject.org working
     's390_DVD':            '1.5',
-    # Lives
+    # Spins
     'i686_Live_KDE':       '1.4',       # In GB
     'x86_64_Live_KDE':     '1.3',       # In GB
     'i686_Live_LXDE':      '999',       # In MB
@@ -133,7 +133,7 @@ iso_size={
     'x86_64_Live_Soas':    '700',       # In MB
     'i686_Live_Cinnamon':   '1.4',       # In GB
     'x86_64_Live_Cinnamon': '1.3',       # In GB
-    # Lives prerelease
+    # Spins prerelease
     'pre_i686_Live_KDE':    '1.4',       # In GB
     'pre_x86_64_Live_KDE':  '1.3',       # In GB
     'pre_i686_Live_LXDE':   '1.0',       # In GB
@@ -146,7 +146,9 @@ iso_size={
     'pre_x86_64_Live_Soas': '684',       # In MB
     'pre_i686_Live_Cinnamon': '1.4',     # In GB
     'pre_x86_64_Live_Cinnamon': '1.3',   # In GB
-    # Spins
+    'pre_i686_Live_LXQt':       'nd',    # ND
+    'pre_x86_64_Live_LXQt':     'nd',    # ND
+    # Labs
     'i686_Live_Security':  '1.2',       # In GB
     'x86_64_Live_Security':'1.1',       # In GB
     'i686_Live_Games':     '3.8',       # In GB
@@ -163,7 +165,7 @@ iso_size={
     'x86_64_Live_Jam':     '1.9',       # In GB
     'i686_Live_Astronomy': '2.5',       # In GB
     'x86_64_Live_Astronomy':'2.4',      # In GB
-    # Spins prerelease
+    # Labs prerelease
     'pre_i686_Live_Security':  '1.1',   # In GB
     'pre_x86_64_Live_Security':'1.1',   # In GB
     'pre_i686_Live_Games':     '3.8',   # In GB
diff --git a/spins.fedoraproject.org/data/content/prerelease.html b/spins.fedoraproject.org/data/content/prerelease.html
index 8e91a9a..819427e 100644
--- a/spins.fedoraproject.org/data/content/prerelease.html
+++ b/spins.fedoraproject.org/data/content/prerelease.html
@@ -103,7 +103,7 @@
        </div>
 
        <div class="high">
-        <div class="row top-margin bottom-space">
+        <div class="row top-margin">
          <div class="col-xs-12 pre-box">
           <div class="col-xs-12 col-sm-4 text-center no-leftpadding">
             <img class="screenshot image-responsive" src="${path}/static/images/screenshots/screenshot-lxqt.jpg" alt="LXQt Screenshot" />
@@ -113,11 +113,11 @@
             <span class="grey">${_('A complete and lightweight Qt-based desktop experience.')}</span></p>
               <div class="col-xs-6 text-center">
                 <a class="btn btn-success btn-pre" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/x86_64/iso/Fedora-LXQt-Live-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">64-bit image</a>
-                <h5>${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_Soas']}</h5>
+                <h5>${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_x86_64_Live_LXQt']}</h5>
               </div>
               <div class="col-xs-6 text-center">
-              <a class="btn btn-success btn-pre" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-SoaS-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
-                <h5>${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_i686_Live_Soas']}</h5>
+              <a class="btn btn-success btn-pre" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/i386/iso/Fedora-LXQt-Live-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso" role="button">32-bit image</a>
+                <h5>${Markup(_('%s MB ISO Image')) % global_variables.iso_size['pre_i686_Live_LXQt']}</h5>
               </div>
             </div>
            </div>

From 34c53c9d6c3691d195d2e21cf410ab67ed56c572 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Feb 17 2017 20:19:57 +0000
Subject: [PATCH 3/39] add alt.fp.o prerelease sample page


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
new file mode 100644
index 0000000..7278f79
--- /dev/null
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -0,0 +1,955 @@
+<!DOCTYPE html>
+<html lang="${lang}"
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:py="http://genshi.edgewall.org/"
+  xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../../templates/master.html" />
+  <head>
+    <title>${_('Fedora Alternate Architectures')}</title>
+  </head>
+  <body>
+
+  <xi:include href="../../templates/alt/header.html" />
+
+  <header id="head">
+    <div class="col-xs-12 text-center widewrapper bluebox">
+      <h1>${_('Alternate Architectures')}</h1>
+      <p>${_('Additional architectures supported by Fedora')}</p>
+    </div>
+  </header>
+
+  <!-- aarch64 -->
+    <!-- Desktop -->
+  <div class="jumbotron main-head hidden-xs hidden-sm">
+    <div class="container using">
+      <div class="row">
+        <div class="col-xs-12 top-margin">
+        <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; aarch64 Architecture'))}</h2>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-3 product-feature">
+        <p>${Markup(_('These images are for use with AArch64 &ldquo;Server Base System Architecture&rdquo; (SBSA) compliant systems or Single Board Computers.'))}</p>
+        </div>
+        <div class="col-md-9">
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/server.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Server')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sGB dvd iso')) % global_variables.iso_size['aarch64_Server_DVD']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/server.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Server')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['aarch64_Server_net']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/cloud.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Cloud')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['aarch64_Cloud_net']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/cloud.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Cloud')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB qcow2 image')) % global_variables.iso_size['aarch64_qcow2']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/cloud.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Cloud')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['aarch64_raw']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/docker.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Docker')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB Docker image')) % global_variables.iso_size['aarch64_docker']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/aarch64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Mobile phones-->
+  <div class="jumbotron main-head visible-xs">
+    <div class="container using">
+      <div class="row">
+        <div class="col-xs-12">
+        <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; aarch64 Architecture'))}</h2>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-xs-12 product-feature">
+        <p>${Markup(_('These images are for use with AArch64 &ldquo;Server Base System Architecture&rdquo; (SBSA) compliant systems or Single Board Computers.'))}</p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Server')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Server')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Cloud')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Cloud')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Cloud')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/docker.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Docker')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/aarch64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Tablets-->
+  <div class="jumbotron main-head visible-sm">
+    <div class="container using">
+      <div class="row">
+        <div class="col-xs-12">
+        <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; aarch64 Architecture'))}</h2>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-xs-12 product-feature">
+        <p>${Markup(_('These images are for use with AArch64 &ldquo;Server Base System Architecture&rdquo; (SBSA) compliant systems or Single Board Computers.'))}</p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Server')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+         <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Server')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Cloud')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Cloud')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Cloud')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/docker.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Docker')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/aarch64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Resources -->
+  <div class="jumbotron main-head">
+    <div class="container">
+      <div class="row">
+        <div class="col-xs-12 text-center">
+          <h2>${_('Support Resources')}</h2>
+        </div>
+      </div>
+      <div class="row top-margin">
+        <div class="col-md-4 col-xs-12">
+        <div class="col-xs-12 text-center">
+          <h3><i class="fa fa-fw fa-lg header-icon fa-book"></i>${_('Documentation')}</h3>
+          <p>${Markup(_('A guide for Fedora on AArch64, including a list of supported hardware platforms and installation instructions is available at the &lt;a href="%s"&gt;Fedora Documentation Site&lt;/a&gt;.') % ('https://docs.fedoraproject.org/'))}</p>
+        </div>
+      	</div>
+        <div class="col-md-4 col-xs-12">
+        <div class="col-xs-12 text-center">
+          <h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>
+          <p>${Markup(_('Users and developers are also available on the mailing list at &lt;a href="%s"&gt;arm@lists.fedoraproject.org&lt;/a&gt;.') % ('https://admin.fedoraproject.org/mailman/listinfo/arm'))}</p>
+        </div>
+        </div>
+        <div class="col-md-4 col-xs-12">
+        <div class="col-xs-12 text-center">
+          <h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>
+          <p>${Markup(_('Users and developers are available in the &lt;a href="%s"&gt;#fedora-arm&lt;/a&gt; IRC channel on &lt;strong&gt;irc.freenode.org&lt;/strong&gt; for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-arm'))}</p>
+        </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="white-hr"></div>
+  <!-- end aarch64 -->
+
+  <!-- Power -->
+    <!-- Desktop -->
+  <div class="jumbotron main-head hidden-xs hidden-sm">
+    <div class="container using">
+      <div class="row">
+        <div class="col-xs-12 top-margin">
+        <h2>${_('Power Architecture')}</h2>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-3 product-feature">
+        <p>${_('PPC64 images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
+        </div>
+        <div class="col-md-9">
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/server.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Server')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sGB dvd iso')) % global_variables.iso_size['ppc64_Server_DVD']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-dvd-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/server.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Server')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['ppc64_Server_net']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/cloud.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Cloud')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['ppc64_Cloud_net']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64/iso/Fedora-Cloud-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/cloud.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Cloud')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB qcow2 image')) % global_variables.iso_size['ppc64_qcow2']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/cloud.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Cloud')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['ppc64_raw']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/docker.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Docker')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB Docker image')) % global_variables.iso_size['ppc64_docker']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="row top-space">
+        <div class="col-md-3 product-feature">
+        <p>${_('PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
+        </div>
+        <div class="col-md-9">
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/server.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Server')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sGB dvd iso')) % global_variables.iso_size['ppc64le_Server_DVD']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-dvd-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/server.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Server')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['ppc64le_Server_net']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/cloud.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Cloud')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['ppc64le_Cloud_net']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64le/iso/Fedora-Cloud-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/cloud.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Cloud')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB qcow2 image')) % global_variables.iso_size['ppc64le_qcow2']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/cloud.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Cloud')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['ppc64le_raw']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/docker.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Docker')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sMB Docker image')) % global_variables.iso_size['ppc64le_docker']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64le/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Mobile phones-->
+  <div class="jumbotron main-head visible-xs">
+    <div class="container using">
+      <div class="row">
+        <div class="col-xs-12">
+        <h2>${_('Power Architecture')}</h2>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-xs-12 product-feature">
+        <p>${_('PPC64 images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Server')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-dvd-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Server')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Cloud')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64/iso/Fedora-Cloud-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Cloud')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Cloud')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/docker.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Docker')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+      </div>
+      <div class="row top-space">
+        <div class="col-xs-12 product-feature">
+        <p>${_('PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Server')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-dvd-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Server')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Cloud')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64le/iso/Fedora-Cloud-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Cloud')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Cloud')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/docker.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Docker')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64le/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Tablets-->
+  <div class="jumbotron main-head visible-sm">
+    <div class="container using">
+      <div class="row">
+        <div class="col-xs-12">
+        <h2>${_('Power Architecture')}</h2>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-xs-12 product-feature">
+        <p>${_('These images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Server')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-dvd-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Server')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Cloud')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64/iso/Fedora-Cloud-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Cloud')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Cloud')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/docker.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Docker')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+      </div>
+      <div class="row top-margin">
+        <div class="col-xs-12 product-feature">
+        <p>${_('PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Server')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-dvd-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Server')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Cloud')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64le/iso/Fedora-Cloud-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Cloud')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/cloud.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Cloud')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/docker.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Docker')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64le/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Resources -->
+  <div class="jumbotron main-head">
+    <div class="container">
+      <div class="row">
+        <div class="col-xs-12 text-center">
+          <h2>${_('Support Resources')}</h2>
+        </div>
+      </div>
+      <div class="row top-margin">
+        <div class="col-md-4 col-xs-12">
+        <div class="col-xs-12 text-center">
+          <h3><i class="fa fa-fw fa-lg header-icon fa-book"></i>${_('Documentation')}</h3>
+          <p>${Markup(_('A wiki page with information about Power Architecture on Fedora is available on the &lt;a href="%s"&gt;Fedora Project Wiki&lt;/a&gt;.') % ('https://fedoraproject.org/wiki/Architectures/PowerPC'))}</p>
+        </div>
+        </div>
+        <div class="col-md-4 col-xs-12">
+        <div class="col-xs-12 text-center">
+          <h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>
+          <p>${Markup(_('Users and developers are also available on the mailing list at &lt;a href="%s"&gt;ppc@lists.fedoraproject.org&lt;/a&gt;.') % ('https://admin.fedoraproject.org/mailman/listinfo/ppc'))}</p>
+        </div>
+        </div>
+        <div class="col-md-4 col-xs-12">
+        <div class="col-xs-12 text-center">
+          <h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>
+          <p>${Markup(_('Users and developers are available in the &lt;a href="%s"&gt;#fedora-ppc&lt;/a&gt; IRC channel on &lt;strong&gt;irc.freenode.org&lt;/strong&gt; for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-ppc'))}</p>
+        </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="white-hr"></div>
+  <!-- end PowerPC -->
+
+  <!-- s390x -->
+    <!-- Desktop -->
+  <div class="jumbotron main-head hidden-xs hidden-sm">
+    <div class="container using">
+      <div class="row">
+        <div class="col-xs-12 top-margin">
+        <h2>${_('s390x Architecture')}</h2>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-3 product-feature">
+        <p>${_('If you want to install Fedora on IBM z Systems, then you are looking for this architecture.')}</p>
+        </div>
+        <div class="col-md-9">
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/server.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Server')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('%sGB dvd iso')) % global_variables.iso_size['s390x_Server_DVD']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/s390x/iso/Fedora-Server-dvd-s390x-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Mobile phones-->
+  <div class="jumbotron main-head visible-xs">
+    <div class="container using">
+      <div class="row">
+        <div class="col-xs-12">
+        <h2>${_('s390x Architecture')}</h2>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-xs-12 product-feature">
+        <p>${_('If you want to install Fedora on IBM z Systems, then you are looking for this architecture.')}</p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Fedora Server')}</h3>
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/s390x/iso/Fedora-Server-dvd-s390x-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Tablets-->
+  <div class="jumbotron main-head visible-sm">
+    <div class="container using">
+      <div class="row">
+        <div class="col-xs-12">
+        <h2>${_('s390x Architecture')}</h2>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-xs-12 product-feature">
+        <p>${_('If you want to install Fedora on IBM z Systems, then you are looking for this architecture.')}</p>
+        </div>
+      </div>
+      <div class="row">
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/server.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Server')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/s390x/iso/Fedora-Server-dvd-s390x-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Resources -->
+  <div class="jumbotron main-head">
+    <div class="container">
+      <div class="row">
+        <div class="col-xs-12 text-center">
+          <h2>${_('Support Resources')}</h2>
+        </div>
+      </div>
+      <div class="row top-margin">
+        <div class="col-md-4 col-xs-12">
+        <div class="col-xs-12 text-center">
+          <h3><i class="fa fa-fw fa-lg header-icon fa-book"></i>${_('Documentation')}</h3>
+          <p>${Markup(_('A wiki page with information about Power Architecture on Fedora is available on the &lt;a href="%s"&gt;Fedora Project Wiki&lt;/a&gt;.') % ('https://fedoraproject.org/wiki/Architectures/s390x'))}</p>
+        </div>
+        </div>
+        <div class="col-md-4 col-xs-12">
+        <div class="col-xs-12 text-center">
+          <h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>
+          <p>${Markup(_('Users and developers are also available on the mailing list at &lt;a href="%s"&gt;s390x@lists.fedoraproject.org&lt;/a&gt;.') % ('https://admin.fedoraproject.org/mailman/listinfo/s390x'))}</p>
+        </div>
+        </div>
+        <div class="col-md-4 col-xs-12">
+        <div class="col-xs-12 text-center">
+          <h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>
+          <p>${Markup(_('Users and developers are available in the &lt;a href="%s"&gt;#fedora-s390x&lt;/a&gt; IRC channel on &lt;strong&gt;irc.freenode.org&lt;/strong&gt; for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-s390x'))}</p>
+        </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="white-hr"></div>
+  <!-- end s390x -->
+
+
+
+  </body>
+</html>

From 2e0fd7af6b89bd970205a356c6116d2aba07b750 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Feb 28 2017 22:41:29 +0000
Subject: [PATCH 4/39] start the alt prerelease page - head section


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index 7278f79..4d60d71 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -5,19 +5,56 @@
   xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="../../templates/master.html" />
   <head>
-    <title>${_('Fedora Alternate Architectures')}</title>
+    <title>${_('Fedora Alternate Architectures Prerelease Images')}</title>
   </head>
   <body>
 
   <xi:include href="../../templates/alt/header.html" />
 
   <header id="head">
-    <div class="col-xs-12 text-center widewrapper bluebox">
-      <h1>${_('Alternate Architectures')}</h1>
-      <p>${_('Additional architectures supported by Fedora')}</p>
+    <div class="col-xs-12 text-center widewrapper bluebox prerelease">
+      <h1>${_('Pre-releases')}</h1>
+      <p>${_('Official pre-releases of Fedora alternative downloads.')}</p>
     </div>
   </header>
 
+<!-- News -->
+      <py:choose>
+        <py:when test="global_variables.release['curr_state'] == 'Alpha'">
+          <div class="newsbox">
+            <div class="container">
+              <div class="row">
+                <div class="col-xs-12 text-center">
+                  <h3>${Markup(_('Currently offering &lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt;.')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h3>
+                </div>
+              </div>
+            </div>
+          </div>
+        </py:when>
+        <py:when test="global_variables.release['curr_state'] == 'Beta'">
+          <div class="jumbotron newsbox">
+            <div class="container">
+              <div class="row">
+                <div class="col-xs-12 text-center">
+                  <h3>${Markup(_('Currently offering &lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt;.')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h3>
+                </div>
+              </div>
+            </div>
+          </div>
+        </py:when>
+        <py:otherwise>
+        	<div class="jumbotron newsbox">
+            <div class="container">
+              <div class="row">
+                <div class="col-xs-12 text-center">
+                  <h3>${Markup(_('Currently offering &lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt;.')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h3>
+                </div>
+              </div>
+            </div>
+          </div>
+        </py:otherwise>
+      </py:choose>
+
   <!-- aarch64 -->
     <!-- Desktop -->
   <div class="jumbotron main-head hidden-xs hidden-sm">
diff --git a/alt.fedoraproject.org/static/css/app.css b/alt.fedoraproject.org/static/css/app.css
index be03764..bedf28e 100644
--- a/alt.fedoraproject.org/static/css/app.css
+++ b/alt.fedoraproject.org/static/css/app.css
@@ -239,6 +239,10 @@ a.btn-lg {
   font-size: 52px;
 }
 
+#head .prerelease h1 {
+  margin-bottom: 0px;
+}
+
 #head .bluebox p {
   color: #fff;
   text-align: center;
@@ -347,15 +351,15 @@ a.btn-lg {
 }
 
 .newsbox {
-  background-color: #ebb05d;
-  color: #000;
+  background-color: #a07cbc;
+  color: #fff;
   padding: 20px;
 }
 
 .newsbox h2,
 .newsbox h3 {
-  margin-top: 10px;
-  color: #000;
+  margin-top: 22px;
+  color: #fff;
 }
 
 .whitesupport {

From a82ff420afe39906a28778e48bc0aab479f69af5 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 06 2017 20:41:31 +0000
Subject: [PATCH 5/39] update globalvar for F26 Alpha


---

diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index e31d5c8..31f8496 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -7,11 +7,11 @@ release={
     'next_id':     '26',
     'curr_name':   '',
     'next_name':   '',
-    'curr_state':  '',        # either 'Alpha', 'Beta' or '' (i.e empty)
-    'curr_arm_state':  '',         # either 'Alpha', 'Beta' or '' (i.e empty)
-    'curr_alt_state':  '',        # either 'Alpha', 'Beta' or '' (i.e empty)
-    'curr_cloud_state':  '',       # either 'Alpha', 'Beta' or '' (i.e empty)
-    'curr_cloud_AMI_state':  '',   # either 'Alpha', 'Beta' or '' (i.e empty)
+    'curr_state':  'Alpha',        # either 'Alpha', 'Beta' or '' (i.e empty)
+    'curr_arm_state':  'Alpha',         # either 'Alpha', 'Beta' or '' (i.e empty)
+    'curr_alt_state':  'Alpha',        # either 'Alpha', 'Beta' or '' (i.e empty)
+    'curr_cloud_state':  'Alpha',       # either 'Alpha', 'Beta' or '' (i.e empty)
+    'curr_cloud_AMI_state':  'Alpha',   # either 'Alpha', 'Beta' or '' (i.e empty)
     'curr_atomic_state':  '',   # either 'Alpha', 'Beta' or '' (i.e empty)
     'prev_arm_id': '24',
     'prev_alt_id': '24',

From 18580ac7a8f03136a9bd236b7c37b6fcd4956762 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 06 2017 20:53:41 +0000
Subject: [PATCH 6/39] add the alt prerelease banner on top


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index 4d60d71..88a24c8 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -25,7 +25,7 @@
             <div class="container">
               <div class="row">
                 <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Currently offering &lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt;.')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h3>
+                  <h3>${Markup(_('Currently offering &lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt;.')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}<span class="alt-thin">${_('Released 21 march 2017.')}</span></h3>
                 </div>
               </div>
             </div>
@@ -42,17 +42,6 @@
             </div>
           </div>
         </py:when>
-        <py:otherwise>
-        	<div class="jumbotron newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Currently offering &lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt;.')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:otherwise>
       </py:choose>
 
   <!-- aarch64 -->
diff --git a/alt.fedoraproject.org/static/css/app.css b/alt.fedoraproject.org/static/css/app.css
index bedf28e..a470f40 100644
--- a/alt.fedoraproject.org/static/css/app.css
+++ b/alt.fedoraproject.org/static/css/app.css
@@ -958,6 +958,7 @@ h1.nopad, h2.nopad, h3.nopad, p.nopad { margin: 0 !important; padding: 0 !import
 blockquote { font-style: italic; color:#999; margin:30px 0 30px; }
 label { color: #777; }
 .thin { font-weight:300; }
+.alt-thin { font-weight:300; font-size:20px; margin-left:10px; }
 .page-title { margin-top:20px; font-weight:300; }
 .text-muted { color:#888; }
 .breadcrumb { background:none; padding:0; margin:30px 0 0px 0; }

From 2348b288f3fba71e81411f1c8cb4ee83d3a3610c Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 07 2017 16:31:37 +0000
Subject: [PATCH 7/39] add prerelease Network Installers for desktop only


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index 88a24c8..4b056ab 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -44,18 +44,18 @@
         </py:when>
       </py:choose>
 
-  <!-- aarch64 -->
+  <!-- Network Installers -->
     <!-- Desktop -->
   <div class="jumbotron main-head hidden-xs hidden-sm">
     <div class="container using">
       <div class="row">
         <div class="col-xs-12 top-margin">
-        <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; aarch64 Architecture'))}</h2>
+        <h2>${_('Network Installers')}<span class="prerelease-offer">${Markup(_('F%(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</span></h2>
         </div>
       </div>
       <div class="row">
         <div class="col-md-3 product-feature">
-        <p>${Markup(_('These images are for use with AArch64 &ldquo;Server Base System Architecture&rdquo; (SBSA) compliant systems or Single Board Computers.'))}</p>
+        <p>${_('These are very small images you can use to install Fedora over the network.')}</p>
         </div>
         <div class="col-md-9">
           <div class="white">
@@ -66,80 +66,38 @@
             <h3>${_('Fedora Server')}</h3>
             </div>
             <div class="col-md-3">
-            <p>${Markup(_('%sGB dvd iso')) % global_variables.iso_size['aarch64_Server_DVD']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/server.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Server')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['aarch64_Server_net']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/cloud.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Cloud')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['aarch64_Cloud_net']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/cloud.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Cloud')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB qcow2 image')) % global_variables.iso_size['aarch64_qcow2']}</p>
+            <p>${Markup(_('64 bit %sMB ISO')) % global_variables.iso_size['x86_64_server_net']}</p>
             </div>
             <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/x86_64/iso/Fedora-Server-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
             </div>
           </div>
           <div class="white">
             <div class="col-md-1">
-            <img src="/static/images/cloud.png" />
+            <img src="/static/images/workstation.png" />
             </div>
             <div class="col-md-4">
-            <h3>${_('Fedora Cloud')}</h3>
+            <h3>${_('Fedora Workstation')}</h3>
             </div>
             <div class="col-md-3">
-            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['aarch64_raw']}</p>
+            <p>${Markup(_('64 bit %sMB ISO')) % global_variables.iso_size['x86_64_workstation_net']}</p>
             </div>
             <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
             </div>
           </div>
           <div class="white">
             <div class="col-md-1">
-            <img src="/static/images/docker.png" />
+            <img src="/static/images/workstation.png" />
             </div>
             <div class="col-md-4">
-            <h3>${_('Fedora Docker')}</h3>
+            <h3>${_('Fedora Workstation')}</h3>
             </div>
             <div class="col-md-3">
-            <p>${Markup(_('%sMB Docker image')) % global_variables.iso_size['aarch64_docker']}</p>
+            <p>${Markup(_('32 bit %sMB ISO')) % global_variables.iso_size['i386_workstation_net']}</p>
             </div>
             <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/aarch64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/i386/iso/Fedora-Workstation-netinst-i386-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
             </div>
           </div>
         </div>
@@ -303,38 +261,8 @@
     </div>
   </div>
 
-  <!-- Resources -->
-  <div class="jumbotron main-head">
-    <div class="container">
-      <div class="row">
-        <div class="col-xs-12 text-center">
-          <h2>${_('Support Resources')}</h2>
-        </div>
-      </div>
-      <div class="row top-margin">
-        <div class="col-md-4 col-xs-12">
-        <div class="col-xs-12 text-center">
-          <h3><i class="fa fa-fw fa-lg header-icon fa-book"></i>${_('Documentation')}</h3>
-          <p>${Markup(_('A guide for Fedora on AArch64, including a list of supported hardware platforms and installation instructions is available at the &lt;a href="%s"&gt;Fedora Documentation Site&lt;/a&gt;.') % ('https://docs.fedoraproject.org/'))}</p>
-        </div>
-      	</div>
-        <div class="col-md-4 col-xs-12">
-        <div class="col-xs-12 text-center">
-          <h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>
-          <p>${Markup(_('Users and developers are also available on the mailing list at &lt;a href="%s"&gt;arm@lists.fedoraproject.org&lt;/a&gt;.') % ('https://admin.fedoraproject.org/mailman/listinfo/arm'))}</p>
-        </div>
-        </div>
-        <div class="col-md-4 col-xs-12">
-        <div class="col-xs-12 text-center">
-          <h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>
-          <p>${Markup(_('Users and developers are available in the &lt;a href="%s"&gt;#fedora-arm&lt;/a&gt; IRC channel on &lt;strong&gt;irc.freenode.org&lt;/strong&gt; for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-arm'))}</p>
-        </div>
-        </div>
-      </div>
-    </div>
-  </div>
   <div class="white-hr"></div>
-  <!-- end aarch64 -->
+  <!-- end Network Installers -->
 
   <!-- Power -->
     <!-- Desktop -->
diff --git a/alt.fedoraproject.org/static/css/app.css b/alt.fedoraproject.org/static/css/app.css
index a470f40..289cfc5 100644
--- a/alt.fedoraproject.org/static/css/app.css
+++ b/alt.fedoraproject.org/static/css/app.css
@@ -959,6 +959,7 @@ blockquote { font-style: italic; color:#999; margin:30px 0 30px; }
 label { color: #777; }
 .thin { font-weight:300; }
 .alt-thin { font-weight:300; font-size:20px; margin-left:10px; }
+.prerelease-offer { background-color:#a07cbc; color:#fff; text-transform: uppercase; font-weight: bold; margin-left: 10px; font-size: 14px; padding: 2px; vertical-align: middle; }
 .page-title { margin-top:20px; font-weight:300; }
 .text-muted { color:#888; }
 .breadcrumb { background:none; padding:0; margin:30px 0 0px 0; }

From ac5eb92ef950b27f542ac5a9d8597e334016b667 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 08 2017 22:04:14 +0000
Subject: [PATCH 8/39] fix Network Installers paths and add mobile coding


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index 4b056ab..7309a7d 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -66,10 +66,10 @@
             <h3>${_('Fedora Server')}</h3>
             </div>
             <div class="col-md-3">
-            <p>${Markup(_('64 bit %sMB ISO')) % global_variables.iso_size['x86_64_server_net']}</p>
+            <p>${Markup(_('64 bit %sMB ISO')) % global_variables.iso_size['pre_x86_64_server_net']}</p>
             </div>
             <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Server/x86_64/iso/Fedora-Server-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
+            <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Server/x86_64/iso/Fedora-Server-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
             </div>
           </div>
           <div class="white">
@@ -80,10 +80,10 @@
             <h3>${_('Fedora Workstation')}</h3>
             </div>
             <div class="col-md-3">
-            <p>${Markup(_('64 bit %sMB ISO')) % global_variables.iso_size['x86_64_workstation_net']}</p>
+            <p>${Markup(_('64 bit %sMB ISO')) % global_variables.iso_size['pre_x86_64_workstation_net']}</p>
             </div>
             <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
+            <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
             </div>
           </div>
           <div class="white">
@@ -94,10 +94,10 @@
             <h3>${_('Fedora Workstation')}</h3>
             </div>
             <div class="col-md-3">
-            <p>${Markup(_('32 bit %sMB ISO')) % global_variables.iso_size['i386_workstation_net']}</p>
+            <p>${Markup(_('32 bit %sMB ISO')) % global_variables.iso_size['pre_i386_workstation_net']}</p>
             </div>
             <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Workstation/i386/iso/Fedora-Workstation-netinst-i386-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
+            <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Workstation/i386/iso/Fedora-Workstation-netinst-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
             </div>
           </div>
         </div>
@@ -105,17 +105,17 @@
     </div>
   </div>
 
-  <!-- Mobile phones-->
+  <!-- Network Installers mobile phones-->
   <div class="jumbotron main-head visible-xs">
     <div class="container using">
       <div class="row">
         <div class="col-xs-12">
-        <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; aarch64 Architecture'))}</h2>
+        <h2>${_('Network Installers')}<span class="prerelease-offer">${Markup(_('F%(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</span></h2>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-12 product-feature">
-        <p>${Markup(_('These images are for use with AArch64 &ldquo;Server Base System Architecture&rdquo; (SBSA) compliant systems or Single Board Computers.'))}</p>
+        <p>${_('These are very small images you can use to install Fedora over the network.')}</p>
         </div>
       </div>
       <div class="row">
@@ -125,69 +125,42 @@
           </div>
           <div class="col-xs-9">
           <h3>${_('Fedora Server')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/server.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Server')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Cloud')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Server/x86_64/iso/Fedora-Server-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
           </div>
         </div>
         <div class="white">
           <div class="col-xs-3">
-          <img src="/static/images/cloud.png" />
+          <img src="/static/images/workstation.png" />
           </div>
           <div class="col-xs-9">
-          <h3>${_('Fedora Cloud')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          <h3>${_('Workstation')}</h3>
+          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
           </div>
         </div>
         <div class="white">
           <div class="col-xs-3">
-          <img src="/static/images/cloud.png" />
+          <img src="/static/images/workstation.png" />
           </div>
           <div class="col-xs-9">
-          <h3>${_('Fedora Cloud')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/docker.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Docker')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/aarch64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          <h3>${_('Workstation')}</h3>
+          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Workstation/i386/iso/Fedora-Workstation-netinst-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
           </div>
         </div>
       </div>
     </div>
   </div>
 
-  <!-- Tablets-->
+  <!-- Network Installers mobile tablets-->
   <div class="jumbotron main-head visible-sm">
     <div class="container using">
       <div class="row">
         <div class="col-xs-12">
-        <h2>${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; aarch64 Architecture'))}</h2>
+        <h2>${_('Network Installers')}<span class="prerelease-offer">${Markup(_('F%(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</span></h2>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-12 product-feature">
-        <p>${Markup(_('These images are for use with AArch64 &ldquo;Server Base System Architecture&rdquo; (SBSA) compliant systems or Single Board Computers.'))}</p>
+        <p>${_('These are very small images you can use to install Fedora over the network.')}</p>
         </div>
       </div>
       <div class="row">
@@ -199,62 +172,29 @@
           <h3>${_('Fedora Server')}</h3>
           </div>
           <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-         <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/server.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Server')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Server/x86_64/iso/Fedora-Server-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
           </div>
         </div>
         <div class="white">
           <div class="col-sm-3">
-          <img src="/static/images/cloud.png" />
+          <img src="/static/images/workstation.png" />
           </div>
           <div class="col-sm-5">
-          <h3>${_('Fedora Cloud')}</h3>
+          <h3>${_('Fedora Workstation')}</h3>
           </div>
           <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
           </div>
         </div>
         <div class="white">
           <div class="col-sm-3">
-          <img src="/static/images/cloud.png" />
+          <img src="/static/images/workstation.png" />
           </div>
           <div class="col-sm-5">
-          <h3>${_('Fedora Cloud')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Cloud')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/docker.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Docker')}</h3>
+          <h3>${_('Fedora Workstation')}</h3>
           </div>
           <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/aarch64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_aarch64']}.aarch64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Workstation/i386/iso/Fedora-Workstation-netinst-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
           </div>
         </div>
       </div>

From d30064cab514a9be72b15fb79b778a9c0289cb31 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 09 2017 22:29:40 +0000
Subject: [PATCH 9/39] make a panel accordion toggle for alternate arches - still testing


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index 7309a7d..e351038 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -218,6 +218,78 @@
         <p>${_('PPC64 images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
         </div>
         <div class="col-md-9">
+        <div class="panel-group" id="accordion">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h3 class="panel-title">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                <img src="/static/images/aarch64.png" />
+                ${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; aarch64 Architecture'))}
+                </a>
+              </h3>
+            </div>
+            <div id="collapseOne" class="panel-collapse collapse">
+              <div class="panel-body">
+                This is just a test
+              </div>
+            </div>
+          </div>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
+                <img src="/static/images/ppc.png" />
+                ${Markup(_('PowerPC Architecture (PPC64)'))}
+                </a>
+              </h4>
+            </div>
+            <div id="collapseTwo" class="panel-collapse collapse">
+              <div class="panel-body">
+                This is just a test
+              </div>
+            </div>
+          </div>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
+                <img src="/static/images/ppc.png" />
+                ${Markup(_('PowerPC Architecture (PPC64LE)'))}
+                </a>
+              </h4>
+            </div>
+            <div id="collapseThree" class="panel-collapse collapse">
+              <div class="panel-body">
+                This is just a test
+              </div>
+            </div>
+          </div>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseFour">
+                <img src="/static/images/s390x.png" />
+                ${Markup(_('s390x Architecture'))}
+                </a>
+              </h4>
+            </div>
+            <div id="collapseFour" class="panel-collapse collapse">
+              <div class="panel-body">
+                This is just a test
+              </div>
+            </div>
+          </div>
+        </div>
+        </div>
+
+
+
+
+
+
+
+
+        <div class="col-md-9">
           <div class="white">
             <div class="col-md-1">
             <img src="/static/images/server.png" />
diff --git a/alt.fedoraproject.org/data/templates/css.html b/alt.fedoraproject.org/data/templates/css.html
index 03262e5..efb9a43 100644
--- a/alt.fedoraproject.org/data/templates/css.html
+++ b/alt.fedoraproject.org/data/templates/css.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" media="screen" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&amp;subset=latin,latin-ext" />
     <link rel='stylesheet' media="screen" href='https://fonts.googleapis.com/css?family=Montserrat' />
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" />
-    
+
     <!-- language selector -->
     <link rel="stylesheet" type="text/css" href="${path}/static/css/jquery.uls.css" />
     <link rel="stylesheet" type="text/css" href="${path}/static/css/jquery.uls.grid.css" />
diff --git a/alt.fedoraproject.org/data/templates/js.html b/alt.fedoraproject.org/data/templates/js.html
index 3d78109..a249817 100644
--- a/alt.fedoraproject.org/data/templates/js.html
+++ b/alt.fedoraproject.org/data/templates/js.html
@@ -3,15 +3,16 @@
   xmlns:py="http://genshi.edgewall.org/"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   py:strip="">
-    <script type="text/javascript" src="${path}/static/js/jquery.min.js"></script>
     <script type="text/javascript" src="${path}/static/js/jquery.expander.js"></script>
     <script type="text/javascript" src="${path}/static/js/jquery.tools.min.js"></script>
     <script type="text/javascript" src="${path}/static/js/jquery.query.min.js"></script>
     <script type="text/javascript" src="${path}/static/js/jquery.slideshow.minified.js"></script>
     <script type="text/javascript" src="${path}/static/js/jquery.tweet.js"></script>
     <script type="text/javascript" src="${path}/static/js/init.js"></script>
-    <script type="text/javascript" src="${path}/static/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="${path}/static/js/regulations.js"></script>
+    <!-- Latest compiled and minified JavaScript -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
 
     <script type="text/javascript" src="${path}/static/js/jquery.uls.data.js"></script>
 	  <script type="text/javascript" src="${path}/static/js/jquery.uls.data.utils.js"></script>
diff --git a/alt.fedoraproject.org/static/css/app.css b/alt.fedoraproject.org/static/css/app.css
index 289cfc5..35515e1 100644
--- a/alt.fedoraproject.org/static/css/app.css
+++ b/alt.fedoraproject.org/static/css/app.css
@@ -920,6 +920,36 @@ p.warning a {
   font-weight: 600;
 }
 
+.panel-heading {
+  padding: 0 !important;
+}
+
+.panel-heading .accordion-toggle:after {
+    /* symbol for "opening" panels */
+    content: "\f077";
+    float: right;
+    color: grey;
+    padding: 15px 15px;
+    vertical-align: middle;
+}
+.panel-heading .accordion-toggle.collapsed:after {
+    /* symbol for "collapsed" panels */
+    content: "\f078";
+}
+
+.panel-heading img {
+  padding-right: 25px;
+}
+
+.panel-heading h3,
+.panel-heading a:hover,
+.panel-heading a:active,
+.panel-heading a {
+  font-size: 20px;
+  text-decoration: none;
+  font-weight: 400;
+}
+
 /*bootstrap xs*/
 @media max-width:767px
 {

From b49a7554b19723c7e8c0f9b7d0b1a658db21c268 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 10 2017 16:17:05 +0000
Subject: [PATCH 10/39] complete aarch64 with accordion lines - tablet ok but not phone


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index e351038..1ee0135 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -204,18 +204,18 @@
   <div class="white-hr"></div>
   <!-- end Network Installers -->
 
-  <!-- Power -->
+  <!-- Alternate Architectures -->
     <!-- Desktop -->
-  <div class="jumbotron main-head hidden-xs hidden-sm">
+  <div class="jumbotron main-head">
     <div class="container using">
       <div class="row">
         <div class="col-xs-12 top-margin">
-        <h2>${_('Power Architecture')}</h2>
+        <h2>${_('Alternate Architectures')}<span class="prerelease-offer">${Markup(_('F%(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</span></h2>
         </div>
       </div>
       <div class="row">
         <div class="col-md-3 product-feature">
-        <p>${_('PPC64 images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
+        <p>${_('These are additional architectures supported by Fedora beyond the standard set')}</p>
         </div>
         <div class="col-md-9">
         <div class="panel-group" id="accordion">
@@ -229,8 +229,42 @@
               </h3>
             </div>
             <div id="collapseOne" class="panel-collapse collapse">
-              <div class="panel-body">
-                This is just a test
+              <div class="panel-body panel-heading">
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/server.png" />
+                  ${_('Fedora Server DVD')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/server.png" />
+                  ${_('Fedora Server Netinstall')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Fedora Cloud Netinstall')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Fedora Cloud qcow2')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.aarch64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Fedora Cloud raw')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/docker.png" />
+                  ${_('Fedora Docker')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Docker/aarch64/images/Fedora-Docker-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.aarch64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
               </div>
             </div>
           </div>
@@ -281,191 +315,6 @@
           </div>
         </div>
         </div>
-
-
-
-
-
-
-
-
-        <div class="col-md-9">
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/server.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Server')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sGB dvd iso')) % global_variables.iso_size['ppc64_Server_DVD']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-dvd-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/server.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Server')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['ppc64_Server_net']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/cloud.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Cloud')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['ppc64_Cloud_net']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64/iso/Fedora-Cloud-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/cloud.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Cloud')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB qcow2 image')) % global_variables.iso_size['ppc64_qcow2']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/cloud.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Cloud')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['ppc64_raw']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/docker.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Docker')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB Docker image')) % global_variables.iso_size['ppc64_docker']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="row top-space">
-        <div class="col-md-3 product-feature">
-        <p>${_('PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
-        </div>
-        <div class="col-md-9">
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/server.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Server')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sGB dvd iso')) % global_variables.iso_size['ppc64le_Server_DVD']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-dvd-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/server.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Server')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['ppc64le_Server_net']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/cloud.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Cloud')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['ppc64le_Cloud_net']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64le/iso/Fedora-Cloud-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/cloud.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Cloud')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB qcow2 image')) % global_variables.iso_size['ppc64le_qcow2']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/cloud.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Cloud')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['ppc64le_raw']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-          <div class="white">
-            <div class="col-md-1">
-            <img src="/static/images/docker.png" />
-            </div>
-            <div class="col-md-4">
-            <h3>${_('Fedora Docker')}</h3>
-            </div>
-            <div class="col-md-3">
-            <p>${Markup(_('%sMB Docker image')) % global_variables.iso_size['ppc64le_docker']}</p>
-            </div>
-            <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64le/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-            </div>
-          </div>
-        </div>
       </div>
     </div>
   </div>
@@ -760,38 +609,8 @@
     </div>
   </div>
 
-  <!-- Resources -->
-  <div class="jumbotron main-head">
-    <div class="container">
-      <div class="row">
-        <div class="col-xs-12 text-center">
-          <h2>${_('Support Resources')}</h2>
-        </div>
-      </div>
-      <div class="row top-margin">
-        <div class="col-md-4 col-xs-12">
-        <div class="col-xs-12 text-center">
-          <h3><i class="fa fa-fw fa-lg header-icon fa-book"></i>${_('Documentation')}</h3>
-          <p>${Markup(_('A wiki page with information about Power Architecture on Fedora is available on the &lt;a href="%s"&gt;Fedora Project Wiki&lt;/a&gt;.') % ('https://fedoraproject.org/wiki/Architectures/PowerPC'))}</p>
-        </div>
-        </div>
-        <div class="col-md-4 col-xs-12">
-        <div class="col-xs-12 text-center">
-          <h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>
-          <p>${Markup(_('Users and developers are also available on the mailing list at &lt;a href="%s"&gt;ppc@lists.fedoraproject.org&lt;/a&gt;.') % ('https://admin.fedoraproject.org/mailman/listinfo/ppc'))}</p>
-        </div>
-        </div>
-        <div class="col-md-4 col-xs-12">
-        <div class="col-xs-12 text-center">
-          <h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>
-          <p>${Markup(_('Users and developers are available in the &lt;a href="%s"&gt;#fedora-ppc&lt;/a&gt; IRC channel on &lt;strong&gt;irc.freenode.org&lt;/strong&gt; for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-ppc'))}</p>
-        </div>
-        </div>
-      </div>
-    </div>
-  </div>
   <div class="white-hr"></div>
-  <!-- end PowerPC -->
+  <!-- end Alternate Architectures -->
 
   <!-- s390x -->
     <!-- Desktop -->
diff --git a/alt.fedoraproject.org/static/css/app.css b/alt.fedoraproject.org/static/css/app.css
index 35515e1..efd337c 100644
--- a/alt.fedoraproject.org/static/css/app.css
+++ b/alt.fedoraproject.org/static/css/app.css
@@ -350,6 +350,11 @@ a.btn-lg {
   height: 50px;
 }
 
+.grey-hr {
+  background-image: url("../images/greybg.png");
+  height: 10px;
+}
+
 .newsbox {
   background-color: #a07cbc;
   color: #fff;
@@ -950,6 +955,29 @@ p.warning a {
   font-weight: 400;
 }
 
+.accordion-title {
+  color:#60605B;
+  font-size: 20px;
+}
+
+.accordion-title .download a {
+  color:#428BCA;
+  font-size: 16px !important;
+  font-weight: 600;
+}
+
+.panel-body .download {
+  position: relative;
+  float: right;
+  margin-top: 13px;
+  margin-right: 60px;
+  color:#A7A9AC;
+}
+
+.panel-body {
+  padding: 0 !important;
+}
+
 /*bootstrap xs*/
 @media max-width:767px
 {
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index 31f8496..cf10565 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -53,6 +53,7 @@ release={
     'RC_gold_s390x': '1.3',       # RC Gold for s390x
     'RC_pre_gold': '1.1',         # insert the number of the prerelease RC version declared GOLD
     'RC_pre_build': '1',          # sometimes releng use the RC build
+    'RC_pre_gold_aarch64': '1.3', # Pre RC Gold for aarch64
 
     'atomic_qcow2_cloud_url': 'FIXME',
     'atomic_raw_cloud_url': 'FIXME',

From b9c68470295e487f02e846a505d4e8b25297772d Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 10 2017 21:51:36 +0000
Subject: [PATCH 11/39] add Everything and testing resources to alt prerelease page


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index 1ee0135..b5ae387 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -612,32 +612,46 @@
   <div class="white-hr"></div>
   <!-- end Alternate Architectures -->
 
-  <!-- s390x -->
+  <!-- Everything -->
     <!-- Desktop -->
   <div class="jumbotron main-head hidden-xs hidden-sm">
     <div class="container using">
       <div class="row">
         <div class="col-xs-12 top-margin">
-        <h2>${_('s390x Architecture')}</h2>
+        <h2>${_('Everything')}<span class="prerelease-offer">${Markup(_('F%(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</span></h2>
         </div>
       </div>
       <div class="row">
         <div class="col-md-3 product-feature">
-        <p>${_('If you want to install Fedora on IBM z Systems, then you are looking for this architecture.')}</p>
+        <p>${_('Choose from thousands of packages to customize your installation; requires a fast network connection.')}</p>
         </div>
         <div class="col-md-9">
           <div class="white">
             <div class="col-md-1">
-            <img src="/static/images/server.png" />
+            <img src="/static/images/ev.png" />
             </div>
             <div class="col-md-4">
             <h3>${_('Fedora Server')}</h3>
             </div>
             <div class="col-md-3">
-            <p>${Markup(_('%sGB dvd iso')) % global_variables.iso_size['s390x_Server_DVD']}</p>
+            <p>${Markup(_('64 bit %sMB ISO')) % global_variables.iso_size['pre_x86_64_ev']}</p>
             </div>
             <div class="col-md-4">
-            <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/s390x/iso/Fedora-Server-dvd-s390x-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+            <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
+            </div>
+          </div>
+          <div class="white">
+            <div class="col-md-1">
+            <img src="/static/images/ev.png" />
+            </div>
+            <div class="col-md-4">
+            <h3>${_('Fedora Workstation')}</h3>
+            </div>
+            <div class="col-md-3">
+            <p>${Markup(_('64 bit %sMB ISO')) % global_variables.iso_size['pre_i386_ev']}</p>
+            </div>
+            <div class="col-md-4">
+            <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Everything/i386/iso/Fedora-Everything-netinst-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
             </div>
           </div>
         </div>
@@ -645,88 +659,117 @@
     </div>
   </div>
 
-  <!-- Mobile phones-->
+  <!-- Network Installers mobile phones-->
   <div class="jumbotron main-head visible-xs">
     <div class="container using">
       <div class="row">
         <div class="col-xs-12">
-        <h2>${_('s390x Architecture')}</h2>
+        <h2>${_('Network Installers')}<span class="prerelease-offer">${Markup(_('F%(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</span></h2>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-12 product-feature">
-        <p>${_('If you want to install Fedora on IBM z Systems, then you are looking for this architecture.')}</p>
+        <p>${_('Choose from thousands of packages to customize your installation; requires a fast network connection.')}</p>
         </div>
       </div>
       <div class="row">
         <div class="white">
           <div class="col-xs-3">
-          <img src="/static/images/server.png" />
+          <img src="/static/images/ev.png" />
           </div>
           <div class="col-xs-9">
           <h3>${_('Fedora Server')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/s390x/iso/Fedora-Server-dvd-s390x-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-xs-3">
+          <img src="/static/images/ev.png" />
+          </div>
+          <div class="col-xs-9">
+          <h3>${_('Workstation')}</h3>
+          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Everything/i386/iso/Fedora-Everything-netinst-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
           </div>
         </div>
       </div>
     </div>
   </div>
 
-  <!-- Tablets-->
+  <!-- Network Installers mobile tablets-->
   <div class="jumbotron main-head visible-sm">
     <div class="container using">
       <div class="row">
         <div class="col-xs-12">
-        <h2>${_('s390x Architecture')}</h2>
+        <h2>${_('Network Installers')}<span class="prerelease-offer">${Markup(_('F%(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</span></h2>
         </div>
       </div>
       <div class="row">
         <div class="col-xs-12 product-feature">
-        <p>${_('If you want to install Fedora on IBM z Systems, then you are looking for this architecture.')}</p>
+        <p>${_('Choose from thousands of packages to customize your installation; requires a fast network connection.')}</p>
         </div>
       </div>
       <div class="row">
         <div class="white">
           <div class="col-sm-3">
-          <img src="/static/images/server.png" />
+          <img src="/static/images/ev.png" />
           </div>
           <div class="col-sm-5">
           <h3>${_('Fedora Server')}</h3>
           </div>
           <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/s390x/iso/Fedora-Server-dvd-s390x-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_s390x']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
+          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Everything/x86_64/iso/Fedora-Everything-netinst-x86_64-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
+          </div>
+        </div>
+        <div class="white">
+          <div class="col-sm-3">
+          <img src="/static/images/ev.png" />
+          </div>
+          <div class="col-sm-5">
+          <h3>${_('Fedora Workstation')}</h3>
+          </div>
+          <div class="col-sm-4">
+          <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Everything/i386/iso/Fedora-Everything-netinst-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.iso">${_('Download')}</a> | <a href="https://getfedora.org/verify">${_('Verify')}</a></p>
           </div>
         </div>
       </div>
     </div>
   </div>
 
+  <div class="white-hr"></div>
+  <!-- end Everything -->
+
   <!-- Resources -->
   <div class="jumbotron main-head">
     <div class="container">
       <div class="row">
         <div class="col-xs-12 text-center">
-          <h2>${_('Support Resources')}</h2>
+          <h2>${_('Testing Resources')}</h2>
         </div>
       </div>
       <div class="row top-margin">
         <div class="col-md-4 col-xs-12">
         <div class="col-xs-12 text-center">
           <h3><i class="fa fa-fw fa-lg header-icon fa-book"></i>${_('Documentation')}</h3>
-          <p>${Markup(_('A wiki page with information about Power Architecture on Fedora is available on the &lt;a href="%s"&gt;Fedora Project Wiki&lt;/a&gt;.') % ('https://fedoraproject.org/wiki/Architectures/s390x'))}</p>
+          <p>${Markup(_('Some basic information about getting involved in Fedora\'s testing efforts is available on &lt;a href="%s"&gt;the Fedora QA wiki&lt;/a&gt;.') % ('https://fedoraproject.org/wiki/QA'))}</p>
         </div>
         </div>
         <div class="col-md-4 col-xs-12">
         <div class="col-xs-12 text-center">
           <h3><i class="fa fa-fw fa-lg header-icon fa-envelope-o"></i>${_('Email')}</h3>
-          <p>${Markup(_('Users and developers are also available on the mailing list at &lt;a href="%s"&gt;s390x@lists.fedoraproject.org&lt;/a&gt;.') % ('https://admin.fedoraproject.org/mailman/listinfo/s390x'))}</p>
+          <p>${Markup(_('Email discussion of Fedora testing is available on the mailing list at &lt;a href="%s"&gt;test@lists.fedoraproject.org&lt;/a&gt;.') % ('https://admin.fedoraproject.org/mailman/listinfo/test'))}</p>
         </div>
         </div>
         <div class="col-md-4 col-xs-12">
         <div class="col-xs-12 text-center">
           <h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>
-          <p>${Markup(_('Users and developers are available in the &lt;a href="%s"&gt;#fedora-s390x&lt;/a&gt; IRC channel on &lt;strong&gt;irc.freenode.org&lt;/strong&gt; for real-time chat.') % ('http://webchat.freenode.net/?channels=fedora-s390x'))}</p>
+          <p>${Markup(_('Discussion of Feora testing takes place in the &lt;a href="%s"&gt;#fedora-qa&lt;/a&gt; IRC channel on &lt;strong&gt;irc.freenode.org.&lt;/strong&gt;') % ('http://webchat.freenode.net/?channels=fedora-qa'))}</p>
+        </div>
         </div>
+      </div>
+      <div class="row top-margin">
+        <div class="col-xs-12 text-center">
+          <h4><i class="fa fa-fw header-icon fa-question-circle"></i>${_('General Help Using Fedora')}</h4>
+          <p>${Markup(_('Sometimes you may encounter an issue with this spin that you can get help with using general Fedora support resources. A list of resources is available at the &lt;a href="%s"&gt;Fedora &ldquo;Get Help&rdquo; page&lt;/a&gt;.') % ('https://fedoraproject.org/wiki/Communicating_and_getting_help'))}</p>
         </div>
       </div>
     </div>
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index cf10565..ca60169 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -260,7 +260,10 @@ iso_size={
     'manual_pre_atomic_libvag_cloud': '400',   # In MB
     # Everything release
     'x86_64_ev':        '477',   #In MB
-    'i386_ev':          '465'   #In MB
+    'i386_ev':          '465',   #In MB
+    # Everything prerelease
+    'pre_x86_64_ev':        '477',   #In MB
+    'pre_i386_ev':          '465',   #In MB
 }
 
 # Redirect EC2 images

From f59b236471b31e614e688f901c235eedbebc68db Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 10 2017 22:05:14 +0000
Subject: [PATCH 12/39] add ppc64 prerelease


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index b5ae387..f5a4c90 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -270,16 +270,50 @@
           </div>
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h4 class="panel-title">
+              <h3 class="panel-title">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
                 <img src="/static/images/ppc.png" />
                 ${Markup(_('PowerPC Architecture (PPC64)'))}
                 </a>
-              </h4>
+              </h3>
             </div>
             <div id="collapseTwo" class="panel-collapse collapse">
-              <div class="panel-body">
-                This is just a test
+              <div class="panel-body panel-heading">
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/server.png" />
+                  ${_('Fedora Server DVD')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64/iso/Fedora-Server-dvd-ppc64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/server.png" />
+                  ${_('Fedora Server Netinstall')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64/iso/Fedora-Server-netinst-ppc64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Fedora Cloud Netinstall')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Cloud/ppc64/iso/Fedora-Cloud-netinst-ppc64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Fedora Cloud qcow2')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.ppc64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Fedora Cloud raw')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.ppc64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/docker.png" />
+                  ${_('Fedora Docker')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Docker/ppc64/images/Fedora-Docker-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.ppc64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
               </div>
             </div>
           </div>
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index ca60169..0fb0671 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -54,6 +54,7 @@ release={
     'RC_pre_gold': '1.1',         # insert the number of the prerelease RC version declared GOLD
     'RC_pre_build': '1',          # sometimes releng use the RC build
     'RC_pre_gold_aarch64': '1.3', # Pre RC Gold for aarch64
+    'RC_pre_gold_ppc64': '1.3',   # Pre RC Gold for ppc64
 
     'atomic_qcow2_cloud_url': 'FIXME',
     'atomic_raw_cloud_url': 'FIXME',

From d7a66e76e7250463a24bc0e254958288ea88c641 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 10 2017 22:14:12 +0000
Subject: [PATCH 13/39] add ppc64le prerelease


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index f5a4c90..7915a1e 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -319,16 +319,50 @@
           </div>
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h4 class="panel-title">
+              <h3 class="panel-title">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
                 <img src="/static/images/ppc.png" />
                 ${Markup(_('PowerPC Architecture (PPC64LE)'))}
                 </a>
-              </h4>
+              </h3>
             </div>
             <div id="collapseThree" class="panel-collapse collapse">
-              <div class="panel-body">
-                This is just a test
+              <div class="panel-body panel-heading">
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/server.png" />
+                  ${_('Fedora Server DVD')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64le/iso/Fedora-Server-dvd-ppc64le-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/server.png" />
+                  ${_('Fedora Server Netinstall')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64le/iso/Fedora-Server-netinst-ppc64le-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Fedora Cloud Netinstall')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Cloud/ppc64le/iso/Fedora-Cloud-netinst-ppc64le-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Fedora Cloud qcow2')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.ppc64le.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Fedora Cloud raw')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.ppc64le.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/docker.png" />
+                  ${_('Fedora Docker')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Docker/ppc64le/images/Fedora-Docker-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.ppc64le.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
               </div>
             </div>
           </div>
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index 0fb0671..b12d1c4 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -55,6 +55,7 @@ release={
     'RC_pre_build': '1',          # sometimes releng use the RC build
     'RC_pre_gold_aarch64': '1.3', # Pre RC Gold for aarch64
     'RC_pre_gold_ppc64': '1.3',   # Pre RC Gold for ppc64
+    'RC_pre_gold_ppc64le': '1.3',   # Pre RC Gold for ppc64le
 
     'atomic_qcow2_cloud_url': 'FIXME',
     'atomic_raw_cloud_url': 'FIXME',

From ca117148058889db50c061c4008d24458e55f8fd Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 10 2017 22:22:05 +0000
Subject: [PATCH 14/39] add s390x prerelease


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index 7915a1e..4368ec0 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -368,16 +368,21 @@
           </div>
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h4 class="panel-title">
+              <h3 class="panel-title">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseFour">
-                <img src="/static/images/s390x.png" />
+                <img src="/static/images/ppc.png" />
                 ${Markup(_('s390x Architecture'))}
                 </a>
-              </h4>
+              </h3>
             </div>
             <div id="collapseFour" class="panel-collapse collapse">
-              <div class="panel-body">
-                This is just a test
+              <div class="panel-body panel-heading">
+                <h3 class="panel-title accordion-title">
+                  <img src="/static/images/server.png" />
+                  ${_('Fedora Server')}
+                  <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/s390x/iso/Fedora-Server-dvd-s390x-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_s390x']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
+                <div class="grey-hr"></div>
               </div>
             </div>
           </div>
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index b12d1c4..5918b4e 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -55,7 +55,8 @@ release={
     'RC_pre_build': '1',          # sometimes releng use the RC build
     'RC_pre_gold_aarch64': '1.3', # Pre RC Gold for aarch64
     'RC_pre_gold_ppc64': '1.3',   # Pre RC Gold for ppc64
-    'RC_pre_gold_ppc64le': '1.3',   # Pre RC Gold for ppc64le
+    'RC_pre_gold_ppc64le': '1.3', # Pre RC Gold for ppc64le
+    'RC_pre_gold_s390x': '1.3',   # Pre RC Gold for s390x
 
     'atomic_qcow2_cloud_url': 'FIXME',
     'atomic_raw_cloud_url': 'FIXME',

From fc4ede2d5e40b1a40625532632887ce3c00cbe34 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 10 2017 22:49:57 +0000
Subject: [PATCH 15/39] add the newsbox on top and fix link


---

diff --git a/alt.fedoraproject.org/data/content/index.html b/alt.fedoraproject.org/data/content/index.html
index df48d48..b0853ea 100644
--- a/alt.fedoraproject.org/data/content/index.html
+++ b/alt.fedoraproject.org/data/content/index.html
@@ -25,6 +25,43 @@
     </div>
   </header>
 
+  <!-- News -->
+  <py:choose>
+    <py:when test="global_variables.release['curr_state'] == 'Alpha'">
+      <div class="newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease/index.html'}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:when>
+    <py:when test="global_variables.release['curr_state'] == 'Beta'">
+      <div class="jumbotron newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease/index.html'}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:when>
+    <py:otherwise>
+      <div class="jumbotron newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('Fedora %(rel)s released! Get it now.')) % {'rel':global_variables.release['curr_id']}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:otherwise>
+  </py:choose>
+
   <!-- Network Installers -->
   <div class="jumbotron main-head hidden-xs hidden-sm">
     <div class="container using">
diff --git a/alt.fedoraproject.org/static/css/app.css b/alt.fedoraproject.org/static/css/app.css
index efd337c..6c3b745 100644
--- a/alt.fedoraproject.org/static/css/app.css
+++ b/alt.fedoraproject.org/static/css/app.css
@@ -367,6 +367,18 @@ a.btn-lg {
   color: #fff;
 }
 
+.newsbox .index h3 {
+  margin-top: 10px;
+  color: #fff;
+}
+
+.newsbox a,
+.newsbox a:hover,
+.newsbox a:active {
+  text-decoration: none;
+  color: #fff;
+}
+
 .whitesupport {
   background-color: #fff;
   color: #000;

From aa49d53b8ba7e416ac7fed850aa148ec7e26ea83 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 11 2017 23:06:09 +0000
Subject: [PATCH 16/39] make alt prerelase page mobile friendly


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index 4368ec0..181e1dd 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -221,168 +221,286 @@
         <div class="panel-group" id="accordion">
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h3 class="panel-title">
+              <h3 class="panel-title hidden-xs">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
                 <img src="/static/images/aarch64.png" />
                 ${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt; aarch64 Architecture'))}
                 </a>
               </h3>
+              <h3 class="panel-title visible-xs">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                <img src="/static/images/aarch64.png" />
+                ${Markup(_('ARM&lt;span class="sup"&gt;&reg;&lt;/span&gt;'))}
+                </a>
+              </h3>
             </div>
             <div id="collapseOne" class="panel-collapse collapse">
               <div class="panel-body panel-heading">
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/server.png" />
                   ${_('Fedora Server DVD')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/server.png" />
+                  ${_('DVD')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/aarch64/iso/Fedora-Server-dvd-aarch64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/server.png" />
                   ${_('Fedora Server Netinstall')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/server.png" />
+                  ${_('Net')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/aarch64/iso/Fedora-Server-netinst-aarch64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/cloud.png" />
                   ${_('Fedora Cloud Netinstall')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Net')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Cloud/aarch64/iso/Fedora-Cloud-netinst-aarch64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/cloud.png" />
                   ${_('Fedora Cloud qcow2')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.aarch64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/cloud.png" />
+                  ${_('qcow2')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.aarch64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/cloud.png" />
                   ${_('Fedora Cloud raw')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/cloud.png" />
+                  ${_('raw')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/aarch64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.aarch64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/docker.png" />
                   ${_('Fedora Docker')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Docker/aarch64/images/Fedora-Docker-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.aarch64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/docker.png" />
+                  ${_('Docker')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Docker/aarch64/images/Fedora-Docker-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_aarch64']}.aarch64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
               </div>
             </div>
           </div>
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h3 class="panel-title">
+              <h3 class="panel-title hidden-xs">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
                 <img src="/static/images/ppc.png" />
                 ${Markup(_('PowerPC Architecture (PPC64)'))}
                 </a>
               </h3>
+              <h3 class="panel-title visible-xs">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
+                <img src="/static/images/ppc.png" />
+                ${Markup(_('PPC64'))}
+                </a>
+              </h3>
             </div>
             <div id="collapseTwo" class="panel-collapse collapse">
               <div class="panel-body panel-heading">
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/server.png" />
                   ${_('Fedora Server DVD')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64/iso/Fedora-Server-dvd-ppc64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/server.png" />
+                  ${_('DVD')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64/iso/Fedora-Server-dvd-ppc64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/server.png" />
                   ${_('Fedora Server Netinstall')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64/iso/Fedora-Server-netinst-ppc64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/server.png" />
+                  ${_('Net')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64/iso/Fedora-Server-netinst-ppc64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/cloud.png" />
                   ${_('Fedora Cloud Netinstall')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Cloud/ppc64/iso/Fedora-Cloud-netinst-ppc64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Net')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Cloud/ppc64/iso/Fedora-Cloud-netinst-ppc64-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/cloud.png" />
                   ${_('Fedora Cloud qcow2')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.ppc64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/cloud.png" />
+                  ${_('qcow2')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.ppc64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/cloud.png" />
                   ${_('Fedora Cloud raw')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.ppc64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/cloud.png" />
+                  ${_('raw')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.ppc64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/docker.png" />
                   ${_('Fedora Docker')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Docker/ppc64/images/Fedora-Docker-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.ppc64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/docker.png" />
+                  ${_('Docker')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Docker/ppc64/images/Fedora-Docker-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64']}.ppc64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
               </div>
             </div>
           </div>
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h3 class="panel-title">
+              <h3 class="panel-title hidden-xs">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
                 <img src="/static/images/ppc.png" />
                 ${Markup(_('PowerPC Architecture (PPC64LE)'))}
                 </a>
               </h3>
+              <h3 class="panel-title visible-xs">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
+                <img src="/static/images/ppc.png" />
+                ${Markup(_('PPC64LE'))}
+                </a>
+              </h3>
             </div>
             <div id="collapseThree" class="panel-collapse collapse">
               <div class="panel-body panel-heading">
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/server.png" />
                   ${_('Fedora Server DVD')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64le/iso/Fedora-Server-dvd-ppc64le-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/server.png" />
+                  ${_('DVD')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64le/iso/Fedora-Server-dvd-ppc64le-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/server.png" />
                   ${_('Fedora Server Netinstall')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64le/iso/Fedora-Server-netinst-ppc64le-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/server.png" />
+                  ${_('Net')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/ppc64le/iso/Fedora-Server-netinst-ppc64le-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/cloud.png" />
                   ${_('Fedora Cloud Netinstall')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Cloud/ppc64le/iso/Fedora-Cloud-netinst-ppc64le-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/cloud.png" />
+                  ${_('Net')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Cloud/ppc64le/iso/Fedora-Cloud-netinst-ppc64le-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/cloud.png" />
                   ${_('Fedora Cloud qcow2')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.ppc64le.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/cloud.png" />
+                  ${_('qcow2')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.ppc64le.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/cloud.png" />
                   ${_('Fedora Cloud raw')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.ppc64le.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/cloud.png" />
+                  ${_('raw')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.ppc64le.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
                 <div class="grey-hr"></div>
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/docker.png" />
                   ${_('Fedora Docker')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Docker/ppc64le/images/Fedora-Docker-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.ppc64le.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/docker.png" />
+                  ${_('Docker')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Docker/ppc64le/images/Fedora-Docker-Base-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_ppc64le']}.ppc64le.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
               </div>
             </div>
           </div>
           <div class="panel panel-default">
             <div class="panel-heading">
-              <h3 class="panel-title">
+              <h3 class="panel-title hidden-xs">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseFour">
                 <img src="/static/images/ppc.png" />
                 ${Markup(_('s390x Architecture'))}
                 </a>
               </h3>
+              <h3 class="panel-title visible-xs">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseFour">
+                <img src="/static/images/ppc.png" />
+                ${Markup(_('s390x'))}
+                </a>
+              </h3>
             </div>
             <div id="collapseFour" class="panel-collapse collapse">
               <div class="panel-body panel-heading">
-                <h3 class="panel-title accordion-title">
+                <h3 class="panel-title accordion-title hidden-xs">
                   <img src="/static/images/server.png" />
                   ${_('Fedora Server')}
                   <span class="download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/s390x/iso/Fedora-Server-dvd-s390x-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_s390x']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
                 </h3>
-                <div class="grey-hr"></div>
+                <h3 class="panel-title accordion-title visible-xs">
+                  <img src="/static/images/server.png" />
+                  ${_('Server')}
+                  <span class="mobile-download"><a href="${global_variables.path['download_arch']}/test/${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}/Server/s390x/iso/Fedora-Server-dvd-s390x-${global_variables.release['next_alt_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold_s390x']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></span>
+                </h3>
               </div>
             </div>
           </div>
diff --git a/alt.fedoraproject.org/static/css/app.css b/alt.fedoraproject.org/static/css/app.css
index 6c3b745..dbab084 100644
--- a/alt.fedoraproject.org/static/css/app.css
+++ b/alt.fedoraproject.org/static/css/app.css
@@ -967,6 +967,12 @@ p.warning a {
   font-weight: 400;
 }
 
+.panel-heading h3.visible-xs {
+  font-size: 18px;
+  text-decoration: none;
+  font-weight: 400;
+}
+
 .accordion-title {
   color:#60605B;
   font-size: 20px;
@@ -986,6 +992,19 @@ p.warning a {
   color:#A7A9AC;
 }
 
+.panel-body .mobile-download {
+  margin-top: 14px;
+  color:#A7A9AC;
+  float: right;
+  margin-right: 10px;
+}
+
+.accordion-title .mobile-download a {
+  color:#428BCA;
+  font-size: 14px !important;
+  font-weight: 600;
+}
+
 .panel-body {
   padding: 0 !important;
 }
@@ -1114,8 +1133,7 @@ img.pull-left { margin-right: 10px; }
   .white h3 { color: #60605b; margin: 4px 0px 2px; font-size: 18px; }
   .white p, .prewhite p { color: #a7a9ac; margin: 2px 0px 2px; font-weight: 400; text-align: left; padding: 2px 0px 2px; }
   .white p.download { font-size: 14px; margin-top: 2px; text-align: left; padding: 2px 0px 2px; }
-  .border { border: none;
-}
+  .border { border: none; }
 }
 
 @media (max-width: 991px) {

From c90ef668f31021641c260592447182c8123b419e Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 12 2017 14:58:46 +0000
Subject: [PATCH 17/39] more mobile fixes


---

diff --git a/alt.fedoraproject.org/static/css/app.css b/alt.fedoraproject.org/static/css/app.css
index dbab084..7956583 100644
--- a/alt.fedoraproject.org/static/css/app.css
+++ b/alt.fedoraproject.org/static/css/app.css
@@ -955,7 +955,7 @@ p.warning a {
 }
 
 .panel-heading img {
-  padding-right: 25px;
+  padding-right: 20px;
 }
 
 .panel-heading h3,
@@ -968,7 +968,7 @@ p.warning a {
 }
 
 .panel-heading h3.visible-xs {
-  font-size: 18px;
+  font-size: 16px;
   text-decoration: none;
   font-weight: 400;
 }
@@ -993,10 +993,10 @@ p.warning a {
 }
 
 .panel-body .mobile-download {
-  margin-top: 14px;
+  margin-top: 16px;
   color:#A7A9AC;
   float: right;
-  margin-right: 10px;
+  margin-right: 7px;
 }
 
 .accordion-title .mobile-download a {

From 8c079a4ac063a11b3d14c4195214b06bb6a06452 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 12 2017 16:08:41 +0000
Subject: [PATCH 18/39] add a Atomic prerelease page - still needs script and links


---

diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index 5918b4e..7788d30 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -12,7 +12,7 @@ release={
     'curr_alt_state':  'Alpha',        # either 'Alpha', 'Beta' or '' (i.e empty)
     'curr_cloud_state':  'Alpha',       # either 'Alpha', 'Beta' or '' (i.e empty)
     'curr_cloud_AMI_state':  'Alpha',   # either 'Alpha', 'Beta' or '' (i.e empty)
-    'curr_atomic_state':  '',   # either 'Alpha', 'Beta' or '' (i.e empty)
+    'curr_atomic_state':  'Alpha',   # either 'Alpha', 'Beta' or '' (i.e empty)
     'prev_arm_id': '24',
     'prev_alt_id': '24',
     'prev_cloud_id': '24',
@@ -253,6 +253,7 @@ iso_size={
     'pre_atomic_qcow2_cloud':  '???',   # In MB
     'pre_atomic_VBvag_cloud':  '???',   # In MB
     'pre_atomic_libvag_cloud': '???',   # In MB
+    'pre_atomic_iso':          '918',   # In MB
     'pre_x86_64_docker':        '40',   # In MB
     'pre_VBvag_cloud':         '237',   # In MB
     'pre_libvag_cloud':        '227',   # In MB
diff --git a/getfedora.org/data/content/atomic/prerelease/docker.html b/getfedora.org/data/content/atomic/prerelease/docker.html
deleted file mode 100644
index e9e74bb..0000000
--- a/getfedora.org/data/content/atomic/prerelease/docker.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE html>
-<html lang="${lang}"
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:py="http://genshi.edgewall.org/"
-  xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="../../../templates/master.html" />
-  <head>
-    <script type="text/javascript" src="${path}/static/js/cloud_ec2.js"></script>
-
-    <title>${Markup(_('Download Fedora Cloud %s')) % global_variables.release['curr_state']}</title>
-  </head>
-  <body id="cloud">
-
-  <xi:include href="../../../templates/cloud/header.html" />
-  <!--!<div class="mymenu cloudmenu">
-    <div class="container">
-     <div class="row col-md-8 col-md-offset-2 row col-xs-12">
-        <div class="collapse navbar-collapse">
-          <ul class="nav nav-tabs nav-justified" role="tablist">
-                <li><a href="../">About</a></li>
-                <li><a href="#">Take the Tour</a></li>
-                <li class="active"><a href="#">Download</a></li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>-->
-
-  <header class="downloadheader">
-    <div class="container">
-      <div class="row">
-        <div class="col-md-7 col-md-offset-5 text-left recover-heading">
-          <h2>${Markup(_('Download Fedora %(rel)s %(state)s Cloud')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</h2>
-<!--            <p>${_('There are two main versions of Fedora Cloud available:')}
-              <ul>
-                <li>${Markup(_('&lt;a href="index.html"&gt;Base images&lt;/a&gt; suitable for creating VMs.'))}</li>
-                <li>${Markup(_('&lt;a href="atomic.html"&gt;Atomic images&lt;/a&gt; for creating hosts for container deployment.'))}</li>
-              </ul>
-            </p>
--->
-        </div>
-      </div>
-    </div>
-  </header>
-
-      <!-- Menu -->
-  <div class="navbar-custom navbar-default">
-      <div class="container">
-          <div class="navbar-header">
-              <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-              </button>
-          </div>
-          <div class="collapse navbar-collapse navbar-center">
-              <ul class="nav navbar-nav">
-                  <li class=""><a href="index.html">${_('Base Images')}</a></li>
-<!--                  <li class=""><a href="atomic.html">${_('Atomic Images')}</a></li>-->
-                  <li class=""><a href="docker.html" class="active">${_('Docker Image')}</a></li>
-              </ul>
-          </div>
-      </div>
-  </div>
-
-  <div class="container download-container recover-heading top-margin">
-	<div class="row">
-    <div class="col-md-8 col-xs-12">
-      <div class="row top-margin">
-          <div class="col-xs-12">
-          <p class="warning">${Markup(_('This is pre-release software and is supported by the &lt;a href="%(team_url)s"&gt;Cloud Working Group&lt;/a&gt;. Please direct questions to their &lt;a href="%(team_list)s"&gt;mailing list&lt;/a&gt; or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Cloud', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/cloud', 'team_irc':'#fedora-cloud'})}
-          ${Markup(_('All issues or bugs should be reported via the &lt;a href="%s"&gt;Red Hat Bugzilla&lt;/a&gt;. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}
-          <py:choose>
-            <py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the &lt;a href="%(relnotes_url)s"&gt;Release Notes&lt;/a&gt; for more information on changes and new features, and the &lt;a href="%(commonbugs_url)s"&gt;Common Bugs&lt;/a&gt; page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}
-            </py:when>
-            <py:when test="global_variables.release['curr_state'] == 'Beta'">${Markup(_('Read the &lt;a href="%(relnotes_url)s"&gt;Release Notes&lt;/a&gt; for more information on changes and new features, and the &lt;a href="%(commonbugs_url)s"&gt;Common Bugs&lt;/a&gt; page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/F%s_Beta_release_announcement' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}
-            </py:when>
-          </py:choose>
-          </p>
-            <h2 class="cloudy">${Markup(_('Docker %(state)s Image')) % {'state': global_variables.release['curr_state']}}</h2>
-            <p>${_('The Fedora Docker Base Image is a minimal Fedora install which can be spawned as a Docker container. It contains basic tools which can be used as a foundation for building Docker Layered Images - bash, vi and yum (and its dependencies).')}</p>
-            <h3>${_('Docker Base Image')}</h3>
-          </div>
-      </div>
-      <div class="row bottom-margin">
-          <div class="col-xs-12">
-            <p>${_('You can easily load this Docker image into your running Docker daemon using command:')}</p>
-            <pre>docker load -i Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.x86_64.tar.xz</pre>
-            <p>${_('Following command can be used to spawn a container running bash inside:')}</p>
-            <pre>docker run -it --rm Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.x86_64 bash</pre>
-            <a class="btn btn-success download-cloud" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Docker/x86_64/images/Fedora-Docker-Base-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}.x86_64.tar.xz" role="button">${_('Download')}</a>
-              <p class="caption">${_('64-bit %sMB raw.xz Image') % global_variables.iso_size['pre_x86_64_docker']}</p>
-          </div>
-      </div>
-
-      <div class="row">
-          <div class="col-sm-12 col-xs-12">
-            <h3>${_('When is Fedora %s going to be released?') % global_variables.release['next_id']}</h3>
-            <table class="table table-bordered table-responsive">
-              <thead>
-                <tr>
-                  <th>${_('Release State')}</th>
-                  <th>${_('Release Date')}</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td>${_('Alpha Release Public Availability')}</td>
-                  <td>${schedule['alpha']}</td>
-                </tr>
-                <tr>
-                  <td>${_('Beta Release Public Availability')}</td>
-                  <td>${schedule['beta']}</td>
-                </tr>
-                <tr>
-                  <td>${_('Final Release Public Availability (GA)')}</td>
-                  <td>${schedule['final']}</td>
-                </tr>
-              </tbody>
-            </table>
-            <a href="http://fedoraproject.org/wiki/Releases/${global_variables.release['next_id']}/Schedule">${_('Read all the key milestones of the release schedule...')}</a>
-          </div>
-        </div>
-
-        <div class="row bottom-space">
-          <div class="col-sm-12 col-xs-12">
-
-            <h3>${_('Verify your Image')}</h3>
-            <p>${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow &lt;a href="%s/%s/verify"&gt;these instructions&lt;/a&gt;.') % (path, lang))}</p>
-            <div class="row bottom-margin">
-              <div class="col-sm-6 col-xs-12">
-                <a class="btn btn-default btn-topmargin validate" href="${path}/static/checksums/Fedora-Docker-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}-x86_64-CHECKSUM">${_('Docker 64bit!')}</a>
-              </div>
-            </div>
-          </div>
-        </div>
-
-  	</div>
-
-    <div class="col-md-3 col-xs-12 col-md-offset-1 top-margin">
-
-    </div>
-  </div>
-</div>
-
-  </body>
-</html>
-
-
-
-
-
diff --git a/getfedora.org/data/content/atomic/prerelease/index.html b/getfedora.org/data/content/atomic/prerelease/index.html
index d50506d..3320f23 100644
--- a/getfedora.org/data/content/atomic/prerelease/index.html
+++ b/getfedora.org/data/content/atomic/prerelease/index.html
@@ -7,11 +7,12 @@
   <head>
     <script type="text/javascript" src="${path}/static/js/cloud_ec2.js"></script>
 
-    <title>${Markup(_('Download Fedora Cloud %s')) % global_variables.release['curr_state']}</title>
+    <title>${_('Download Fedora Atomic')}</title>
   </head>
   <body id="cloud">
 
   <xi:include href="../../../templates/cloud/header.html" />
+  <xi:include href="../../../templates/regulations.html" />
   <!--!<div class="mymenu cloudmenu">
     <div class="container">
      <div class="row col-md-8 col-md-offset-2 row col-xs-12">
@@ -30,39 +31,15 @@
     <div class="container">
       <div class="row">
         <div class="col-md-7 col-md-offset-5 text-left recover-heading">
-          <h2>${Markup(_('Download Fedora %(rel)s %(state)s Cloud')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</h2>
-<!--            <p>${_('There are two main versions of Fedora Cloud available:')}
-              <ul>
-                <li>${Markup(_('&lt;a href="index.html"&gt;Base images&lt;/a&gt; suitable for creating VMs.'))}</li>
-                <li>${Markup(_('&lt;a href="atomic.html"&gt;Atomic images&lt;/a&gt; for creating hosts for container deployment.'))}</li>
-              </ul>
-            </p>
--->
+          <h2>${Markup(_('Download Fedora %(rel)s %(state)s Atomic Host')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</h2>
+            <p>${_('Atomic Host is built every 2 weeks or so.')}</p>
+            <p py:if="not global_variables.release['atomic_freshness']">${Markup(_('The latest two week build did not meet our testing criteria. The images available are from over %(atomic_age)s days ago. Check the Project Atomic blog for updates and information about Atomic blocker bugs.') % global_variables.release)}</p>
+            <p py:if="global_variables.release['atomic_freshness']">${Markup(_('These are the latest official Fedora Atomic Host images, produced %(atomic_age)s days ago.') % global_variables.release)}</p>
         </div>
       </div>
     </div>
   </header>
 
-      <!-- Menu -->
-  <div class="navbar-custom navbar-default">
-      <div class="container">
-          <div class="navbar-header">
-              <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-              </button>
-          </div>
-          <div class="collapse navbar-collapse navbar-center">
-              <ul class="nav navbar-nav">
-                  <li class=""><a href="index.html" class="active">${_('Base Images')}</a></li>
-<!--                  <li class=""><a href="atomic.html">${_('Atomic Images')}</a></li>-->
-                  <li class=""><a href="docker.html">${_('Docker Image')}</a></li>
-              </ul>
-          </div>
-      </div>
-  </div>
-
   <div class="container download-container recover-heading top-margin">
 	<div class="row">
     <div class="col-md-8 col-xs-12">
@@ -71,166 +48,49 @@
           <p class="warning">${Markup(_('This is pre-release software and is supported by the &lt;a href="%(team_url)s"&gt;Cloud Working Group&lt;/a&gt;. Please direct questions to their &lt;a href="%(team_list)s"&gt;mailing list&lt;/a&gt; or %(team_irc)s on freenode.') % {'team_url':'http://fedoraproject.org/wiki/Cloud', 'team_list':'https://lists.fedoraproject.org/mailman/listinfo/cloud', 'team_irc':'#fedora-cloud'})}
           ${Markup(_('All issues or bugs should be reported via the &lt;a href="%s"&gt;Red Hat Bugzilla&lt;/a&gt;. The Fedora Project makes no guarantees as to its suitability or usefulness.') % 'https://bugzilla.redhat.com/')}
           <py:choose>
-            <py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the &lt;a href="%(relnotes_url)s"&gt;Release Notes&lt;/a&gt; for more information on changes and new features, and the &lt;a href="%(commonbugs_url)s"&gt;Common Bugs&lt;/a&gt; page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}
+            <py:when test="global_variables.release['curr_state'] == 'Alpha'">${Markup(_('Read the &lt;a href="%(relnotes_url)s"&gt;Release Notes&lt;/a&gt; for more information on changes and new features, and the &lt;a href="%(commonbugs_url)s"&gt;Common Bugs&lt;/a&gt; page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/Fedora_%s_Alpha_release_notes' % global_variables.release['next_atomic_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_atomic_id'])})}
             </py:when>
-            <py:when test="global_variables.release['curr_state'] == 'Beta'">${Markup(_('Read the &lt;a href="%(relnotes_url)s"&gt;Release Notes&lt;/a&gt; for more information on changes and new features, and the &lt;a href="%(commonbugs_url)s"&gt;Common Bugs&lt;/a&gt; page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/F%s_Beta_release_announcement' % global_variables.release['next_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_id'])})}
+            <py:when test="global_variables.release['curr_state'] == 'Beta'">${Markup(_('Read the &lt;a href="%(relnotes_url)s"&gt;Release Notes&lt;/a&gt; for more information on changes and new features, and the &lt;a href="%(commonbugs_url)s"&gt;Common Bugs&lt;/a&gt; page for information on commonly-encountered bugs and how to avoid them.') % {'relnotes_url':'https://fedoraproject.org/wiki/F%s_Beta_release_announcement' % global_variables.release['next_atomic_id'], 'commonbugs_url': 'https://fedoraproject.org/wiki/Common_F%s_bugs' % (global_variables.release['next_atomic_id'])})}
             </py:when>
           </py:choose>
         </p>
-            <h2 class="cloudy">${Markup(_('Base Cloud %(state)s Images')) % {'state': global_variables.release['curr_state']}}</h2>
-            <p>${_('The images on this page are Fedora Cloud images for creating general purpose virtual machines (VMs).')}</p>
-            <h3>${_('Base Cloud Image')}</h3>
-          </div>
-      </div>
-      <!-- Mobile -->
-      <div class="row visible-xs">
-      	  <div class="col-xs-12">
-            <h5 class="bold">${_('qcow2 Image')}</h5>
-            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</p>
-            <a class="btn btn-success download-cloud" href="${global_variables.path['download']}/test/${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}/CloudImages/x86_64/images/Fedora-Cloud-Base-${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}-${global_variables.release['RC_pre_gold']}.x86_64.qcow2" role="button">${_('Download')}</a>
-              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_qcow2_x86_64_cloud']}</p>
-          </div>
-          <div class="col-xs-12">
-            <h5 class="bold">${_('Raw Image')}</h5>
-            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</p>
-            <a class="btn btn-success download-cloud" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/CloudImages/x86_64/images/Fedora-Cloud-Base-${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}-${global_variables.release['RC_pre_gold']}.x86_64.raw.xz" role="button">${_('Download')}</a>
-              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_raw_x86_64_cloud']}</p>
-          </div>
-      </div>
-
-      <!-- Desktop -->
-      <div class="row hidden-xs">
-      	  <div class="col-sm-6">
-            <h5 class="bold">${_('qcow2 Image')}</h5>
-            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</p>
-           </div>
-          <div class="col-sm-6">
-            <h5 class="bold">${_('Raw Image')}</h5>
-           <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</p>
-          </div>
-      </div>
-      <div class="row hidden-xs">
-          <div class="col-sm-6">
-            <a class="btn btn-success download-cloud" href="${global_variables.path['download']}/test/${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}/CloudImages/x86_64/images/Fedora-Cloud-Base-${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}-${global_variables.release['RC_pre_gold']}.x86_64.qcow2" role="button">${_('Download')}</a>
-              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_qcow2_x86_64_cloud']}</p>
-          </div>
-          <div class="col-sm-6">
-            <a class="btn btn-success download-cloud" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/CloudImages/x86_64/images/Fedora-Cloud-Base-${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}-${global_variables.release['RC_pre_gold']}.x86_64.raw.xz" role="button">${_('Download')}</a>
-              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_raw_x86_64_cloud']}</p>
           </div>
       </div>
-      <!-- end Desktop -->
-
-<!-- Start Vagrant
-        <div class="row">
-            <div class="col-xs-12 top-margin">
-              <h3>${_('Base Cloud Images for Vagrant')}</h3>
-              <p>${_('These images are Vagrant Boxes images for deployment using Vagrant.')}</p>
-            </div>
-        </div>
-        <div class="row visible-xs">
-          <div class="col-xs-12">
-            <h5 class="bold">${_('VirtualBox Image')}</h5>
-            <p>${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}</p>
-            <a class="btn btn-success btn-fix download-cloud" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}-${global_variables.release['RC_pre_gold']}.x86_64.vagrant-virtualbox.box" role="button">${_('VirtualBox Image')}</a>
-              <p class="caption">${_('64-bit %sMB VirtualBox Base Vagrant Image') % global_variables.iso_size['pre_VBvag_cloud']}</p>
-          </div>
-          <div class="col-xs-12">
-            <h5 class="bold">${_('libvirt/KVM Image')}</h5>
-            <p>${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}</p>
-            <a class="btn btn-success btn-fix download-cloud" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}-${global_variables.release['RC_pre_gold']}.x86_64.vagrant-libvirt.box" role="button">${_('libvirt/KVM Image')}</a>
-              <p class="caption">${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['pre_libvag_cloud']}</p>
-          </div>
-        </div>
-
-        <div class="row hidden-xs">
-          <div class="col-sm-6">
-            <h5 class="bold">${_('VirtualBox Image')}</h5>
-            <p>${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}</p>
-          </div>
-          <div class="col-sm-6">
-            <h5 class="bold">${_('libvirt/KVM Image')}</h5>
-            <p>${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}</p>
-          </div>
-        </div>
-        <div class="row hidden-xs">
-          <div class="col-sm-6">
-            <a class="btn btn-success btn-fix download-cloud" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}-${global_variables.release['RC_pre_gold']}.x86_64.vagrant-virtualbox.box" role="button">${_('VirtualBox Image')}</a>
-              <p class="caption">${_('64-bit %sMB VirtualBox Base Vagrant Image') % global_variables.iso_size['pre_VBvag_cloud']}</p>
-          </div>
-          <div class="col-sm-6">
-            <a class="btn btn-success btn-fix download-cloud" href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}-${global_variables.release['RC_pre_gold']}.x86_64.vagrant-libvirt.box" role="button">${_('libvirt/KVM Image')}</a>
-              <p class="caption">${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['pre_libvag_cloud']}</p>
-          </div>
-        </div>
-End Vagrant -->
-
 
       <!-- Start Amazon -->
         <div class="row">
-            <div class="col-xs-12 top-margin">
-              <h3>${_('Base Cloud Images for Amazon Public Cloud EC2')}</h3>
-              <p>${_('The links below will provide you listings of available AMIs by region with buttons to launch them in your Amazon Web Services account. AMI IDs for usage with the AWS Console or command-line tools are also provided.')}</p>
-              <p>${_('All images are available in two formats: a GP2 format which uses faster SSD storage, and a standard format which is more suitable if you have infrequently accessed data and you want to keep storage cost low.')}</p>
+            <div class="col-xs-12">
+              <h3>${_('Atomic Host Images for Amazon Public Cloud EC2')}</h3>
+              <p>${_('The links below will provide you listings of available Atomic Host Hardware Virtual Machine (HVM) AMIs by region with buttons to launch them in your Amazon Web Services account. AMI IDs for usage with the AWS Console or command-line tools are also provided.')}</p>
             </div>
         </div>
         <!-- Mobile -->
         <div class="row visible-xs">
           <div class="col-xs-12">
-            <h5 class="bold">${_('Hardware Virtual Machine (HVM)')}</h5>
-            <p>${_('If you\'re unsure which image to choose, use this format. It can provide the same or better performance than PV images.')}</p>
+            <h5 class="bold">${_('GP2 Format')}</h5>
+            <p>${_('GP2 format AMIs use faster SSD storage; use these AMIs for speed, although note your storage costs will be more than standard.')}</p>
             <!-- Modal for EC2 Cloud GP2 Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".GP2-base-EC2-mobile">${_('GP2 HVM AMIs')}</button>
-            <div class="modal fade GP2-base-EC2-mobile" tabindex="-1" role="dialog" aria-hidden="true">
-              <div class="modal-dialog modal-cloud">
-                <div class="modal-content"> download-cloud
-                  <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>
-                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s GP2 Base Cloud HVM AMIs')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</h4>
-                  </div>
-                  <table class="table table-hover">
-                    <thead>
-                      <tr>
-                        <th>${_('Region')}</th>
-                        <th class="hidden-xs">${_('AMI ID')}</th>
-                        <th class="text-center">${_('Launch')}</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr py:for="r in global_variables.EC2_regions">
-                        <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI">${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI" class="hidden-xs">${global_variables.pre_GP2_HVM_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
-                      </tr>
-                    </tbody>
-                  </table>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="col-xs-12">
-            <!-- Modal for EC2 Cloud standard Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".base-EC2-mobile">${_('Standard HVM AMIs')}</button>
-            <div class="modal fade base-EC2-mobile" tabindex="-1" role="dialog" aria-hidden="true">
+            <button type="button" class="btn btn-success btn-fix download-cloud-splash" data-toggle="modal" data-target=".GP2-atomic-mobile-EC2">${_('GP2 HVM AMIs')}</button>
+            <div class="modal fade GP2-atomic-mobile-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
                   <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>
-                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s standard Base Cloud HVM AMIs')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</h4>
+                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s GP2 Atomic Host HVM AMIs')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</h4>
                   </div>
                   <table class="table table-hover">
                     <thead>
                       <tr>
                         <th>${_('Region')}</th>
                         <th class="hidden-xs">${_('AMI ID')}</th>
-                        <th class="text-center">${_('Launch')}</th>
+                        <th>${_('Launch')}</th>
                       </tr>
                     </thead>
                     <tbody>
                       <tr py:for="r in global_variables.EC2_regions">
-                        <td py:if="r.code in global_variables.pre_HVM_base_AMI">${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.pre_HVM_base_AMI" class="hidden-xs">${global_variables.pre_HVM_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.pre_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
+                        <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI">${_(r.long)}</td>
+                        <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI" class="hidden-xs">${global_variables.GP2_HVM_atomic_AMI[r.code]}</td>
+                        <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.GP2_HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
                       </tr>
                     </tbody>
                   </table>
@@ -238,32 +98,31 @@ End Vagrant -->
               </div>
             </div>
           </div>
-
           <div class="col-xs-12 top-margin">
-            <h5 class="bold">${_('Paravirtual (PV)')}</h5>
-            <p>${_('If you know you need a paravirtual format image for EC2, use this format.')}</p>
-            <!-- Modal for EC2 GP2 Cloud Base PV Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".GP2-base-EC2-PV-mobile">${_('GP2 PV AMIs')}</button>
-            <div class="modal fade GP2-base-EC2-PV-mobile" tabindex="-1" role="dialog" aria-hidden="true">
+            <h5 class="bold">${_('Standard Format)')}</h5>
+            <p>${_('Standard format AMIs are more suitable if you have infrequently accessed data and want to keep storage cost low.')}</p>
+            <!-- Modal for EC2 Cloud standard Base HVM Instances -->
+            <button type="button" class="btn btn-success btn-fix download-cloud-splash" data-toggle="modal" data-target=".atomic-mobile-EC2">${_('Standard HVM AMIs')}</button>
+            <div class="modal fade atomic-mobile-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
                   <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>
-                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s GP2 Base Cloud PV AMIs')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</h4>
+                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s Standard Atomic Host HVM AMIs')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</h4>
                   </div>
                   <table class="table table-hover">
                     <thead>
                       <tr>
                         <th>${_('Region')}</th>
                         <th class="hidden-xs">${_('AMI ID')}</th>
-                        <th class="text-center">${_('Launch')}</th>
+                        <th>${_('Launch')}</th>
                       </tr>
                     </thead>
                     <tbody>
                       <tr py:for="r in global_variables.EC2_regions">
-                        <td>${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.pre_GP2_PV_base_AMI" class="hidden-xs">${global_variables.pre_GP2_PV_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.pre_GP2_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_PV_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
+                        <td py:if="r.code in global_variables.HVM_atomic_AMI">${_(r.long)}</td>
+                        <td py:if="r.code in global_variables.HVM_atomic_AMI" class="hidden-xs">${global_variables.HVM_atomic_AMI[r.code]}</td>
+                        <td py:if="r.code in global_variables.HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
                       </tr>
                     </tbody>
                   </table>
@@ -271,238 +130,232 @@ End Vagrant -->
               </div>
             </div>
           </div>
-          <div class="col-xs-12">
-            <!-- Modal for EC2 Standard Cloud Base PV Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".base-EC2-PV-mobile">${_('Standard PV AMIs')}</button>
-            <div class="modal fade base-EC2-PV-mobile" tabindex="-1" role="dialog" aria-hidden="true">
-              <div class="modal-dialog modal-cloud">
-                <div class="modal-content">
-                  <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>
-                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s Standard Base Cloud PV AMIs')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</h4>
-                  </div>
-                  <table class="table table-hover">
-                    <thead>
-                      <tr>
-                        <th>${_('Region')}</th>
-                        <th class="hidden-xs">${_('AMI ID')}</th>
-                        <th class="text-center">${_('Launch')}</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr py:for="r in global_variables.EC2_regions">
-                        <td>${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.pre_PV_base_AMI" class="hidden-xs">${global_variables.pre_PV_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.pre_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_PV_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
-                      </tr>
-                    </tbody>
-                  </table>
-                </div>
-              </div>
-            </div>
           </div>
-        </div>
 
           <!-- Desktop -->
         <div class="row hidden-xs">
           <div class="col-sm-6">
-            <h5 class="bold">${_('Hardware Virtual Machine (HVM)')}</h5>
-            <p>${_('If you\'re unsure which image to choose, use this format. It can provide the same or better performance than PV images.')}</p>
+            <h5 class="bold">${_('GP2 Format')}</h5>
+            <p>${_('GP2 format AMIs use faster SSD storage; use these AMIs for speed, although note your storage costs will be more than standard.')}</p>
           </div>
           <div class="col-sm-6">
-            <h5 class="bold">${_('Paravirtual (PV)')}</h5>
-            <p>${_('If you know you need a paravirtual format image for EC2, use this format.')}</p>
+            <h5 class="bold">${_('Standard Format')}</h5>
+            <p>${_('Standard format AMIs are more suitable if you have infrequently accessed data and want to keep storage cost low.')}</p>
           </div>
         </div>
-        <div class="row hidden-xs bottom-space">
+        <div class="row hidden-xs">
           <div class="col-sm-6">
             <!-- Modal for EC2 GP2 Cloud Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".GP2-base-EC2">${_('GP2 HVM AMIs')}</button>
-            <div class="modal fade GP2-base-EC2" tabindex="-1" role="dialog" aria-hidden="true">
+            <button type="button" class="btn btn-success btn-fix download-cloud-splash" data-toggle="modal" data-target=".GP2-atomic-EC2">${_('GP2 HVM AMIs')}</button>
+            <div class="modal fade GP2-atomic-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
                   <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>
-                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s GP2 Base Cloud HVM AMIs')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</h4>
+                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s GP2 Atomic Host HVM AMIs')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</h4>
                   </div>
                   <table class="table table-hover">
                     <thead>
                       <tr>
                         <th>${_('Region')}</th>
                         <th class="hidden-xs">${_('AMI ID')}</th>
-                        <th class="text-center">${_('Launch')}</th>
+                        <th>${_('Launch')}</th>
                       </tr>
                     </thead>
                     <tbody>
                       <tr py:for="r in global_variables.EC2_regions">
-                        <td>${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI" class="hidden-xs">${global_variables.pre_GP2_HVM_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
+                        <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI">${_(r.long)}</td>
+                        <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI" class="hidden-xs">${global_variables.GP2_HVM_atomic_AMI[r.code]}</td>
+                        <td py:if="r.code in global_variables.GP2_HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.GP2_HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
                       </tr>
                     </tbody>
                   </table>
                 </div>
               </div>
             </div>
-            <!-- Modal for EC2 Standard Cloud Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".base-EC2">${_('Standard HVM AMIs')}</button>
-            <div class="modal fade base-EC2" tabindex="-1" role="dialog" aria-hidden="true">
-              <div class="modal-dialog modal-cloud">
-                <div class="modal-content">
-                  <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>
-                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s Standard Base Cloud HVM AMIs')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</h4>
-                  </div>
-                  <table class="table table-hover">
-                    <thead>
-                      <tr>
-                        <th>${_('Region')}</th>
-                        <th class="hidden-xs">${_('AMI ID')}</th>
-                        <th class="text-center">${_('Launch')}</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr py:for="r in global_variables.EC2_regions">
-                        <td>${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.pre_HVM_base_AMI" class="hidden-xs">${global_variables.pre_HVM_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.pre_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
-                      </tr>
-                    </tbody>
-                  </table>
-                </div>
-              </div>
-            </div>
-
-
           </div>
           <div class="col-sm-6">
-            <!-- Modal for EC2 GP2 Cloud Base PV Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".GP2-base-EC2-PV">${_('GP2 PV AMIs')}</button>
-            <div class="modal fade GP2-base-EC2-PV" tabindex="-1" role="dialog" aria-hidden="true">
-              <div class="modal-dialog modal-cloud">
-                <div class="modal-content">
-                  <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>
-                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s GP2 Base Cloud PV AMIs')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</h4>
-                  </div>
-                  <table class="table table-hover">
-                    <thead>
-                      <tr>
-                        <th>${_('Region')}</th>
-                        <th class="hidden-xs">${_('AMI ID')}</th>
-                        <th class="text-center">${_('Launch')}</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr py:for="r in global_variables.EC2_regions">
-                        <td>${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.pre_GP2_PV_base_AMI" class="hidden-xs">${global_variables.pre_GP2_PV_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.pre_GP2_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_PV_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
-                      </tr>
-                    </tbody>
-                  </table>
-                </div>
-              </div>
-            </div>
-            <!-- Modal for EC2 Standard Cloud Base PV Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".base-EC2-PV">${_('Standard PV AMIs')}</button>
-            <div class="modal fade base-EC2-PV" tabindex="-1" role="dialog" aria-hidden="true">
+            <!-- Modal for EC2 Standard Cloud Base HVM Instances -->
+            <button type="button" class="btn btn-success btn-fix download-cloud-splash" data-toggle="modal" data-target=".atomic-EC2">${_('Standard HVM AMIs')}</button>
+            <div class="modal fade atomic-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
                   <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>
-                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s Standard Base Cloud PV AMIs')) % {'rel':global_variables.release['next_id'], 'state': global_variables.release['curr_state']}}</h4>
+                    <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s Standard Atomic Host HVM AMIs')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</h4>
                   </div>
                   <table class="table table-hover">
                     <thead>
                       <tr>
                         <th>${_('Region')}</th>
                         <th class="hidden-xs">${_('AMI ID')}</th>
-                        <th class="text-center">${_('Launch')}</th>
+                        <th>${_('Launch')}</th>
                       </tr>
                     </thead>
                     <tbody>
                       <tr py:for="r in global_variables.EC2_regions">
-                        <td>${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.pre_PV_base_AMI" class="hidden-xs">${global_variables.pre_PV_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.pre_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_PV_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
+                        <td py:if="r.code in global_variables.HVM_atomic_AMI">${_(r.long)}</td>
+                        <td py:if="r.code in global_variables.HVM_atomic_AMI" class="hidden-xs">${global_variables.HVM_atomic_AMI[r.code]}</td>
+                        <td py:if="r.code in global_variables.HVM_atomic_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.HVM_atomic_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>
                       </tr>
                     </tbody>
                   </table>
                 </div>
               </div>
             </div>
-
-
-
           </div>
         </div>
       <!-- End Amazon -->
 
-      <div class="row">
-          <div class="col-sm-12 col-xs-12">
-            <h3>${_('When is Fedora %s going to be released?') % global_variables.release['next_id']}</h3>
-            <table class="table table-bordered table-responsive">
-              <thead>
-                <tr>
-                  <th>${_('Release State')}</th>
-                  <th>${_('Release Date')}</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td>${_('Alpha Release Public Availability')}</td>
-                  <td>${schedule['alpha']}</td>
-                </tr>
-                <tr>
-                  <td>${_('Beta Release Public Availability')}</td>
-                  <td>${schedule['beta']}</td>
-                </tr>
-                <tr>
-                  <td>${_('Final Release Public Availability (GA)')}</td>
-                  <td>${schedule['final']}</td>
-                </tr>
-              </tbody>
-            </table>
-            <a href="http://fedoraproject.org/wiki/Releases/${global_variables.release['next_id']}/Schedule">${_('Read all the key milestones of the release schedule...')}</a>
-          </div>
-        </div>
-
-        <div class="row bottom-space">
-          <div class="col-sm-12 col-xs-12">
+      <!-- Start Vagrant -->
+        <div class="row">
+            <div class="col-xs-12 top-margin">
+              <h3>${_('Atomic Host Images for Vagrant')}</h3>
+                <p>${Markup(_('Vagrant Boxes for Fedora Atomic Host are available for the VirtualBox and Libvirt providers. You can bring up Fedora Atomic Host in a vagrant box by downloading the images from Fedora or using the vagrant tools to pull the images from &lt;a href="%s"&gt;HashiCorp\'s Atlas&lt;/a&gt;.') % ('https://atlas.hashicorp.com/fedora'))}</p>
+          	  <a href="#" id="openstack-base-click" class="btn btn-success download-cloud" role="button">${_('View Vagrant Downloads')}</a>
+	          <div id="openstack-base-link" class="reveal" style="display: none;">
+	            <div class="row">
+	              <h4 class="bold">${_('Vagrant Image Downloads')}</h4>
+	              <p>${Markup(_('These images are Vagrant Boxes images for deployment using &lt;a href="%s"&gt;Vagrant&lt;/a&gt;.') % ('https://www.vagrantup.com/'))}</p>
+	            </div>
+	            <!-- Mobile -->
+	            <div class="row visible-xs">
+	              <div class="col-xs-12">
+	                <h5 class="bold">${_('VirtualBox Image')}</h5>
+	                <p>${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}</p>
+	                <a class="btn btn-success btn-fix download-cloud download-cloud-splash" href="${global_variables.release['atomic_VBvag_cloud_url']}" role="button">${_('Download')}</a>
+	                  <p class="caption">${_('64-bit %sMB VirtualBox Base Vagrant Image') % global_variables.iso_size['pre_atomic_VBvag_cloud']}</p>
+	              </div>
+	              <div class="col-xs-12">
+	                <h5 class="bold">${_('libvirt/KVM Image')}</h5>
+	                <p>${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}</p>
+	                <a class="btn btn-success btn-fix download-cloud download-cloud-splash" href="${global_variables.release['atomic_libvag_cloud_url']}" role="button">${_('Download')}</a>
+	                  <p class="caption">${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['pre_atomic_libvag_cloud']}</p>
+	              </div>
+	            </div>
 
-            <h3>${_('Verify your Image')}</h3>
-            <p>${Markup(_('Once you have downloaded an image, verify it for security and integrity. To verify your image, start by downloading the proper CHECKSUM file into the same directory as the image you downloaded and follow &lt;a href="%s/%s/verify"&gt;these instructions&lt;/a&gt;.') % (path, lang))}</p>
-            <div class="row">
-              <div class="col-sm-6 col-xs-12">
-                <a class="btn btn-default btn-topmargin validate" href="${path}/static/checksums/Fedora-CloudImages-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-${global_variables.release['RC_pre_gold']}-x86_64-CHECKSUM">${_('Validate 64bit!')}</a>
-              </div>
-<!--              <div class="col-sm-6 col-xs-12">
-                <a class="btn btn-default btn-topmargin validate" href="${path}/static/checksums/Fedora-Cloud_Images-i386-${global_variables.release['next_id']}_${global_variables.release['curr_state']}-CHECKSUM">${_('Validate 32bit!')}</a>
-              </div>  -->
+	              <!-- Desktop -->
+	            <div class="row hidden-xs">
+	              <div class="col-sm-6">
+	                <h5 class="bold">${_('VirtualBox Image')}</h5>
+	                <p>${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}</p>
+	              </div>
+	              <div class="col-sm-6">
+	                <h5 class="bold">${_('libvirt/KVM Image')}</h5>
+	                <p>${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}</p>
+	              </div>
+	            </div>
+	            <div class="row hidden-xs">
+	              <div class="col-sm-6">
+	                <a class="btn btn-success btn-fix download-cloud download-cloud-splash" href="${global_variables.release['atomic_VBvag_cloud_url']}" role="button">${_('Download')}</a>
+	                  <p class="caption">${_('64-bit %sMB VirtualBox Base Vagrant Image') % global_variables.iso_size['pre_atomic_VBvag_cloud']}</p>
+	              </div>
+	              <div class="col-sm-6">
+	                <a class="btn btn-success btn-fix download-cloud download-cloud-splash" href="${global_variables.release['atomic_libvag_cloud_url']}" role="button">${_('Download')}</a>
+	                  <p class="caption">${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['pre_atomic_libvag_cloud']}</p>
+	              </div>
+	            </div>
+	          </div>
+	        </div>
+	    </div>
+	    <div class="row">
+	    	<div class="col-xs-12">
+	          <a href="#" id="openstack-cont-click" class="btn btn-success download-cloud" role="button">${_('View Downloads using Vagrant tools')}</a>
+	          <div id="openstack-cont-link" class="reveal" style="display: none;">
+	            <div class="row">
+	              <div class="col-xs-12">
+	              	<h4 class="bold">${_('Vagrant Downloads using Vagrant tools')}</h4>
+	              	<p>${Markup(_('You can use the following command to grab the Vagrant Box images from &lt;a href="%s"&gt;HashiCorp\'s Atlas&lt;/a&gt;.') % ('https://atlas.hashicorp.com/fedora'))}</p>
+	                <pre>vagrant box add fedora/${global_variables.release['curr_atomic_id']}-atomic-host</pre>
+	                <p>${Markup(_('If you\'ve previously run Fedora %(rel)s Atomic Host in Vagrant on your machine then you can get the latest version by running:')) % {'rel':global_variables.release['curr_atomic_id']}}</p>
+	                <pre>vagrant box update --box=fedora/${global_variables.release['next_atomic_id']}_${global_variables.release['curr_atomic_state']}-atomic-host</pre>
+	              </div>
+	            </div>
+	          </div>
+	        </div>
+	    </div>
+        <div class="row">
+            <div class="col-xs-12 top-margin">
+              <p>${Markup(_('For more information about running Vagrant on Fedora Workstation, see &lt;a href="%s"&gt;our wiki page&lt;/a&gt;.') % ('https://fedoraproject.org/wiki/Vagrant'))}</p>
             </div>
-          </div>
         </div>
+        <!-- End Vagrant -->
+
+        <!-- Start Base images -->
+		      <div class="row">
+		          <div class="col-xs-12">
+		            <h3>${_('Atomic Host Images for Cloud Environments')}</h3>
+		          </div>
+		      </div>
+		      <!-- Mobile -->
+		      <div class="row visible-xs">
+		          <div class="col-xs-12">
+		            <h5 class="bold">${_('qcow2 Image')}</h5>
+		            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</p>
+		            <a class="btn btn-success download-cloud-splash" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>
+		              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_atomic_qcow2_cloud']}</p>
+		          </div>
+		          <div class="col-xs-12">
+		            <h5 class="bold">${_('Raw Image')}</h5>
+		            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</p>
+		            <a class="btn btn-success download-cloud-splash" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>
+		              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_atomic_raw_cloud']}</p>
+		          </div>
+		      </div>
+		      <!-- Desktop -->
+		      <div class="row hidden-xs">
+		          <div class="col-sm-6">
+		            <h5 class="bold">${_('qcow2 Image')}</h5>
+		            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</p>
+		          </div>
+		          <div class="col-sm-6">
+		            <h5 class="bold">${_('Raw Image')}</h5>
+		            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</p>
+		          </div>
+		      </div>
+		      <div class="row hidden-xs">
+		          <div class="col-sm-6">
+		            <a class="btn btn-success download-cloud-splash" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>
+		              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_atomic_qcow2_cloud']}</p>
+		          </div>
+		          <div class="col-sm-6">
+		            <a class="btn btn-success download-cloud-splash" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>
+		              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_atomic_raw_cloud']}</p>
+		          </div>
+		      </div>
+      <!-- end Base images -->
 
+    <hr />
+    <xi:include href="../../../templates/export-regulations.html" />
   </div>
 
-<!--    <div class="col-md-3 col-xs-12 col-md-offset-1 top-margin">
+    <div class="col-md-3 col-xs-12 col-md-offset-1 top-margin">
         <h3>${_('Other Downloads')}</h3>
-        <p>
-          ${_('Base Images:')}
           <ul>
-            <li><p><a href="${global_variables.path['download']}/test/${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}/Cloud/i386/Images/Fedora-Cloud-Base-${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}-${global_variables.release['pre_cloud_composedate']}.i386.qcow2">${_('32-bit qcow2 image for OpenStack')}</a></p></li>
-            <li><p><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Cloud/i386/Images/Fedora-Cloud-Base-${global_variables.release['next_cloud_id']}_${global_variables.release['curr_cloud_state']}-${global_variables.release['pre_cloud_composedate']}.i386.raw.xz">${_('32-bit raw image')}</a></p></li>
+            <li><p><a class="download-cloud-splash" href="${global_variables.path['download_atomic']}/stable/Fedora-Atomic-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}/Atomic/x86_64/iso/Fedora-Atomic-ostree-x86_64-${global_variables.release['curr_atomic_id']}-${global_variables.release['atomic_composedate']}.iso">${_('Atomic Host ISO image (%sMB)') % global_variables.iso_size['pre_atomic_iso']}</a></p></li>
+            <li><p><a class="download-cloud-splash" href="${global_variables.path['download']}/${global_variables.release['curr_id']}/Docker/x86_64/images/Fedora-Docker-Base-${global_variables.release['curr_id']}-${global_variables.release['RC_gold']}.x86_64.tar.xz">${_('Docker Image (%sMB)') % global_variables.iso_size['pre_x86_64_docker']}</a></p></li>
+            <li><p><a href="https://cloud.fedoraproject.org/">Fedora Cloud Base images</a></p></li>
           </ul>
-        </p>
-    </div> -->
+        <div class="top-space bottom-margin"><h4>${_('Resources')}</h4></div>
+          <p><i class="fa fa-fw fa-sm header-icon fa-globe"></i>${Markup(_('&lt;a href="https://www.projectatomic.io/docs/quickstart/"&gt;&lt;strong&gt;Project Atomic: Getting Started&lt;/strong&gt;&lt;/a&gt;'))}</p>
+          <div class="pull-right bottom-step"><p>${_('Documentation on getting started using Project Atomic / Atomic Host.')}</p></div>
+          <p><i class="fa fa-fw fa-sm header-icon fa-envelope-o"></i>${Markup(_('&lt;a href="https://lists.projectatomic.io/mailman/listinfo/atomic"&gt;&lt;strong&gt;Project Atomic: Mailing List&lt;/strong&gt;&lt;/a&gt;'))}</p>
+          <div class="pull-right bottom-step"><p>${Markup(_('Join the upstream mailing list at &lt;a href="%s"&gt;atomic@projectatomic.io&lt;/a&gt;.') % ('mailto:atomic@projectatomic.io'))}</p></div>
+          <p><i class="fa fa-fw fa-sm header-icon fa-comments-o"></i>${Markup(_('&lt;a href="%s"&gt;&lt;strong&gt;Project Atomic: IRC Chat&lt;/strong&gt;&lt;/a&gt;') % ('https://kiwiirc.com/client/irc.freenode.net'))}</p>
+          <div class="pull-right bottom-margin"><p>${Markup(_('Join the Project Atomic channel &lt;strong&gt;#atomic&lt;/strong&gt;&lt;/a&gt; on &lt;strong&gt;irc.freenode.org&lt;/strong&gt;&lt;/a&gt;.'))}</p></div>
+          <noscript>
+          <div class="bottom-margin">
+            <h3>${_('Verify')}</h3>
+              <ul>
+              <li>
+                  <p><a href="/verify">${_('Verify your Image')}</a></p>
+              </li>
+              </ul>
+          </div>
+          </noscript>
+    </div>
   </div>
 </div>
 
   </body>
 </html>
-
-
-
-
-

From 2ad7a4bb9471acf429e6eccd89c416bbdae93cc8 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 12 2017 21:42:41 +0000
Subject: [PATCH 19/39] even more mobile tweaks for alt.fpo


---

diff --git a/alt.fedoraproject.org/static/css/app.css b/alt.fedoraproject.org/static/css/app.css
index 7956583..c4a8080 100644
--- a/alt.fedoraproject.org/static/css/app.css
+++ b/alt.fedoraproject.org/static/css/app.css
@@ -1134,6 +1134,7 @@ img.pull-left { margin-right: 10px; }
   .white p, .prewhite p { color: #a7a9ac; margin: 2px 0px 2px; font-weight: 400; text-align: left; padding: 2px 0px 2px; }
   .white p.download { font-size: 14px; margin-top: 2px; text-align: left; padding: 2px 0px 2px; }
   .border { border: none; }
+  .panel-heading img { padding-right: 5px; }
 }
 
 @media (max-width: 991px) {

From 9e12dbe26bf37dd154452b48d0eaec6698775618 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 12 2017 21:53:24 +0000
Subject: [PATCH 20/39] drop atomic splash screen for prerelease


---

diff --git a/getfedora.org/data/content/atomic/prerelease/index.html b/getfedora.org/data/content/atomic/prerelease/index.html
index 3320f23..dded4e2 100644
--- a/getfedora.org/data/content/atomic/prerelease/index.html
+++ b/getfedora.org/data/content/atomic/prerelease/index.html
@@ -70,7 +70,7 @@
             <h5 class="bold">${_('GP2 Format')}</h5>
             <p>${_('GP2 format AMIs use faster SSD storage; use these AMIs for speed, although note your storage costs will be more than standard.')}</p>
             <!-- Modal for EC2 Cloud GP2 Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud-splash" data-toggle="modal" data-target=".GP2-atomic-mobile-EC2">${_('GP2 HVM AMIs')}</button>
+            <button type="button" class="btn btn-success btn-fix" data-toggle="modal" data-target=".GP2-atomic-mobile-EC2">${_('GP2 HVM AMIs')}</button>
             <div class="modal fade GP2-atomic-mobile-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
@@ -102,7 +102,7 @@
             <h5 class="bold">${_('Standard Format)')}</h5>
             <p>${_('Standard format AMIs are more suitable if you have infrequently accessed data and want to keep storage cost low.')}</p>
             <!-- Modal for EC2 Cloud standard Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud-splash" data-toggle="modal" data-target=".atomic-mobile-EC2">${_('Standard HVM AMIs')}</button>
+            <button type="button" class="btn btn-success btn-fix" data-toggle="modal" data-target=".atomic-mobile-EC2">${_('Standard HVM AMIs')}</button>
             <div class="modal fade atomic-mobile-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
@@ -146,7 +146,7 @@
         <div class="row hidden-xs">
           <div class="col-sm-6">
             <!-- Modal for EC2 GP2 Cloud Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud-splash" data-toggle="modal" data-target=".GP2-atomic-EC2">${_('GP2 HVM AMIs')}</button>
+            <button type="button" class="btn btn-success btn-fix" data-toggle="modal" data-target=".GP2-atomic-EC2">${_('GP2 HVM AMIs')}</button>
             <div class="modal fade GP2-atomic-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
@@ -176,7 +176,7 @@
           </div>
           <div class="col-sm-6">
             <!-- Modal for EC2 Standard Cloud Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix download-cloud-splash" data-toggle="modal" data-target=".atomic-EC2">${_('Standard HVM AMIs')}</button>
+            <button type="button" class="btn btn-success btn-fix" data-toggle="modal" data-target=".atomic-EC2">${_('Standard HVM AMIs')}</button>
             <div class="modal fade atomic-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
@@ -223,13 +223,13 @@
 	              <div class="col-xs-12">
 	                <h5 class="bold">${_('VirtualBox Image')}</h5>
 	                <p>${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}</p>
-	                <a class="btn btn-success btn-fix download-cloud download-cloud-splash" href="${global_variables.release['atomic_VBvag_cloud_url']}" role="button">${_('Download')}</a>
+	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['atomic_VBvag_cloud_url']}" role="button">${_('Download')}</a>
 	                  <p class="caption">${_('64-bit %sMB VirtualBox Base Vagrant Image') % global_variables.iso_size['pre_atomic_VBvag_cloud']}</p>
 	              </div>
 	              <div class="col-xs-12">
 	                <h5 class="bold">${_('libvirt/KVM Image')}</h5>
 	                <p>${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}</p>
-	                <a class="btn btn-success btn-fix download-cloud download-cloud-splash" href="${global_variables.release['atomic_libvag_cloud_url']}" role="button">${_('Download')}</a>
+	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['atomic_libvag_cloud_url']}" role="button">${_('Download')}</a>
 	                  <p class="caption">${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['pre_atomic_libvag_cloud']}</p>
 	              </div>
 	            </div>
@@ -247,11 +247,11 @@
 	            </div>
 	            <div class="row hidden-xs">
 	              <div class="col-sm-6">
-	                <a class="btn btn-success btn-fix download-cloud download-cloud-splash" href="${global_variables.release['atomic_VBvag_cloud_url']}" role="button">${_('Download')}</a>
+	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['atomic_VBvag_cloud_url']}" role="button">${_('Download')}</a>
 	                  <p class="caption">${_('64-bit %sMB VirtualBox Base Vagrant Image') % global_variables.iso_size['pre_atomic_VBvag_cloud']}</p>
 	              </div>
 	              <div class="col-sm-6">
-	                <a class="btn btn-success btn-fix download-cloud download-cloud-splash" href="${global_variables.release['atomic_libvag_cloud_url']}" role="button">${_('Download')}</a>
+	                <a class="btn btn-success btn-fix download-cloud" href="${global_variables.release['atomic_libvag_cloud_url']}" role="button">${_('Download')}</a>
 	                  <p class="caption">${_('64-bit %sMB libvirt/KVM Base Vagrant Image') % global_variables.iso_size['pre_atomic_libvag_cloud']}</p>
 	              </div>
 	            </div>
@@ -292,13 +292,13 @@
 		          <div class="col-xs-12">
 		            <h5 class="bold">${_('qcow2 Image')}</h5>
 		            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</p>
-		            <a class="btn btn-success download-cloud-splash" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>
+		            <a class="btn btn-success" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>
 		              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_atomic_qcow2_cloud']}</p>
 		          </div>
 		          <div class="col-xs-12">
 		            <h5 class="bold">${_('Raw Image')}</h5>
 		            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</p>
-		            <a class="btn btn-success download-cloud-splash" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>
+		            <a class="btn btn-success" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>
 		              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_atomic_raw_cloud']}</p>
 		          </div>
 		      </div>
@@ -315,11 +315,11 @@
 		      </div>
 		      <div class="row hidden-xs">
 		          <div class="col-sm-6">
-		            <a class="btn btn-success download-cloud-splash" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>
+		            <a class="btn btn-success" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>
 		              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_atomic_qcow2_cloud']}</p>
 		          </div>
 		          <div class="col-sm-6">
-		            <a class="btn btn-success download-cloud-splash" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>
+		            <a class="btn btn-success" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>
 		              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_atomic_raw_cloud']}</p>
 		          </div>
 		      </div>

From 2ea0bfa6e887eeb2e81553f6dbba5618b655661f Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 12 2017 22:05:05 +0000
Subject: [PATCH 21/39] newsbox to the top and different color


---

diff --git a/getfedora.org/data/content/index.html b/getfedora.org/data/content/index.html
index 7e4d738..565ea2c 100644
--- a/getfedora.org/data/content/index.html
+++ b/getfedora.org/data/content/index.html
@@ -21,6 +21,43 @@
     </div>
   </div>
 
+  <!-- News -->
+  <py:choose>
+    <py:when test="global_variables.release['curr_state'] == 'Alpha'">
+      <div class="newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! Test it in the Download section.')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:when>
+    <py:when test="global_variables.release['curr_state'] == 'Beta'">
+      <div class="jumbotron newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! Test it in the Download section.')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:when>
+    <py:otherwise>
+      <div class="jumbotron newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('Fedora %(rel)s released! Get it now.')) % {'rel':global_variables.release['curr_id']}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:otherwise>
+  </py:choose>
+
    <header id="head">
       <div id="product-logo-row">
         <div class="col-sm-4 col-xs-12 productitem workstation">
@@ -215,42 +252,5 @@
   </div>
   </div>
 
-<!-- News -->
-      <py:choose>
-        <py:when test="global_variables.release['curr_state'] == 'Alpha'">
-          <div class="newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s %(state)s released! Check it out in the Download section.')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:when>
-        <py:when test="global_variables.release['curr_state'] == 'Beta'">
-          <div class="jumbotron newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s %(state)s released! Check it out in the Download section.')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:when>
-        <py:otherwise>
-        	<div class="jumbotron newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s released! Check it out in the Download section.')) % {'rel':global_variables.release['curr_id']}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:otherwise>
-      </py:choose>
-
 </body>
 </html>
diff --git a/getfedora.org/static/css/app.css b/getfedora.org/static/css/app.css
index 6afa2cb..cd02432 100644
--- a/getfedora.org/static/css/app.css
+++ b/getfedora.org/static/css/app.css
@@ -274,15 +274,27 @@ margin-top:4px;
 }
 
 .newsbox {
-  background-color: #ebb05d;
-  color: #000;
+  background-color: #a07cbc;
+  color: #fff;
   padding: 20px;
 }
 
 .newsbox h2,
 .newsbox h3 {
+  margin-top: 22px;
+  color: #fff;
+}
+
+.newsbox .index h3 {
   margin-top: 10px;
-  color: #000;
+  color: #fff;
+}
+
+.newsbox a,
+.newsbox a:hover,
+.newsbox a:active {
+  text-decoration: none;
+  color: #fff;
 }
 
 .product-box {
@@ -503,7 +515,7 @@ margin-top:4px;
     padding-top: 90px;
     padding-bottom: 100px;
     background: rgba(0, 0, 0, 0) radial-gradient(ellipse at 50% 50% , #294172 15%, #233862 70%) repeat scroll 0 0;
-    text-align: center;    
+    text-align: center;
 }
 
 .main-head-index h1

From 1f5c019560e37165f540b0640b5cbbf07412cb7b Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 12 2017 22:05:59 +0000
Subject: [PATCH 22/39] drop old newsbox in alt.fpo


---

diff --git a/alt.fedoraproject.org/data/content/index.html b/alt.fedoraproject.org/data/content/index.html
index b0853ea..d62a805 100644
--- a/alt.fedoraproject.org/data/content/index.html
+++ b/alt.fedoraproject.org/data/content/index.html
@@ -627,41 +627,5 @@
     </div>
   </div>
 
-      <py:choose>
-        <py:when test="global_variables.release['curr_state'] == 'Alpha'">
-          <div class="newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s %(state)s released! &lt;a href="%(link)s"&gt;Try it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:when>
-        <py:when test="global_variables.release['curr_state'] == 'Beta'">
-          <div class="jumbotron newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s %(state)s released! &lt;a href="%(link)s"&gt;Try it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:when>
-        <py:otherwise>
-          <div class="jumbotron newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s released! Try it now.')) % {'rel':global_variables.release['curr_id']}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:otherwise>
-      </py:choose>
-
 </body>
 </html>

From 9933355b2cea6124fdaee8d1293a0325d73098b2 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 12 2017 22:06:45 +0000
Subject: [PATCH 23/39] getfedora POT update


---

diff --git a/getfedora.org/po/getfedora.pot b/getfedora.org/po/getfedora.pot
index 6538b88..3e1e74c 100644
--- a/getfedora.org/po/getfedora.pot
+++ b/getfedora.org/po/getfedora.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2016 ORGANIZATION
+# Copyright (C) 2017 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-12-13 22:57+0100\n"
+"POT-Creation-Date: 2017-03-12 23:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -103,17 +103,29 @@ msgid ""
 "streamlined for your needs, and get to work right away."
 msgstr ""
 
-#: data/content/index.html:30 data/content/verify.html:39
+#: data/content/index.html:31 data/content/index.html:42
+#, python-format
+msgid ""
+"<strong>Fedora %(rel)s %(state)s</strong> released! Test it in the "
+"Download section."
+msgstr ""
+
+#: data/content/index.html:53
+#, python-format
+msgid "Fedora %(rel)s released! Get it now."
+msgstr ""
+
+#: data/content/index.html:67 data/content/verify.html:39
 #: data/templates/productselector-workstation.html:12
 msgid "Workstation"
 msgstr ""
 
-#: data/content/index.html:32 data/content/index.html:48
-#: data/content/index.html:63
+#: data/content/index.html:69 data/content/index.html:85
+#: data/content/index.html:100
 msgid "Download Now"
 msgstr ""
 
-#: data/content/index.html:37 data/content/index.html:90
+#: data/content/index.html:74 data/content/index.html:127
 msgid ""
 "Fedora Workstation is a polished, easy to use operating system for laptop"
 " and desktop computers, with a complete set of tools for developers and "
@@ -121,8 +133,8 @@ msgid ""
 msgstr ""
 
 #: data/content/atomic/index.html:24 data/content/atomic/index.html:125
-#: data/content/atomic/index.html:131 data/content/index.html:39
-#: data/content/index.html:54 data/content/index.html:69
+#: data/content/atomic/index.html:131 data/content/index.html:76
+#: data/content/index.html:91 data/content/index.html:106
 #: data/content/server/index.html:20 data/content/server/index.html:125
 #: data/content/server/index.html:131 data/content/workstation/index.html:20
 #: data/content/workstation/index.html:185
@@ -130,42 +142,42 @@ msgstr ""
 msgid "Download now"
 msgstr ""
 
-#: data/content/index.html:46 data/content/verify.html:51
+#: data/content/index.html:83 data/content/verify.html:51
 #: data/templates/productselector-server.html:13
 msgid "Server"
 msgstr ""
 
-#: data/content/index.html:52 data/content/index.html:95
+#: data/content/index.html:89 data/content/index.html:132
 msgid ""
 "Fedora Server is a powerful, flexible operating system that includes the "
 "best and latest datacenter technologies. It puts you in control of all "
 "your infrastructure and services."
 msgstr ""
 
-#: data/content/index.html:61 data/content/verify.html:60
+#: data/content/index.html:98 data/content/verify.html:60
 #: data/templates/productselector-cloud.html:13
 msgid "Atomic"
 msgstr ""
 
-#: data/content/atomic/index.html:19 data/content/index.html:67
-#: data/content/index.html:100
+#: data/content/atomic/index.html:19 data/content/index.html:104
+#: data/content/index.html:137
 msgid ""
 "Fedora Atomic provides the best platform for your Linux-Docker-Kubernetes"
 " (LDK) application stack."
 msgstr ""
 
-#: data/content/index.html:126
+#: data/content/index.html:163
 msgid ""
 "Fedora is always free for anyone to use, modify, and distribute. It is "
 "built and used by people across the globe who work together as a "
 "community: the Fedora Project."
 msgstr ""
 
-#: data/content/index.html:139
+#: data/content/index.html:176
 msgid "Want more Fedora options?"
 msgstr ""
 
-#: data/content/index.html:158
+#: data/content/index.html:195
 msgid ""
 "The Fedora community also releases <a "
 "href=\"https://arm.fedoraproject.org/\">ARM images</a>, alternate live "
@@ -175,11 +187,11 @@ msgid ""
 "website."
 msgstr ""
 
-#: data/content/index.html:165
+#: data/content/index.html:202
 msgid "Be connected & informed."
 msgstr ""
 
-#: data/content/index.html:175
+#: data/content/index.html:212
 msgid ""
 "Want to get <a href=\"http://whatcanidoforfedora.org/\">involved</a>? "
 "Find out what's happening in the <a "
@@ -188,11 +200,11 @@ msgid ""
 "href=\"http://fedoramagazine.org/\">Fedora Magazine</a>."
 msgstr ""
 
-#: data/content/index.html:185
+#: data/content/index.html:222
 msgid "Read the docs."
 msgstr ""
 
-#: data/content/index.html:195
+#: data/content/index.html:232
 #, python-format
 msgid ""
 "Check out the Release Notes for detailed information on the current "
@@ -201,11 +213,11 @@ msgid ""
 "documentation</strong></a>."
 msgstr ""
 
-#: data/content/index.html:202
+#: data/content/index.html:239
 msgid "Get help."
 msgstr ""
 
-#: data/content/index.html:212
+#: data/content/index.html:249
 #, python-format
 msgid ""
 "Need some help with Fedora? Check out <a href=\"%s\">Ask Fedora</a>, "
@@ -213,16 +225,6 @@ msgid ""
 "own question."
 msgstr ""
 
-#: data/content/index.html:225 data/content/index.html:236
-#, python-format
-msgid "Fedora %(rel)s %(state)s released! Check it out in the Download section."
-msgstr ""
-
-#: data/content/index.html:247
-#, python-format
-msgid "Fedora %(rel)s released! Check it out in the Download section."
-msgstr ""
-
 #: data/content/sponsors.html:8 data/content/sponsors.html:18
 msgid "Fedora Sponsors"
 msgstr ""
@@ -473,8 +475,6 @@ msgid "Verify your Download!"
 msgstr ""
 
 #: data/content/atomic/download/download-cloud-splash.html:49
-#: data/content/atomic/prerelease/docker.html:129
-#: data/content/atomic/prerelease/index.html:475
 #: data/content/server/download/server-download-splash.html:44
 #: data/content/workstation/download/ws-download-splash.html:49
 #: data/content/workstation/prerelease/index.html:142
@@ -494,6 +494,7 @@ msgid "Validate!"
 msgstr ""
 
 #: data/content/atomic/download/index.html:10
+#: data/content/atomic/prerelease/index.html:10
 msgid "Download Fedora Atomic"
 msgstr ""
 
@@ -503,10 +504,12 @@ msgid "Download Fedora %(rel)s Atomic Host"
 msgstr ""
 
 #: data/content/atomic/download/index.html:35
+#: data/content/atomic/prerelease/index.html:35
 msgid "Atomic Host is built every 2 weeks or so."
 msgstr ""
 
 #: data/content/atomic/download/index.html:36
+#: data/content/atomic/prerelease/index.html:36
 #, python-format
 msgid ""
 "The latest two week build did not meet our testing criteria. The images "
@@ -515,6 +518,7 @@ msgid ""
 msgstr ""
 
 #: data/content/atomic/download/index.html:37
+#: data/content/atomic/prerelease/index.html:37
 #, python-format
 msgid ""
 "These are the latest official Fedora Atomic Host images, produced "
@@ -560,10 +564,12 @@ msgid ""
 msgstr ""
 
 #: data/content/atomic/download/index.html:61
+#: data/content/atomic/prerelease/index.html:63
 msgid "Atomic Host Images for Amazon Public Cloud EC2"
 msgstr ""
 
 #: data/content/atomic/download/index.html:62
+#: data/content/atomic/prerelease/index.html:64
 msgid ""
 "The links below will provide you listings of available Atomic Host "
 "Hardware Virtual Machine (HVM) AMIs by region with buttons to launch them"
@@ -573,11 +579,15 @@ msgstr ""
 
 #: data/content/atomic/download/index.html:68
 #: data/content/atomic/download/index.html:136
+#: data/content/atomic/prerelease/index.html:70
+#: data/content/atomic/prerelease/index.html:138
 msgid "GP2 Format"
 msgstr ""
 
 #: data/content/atomic/download/index.html:69
 #: data/content/atomic/download/index.html:137
+#: data/content/atomic/prerelease/index.html:71
+#: data/content/atomic/prerelease/index.html:139
 msgid ""
 "GP2 format AMIs use faster SSD storage; use these AMIs for speed, "
 "although note your storage costs will be more than standard."
@@ -585,8 +595,8 @@ msgstr ""
 
 #: data/content/atomic/download/index.html:71
 #: data/content/atomic/download/index.html:147
-#: data/content/atomic/prerelease/index.html:183
-#: data/content/atomic/prerelease/index.html:320
+#: data/content/atomic/prerelease/index.html:73
+#: data/content/atomic/prerelease/index.html:149
 msgid "GP2 HVM AMIs"
 msgstr ""
 
@@ -594,14 +604,10 @@ msgstr ""
 #: data/content/atomic/download/index.html:108
 #: data/content/atomic/download/index.html:152
 #: data/content/atomic/download/index.html:182
-#: data/content/atomic/prerelease/index.html:188
-#: data/content/atomic/prerelease/index.html:218
-#: data/content/atomic/prerelease/index.html:251
-#: data/content/atomic/prerelease/index.html:281
-#: data/content/atomic/prerelease/index.html:325
-#: data/content/atomic/prerelease/index.html:353
-#: data/content/atomic/prerelease/index.html:385
-#: data/content/atomic/prerelease/index.html:413
+#: data/content/atomic/prerelease/index.html:78
+#: data/content/atomic/prerelease/index.html:110
+#: data/content/atomic/prerelease/index.html:154
+#: data/content/atomic/prerelease/index.html:184
 #: data/templates/keys/key-button-and-modal-obsolete.html:37
 #: data/templates/keys/key-button-and-modal-obsolete.html:88
 #: data/templates/keys/key-button-and-modal.html:37
@@ -619,14 +625,10 @@ msgstr ""
 #: data/content/atomic/download/index.html:114
 #: data/content/atomic/download/index.html:158
 #: data/content/atomic/download/index.html:188
-#: data/content/atomic/prerelease/index.html:194
-#: data/content/atomic/prerelease/index.html:224
-#: data/content/atomic/prerelease/index.html:257
-#: data/content/atomic/prerelease/index.html:287
-#: data/content/atomic/prerelease/index.html:331
-#: data/content/atomic/prerelease/index.html:359
-#: data/content/atomic/prerelease/index.html:391
-#: data/content/atomic/prerelease/index.html:419
+#: data/content/atomic/prerelease/index.html:84
+#: data/content/atomic/prerelease/index.html:116
+#: data/content/atomic/prerelease/index.html:160
+#: data/content/atomic/prerelease/index.html:190
 #: data/templates/cloud-tab.html:13
 msgid "Region"
 msgstr ""
@@ -635,14 +637,10 @@ msgstr ""
 #: data/content/atomic/download/index.html:115
 #: data/content/atomic/download/index.html:159
 #: data/content/atomic/download/index.html:189
-#: data/content/atomic/prerelease/index.html:195
-#: data/content/atomic/prerelease/index.html:225
-#: data/content/atomic/prerelease/index.html:258
-#: data/content/atomic/prerelease/index.html:288
-#: data/content/atomic/prerelease/index.html:332
-#: data/content/atomic/prerelease/index.html:360
-#: data/content/atomic/prerelease/index.html:392
-#: data/content/atomic/prerelease/index.html:420
+#: data/content/atomic/prerelease/index.html:85
+#: data/content/atomic/prerelease/index.html:117
+#: data/content/atomic/prerelease/index.html:161
+#: data/content/atomic/prerelease/index.html:191
 #: data/templates/cloud-tab.html:16
 msgid "AMI ID"
 msgstr ""
@@ -651,24 +649,23 @@ msgstr ""
 #: data/content/atomic/download/index.html:116
 #: data/content/atomic/download/index.html:160
 #: data/content/atomic/download/index.html:190
-#: data/content/atomic/prerelease/index.html:196
-#: data/content/atomic/prerelease/index.html:226
-#: data/content/atomic/prerelease/index.html:259
-#: data/content/atomic/prerelease/index.html:289
-#: data/content/atomic/prerelease/index.html:333
-#: data/content/atomic/prerelease/index.html:361
-#: data/content/atomic/prerelease/index.html:393
-#: data/content/atomic/prerelease/index.html:421
+#: data/content/atomic/prerelease/index.html:86
+#: data/content/atomic/prerelease/index.html:118
+#: data/content/atomic/prerelease/index.html:162
+#: data/content/atomic/prerelease/index.html:192
 #: data/templates/cloud-tab.html:17
 msgid "Launch"
 msgstr ""
 
 #: data/content/atomic/download/index.html:100
+#: data/content/atomic/prerelease/index.html:102
 msgid "Standard Format)"
 msgstr ""
 
 #: data/content/atomic/download/index.html:101
 #: data/content/atomic/download/index.html:141
+#: data/content/atomic/prerelease/index.html:103
+#: data/content/atomic/prerelease/index.html:143
 msgid ""
 "Standard format AMIs are more suitable if you have infrequently accessed "
 "data and want to keep storage cost low."
@@ -676,8 +673,8 @@ msgstr ""
 
 #: data/content/atomic/download/index.html:103
 #: data/content/atomic/download/index.html:177
-#: data/content/atomic/prerelease/index.html:213
-#: data/content/atomic/prerelease/index.html:348
+#: data/content/atomic/prerelease/index.html:105
+#: data/content/atomic/prerelease/index.html:179
 msgid "Standard HVM AMIs"
 msgstr ""
 
@@ -688,14 +685,17 @@ msgid "Fedora %(rel)s Standard Atomic Host HVM AMIs"
 msgstr ""
 
 #: data/content/atomic/download/index.html:140
+#: data/content/atomic/prerelease/index.html:142
 msgid "Standard Format"
 msgstr ""
 
 #: data/content/atomic/download/index.html:211
+#: data/content/atomic/prerelease/index.html:213
 msgid "Atomic Host Images for Vagrant"
 msgstr ""
 
 #: data/content/atomic/download/index.html:212
+#: data/content/atomic/prerelease/index.html:214
 #, python-format
 msgid ""
 "Vagrant Boxes for Fedora Atomic Host are available for the VirtualBox and"
@@ -705,14 +705,17 @@ msgid ""
 msgstr ""
 
 #: data/content/atomic/download/index.html:213
+#: data/content/atomic/prerelease/index.html:215
 msgid "View Vagrant Downloads"
 msgstr ""
 
 #: data/content/atomic/download/index.html:216
+#: data/content/atomic/prerelease/index.html:218
 msgid "Vagrant Image Downloads"
 msgstr ""
 
 #: data/content/atomic/download/index.html:217
+#: data/content/atomic/prerelease/index.html:219
 #, python-format
 msgid ""
 "These images are Vagrant Boxes images for deployment using <a "
@@ -721,11 +724,15 @@ msgstr ""
 
 #: data/content/atomic/download/index.html:222
 #: data/content/atomic/download/index.html:238
+#: data/content/atomic/prerelease/index.html:224
+#: data/content/atomic/prerelease/index.html:240
 msgid "VirtualBox Image"
 msgstr ""
 
 #: data/content/atomic/download/index.html:223
 #: data/content/atomic/download/index.html:239
+#: data/content/atomic/prerelease/index.html:225
+#: data/content/atomic/prerelease/index.html:241
 msgid ""
 "If you're using Vagrant on Mac OS X or Windows, this is likely the image "
 "you'll want to use."
@@ -739,19 +746,22 @@ msgstr ""
 #: data/content/atomic/download/index.html:299
 #: data/content/atomic/download/index.html:316
 #: data/content/atomic/download/index.html:320
-#: data/content/atomic/prerelease/docker.html:91
-#: data/content/atomic/prerelease/index.html:90
-#: data/content/atomic/prerelease/index.html:96
-#: data/content/atomic/prerelease/index.html:114
-#: data/content/atomic/prerelease/index.html:118
+#: data/content/atomic/prerelease/index.html:226
+#: data/content/atomic/prerelease/index.html:232
+#: data/content/atomic/prerelease/index.html:250
+#: data/content/atomic/prerelease/index.html:254
+#: data/content/atomic/prerelease/index.html:295
+#: data/content/atomic/prerelease/index.html:301
+#: data/content/atomic/prerelease/index.html:318
+#: data/content/atomic/prerelease/index.html:322
 #: data/content/server/download/index.html:33
 #: data/content/server/prerelease/index.html:18
 #: data/content/workstation/download/index.html:40
 #: data/content/workstation/download/index.html:44
 #: data/content/workstation/download/index.html:49
 #: data/content/workstation/download/index.html:101
-#: data/content/workstation/download/index.html:110
-#: data/content/workstation/download/index.html:122
+#: data/content/workstation/download/index.html:113
+#: data/content/workstation/download/index.html:128
 #: data/content/workstation/prerelease/index.html:19
 #: data/content/workstation/prerelease/index.html:23
 #: data/content/workstation/prerelease/index.html:28
@@ -764,35 +774,46 @@ msgstr ""
 
 #: data/content/atomic/download/index.html:225
 #: data/content/atomic/download/index.html:249
+#: data/content/atomic/prerelease/index.html:227
+#: data/content/atomic/prerelease/index.html:251
 #, python-format
 msgid "64-bit %sMB VirtualBox Base Vagrant Image"
 msgstr ""
 
 #: data/content/atomic/download/index.html:228
 #: data/content/atomic/download/index.html:242
+#: data/content/atomic/prerelease/index.html:230
+#: data/content/atomic/prerelease/index.html:244
 msgid "libvirt/KVM Image"
 msgstr ""
 
 #: data/content/atomic/download/index.html:229
 #: data/content/atomic/download/index.html:243
+#: data/content/atomic/prerelease/index.html:231
+#: data/content/atomic/prerelease/index.html:245
 msgid "If you're using Vagrant on Fedora, this is the image you'll want to use."
 msgstr ""
 
 #: data/content/atomic/download/index.html:231
 #: data/content/atomic/download/index.html:253
+#: data/content/atomic/prerelease/index.html:233
+#: data/content/atomic/prerelease/index.html:255
 #, python-format
 msgid "64-bit %sMB libvirt/KVM Base Vagrant Image"
 msgstr ""
 
 #: data/content/atomic/download/index.html:261
+#: data/content/atomic/prerelease/index.html:263
 msgid "View Downloads using Vagrant tools"
 msgstr ""
 
 #: data/content/atomic/download/index.html:265
+#: data/content/atomic/prerelease/index.html:267
 msgid "Vagrant Downloads using Vagrant tools"
 msgstr ""
 
 #: data/content/atomic/download/index.html:266
+#: data/content/atomic/prerelease/index.html:268
 #, python-format
 msgid ""
 "You can use the following command to grab the Vagrant Box images from <a "
@@ -800,6 +821,7 @@ msgid ""
 msgstr ""
 
 #: data/content/atomic/download/index.html:268
+#: data/content/atomic/prerelease/index.html:270
 #, python-format
 msgid ""
 "If you've previously run Fedora %(rel)s Atomic Host in Vagrant on your "
@@ -807,6 +829,7 @@ msgid ""
 msgstr ""
 
 #: data/content/atomic/download/index.html:277
+#: data/content/atomic/prerelease/index.html:279
 #, python-format
 msgid ""
 "For more information about running Vagrant on Fedora Workstation, see <a "
@@ -814,13 +837,14 @@ msgid ""
 msgstr ""
 
 #: data/content/atomic/download/index.html:285
+#: data/content/atomic/prerelease/index.html:287
 msgid "Atomic Host Images for Cloud Environments"
 msgstr ""
 
 #: data/content/atomic/download/index.html:291
 #: data/content/atomic/download/index.html:306
-#: data/content/atomic/prerelease/index.html:88
-#: data/content/atomic/prerelease/index.html:104
+#: data/content/atomic/prerelease/index.html:293
+#: data/content/atomic/prerelease/index.html:308
 msgid "qcow2 Image"
 msgstr ""
 
@@ -834,16 +858,16 @@ msgstr ""
 
 #: data/content/atomic/download/index.html:294
 #: data/content/atomic/download/index.html:317
-#: data/content/atomic/prerelease/index.html:91
-#: data/content/atomic/prerelease/index.html:115
+#: data/content/atomic/prerelease/index.html:296
+#: data/content/atomic/prerelease/index.html:319
 #, python-format
 msgid "64-bit %sMB Qcow2 Image"
 msgstr ""
 
 #: data/content/atomic/download/index.html:297
 #: data/content/atomic/download/index.html:310
-#: data/content/atomic/prerelease/index.html:94
-#: data/content/atomic/prerelease/index.html:108
+#: data/content/atomic/prerelease/index.html:299
+#: data/content/atomic/prerelease/index.html:312
 msgid "Raw Image"
 msgstr ""
 
@@ -857,180 +881,168 @@ msgstr ""
 
 #: data/content/atomic/download/index.html:300
 #: data/content/atomic/download/index.html:321
-#: data/content/atomic/prerelease/index.html:97
-#: data/content/atomic/prerelease/index.html:119
+#: data/content/atomic/prerelease/index.html:302
+#: data/content/atomic/prerelease/index.html:323
 #, python-format
 msgid "64-bit %sMB xz-Compressed Raw Image"
 msgstr ""
 
 #: data/content/atomic/download/index.html:331
+#: data/content/atomic/prerelease/index.html:333
 #: data/content/server/download/index.html:50
 #: data/content/server/prerelease/index.html:73
-#: data/content/workstation/download/index.html:139
+#: data/content/workstation/download/index.html:145
 #: data/content/workstation/prerelease/index.html:153
 msgid "Other Downloads"
 msgstr ""
 
-#: data/content/atomic/download/index.html:332
+#: data/content/atomic/download/index.html:333
+#: data/content/atomic/prerelease/index.html:335
 #, python-format
 msgid "Atomic Host ISO image (%sMB)"
 msgstr ""
 
 #: data/content/atomic/download/index.html:334
-msgid "Docker:"
-msgstr ""
-
-#: data/content/atomic/download/index.html:336
+#: data/content/atomic/prerelease/index.html:336
 #, python-format
 msgid "Docker Image (%sMB)"
 msgstr ""
 
-#: data/content/atomic/download/index.html:339
-#: data/content/workstation/download/index.html:173
+#: data/content/atomic/download/index.html:337
+#: data/content/atomic/prerelease/index.html:339
+#: data/content/workstation/download/index.html:179
 #: data/content/workstation/prerelease/index.html:165
 msgid "Resources"
 msgstr ""
 
-#: data/content/atomic/download/index.html:340
+#: data/content/atomic/download/index.html:338
+#: data/content/atomic/prerelease/index.html:340
 msgid ""
 "<a href=\"https://www.projectatomic.io/docs/quickstart/\"><strong>Project"
 " Atomic: Getting Started</strong></a>"
 msgstr ""
 
-#: data/content/atomic/download/index.html:341
+#: data/content/atomic/download/index.html:339
+#: data/content/atomic/prerelease/index.html:341
 msgid "Documentation on getting started using Project Atomic / Atomic Host."
 msgstr ""
 
-#: data/content/atomic/download/index.html:342
+#: data/content/atomic/download/index.html:340
+#: data/content/atomic/prerelease/index.html:342
 msgid ""
 "<a "
 "href=\"https://lists.projectatomic.io/mailman/listinfo/atomic\"><strong>Project"
 " Atomic: Mailing List</strong></a>"
 msgstr ""
 
-#: data/content/atomic/download/index.html:343
+#: data/content/atomic/download/index.html:341
+#: data/content/atomic/prerelease/index.html:343
 #, python-format
 msgid ""
 "Join the upstream mailing list at <a "
 "href=\"%s\">atomic@projectatomic.io</a>."
 msgstr ""
 
-#: data/content/atomic/download/index.html:344
+#: data/content/atomic/download/index.html:342
+#: data/content/atomic/prerelease/index.html:344
 #, python-format
 msgid "<a href=\"%s\"><strong>Project Atomic: IRC Chat</strong></a>"
 msgstr ""
 
-#: data/content/atomic/download/index.html:345
+#: data/content/atomic/download/index.html:343
+#: data/content/atomic/prerelease/index.html:345
 msgid ""
 "Join the Project Atomic channel <strong>#atomic</strong></a> on "
 "<strong>irc.freenode.org</strong></a>."
 msgstr ""
 
-#: data/content/atomic/download/index.html:350
+#: data/content/atomic/download/index.html:348
 #: data/content/server/download/index.html:61
-#: data/content/workstation/download/index.html:153
+#: data/content/workstation/download/index.html:159
 #, python-format
 msgid "F%(rel)s Alpha"
 msgstr ""
 
-#: data/content/atomic/download/index.html:351
-#: data/content/atomic/download/index.html:361
+#: data/content/atomic/download/index.html:349
+#: data/content/atomic/download/index.html:359
 #: data/content/server/download/index.html:62
 #: data/content/server/download/index.html:72
-#: data/content/workstation/download/index.html:154
-#: data/content/workstation/download/index.html:164
+#: data/content/workstation/download/index.html:160
+#: data/content/workstation/download/index.html:170
 msgid "Try a pre-release"
 msgstr ""
 
-#: data/content/atomic/download/index.html:352
-#: data/content/atomic/download/index.html:362
+#: data/content/atomic/download/index.html:350
+#: data/content/atomic/download/index.html:360
 #: data/content/server/download/index.html:63
 #: data/content/server/download/index.html:73
-#: data/content/workstation/download/index.html:155
-#: data/content/workstation/download/index.html:165
+#: data/content/workstation/download/index.html:161
+#: data/content/workstation/download/index.html:171
 msgid "We're working on our next release."
 msgstr ""
 
-#: data/content/atomic/download/index.html:353
-#: data/content/atomic/download/index.html:363
+#: data/content/atomic/download/index.html:351
+#: data/content/atomic/download/index.html:361
 #: data/content/server/download/index.html:64
 #: data/content/server/download/index.html:74
-#: data/content/workstation/download/index.html:156
-#: data/content/workstation/download/index.html:166
+#: data/content/workstation/download/index.html:162
+#: data/content/workstation/download/index.html:172
 #, python-format
 msgid "Help us get F%(rel)s ready!"
 msgstr ""
 
-#: data/content/atomic/download/index.html:354
+#: data/content/atomic/download/index.html:352
 #: data/content/server/download/index.html:65
-#: data/content/workstation/download/index.html:157
+#: data/content/workstation/download/index.html:163
 #, python-format
 msgid "Download F%(rel)s Alpha images"
 msgstr ""
 
-#: data/content/atomic/download/index.html:355
-#: data/content/atomic/download/index.html:365
+#: data/content/atomic/download/index.html:353
+#: data/content/atomic/download/index.html:363
 #: data/content/server/download/index.html:66
 #: data/content/server/download/index.html:76
-#: data/content/workstation/download/index.html:158
-#: data/content/workstation/download/index.html:168
+#: data/content/workstation/download/index.html:164
+#: data/content/workstation/download/index.html:174
 msgid "How to test pre-releases"
 msgstr ""
 
-#: data/content/atomic/download/index.html:360
+#: data/content/atomic/download/index.html:358
 #: data/content/server/download/index.html:71
-#: data/content/workstation/download/index.html:163
+#: data/content/workstation/download/index.html:169
 #, python-format
 msgid "F%(rel)s Beta"
 msgstr ""
 
-#: data/content/atomic/download/index.html:364
+#: data/content/atomic/download/index.html:362
 #: data/content/server/download/index.html:75
-#: data/content/workstation/download/index.html:167
+#: data/content/workstation/download/index.html:173
 #, python-format
 msgid "Download F%(rel)s Beta images"
 msgstr ""
 
-#: data/content/atomic/download/index.html:372
+#: data/content/atomic/download/index.html:370
+#: data/content/atomic/prerelease/index.html:348
 #: data/content/server/download/index.html:93
-#: data/content/workstation/download/index.html:200
+#: data/content/workstation/download/index.html:206
 msgid "Verify"
 msgstr ""
 
-#: data/content/atomic/download/index.html:375
-#: data/content/atomic/prerelease/docker.html:128
-#: data/content/atomic/prerelease/index.html:474
+#: data/content/atomic/download/index.html:373
+#: data/content/atomic/prerelease/index.html:351
 #: data/content/server/download/index.html:96
 #: data/content/server/prerelease/index.html:63
-#: data/content/workstation/download/index.html:203
+#: data/content/workstation/download/index.html:209
 #: data/content/workstation/prerelease/index.html:141
 msgid "Verify your Image"
 msgstr ""
 
-#: data/content/atomic/prerelease/docker.html:10
-#: data/content/atomic/prerelease/index.html:10
-#, python-format
-msgid "Download Fedora Cloud %s"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:33
-#: data/content/atomic/prerelease/index.html:33
+#: data/content/atomic/prerelease/index.html:34
 #, python-format
-msgid "Download Fedora %(rel)s %(state)s Cloud"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:58
-#: data/content/atomic/prerelease/index.html:58
-msgid "Base Images"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:60
-#: data/content/atomic/prerelease/index.html:60
-msgid "Docker Image"
+msgid "Download Fedora %(rel)s %(state)s Atomic Host"
 msgstr ""
 
-#: data/content/atomic/prerelease/docker.html:71
-#: data/content/atomic/prerelease/index.html:71
+#: data/content/atomic/prerelease/index.html:48
 #, python-format
 msgid ""
 "This is pre-release software and is supported by the <a "
@@ -1039,8 +1051,7 @@ msgid ""
 "freenode."
 msgstr ""
 
-#: data/content/atomic/prerelease/docker.html:72
-#: data/content/atomic/prerelease/index.html:72
+#: data/content/atomic/prerelease/index.html:49
 #: data/content/server/prerelease/index.html:29
 #: data/content/workstation/prerelease/index.html:46
 #, python-format
@@ -1050,10 +1061,8 @@ msgid ""
 "suitability or usefulness."
 msgstr ""
 
-#: data/content/atomic/prerelease/docker.html:74
-#: data/content/atomic/prerelease/docker.html:76
-#: data/content/atomic/prerelease/index.html:74
-#: data/content/atomic/prerelease/index.html:76
+#: data/content/atomic/prerelease/index.html:51
+#: data/content/atomic/prerelease/index.html:53
 #: data/content/server/prerelease/index.html:31
 #: data/content/server/prerelease/index.html:33
 #: data/content/workstation/prerelease/index.html:48
@@ -1066,203 +1075,32 @@ msgid ""
 "commonly-encountered bugs and how to avoid them."
 msgstr ""
 
-#: data/content/atomic/prerelease/docker.html:80
-#, python-format
-msgid "Docker %(state)s Image"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:81
-msgid ""
-"The Fedora Docker Base Image is a minimal Fedora install which can be "
-"spawned as a Docker container. It contains basic tools which can be used "
-"as a foundation for building Docker Layered Images - bash, vi and yum "
-"(and its dependencies)."
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:82
-msgid "Docker Base Image"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:87
-msgid ""
-"You can easily load this Docker image into your running Docker daemon "
-"using command:"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:89
-msgid "Following command can be used to spawn a container running bash inside:"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:92
-#, python-format
-msgid "64-bit %sMB raw.xz Image"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:98
-#: data/content/atomic/prerelease/index.html:444
-#: data/content/server/prerelease/index.html:38
-#: data/content/workstation/prerelease/index.html:55
-#, python-format
-msgid "When is Fedora %s going to be released?"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:102
-#: data/content/atomic/prerelease/index.html:448
-#: data/content/server/prerelease/index.html:42
-#: data/content/workstation/prerelease/index.html:59
-msgid "Release State"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:103
-#: data/content/atomic/prerelease/index.html:449
-#: data/content/server/prerelease/index.html:43
-#: data/content/workstation/prerelease/index.html:60
-msgid "Release Date"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:108
-#: data/content/atomic/prerelease/index.html:454
-#: data/content/server/prerelease/index.html:48
-#: data/content/workstation/prerelease/index.html:65
-msgid "Alpha Release Public Availability"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:112
-#: data/content/atomic/prerelease/index.html:458
-#: data/content/server/prerelease/index.html:52
-#: data/content/workstation/prerelease/index.html:69
-msgid "Beta Release Public Availability"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:116
-#: data/content/atomic/prerelease/index.html:462
-#: data/content/server/prerelease/index.html:56
-#: data/content/workstation/prerelease/index.html:73
-msgid "Final Release Public Availability (GA)"
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:121
-#: data/content/atomic/prerelease/index.html:467
-#: data/content/server/prerelease/index.html:61
-#: data/content/workstation/prerelease/index.html:78
-msgid "Read all the key milestones of the release schedule..."
-msgstr ""
-
-#: data/content/atomic/prerelease/docker.html:132
-msgid "Docker 64bit!"
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:80
-#, python-format
-msgid "Base Cloud %(state)s Images"
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:81
-msgid ""
-"The images on this page are Fedora Cloud images for creating general "
-"purpose virtual machines (VMs)."
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:82
-msgid "Base Cloud Image"
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:89
-#: data/content/atomic/prerelease/index.html:105
+#: data/content/atomic/prerelease/index.html:79
+#: data/content/atomic/prerelease/index.html:155
 #, python-format
-msgid ""
-"This is Fedora %(rel)s %(state)s Cloud in a Qcow2-formatted image for use"
-" with OpenStack."
+msgid "Fedora %(rel)s %(state)s GP2 Atomic Host HVM AMIs"
 msgstr ""
 
-#: data/content/atomic/prerelease/index.html:95
-#: data/content/atomic/prerelease/index.html:109
+#: data/content/atomic/prerelease/index.html:111
+#: data/content/atomic/prerelease/index.html:185
 #, python-format
-msgid ""
-"This is Fedora %(rel)s %(state)s Cloud in a compressed raw image format. "
-"If you're not sure what to use, try this."
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:172
-msgid "Base Cloud Images for Amazon Public Cloud EC2"
+msgid "Fedora %(rel)s %(state)s Standard Atomic Host HVM AMIs"
 msgstr ""
 
-#: data/content/atomic/prerelease/index.html:173
-msgid ""
-"The links below will provide you listings of available AMIs by region "
-"with buttons to launch them in your Amazon Web Services account. AMI IDs "
-"for usage with the AWS Console or command-line tools are also provided."
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:174
-msgid ""
-"All images are available in two formats: a GP2 format which uses faster "
-"SSD storage, and a standard format which is more suitable if you have "
-"infrequently accessed data and you want to keep storage cost low."
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:180
+#: data/content/atomic/prerelease/index.html:294
 #: data/content/atomic/prerelease/index.html:309
-msgid "Hardware Virtual Machine (HVM)"
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:181
-#: data/content/atomic/prerelease/index.html:310
-msgid ""
-"If you're unsure which image to choose, use this format. It can provide "
-"the same or better performance than PV images."
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:189
-#: data/content/atomic/prerelease/index.html:326
-#, python-format
-msgid "Fedora %(rel)s %(state)s GP2 Base Cloud HVM AMIs"
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:219
 #, python-format
-msgid "Fedora %(rel)s %(state)s standard Base Cloud HVM AMIs"
+msgid ""
+"This is Fedora %(rel)s %(state)s Cloud Atomic Host in a Qcow2-formatted "
+"image for use with OpenStack."
 msgstr ""
 
-#: data/content/atomic/prerelease/index.html:243
+#: data/content/atomic/prerelease/index.html:300
 #: data/content/atomic/prerelease/index.html:313
-msgid "Paravirtual (PV)"
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:244
-#: data/content/atomic/prerelease/index.html:314
-msgid "If you know you need a paravirtual format image for EC2, use this format."
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:246
-#: data/content/atomic/prerelease/index.html:380
-msgid "GP2 PV AMIs"
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:252
-#: data/content/atomic/prerelease/index.html:386
-#, python-format
-msgid "Fedora %(rel)s %(state)s GP2 Base Cloud PV AMIs"
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:276
-#: data/content/atomic/prerelease/index.html:408
-msgid "Standard PV AMIs"
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:282
-#: data/content/atomic/prerelease/index.html:414
 #, python-format
-msgid "Fedora %(rel)s %(state)s Standard Base Cloud PV AMIs"
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:354
-#, python-format
-msgid "Fedora %(rel)s %(state)s Standard Base Cloud HVM AMIs"
-msgstr ""
-
-#: data/content/atomic/prerelease/index.html:478
-msgid "Validate 64bit!"
+msgid ""
+"This is Fedora %(rel)s %(state)s Cloud Atomic Host in a compressed raw "
+"image format. If you're not sure what to use, try this."
 msgstr ""
 
 #: data/content/e/404.html:7
@@ -1732,19 +1570,19 @@ msgstr ""
 
 #: data/content/server/download/index.html:54
 #: data/content/server/prerelease/index.html:77
-#: data/content/workstation/download/index.html:145
+#: data/content/workstation/download/index.html:151
 #: data/content/workstation/prerelease/index.html:160
 #, python-format
 msgid "64-bit %sMB image"
 msgstr ""
 
 #: data/content/server/download/index.html:82
-#: data/content/workstation/download/index.html:185
+#: data/content/workstation/download/index.html:191
 msgid "Get more Fedora"
 msgstr ""
 
 #: data/content/server/download/index.html:86
-#: data/content/workstation/download/index.html:194
+#: data/content/workstation/download/index.html:200
 msgid "ARM<span class=\"sup\">®</span> Technology"
 msgstr ""
 
@@ -1801,6 +1639,42 @@ msgid ""
 "freenode."
 msgstr ""
 
+#: data/content/server/prerelease/index.html:38
+#: data/content/workstation/prerelease/index.html:55
+#, python-format
+msgid "When is Fedora %s going to be released?"
+msgstr ""
+
+#: data/content/server/prerelease/index.html:42
+#: data/content/workstation/prerelease/index.html:59
+msgid "Release State"
+msgstr ""
+
+#: data/content/server/prerelease/index.html:43
+#: data/content/workstation/prerelease/index.html:60
+msgid "Release Date"
+msgstr ""
+
+#: data/content/server/prerelease/index.html:48
+#: data/content/workstation/prerelease/index.html:65
+msgid "Alpha Release Public Availability"
+msgstr ""
+
+#: data/content/server/prerelease/index.html:52
+#: data/content/workstation/prerelease/index.html:69
+msgid "Beta Release Public Availability"
+msgstr ""
+
+#: data/content/server/prerelease/index.html:56
+#: data/content/workstation/prerelease/index.html:73
+msgid "Final Release Public Availability (GA)"
+msgstr ""
+
+#: data/content/server/prerelease/index.html:61
+#: data/content/workstation/prerelease/index.html:78
+msgid "Read all the key milestones of the release schedule..."
+msgstr ""
+
 #: data/content/server/prerelease/index.html:64
 #, python-format
 msgid ""
@@ -1906,7 +1780,7 @@ msgid "%s MB Fedora Media Writer for <strong>Mac OS X</strong>"
 msgstr ""
 
 #: data/content/workstation/download/index.html:45
-#: data/content/workstation/download/index.html:120
+#: data/content/workstation/download/index.html:126
 #: data/content/workstation/prerelease/index.html:24
 #: data/content/workstation/prerelease/index.html:131
 #, python-format
@@ -1920,7 +1794,7 @@ msgid "<a href=\"%s\">Install via DNF</a> if you are already on Fedora."
 msgstr ""
 
 #: data/content/workstation/download/index.html:50
-#: data/content/workstation/download/index.html:107
+#: data/content/workstation/download/index.html:110
 #: data/content/workstation/prerelease/index.html:29
 #: data/content/workstation/prerelease/index.html:118
 #, python-format
@@ -1994,13 +1868,13 @@ msgid "Mac OS X"
 msgstr ""
 
 #: data/content/workstation/download/index.html:78
-#: data/content/workstation/download/index.html:106
+#: data/content/workstation/download/index.html:109
 #: data/content/workstation/prerelease/index.html:117
 msgid "Windows"
 msgstr ""
 
 #: data/content/workstation/download/index.html:79
-#: data/content/workstation/download/index.html:115
+#: data/content/workstation/download/index.html:121
 #: data/content/workstation/prerelease/index.html:126
 msgid "Linux"
 msgstr ""
@@ -2033,92 +1907,92 @@ msgstr ""
 msgid "View all platform downloads"
 msgstr ""
 
-#: data/content/workstation/download/index.html:116
+#: data/content/workstation/download/index.html:122
 #: data/content/workstation/prerelease/index.html:127
 msgid "Available via DNF for <strong>Fedora</strong>"
 msgstr ""
 
-#: data/content/workstation/download/index.html:117
+#: data/content/workstation/download/index.html:123
 #: data/content/workstation/prerelease/index.html:128
 msgid "More details"
 msgstr ""
 
-#: data/content/workstation/download/index.html:121
+#: data/content/workstation/download/index.html:127
 #: data/content/workstation/prerelease/index.html:132
 msgid "How to use this ISO?"
 msgstr ""
 
-#: data/content/workstation/download/index.html:123
+#: data/content/workstation/download/index.html:129
 #: data/content/workstation/prerelease/index.html:134
 msgid "Verify this image"
 msgstr ""
 
-#: data/content/workstation/download/index.html:140
+#: data/content/workstation/download/index.html:146
 #: data/content/workstation/prerelease/index.html:154
 #, python-format
 msgid "64-bit %sGB Live image"
 msgstr ""
 
-#: data/content/workstation/download/index.html:141
+#: data/content/workstation/download/index.html:147
 #: data/content/workstation/prerelease/index.html:155
 #, python-format
 msgid "32-bit %sGB Live image"
 msgstr ""
 
-#: data/content/workstation/download/index.html:143
+#: data/content/workstation/download/index.html:149
 #: data/content/workstation/prerelease/index.html:158
 msgid "Netinstall Images:"
 msgstr ""
 
-#: data/content/workstation/download/index.html:146
+#: data/content/workstation/download/index.html:152
 #: data/content/workstation/prerelease/index.html:161
 #, python-format
 msgid "32-bit %sMB image"
 msgstr ""
 
-#: data/content/workstation/download/index.html:174
+#: data/content/workstation/download/index.html:180
 msgid ""
 "<a href=\"//docs.fedoraproject.org/release-notes\"><strong>Release "
 "Notes</strong></a>"
 msgstr ""
 
-#: data/content/workstation/download/index.html:175
+#: data/content/workstation/download/index.html:181
 msgid ""
 "Learn about changes since the last version of Fedora as well as minimum "
 "requirements and recommendations for running Fedora."
 msgstr ""
 
-#: data/content/workstation/download/index.html:176
+#: data/content/workstation/download/index.html:182
 msgid ""
 "<a href=\"//docs.fedoraproject.org/install-guide\"><strong>Installation "
 "Guide</strong></a>"
 msgstr ""
 
-#: data/content/workstation/download/index.html:177
+#: data/content/workstation/download/index.html:183
 msgid ""
 "We recommend you look through this before installing to your system, "
 "since it answers many common questions."
 msgstr ""
 
-#: data/content/workstation/download/index.html:178
+#: data/content/workstation/download/index.html:184
 #: data/content/workstation/prerelease/index.html:166
 #, python-format
 msgid "<a href=\"%(commonbugs_url)s\"><strong>Common Bugs</strong></a>"
 msgstr ""
 
-#: data/content/workstation/download/index.html:179
+#: data/content/workstation/download/index.html:185
 #: data/content/workstation/prerelease/index.html:167
 msgid ""
 "An excellent resource to consult in case you run into any issues "
 "installing or running Fedora."
 msgstr ""
 
-#: data/content/workstation/download/index.html:181
+#: data/content/workstation/download/index.html:187
 #: data/content/workstation/prerelease/index.html:171
 msgid "What does \"Live\" mean?"
 msgstr ""
 
-#: data/content/workstation/download/index.html:182
+#: data/content/workstation/download/index.html:188
 #: data/content/workstation/prerelease/index.html:172
 msgid ""
 "Fedora Media Writer will create a complete, running Fedora Workstation "
@@ -2126,19 +2000,19 @@ msgid ""
 "test and play with Fedora without making changes to your hard disk."
 msgstr ""
 
-#: data/content/workstation/download/index.html:183
+#: data/content/workstation/download/index.html:189
 #: data/content/workstation/prerelease/index.html:173
 msgid ""
 "When you are ready, you can install Fedora to your hard disk from within "
 "this \"live\" version of Fedora Workstation."
 msgstr ""
 
-#: data/content/workstation/download/index.html:188
+#: data/content/workstation/download/index.html:194
 #: data/templates/footer.html:43
 msgid "Fedora Spins"
 msgstr ""
 
-#: data/content/workstation/download/index.html:191
+#: data/content/workstation/download/index.html:197
 #: data/templates/footer.html:44
 msgid "Fedora Labs"
 msgstr ""

From a4e660f4cecad8ee8c0e19aef9ef5b101c781701 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 12 2017 22:07:21 +0000
Subject: [PATCH 24/39] alt.fpo POT update


---

diff --git a/alt.fedoraproject.org/po/alt.fedoraproject.org.pot b/alt.fedoraproject.org/po/alt.fedoraproject.org.pot
index bcb4717..ebdffc2 100644
--- a/alt.fedoraproject.org/po/alt.fedoraproject.org.pot
+++ b/alt.fedoraproject.org/po/alt.fedoraproject.org.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-02-07 23:03+0100\n"
+"POT-Creation-Date: 2017-03-12 23:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,13 +39,31 @@ msgid ""
 "alternative versions of Fedora."
 msgstr ""
 
-#: data/content/index.html:33 data/content/index.html:93
-#: data/content/index.html:138
+#: data/content/index.html:35 data/content/index.html:46
+#, python-format
+msgid ""
+"<strong>Fedora %(rel)s %(state)s</strong> released! <a "
+"href=\"%(link)s\">Test it now ></a>"
+msgstr ""
+
+#: data/content/index.html:57
+#, python-format
+msgid "Fedora %(rel)s released! Get it now."
+msgstr ""
+
+#: data/content/index.html:70 data/content/index.html:130
+#: data/content/index.html:175 data/content/prerelease/index.html:53
+#: data/content/prerelease/index.html:113
+#: data/content/prerelease/index.html:158
+#: data/content/prerelease/index.html:858
+#: data/content/prerelease/index.html:894
 msgid "Network Installers"
 msgstr ""
 
-#: data/content/index.html:38 data/content/index.html:98
-#: data/content/index.html:143
+#: data/content/index.html:75 data/content/index.html:135
+#: data/content/index.html:180 data/content/prerelease/index.html:58
+#: data/content/prerelease/index.html:118
+#: data/content/prerelease/index.html:163
 msgid ""
 "These are very small images you can use to install Fedora over the "
 "network."
@@ -61,13 +79,29 @@ msgstr ""
 #: data/content/alt/index.html:659 data/content/alt/index.html:670
 #: data/content/alt/index.html:732 data/content/alt/index.html:743
 #: data/content/alt/index.html:849 data/content/alt/index.html:882
-#: data/content/alt/index.html:909 data/content/index.html:46
-#: data/content/index.html:107 data/content/index.html:152
+#: data/content/alt/index.html:909 data/content/index.html:83
+#: data/content/index.html:144 data/content/index.html:189
+#: data/content/prerelease/index.html:66 data/content/prerelease/index.html:127
+#: data/content/prerelease/index.html:172
+#: data/content/prerelease/index.html:496
+#: data/content/prerelease/index.html:532
+#: data/content/prerelease/index.html:541
+#: data/content/prerelease/index.html:593
+#: data/content/prerelease/index.html:602
+#: data/content/prerelease/index.html:665
+#: data/content/prerelease/index.html:676
+#: data/content/prerelease/index.html:738
+#: data/content/prerelease/index.html:749
+#: data/content/prerelease/index.html:825
+#: data/content/prerelease/index.html:872
+#: data/content/prerelease/index.html:908
 msgid "Fedora Server"
 msgstr ""
 
-#: data/content/index.html:49 data/content/index.html:63
-#: data/content/index.html:265
+#: data/content/index.html:86 data/content/index.html:100
+#: data/content/index.html:302 data/content/prerelease/index.html:69
+#: data/content/prerelease/index.html:83 data/content/prerelease/index.html:828
+#: data/content/prerelease/index.html:842
 #, python-format
 msgid "64 bit %sMB ISO"
 msgstr ""
@@ -106,16 +140,91 @@ msgstr ""
 #: data/content/cloud/index.html:135 data/content/cloud/index.html:170
 #: data/content/cloud/index.html:184 data/content/cloud/index.html:211
 #: data/content/cloud/index.html:220 data/content/cloud/index.html:249
-#: data/content/cloud/index.html:260 data/content/index.html:52
-#: data/content/index.html:66 data/content/index.html:80
-#: data/content/index.html:108 data/content/index.html:117
-#: data/content/index.html:126 data/content/index.html:155
-#: data/content/index.html:166 data/content/index.html:177
-#: data/content/index.html:216 data/content/index.html:235
-#: data/content/index.html:268 data/content/index.html:282
-#: data/content/index.html:313 data/content/index.html:322
-#: data/content/index.html:354 data/content/index.html:365
-#: data/templates/footer.html:37
+#: data/content/cloud/index.html:260 data/content/index.html:89
+#: data/content/index.html:103 data/content/index.html:117
+#: data/content/index.html:145 data/content/index.html:154
+#: data/content/index.html:163 data/content/index.html:192
+#: data/content/index.html:203 data/content/index.html:214
+#: data/content/index.html:253 data/content/index.html:272
+#: data/content/index.html:305 data/content/index.html:319
+#: data/content/index.html:350 data/content/index.html:359
+#: data/content/index.html:391 data/content/index.html:402
+#: data/content/prerelease/index.html:72 data/content/prerelease/index.html:86
+#: data/content/prerelease/index.html:100
+#: data/content/prerelease/index.html:128
+#: data/content/prerelease/index.html:137
+#: data/content/prerelease/index.html:146
+#: data/content/prerelease/index.html:175
+#: data/content/prerelease/index.html:186
+#: data/content/prerelease/index.html:197
+#: data/content/prerelease/index.html:242
+#: data/content/prerelease/index.html:247
+#: data/content/prerelease/index.html:253
+#: data/content/prerelease/index.html:258
+#: data/content/prerelease/index.html:264
+#: data/content/prerelease/index.html:269
+#: data/content/prerelease/index.html:275
+#: data/content/prerelease/index.html:280
+#: data/content/prerelease/index.html:286
+#: data/content/prerelease/index.html:291
+#: data/content/prerelease/index.html:297
+#: data/content/prerelease/index.html:302
+#: data/content/prerelease/index.html:327
+#: data/content/prerelease/index.html:332
+#: data/content/prerelease/index.html:338
+#: data/content/prerelease/index.html:343
+#: data/content/prerelease/index.html:349
+#: data/content/prerelease/index.html:354
+#: data/content/prerelease/index.html:360
+#: data/content/prerelease/index.html:365
+#: data/content/prerelease/index.html:371
+#: data/content/prerelease/index.html:376
+#: data/content/prerelease/index.html:382
+#: data/content/prerelease/index.html:387
+#: data/content/prerelease/index.html:412
+#: data/content/prerelease/index.html:417
+#: data/content/prerelease/index.html:423
+#: data/content/prerelease/index.html:428
+#: data/content/prerelease/index.html:434
+#: data/content/prerelease/index.html:439
+#: data/content/prerelease/index.html:445
+#: data/content/prerelease/index.html:450
+#: data/content/prerelease/index.html:456
+#: data/content/prerelease/index.html:461
+#: data/content/prerelease/index.html:467
+#: data/content/prerelease/index.html:472
+#: data/content/prerelease/index.html:497
+#: data/content/prerelease/index.html:502
+#: data/content/prerelease/index.html:533
+#: data/content/prerelease/index.html:542
+#: data/content/prerelease/index.html:551
+#: data/content/prerelease/index.html:560
+#: data/content/prerelease/index.html:569
+#: data/content/prerelease/index.html:578
+#: data/content/prerelease/index.html:594
+#: data/content/prerelease/index.html:603
+#: data/content/prerelease/index.html:612
+#: data/content/prerelease/index.html:621
+#: data/content/prerelease/index.html:630
+#: data/content/prerelease/index.html:639
+#: data/content/prerelease/index.html:668
+#: data/content/prerelease/index.html:679
+#: data/content/prerelease/index.html:690
+#: data/content/prerelease/index.html:701
+#: data/content/prerelease/index.html:712
+#: data/content/prerelease/index.html:723
+#: data/content/prerelease/index.html:741
+#: data/content/prerelease/index.html:752
+#: data/content/prerelease/index.html:763
+#: data/content/prerelease/index.html:774
+#: data/content/prerelease/index.html:785
+#: data/content/prerelease/index.html:796
+#: data/content/prerelease/index.html:831
+#: data/content/prerelease/index.html:845
+#: data/content/prerelease/index.html:873
+#: data/content/prerelease/index.html:882
+#: data/content/prerelease/index.html:911
+#: data/content/prerelease/index.html:922 data/templates/footer.html:37
 msgid "Download"
 msgstr ""
 
@@ -153,125 +262,213 @@ msgstr ""
 #: data/content/cloud/index.html:135 data/content/cloud/index.html:170
 #: data/content/cloud/index.html:184 data/content/cloud/index.html:211
 #: data/content/cloud/index.html:220 data/content/cloud/index.html:249
-#: data/content/cloud/index.html:260 data/content/index.html:52
-#: data/content/index.html:66 data/content/index.html:80
-#: data/content/index.html:108 data/content/index.html:117
-#: data/content/index.html:126 data/content/index.html:155
-#: data/content/index.html:166 data/content/index.html:177
-#: data/content/index.html:268 data/content/index.html:282
-#: data/content/index.html:313 data/content/index.html:322
-#: data/content/index.html:354 data/content/index.html:365
+#: data/content/cloud/index.html:260 data/content/index.html:89
+#: data/content/index.html:103 data/content/index.html:117
+#: data/content/index.html:145 data/content/index.html:154
+#: data/content/index.html:163 data/content/index.html:192
+#: data/content/index.html:203 data/content/index.html:214
+#: data/content/index.html:305 data/content/index.html:319
+#: data/content/index.html:350 data/content/index.html:359
+#: data/content/index.html:391 data/content/index.html:402
+#: data/content/prerelease/index.html:72 data/content/prerelease/index.html:86
+#: data/content/prerelease/index.html:100
+#: data/content/prerelease/index.html:128
+#: data/content/prerelease/index.html:137
+#: data/content/prerelease/index.html:146
+#: data/content/prerelease/index.html:175
+#: data/content/prerelease/index.html:186
+#: data/content/prerelease/index.html:197
+#: data/content/prerelease/index.html:242
+#: data/content/prerelease/index.html:247
+#: data/content/prerelease/index.html:253
+#: data/content/prerelease/index.html:258
+#: data/content/prerelease/index.html:264
+#: data/content/prerelease/index.html:269
+#: data/content/prerelease/index.html:275
+#: data/content/prerelease/index.html:280
+#: data/content/prerelease/index.html:286
+#: data/content/prerelease/index.html:291
+#: data/content/prerelease/index.html:297
+#: data/content/prerelease/index.html:302
+#: data/content/prerelease/index.html:327
+#: data/content/prerelease/index.html:332
+#: data/content/prerelease/index.html:338
+#: data/content/prerelease/index.html:343
+#: data/content/prerelease/index.html:349
+#: data/content/prerelease/index.html:354
+#: data/content/prerelease/index.html:360
+#: data/content/prerelease/index.html:365
+#: data/content/prerelease/index.html:371
+#: data/content/prerelease/index.html:376
+#: data/content/prerelease/index.html:382
+#: data/content/prerelease/index.html:387
+#: data/content/prerelease/index.html:412
+#: data/content/prerelease/index.html:417
+#: data/content/prerelease/index.html:423
+#: data/content/prerelease/index.html:428
+#: data/content/prerelease/index.html:434
+#: data/content/prerelease/index.html:439
+#: data/content/prerelease/index.html:445
+#: data/content/prerelease/index.html:450
+#: data/content/prerelease/index.html:456
+#: data/content/prerelease/index.html:461
+#: data/content/prerelease/index.html:467
+#: data/content/prerelease/index.html:472
+#: data/content/prerelease/index.html:497
+#: data/content/prerelease/index.html:502
+#: data/content/prerelease/index.html:533
+#: data/content/prerelease/index.html:542
+#: data/content/prerelease/index.html:551
+#: data/content/prerelease/index.html:560
+#: data/content/prerelease/index.html:569
+#: data/content/prerelease/index.html:578
+#: data/content/prerelease/index.html:594
+#: data/content/prerelease/index.html:603
+#: data/content/prerelease/index.html:612
+#: data/content/prerelease/index.html:621
+#: data/content/prerelease/index.html:630
+#: data/content/prerelease/index.html:639
+#: data/content/prerelease/index.html:668
+#: data/content/prerelease/index.html:679
+#: data/content/prerelease/index.html:690
+#: data/content/prerelease/index.html:701
+#: data/content/prerelease/index.html:712
+#: data/content/prerelease/index.html:723
+#: data/content/prerelease/index.html:741
+#: data/content/prerelease/index.html:752
+#: data/content/prerelease/index.html:763
+#: data/content/prerelease/index.html:774
+#: data/content/prerelease/index.html:785
+#: data/content/prerelease/index.html:796
+#: data/content/prerelease/index.html:831
+#: data/content/prerelease/index.html:845
+#: data/content/prerelease/index.html:873
+#: data/content/prerelease/index.html:882
+#: data/content/prerelease/index.html:911
+#: data/content/prerelease/index.html:922
 msgid "Verify"
 msgstr ""
 
-#: data/content/index.html:60 data/content/index.html:74
-#: data/content/index.html:163 data/content/index.html:174
+#: data/content/index.html:97 data/content/index.html:111
+#: data/content/index.html:200 data/content/index.html:211
+#: data/content/prerelease/index.html:80 data/content/prerelease/index.html:94
+#: data/content/prerelease/index.html:183
+#: data/content/prerelease/index.html:194
+#: data/content/prerelease/index.html:839
+#: data/content/prerelease/index.html:919
 msgid "Fedora Workstation"
 msgstr ""
 
-#: data/content/index.html:77 data/content/index.html:279
+#: data/content/index.html:114 data/content/index.html:316
+#: data/content/prerelease/index.html:97
 #, python-format
 msgid "32 bit %sMB ISO"
 msgstr ""
 
-#: data/content/index.html:116 data/content/index.html:125
+#: data/content/index.html:153 data/content/index.html:162
+#: data/content/prerelease/index.html:136
+#: data/content/prerelease/index.html:145
+#: data/content/prerelease/index.html:881
 msgid "Workstation"
 msgstr ""
 
-#: data/content/index.html:189
+#: data/content/index.html:226
 msgid "Bittorrent Downloads"
 msgstr ""
 
-#: data/content/index.html:194
+#: data/content/index.html:231
 msgid ""
 "Fedora offers many bittorrent downloads. Access our directory of torrents"
 " below:"
 msgstr ""
 
-#: data/content/index.html:197
+#: data/content/index.html:234
 msgid "torrent.fedoraproject.org"
 msgstr ""
 
-#: data/content/alt/index.html:16 data/content/index.html:208
+#: data/content/alt/index.html:16 data/content/index.html:245
+#: data/content/prerelease/index.html:213
 msgid "Alternate Architectures"
 msgstr ""
 
-#: data/content/index.html:213
+#: data/content/index.html:250
 msgid ""
 "These are additional architectures supported by Fedora beyond the "
 "standard set."
 msgstr ""
 
-#: data/content/cloud/index.html:17 data/content/index.html:227
+#: data/content/cloud/index.html:17 data/content/index.html:264
 msgid "Cloud Base Images"
 msgstr ""
 
-#: data/content/index.html:232
+#: data/content/index.html:269
 msgid "These are standard Cloud Base images."
 msgstr ""
 
-#: data/content/index.html:246 data/content/index.html:262
-#: data/content/index.html:276 data/content/index.html:295
-#: data/content/index.html:312 data/content/index.html:321
-#: data/content/index.html:334 data/content/index.html:351
-#: data/content/index.html:362
+#: data/content/index.html:283 data/content/index.html:299
+#: data/content/index.html:313 data/content/index.html:332
+#: data/content/index.html:349 data/content/index.html:358
+#: data/content/index.html:371 data/content/index.html:388
+#: data/content/index.html:399 data/content/prerelease/index.html:812
 msgid "Everything"
 msgstr ""
 
-#: data/content/index.html:249 data/content/index.html:298
-#: data/content/index.html:337
+#: data/content/index.html:286 data/content/index.html:335
+#: data/content/index.html:374
 msgid "Experts only!"
 msgstr ""
 
-#: data/content/index.html:254 data/content/index.html:303
-#: data/content/index.html:342
+#: data/content/index.html:291 data/content/index.html:340
+#: data/content/index.html:379 data/content/prerelease/index.html:817
+#: data/content/prerelease/index.html:863
+#: data/content/prerelease/index.html:899
 msgid ""
 "Choose from thousands of packages to customize your installation; "
 "requires a fast network connection."
 msgstr ""
 
-#: data/content/index.html:377 data/content/index.html:417
-#: data/content/index.html:453
+#: data/content/index.html:414 data/content/index.html:454
+#: data/content/index.html:490
 msgid "Testing Images"
 msgstr ""
 
-#: data/content/index.html:382 data/content/index.html:422
-#: data/content/index.html:458
+#: data/content/index.html:419 data/content/index.html:459
+#: data/content/index.html:495
 msgid ""
 "These are unreleased development versions of Fedora made available for "
 "testing the next official Fedora release."
 msgstr ""
 
-#: data/content/index.html:390 data/content/index.html:431
-#: data/content/index.html:467
+#: data/content/index.html:427 data/content/index.html:468
+#: data/content/index.html:504
 msgid "Nightly builds"
 msgstr ""
 
-#: data/content/index.html:393 data/content/index.html:404
-#: data/content/index.html:432 data/content/index.html:441
-#: data/content/index.html:470 data/content/index.html:481
+#: data/content/index.html:430 data/content/index.html:441
+#: data/content/index.html:469 data/content/index.html:478
+#: data/content/index.html:507 data/content/index.html:518
 msgid "View Images >"
 msgstr ""
 
-#: data/content/index.html:401
+#: data/content/index.html:438
 msgid "Other composes (Alpha / Beta / TCs / RCs)"
 msgstr ""
 
-#: data/content/index.html:440 data/content/index.html:478
+#: data/content/index.html:477 data/content/index.html:515
 msgid "Other test composes"
 msgstr ""
 
 #: data/content/alt/index.html:285 data/content/alt/index.html:802
 #: data/content/alt/index.html:924 data/content/cloud/index.html:620
-#: data/content/index.html:581
+#: data/content/index.html:618
 msgid "Support Resources"
 msgstr ""
 
-#: data/content/index.html:586
+#: data/content/index.html:623 data/content/prerelease/index.html:962
 msgid "General Help Using Fedora"
 msgstr ""
 
-#: data/content/index.html:587
+#: data/content/index.html:624
 #, python-format
 msgid ""
 "Need some help with Fedora? Check out <a href=\"%s\">Ask Fedora</a>, "
@@ -279,16 +476,6 @@ msgid ""
 "own question."
 msgstr ""
 
-#: data/content/index.html:599 data/content/index.html:610
-#, python-format
-msgid "Fedora %(rel)s %(state)s released! <a href=\"%(link)s\">Try it now ></a>"
-msgstr ""
-
-#: data/content/index.html:621
-#, python-format
-msgid "Fedora %(rel)s released! Try it now."
-msgstr ""
-
 #: data/content/verify.html:8 data/content/verify.html:18
 msgid "Verify your Downloaded Image"
 msgstr ""
@@ -308,7 +495,7 @@ msgid ""
 "the same directory as the image you downloaded."
 msgstr ""
 
-#: data/content/verify.html:39
+#: data/content/prerelease/index.html:501 data/content/verify.html:39
 msgid "Server"
 msgstr ""
 
@@ -360,7 +547,9 @@ msgstr ""
 msgid "For Cloud Base images"
 msgstr ""
 
-#: data/content/verify.html:84
+#: data/content/prerelease/index.html:301
+#: data/content/prerelease/index.html:386
+#: data/content/prerelease/index.html:471 data/content/verify.html:84
 msgid "Docker"
 msgstr ""
 
@@ -444,7 +633,7 @@ msgid "Additional architectures supported by Fedora"
 msgstr ""
 
 #: data/content/alt/index.html:27 data/content/alt/index.html:129
-#: data/content/alt/index.html:201
+#: data/content/alt/index.html:201 data/content/prerelease/index.html:227
 msgid "ARM<span class=\"sup\">®</span> aarch64 Architecture"
 msgstr ""
 
@@ -482,7 +671,18 @@ msgstr ""
 #: data/content/alt/index.html:692 data/content/alt/index.html:703
 #: data/content/alt/index.html:754 data/content/alt/index.html:765
 #: data/content/alt/index.html:776 data/content/cloud/index.html:8
-#: data/content/cloud/index.html:16
+#: data/content/cloud/index.html:16 data/content/prerelease/index.html:550
+#: data/content/prerelease/index.html:559
+#: data/content/prerelease/index.html:568
+#: data/content/prerelease/index.html:611
+#: data/content/prerelease/index.html:620
+#: data/content/prerelease/index.html:629
+#: data/content/prerelease/index.html:687
+#: data/content/prerelease/index.html:698
+#: data/content/prerelease/index.html:709
+#: data/content/prerelease/index.html:760
+#: data/content/prerelease/index.html:771
+#: data/content/prerelease/index.html:782
 msgid "Fedora Cloud"
 msgstr ""
 
@@ -502,7 +702,13 @@ msgstr ""
 #: data/content/alt/index.html:270 data/content/alt/index.html:402
 #: data/content/alt/index.html:493 data/content/alt/index.html:571
 #: data/content/alt/index.html:632 data/content/alt/index.html:714
-#: data/content/alt/index.html:787
+#: data/content/alt/index.html:787 data/content/prerelease/index.html:296
+#: data/content/prerelease/index.html:381
+#: data/content/prerelease/index.html:466
+#: data/content/prerelease/index.html:577
+#: data/content/prerelease/index.html:638
+#: data/content/prerelease/index.html:720
+#: data/content/prerelease/index.html:793
 msgid "Fedora Docker"
 msgstr ""
 
@@ -514,6 +720,7 @@ msgstr ""
 
 #: data/content/alt/index.html:291 data/content/alt/index.html:808
 #: data/content/alt/index.html:930 data/content/cloud/index.html:626
+#: data/content/prerelease/index.html:943
 msgid "Documentation"
 msgstr ""
 
@@ -527,6 +734,7 @@ msgstr ""
 
 #: data/content/alt/index.html:297 data/content/alt/index.html:814
 #: data/content/alt/index.html:936 data/content/cloud/index.html:632
+#: data/content/prerelease/index.html:949
 msgid "Email"
 msgstr ""
 
@@ -539,6 +747,7 @@ msgstr ""
 
 #: data/content/alt/index.html:303 data/content/alt/index.html:820
 #: data/content/alt/index.html:942 data/content/cloud/index.html:638
+#: data/content/prerelease/index.html:955
 msgid "Chat"
 msgstr ""
 
@@ -550,24 +759,27 @@ msgid ""
 msgstr ""
 
 #: data/content/alt/index.html:319 data/content/alt/index.html:512
-#: data/content/alt/index.html:645
+#: data/content/alt/index.html:645 data/content/prerelease/index.html:518
+#: data/content/prerelease/index.html:651
 msgid "Power Architecture"
 msgstr ""
 
 #: data/content/alt/index.html:324 data/content/alt/index.html:517
+#: data/content/prerelease/index.html:523
 msgid ""
 "PPC64 images are for installation on IBM Power systems or OpenPOWER "
 "systems."
 msgstr ""
 
 #: data/content/alt/index.html:415 data/content/alt/index.html:578
-#: data/content/alt/index.html:723
+#: data/content/alt/index.html:723 data/content/prerelease/index.html:584
+#: data/content/prerelease/index.html:729
 msgid ""
 "PPC64LE images are for installation on IBM Power systems or OpenPOWER "
 "systems."
 msgstr ""
 
-#: data/content/alt/index.html:650
+#: data/content/alt/index.html:650 data/content/prerelease/index.html:656
 msgid ""
 "These images are for installation on IBM Power systems or OpenPOWER "
 "systems."
@@ -595,7 +807,7 @@ msgid ""
 msgstr ""
 
 #: data/content/alt/index.html:836 data/content/alt/index.html:868
-#: data/content/alt/index.html:895
+#: data/content/alt/index.html:895 data/content/prerelease/index.html:482
 msgid "s390x Architecture"
 msgstr ""
 
@@ -824,6 +1036,157 @@ msgid ""
 "chat."
 msgstr ""
 
+#: data/content/prerelease/index.html:8
+msgid "Fedora Alternate Architectures Prerelease Images"
+msgstr ""
+
+#: data/content/prerelease/index.html:16
+msgid "Pre-releases"
+msgstr ""
+
+#: data/content/prerelease/index.html:17
+msgid "Official pre-releases of Fedora alternative downloads."
+msgstr ""
+
+#: data/content/prerelease/index.html:28 data/content/prerelease/index.html:39
+#, python-format
+msgid "Currently offering <strong>Fedora %(rel)s %(state)s</strong>."
+msgstr ""
+
+#: data/content/prerelease/index.html:28
+msgid "Released 21 march 2017."
+msgstr ""
+
+#: data/content/prerelease/index.html:53 data/content/prerelease/index.html:113
+#: data/content/prerelease/index.html:158
+#: data/content/prerelease/index.html:213
+#: data/content/prerelease/index.html:812
+#: data/content/prerelease/index.html:858
+#: data/content/prerelease/index.html:894
+#, python-format
+msgid "F%(rel)s %(state)s"
+msgstr ""
+
+#: data/content/prerelease/index.html:218
+msgid ""
+"These are additional architectures supported by Fedora beyond the "
+"standard set"
+msgstr ""
+
+#: data/content/prerelease/index.html:233
+msgid "ARM<span class=\"sup\">®</span>"
+msgstr ""
+
+#: data/content/prerelease/index.html:241
+#: data/content/prerelease/index.html:326
+#: data/content/prerelease/index.html:411
+msgid "Fedora Server DVD"
+msgstr ""
+
+#: data/content/prerelease/index.html:246
+#: data/content/prerelease/index.html:331
+#: data/content/prerelease/index.html:416
+msgid "DVD"
+msgstr ""
+
+#: data/content/prerelease/index.html:252
+#: data/content/prerelease/index.html:337
+#: data/content/prerelease/index.html:422
+msgid "Fedora Server Netinstall"
+msgstr ""
+
+#: data/content/prerelease/index.html:257
+#: data/content/prerelease/index.html:268
+#: data/content/prerelease/index.html:342
+#: data/content/prerelease/index.html:353
+#: data/content/prerelease/index.html:427
+#: data/content/prerelease/index.html:438
+msgid "Net"
+msgstr ""
+
+#: data/content/prerelease/index.html:263
+#: data/content/prerelease/index.html:348
+#: data/content/prerelease/index.html:433
+msgid "Fedora Cloud Netinstall"
+msgstr ""
+
+#: data/content/prerelease/index.html:274
+#: data/content/prerelease/index.html:359
+#: data/content/prerelease/index.html:444
+msgid "Fedora Cloud qcow2"
+msgstr ""
+
+#: data/content/prerelease/index.html:279
+#: data/content/prerelease/index.html:364
+#: data/content/prerelease/index.html:449
+msgid "qcow2"
+msgstr ""
+
+#: data/content/prerelease/index.html:285
+#: data/content/prerelease/index.html:370
+#: data/content/prerelease/index.html:455
+msgid "Fedora Cloud raw"
+msgstr ""
+
+#: data/content/prerelease/index.html:290
+#: data/content/prerelease/index.html:375
+#: data/content/prerelease/index.html:460
+msgid "raw"
+msgstr ""
+
+#: data/content/prerelease/index.html:312
+msgid "PowerPC Architecture (PPC64)"
+msgstr ""
+
+#: data/content/prerelease/index.html:318
+msgid "PPC64"
+msgstr ""
+
+#: data/content/prerelease/index.html:397
+msgid "PowerPC Architecture (PPC64LE)"
+msgstr ""
+
+#: data/content/prerelease/index.html:403
+msgid "PPC64LE"
+msgstr ""
+
+#: data/content/prerelease/index.html:488
+msgid "s390x"
+msgstr ""
+
+#: data/content/prerelease/index.html:937
+msgid "Testing Resources"
+msgstr ""
+
+#: data/content/prerelease/index.html:944
+#, python-format
+msgid ""
+"Some basic information about getting involved in Fedora's testing efforts"
+" is available on <a href=\"%s\">the Fedora QA wiki</a>."
+msgstr ""
+
+#: data/content/prerelease/index.html:950
+#, python-format
+msgid ""
+"Email discussion of Fedora testing is available on the mailing list at <a"
+" href=\"%s\">test@lists.fedoraproject.org</a>."
+msgstr ""
+
+#: data/content/prerelease/index.html:956
+#, python-format
+msgid ""
+"Discussion of Feora testing takes place in the <a href=\"%s\">#fedora-"
+"qa</a> IRC channel on <strong>irc.freenode.org.</strong>"
+msgstr ""
+
+#: data/content/prerelease/index.html:963
+#, python-format
+msgid ""
+"Sometimes you may encounter an issue with this spin that you can get help"
+" with using general Fedora support resources. A list of resources is "
+"available at the <a href=\"%s\">Fedora “Get Help” page</a>."
+msgstr ""
+
 #: data/templates/content-export-regulations.html:25
 msgid "Read full export regulations"
 msgstr ""

From 135ab9c4902ba536ad897bd18721e338f8d20583 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 13 2017 21:21:16 +0000
Subject: [PATCH 25/39] atomic buttons are purple


---

diff --git a/getfedora.org/data/content/atomic/prerelease/index.html b/getfedora.org/data/content/atomic/prerelease/index.html
index dded4e2..a5d936a 100644
--- a/getfedora.org/data/content/atomic/prerelease/index.html
+++ b/getfedora.org/data/content/atomic/prerelease/index.html
@@ -70,7 +70,7 @@
             <h5 class="bold">${_('GP2 Format')}</h5>
             <p>${_('GP2 format AMIs use faster SSD storage; use these AMIs for speed, although note your storage costs will be more than standard.')}</p>
             <!-- Modal for EC2 Cloud GP2 Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix" data-toggle="modal" data-target=".GP2-atomic-mobile-EC2">${_('GP2 HVM AMIs')}</button>
+            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".GP2-atomic-mobile-EC2">${_('GP2 HVM AMIs')}</button>
             <div class="modal fade GP2-atomic-mobile-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
@@ -102,7 +102,7 @@
             <h5 class="bold">${_('Standard Format)')}</h5>
             <p>${_('Standard format AMIs are more suitable if you have infrequently accessed data and want to keep storage cost low.')}</p>
             <!-- Modal for EC2 Cloud standard Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix" data-toggle="modal" data-target=".atomic-mobile-EC2">${_('Standard HVM AMIs')}</button>
+            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".atomic-mobile-EC2">${_('Standard HVM AMIs')}</button>
             <div class="modal fade atomic-mobile-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
@@ -146,7 +146,7 @@
         <div class="row hidden-xs">
           <div class="col-sm-6">
             <!-- Modal for EC2 GP2 Cloud Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix" data-toggle="modal" data-target=".GP2-atomic-EC2">${_('GP2 HVM AMIs')}</button>
+            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".GP2-atomic-EC2">${_('GP2 HVM AMIs')}</button>
             <div class="modal fade GP2-atomic-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
@@ -176,7 +176,7 @@
           </div>
           <div class="col-sm-6">
             <!-- Modal for EC2 Standard Cloud Base HVM Instances -->
-            <button type="button" class="btn btn-success btn-fix" data-toggle="modal" data-target=".atomic-EC2">${_('Standard HVM AMIs')}</button>
+            <button type="button" class="btn btn-success btn-fix download-cloud" data-toggle="modal" data-target=".atomic-EC2">${_('Standard HVM AMIs')}</button>
             <div class="modal fade atomic-EC2" tabindex="-1" role="dialog" aria-hidden="true">
               <div class="modal-dialog modal-cloud">
                 <div class="modal-content">
@@ -292,13 +292,13 @@
 		          <div class="col-xs-12">
 		            <h5 class="bold">${_('qcow2 Image')}</h5>
 		            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</p>
-		            <a class="btn btn-success" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>
+		            <a class="btn btn-success download-cloud" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>
 		              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_atomic_qcow2_cloud']}</p>
 		          </div>
 		          <div class="col-xs-12">
 		            <h5 class="bold">${_('Raw Image')}</h5>
 		            <p>${Markup(_('This is Fedora %(rel)s %(state)s Cloud Atomic Host in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['next_atomic_id'], 'state':global_variables.release['curr_atomic_state']}}</p>
-		            <a class="btn btn-success" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>
+		            <a class="btn btn-success download-cloud" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>
 		              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_atomic_raw_cloud']}</p>
 		          </div>
 		      </div>
@@ -315,11 +315,11 @@
 		      </div>
 		      <div class="row hidden-xs">
 		          <div class="col-sm-6">
-		            <a class="btn btn-success" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>
+		            <a class="btn btn-success download-cloud" href="${global_variables.release['atomic_qcow2_cloud_url']}" role="button">${_('Download')}</a>
 		              <p class="caption">${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['pre_atomic_qcow2_cloud']}</p>
 		          </div>
 		          <div class="col-sm-6">
-		            <a class="btn btn-success" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>
+		            <a class="btn btn-success download-cloud" href="${global_variables.release['atomic_raw_cloud_url']}" role="button">${_('Download')}</a>
 		              <p class="caption">${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['pre_atomic_raw_cloud']}</p>
 		          </div>
 		      </div>

From 3c6625c968225142544d0f423f40f1aa64b18aa3 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 13 2017 21:22:38 +0000
Subject: [PATCH 26/39] fix instructions for atomic prerelease


---

diff --git a/getfedora.org/data/content/atomic/prerelease/index.html b/getfedora.org/data/content/atomic/prerelease/index.html
index a5d936a..7043faa 100644
--- a/getfedora.org/data/content/atomic/prerelease/index.html
+++ b/getfedora.org/data/content/atomic/prerelease/index.html
@@ -266,7 +266,7 @@
 	              <div class="col-xs-12">
 	              	<h4 class="bold">${_('Vagrant Downloads using Vagrant tools')}</h4>
 	              	<p>${Markup(_('You can use the following command to grab the Vagrant Box images from &lt;a href="%s"&gt;HashiCorp\'s Atlas&lt;/a&gt;.') % ('https://atlas.hashicorp.com/fedora'))}</p>
-	                <pre>vagrant box add fedora/${global_variables.release['curr_atomic_id']}-atomic-host</pre>
+	                <pre>vagrant box add fedora/${global_variables.release['next_atomic_id']}_${global_variables.release['curr_atomic_state']}-atomic-host</pre>
 	                <p>${Markup(_('If you\'ve previously run Fedora %(rel)s Atomic Host in Vagrant on your machine then you can get the latest version by running:')) % {'rel':global_variables.release['curr_atomic_id']}}</p>
 	                <pre>vagrant box update --box=fedora/${global_variables.release['next_atomic_id']}_${global_variables.release['curr_atomic_state']}-atomic-host</pre>
 	              </div>

From e8b8203e6f82f11f1c651c5fc31b1148689d4e2f Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 13 2017 22:12:19 +0000
Subject: [PATCH 27/39] drop useless mobile content for alt.fpo


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index 181e1dd..374bbb5 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -510,296 +510,6 @@
     </div>
   </div>
 
-  <!-- Mobile phones-->
-  <div class="jumbotron main-head visible-xs">
-    <div class="container using">
-      <div class="row">
-        <div class="col-xs-12">
-        <h2>${_('Power Architecture')}</h2>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-xs-12 product-feature">
-        <p>${_('PPC64 images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
-        </div>
-      </div>
-      <div class="row">
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/server.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Server')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-dvd-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/server.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Server')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Cloud')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64/iso/Fedora-Cloud-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Cloud')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Cloud')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/docker.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Docker')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-      </div>
-      <div class="row top-space">
-        <div class="col-xs-12 product-feature">
-        <p>${_('PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
-        </div>
-      </div>
-      <div class="row">
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/server.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Server')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-dvd-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/server.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Server')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Cloud')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64le/iso/Fedora-Cloud-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Cloud')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Cloud')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-xs-3">
-          <img src="/static/images/docker.png" />
-          </div>
-          <div class="col-xs-9">
-          <h3>${_('Fedora Docker')}</h3>
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64le/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <!-- Tablets-->
-  <div class="jumbotron main-head visible-sm">
-    <div class="container using">
-      <div class="row">
-        <div class="col-xs-12">
-        <h2>${_('Power Architecture')}</h2>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-xs-12 product-feature">
-        <p>${_('These images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
-        </div>
-      </div>
-      <div class="row">
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/server.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Server')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-dvd-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/server.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Server')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64/iso/Fedora-Server-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Cloud')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64/iso/Fedora-Cloud-netinst-ppc64-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Cloud')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Cloud')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/docker.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Docker')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-      </div>
-      <div class="row top-margin">
-        <div class="col-xs-12 product-feature">
-        <p>${_('PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.')}</p>
-        </div>
-      </div>
-      <div class="row">
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/server.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Server')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-dvd-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/server.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Server')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Server/ppc64le/iso/Fedora-Server-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Cloud')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Cloud/ppc64le/iso/Fedora-Cloud-netinst-ppc64le-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.iso">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Cloud')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.qcow2">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/cloud.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Cloud')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/CloudImages/ppc64le/images/Fedora-Cloud-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.raw.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-        <div class="white">
-          <div class="col-sm-3">
-          <img src="/static/images/docker.png" />
-          </div>
-          <div class="col-sm-5">
-          <h3>${_('Fedora Docker')}</h3>
-          </div>
-          <div class="col-sm-4">
-          <p class="download"><a href="${global_variables.path['download_arch']}/${global_variables.release['curr_alt_id']}/Docker/ppc64le/images/Fedora-Docker-Base-${global_variables.release['curr_alt_id']}-${global_variables.release['RC_gold_ppc64']}.ppc64le.tar.xz">${_('Download')}</a> | <a href="${path}/${lang}/verify.html">${_('Verify')}</a></p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
   <div class="white-hr"></div>
   <!-- end Alternate Architectures -->
 

From bab557ca4e8a89dbadc2d35b735fa1dc91ac5f3b Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 14 2017 14:25:01 +0000
Subject: [PATCH 28/39] update news section for arm.fpo


---

diff --git a/arm.fedoraproject.org/data/content/index.html b/arm.fedoraproject.org/data/content/index.html
index d005824..313f666 100644
--- a/arm.fedoraproject.org/data/content/index.html
+++ b/arm.fedoraproject.org/data/content/index.html
@@ -11,6 +11,43 @@
 <body class="home">
 <xi:include href="../templates/head.html" />
 
+  <!-- News -->
+  <py:choose>
+    <py:when test="global_variables.release['curr_state'] == 'Alpha'">
+      <div class="newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:when>
+    <py:when test="global_variables.release['curr_state'] == 'Beta'">
+      <div class="jumbotron newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:when>
+    <py:otherwise>
+      <div class="jumbotron newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('Fedora %(rel)s released! Get it now.')) % {'rel':global_variables.release['curr_id']}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:otherwise>
+  </py:choose>
+
   <!-- Servers -->
   <div class="jumbotron main-head hidden-xs hidden-sm">
     <div class="container using">
@@ -435,42 +472,5 @@
     </div>
   </div>
 
-<!-- News -->
-      <py:choose>
-        <py:when test="global_variables.release['curr_state'] == 'Alpha'">
-          <div class="newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s %(state)s released! &lt;a href="%(link)s"&gt;Try it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:when>
-        <py:when test="global_variables.release['curr_state'] == 'Beta'">
-          <div class="jumbotron newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s %(state)s released! &lt;a href="%(link)s"&gt;Try it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:when>
-        <py:otherwise>
-          <div class="jumbotron newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s released! Try it now.')) % {'rel':global_variables.release['curr_id']}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:otherwise>
-      </py:choose>
-
 </body>
 </html>
diff --git a/arm.fedoraproject.org/static/css/app.css b/arm.fedoraproject.org/static/css/app.css
index ff02bb6..0029001 100644
--- a/arm.fedoraproject.org/static/css/app.css
+++ b/arm.fedoraproject.org/static/css/app.css
@@ -202,15 +202,27 @@ a.btn-lg {
 }
 
 .newsbox {
-  background-color: #ebb05d;
-  color: #000;
+  background-color: #a07cbc;
+  color: #fff;
   padding: 20px;
 }
 
 .newsbox h2,
 .newsbox h3 {
+  margin-top: 22px;
+  color: #fff;
+}
+
+.newsbox .index h3 {
   margin-top: 10px;
-  color: #000;
+  color: #fff;
+}
+
+.newsbox a,
+.newsbox a:hover,
+.newsbox a:active {
+  text-decoration: none;
+  color: #fff;
 }
 
 .whitesupport {

From 76ff0a7a50eb1822b60cbb64ba4afe9d3c48485e Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 14 2017 14:25:25 +0000
Subject: [PATCH 29/39] add fmw json file for mediawriter


---

diff --git a/getfedora.org/static/fmw-version.json b/getfedora.org/static/fmw-version.json
new file mode 100644
index 0000000..cb0c51c
--- /dev/null
+++ b/getfedora.org/static/fmw-version.json
@@ -0,0 +1,12 @@
+{
+    "win32": {
+        "version": "4.0.7",
+        "fileUrl": "https://getfedora.org/fmw/FedoraMediaWriter-win32-4.0.7.exe",
+        "url": "https://getfedora.org/en/workstation/download/"
+    },
+    "osx": {
+        "version": "4.0.7",
+        "fileUrl": "https://getfedora.org/fmw/FedoraMediaWriter-osx-4.0.7.dmg",
+        "url": "https://getfedora.org/en/workstation/download/"
+    }
+}

From 72c4cfe306814cd49350d1b0e667393b61b961bb Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 14 2017 14:29:07 +0000
Subject: [PATCH 30/39] update news section for labs.fpo


---

diff --git a/labs.fedoraproject.org/data/content/index.html b/labs.fedoraproject.org/data/content/index.html
index 86b7c15..16088a7 100644
--- a/labs.fedoraproject.org/data/content/index.html
+++ b/labs.fedoraproject.org/data/content/index.html
@@ -11,6 +11,43 @@
 <body class="home">
 <xi:include href="../templates/head.html" />
 
+  <!-- News -->
+  <py:choose>
+    <py:when test="global_variables.release['curr_state'] == 'Alpha'">
+      <div class="newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:when>
+    <py:when test="global_variables.release['curr_state'] == 'Beta'">
+      <div class="jumbotron newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:when>
+    <py:otherwise>
+      <div class="jumbotron newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('Fedora %(rel)s released! Get it now.')) % {'rel':global_variables.release['curr_id']}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:otherwise>
+  </py:choose>
+
   <!-- Labs Screenshots -->
   <header id="head" class="main-head">
   <!-- Desktop -->
diff --git a/labs.fedoraproject.org/static/css/app.css b/labs.fedoraproject.org/static/css/app.css
index 6594803..35226eb 100644
--- a/labs.fedoraproject.org/static/css/app.css
+++ b/labs.fedoraproject.org/static/css/app.css
@@ -231,15 +231,27 @@ a.btn-lg {
 }
 
 .newsbox {
-  background-color: #ebb05d;
-  color: #000;
+  background-color: #a07cbc;
+  color: #fff;
   padding: 20px;
 }
 
 .newsbox h2,
 .newsbox h3 {
+  margin-top: 22px;
+  color: #fff;
+}
+
+.newsbox .index h3 {
   margin-top: 10px;
-  color: #000;
+  color: #fff;
+}
+
+.newsbox a,
+.newsbox a:hover,
+.newsbox a:active {
+  text-decoration: none;
+  color: #fff;
 }
 
 .widewrapper {

From 5323f326b6c73e417d9c1f726374305514dcd20e Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 14 2017 14:31:54 +0000
Subject: [PATCH 31/39] update news section for spins.fpo


---

diff --git a/spins.fedoraproject.org/data/content/index.html b/spins.fedoraproject.org/data/content/index.html
index 97757b0..f78850c 100644
--- a/spins.fedoraproject.org/data/content/index.html
+++ b/spins.fedoraproject.org/data/content/index.html
@@ -11,6 +11,43 @@
 <body class="home">
 <xi:include href="../templates/head.html" />
 
+  <!-- News -->
+  <py:choose>
+    <py:when test="global_variables.release['curr_state'] == 'Alpha'">
+      <div class="newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:when>
+    <py:when test="global_variables.release['curr_state'] == 'Beta'">
+      <div class="jumbotron newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('&lt;strong&gt;Fedora %(rel)s %(state)s&lt;/strong&gt; released! &lt;a href="%(link)s"&gt;Test it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:when>
+    <py:otherwise>
+      <div class="jumbotron newsbox">
+        <div class="container">
+          <div class="row">
+            <div class="col-xs-12 text-center index">
+              <h3>${Markup(_('Fedora %(rel)s released! Get it now.')) % {'rel':global_variables.release['curr_id']}}</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </py:otherwise>
+  </py:choose>
+
   <!-- Spins Screenshots -->
   <header id="head" class="main-head">
   	<div class="container">
@@ -173,42 +210,5 @@
 
   </div>
 
-<!-- News -->
-      <py:choose>
-        <py:when test="global_variables.release['curr_state'] == 'Alpha'">
-          <div class="newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s %(state)s released! &lt;a href="%(link)s"&gt;Try it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:when>
-        <py:when test="global_variables.release['curr_state'] == 'Beta'">
-          <div class="jumbotron newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s %(state)s released! &lt;a href="%(link)s"&gt;Try it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:when>
-        <py:otherwise>
-        	<div class="jumbotron newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s released! Check it out in the Download section.')) % {'rel':global_variables.release['curr_id']}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:otherwise>
-      </py:choose>
-
 </body>
 </html>
diff --git a/spins.fedoraproject.org/static/css/app.css b/spins.fedoraproject.org/static/css/app.css
index 171dec0..b095277 100644
--- a/spins.fedoraproject.org/static/css/app.css
+++ b/spins.fedoraproject.org/static/css/app.css
@@ -222,15 +222,27 @@ a.btn-lg {
 }
 
 .newsbox {
-  background-color: #ebb05d;
-  color: #000;
+  background-color: #a07cbc;
+  color: #fff;
   padding: 20px;
 }
 
 .newsbox h2,
 .newsbox h3 {
+  margin-top: 22px;
+  color: #fff;
+}
+
+.newsbox .index h3 {
   margin-top: 10px;
-  color: #000;
+  color: #fff;
+}
+
+.newsbox a,
+.newsbox a:hover,
+.newsbox a:active {
+  text-decoration: none;
+  color: #fff;
 }
 
 .widewrapper {

From 458225d8a97aa4870e52fefc4278f17e6f0a02a6 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 14 2017 14:33:04 +0000
Subject: [PATCH 32/39] drop the old news section in labs.fpo


---

diff --git a/labs.fedoraproject.org/data/content/index.html b/labs.fedoraproject.org/data/content/index.html
index 16088a7..d90aedb 100644
--- a/labs.fedoraproject.org/data/content/index.html
+++ b/labs.fedoraproject.org/data/content/index.html
@@ -235,42 +235,5 @@
 
   </div>
 
-<!-- News -->
-      <py:choose>
-        <py:when test="global_variables.release['curr_state'] == 'Alpha'">
-          <div class="newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s %(state)s released! &lt;a href="%(link)s"&gt;Try it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:when>
-        <py:when test="global_variables.release['curr_state'] == 'Beta'">
-          <div class="jumbotron newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s %(state)s released! &lt;a href="%(link)s"&gt;Try it now >&lt;/a&gt;')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state'], 'link':'prerelease.html'}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:when>
-        <py:otherwise>
-          <div class="jumbotron newsbox">
-            <div class="container">
-              <div class="row">
-                <div class="col-xs-12 text-center">
-                  <h3>${Markup(_('Fedora %(rel)s released! Check it out in the Download section.')) % {'rel':global_variables.release['curr_id']}}</h3>
-                </div>
-              </div>
-            </div>
-          </div>
-        </py:otherwise>
-      </py:choose>
-
 </body>
 </html>

From c105c00ce888ce5831964f38d81fac9fb176539d Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 14 2017 14:40:05 +0000
Subject: [PATCH 33/39] full POT files update for all websites


---

diff --git a/alt.fedoraproject.org/po/alt.fedoraproject.org.pot b/alt.fedoraproject.org/po/alt.fedoraproject.org.pot
index ebdffc2..e81aa81 100644
--- a/alt.fedoraproject.org/po/alt.fedoraproject.org.pot
+++ b/alt.fedoraproject.org/po/alt.fedoraproject.org.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-12 23:06+0100\n"
+"POT-Creation-Date: 2017-03-14 15:38+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,8 +55,8 @@ msgstr ""
 #: data/content/index.html:175 data/content/prerelease/index.html:53
 #: data/content/prerelease/index.html:113
 #: data/content/prerelease/index.html:158
-#: data/content/prerelease/index.html:858
-#: data/content/prerelease/index.html:894
+#: data/content/prerelease/index.html:568
+#: data/content/prerelease/index.html:604
 msgid "Network Installers"
 msgstr ""
 
@@ -84,24 +84,16 @@ msgstr ""
 #: data/content/prerelease/index.html:66 data/content/prerelease/index.html:127
 #: data/content/prerelease/index.html:172
 #: data/content/prerelease/index.html:496
-#: data/content/prerelease/index.html:532
-#: data/content/prerelease/index.html:541
-#: data/content/prerelease/index.html:593
-#: data/content/prerelease/index.html:602
-#: data/content/prerelease/index.html:665
-#: data/content/prerelease/index.html:676
-#: data/content/prerelease/index.html:738
-#: data/content/prerelease/index.html:749
-#: data/content/prerelease/index.html:825
-#: data/content/prerelease/index.html:872
-#: data/content/prerelease/index.html:908
+#: data/content/prerelease/index.html:535
+#: data/content/prerelease/index.html:582
+#: data/content/prerelease/index.html:618
 msgid "Fedora Server"
 msgstr ""
 
 #: data/content/index.html:86 data/content/index.html:100
 #: data/content/index.html:302 data/content/prerelease/index.html:69
-#: data/content/prerelease/index.html:83 data/content/prerelease/index.html:828
-#: data/content/prerelease/index.html:842
+#: data/content/prerelease/index.html:83 data/content/prerelease/index.html:538
+#: data/content/prerelease/index.html:552
 #, python-format
 msgid "64 bit %sMB ISO"
 msgstr ""
@@ -195,36 +187,12 @@ msgstr ""
 #: data/content/prerelease/index.html:472
 #: data/content/prerelease/index.html:497
 #: data/content/prerelease/index.html:502
-#: data/content/prerelease/index.html:533
-#: data/content/prerelease/index.html:542
-#: data/content/prerelease/index.html:551
-#: data/content/prerelease/index.html:560
-#: data/content/prerelease/index.html:569
-#: data/content/prerelease/index.html:578
-#: data/content/prerelease/index.html:594
-#: data/content/prerelease/index.html:603
-#: data/content/prerelease/index.html:612
+#: data/content/prerelease/index.html:541
+#: data/content/prerelease/index.html:555
+#: data/content/prerelease/index.html:583
+#: data/content/prerelease/index.html:592
 #: data/content/prerelease/index.html:621
-#: data/content/prerelease/index.html:630
-#: data/content/prerelease/index.html:639
-#: data/content/prerelease/index.html:668
-#: data/content/prerelease/index.html:679
-#: data/content/prerelease/index.html:690
-#: data/content/prerelease/index.html:701
-#: data/content/prerelease/index.html:712
-#: data/content/prerelease/index.html:723
-#: data/content/prerelease/index.html:741
-#: data/content/prerelease/index.html:752
-#: data/content/prerelease/index.html:763
-#: data/content/prerelease/index.html:774
-#: data/content/prerelease/index.html:785
-#: data/content/prerelease/index.html:796
-#: data/content/prerelease/index.html:831
-#: data/content/prerelease/index.html:845
-#: data/content/prerelease/index.html:873
-#: data/content/prerelease/index.html:882
-#: data/content/prerelease/index.html:911
-#: data/content/prerelease/index.html:922 data/templates/footer.html:37
+#: data/content/prerelease/index.html:632 data/templates/footer.html:37
 msgid "Download"
 msgstr ""
 
@@ -316,36 +284,12 @@ msgstr ""
 #: data/content/prerelease/index.html:472
 #: data/content/prerelease/index.html:497
 #: data/content/prerelease/index.html:502
-#: data/content/prerelease/index.html:533
-#: data/content/prerelease/index.html:542
-#: data/content/prerelease/index.html:551
-#: data/content/prerelease/index.html:560
-#: data/content/prerelease/index.html:569
-#: data/content/prerelease/index.html:578
-#: data/content/prerelease/index.html:594
-#: data/content/prerelease/index.html:603
-#: data/content/prerelease/index.html:612
+#: data/content/prerelease/index.html:541
+#: data/content/prerelease/index.html:555
+#: data/content/prerelease/index.html:583
+#: data/content/prerelease/index.html:592
 #: data/content/prerelease/index.html:621
-#: data/content/prerelease/index.html:630
-#: data/content/prerelease/index.html:639
-#: data/content/prerelease/index.html:668
-#: data/content/prerelease/index.html:679
-#: data/content/prerelease/index.html:690
-#: data/content/prerelease/index.html:701
-#: data/content/prerelease/index.html:712
-#: data/content/prerelease/index.html:723
-#: data/content/prerelease/index.html:741
-#: data/content/prerelease/index.html:752
-#: data/content/prerelease/index.html:763
-#: data/content/prerelease/index.html:774
-#: data/content/prerelease/index.html:785
-#: data/content/prerelease/index.html:796
-#: data/content/prerelease/index.html:831
-#: data/content/prerelease/index.html:845
-#: data/content/prerelease/index.html:873
-#: data/content/prerelease/index.html:882
-#: data/content/prerelease/index.html:911
-#: data/content/prerelease/index.html:922
+#: data/content/prerelease/index.html:632
 msgid "Verify"
 msgstr ""
 
@@ -354,8 +298,8 @@ msgstr ""
 #: data/content/prerelease/index.html:80 data/content/prerelease/index.html:94
 #: data/content/prerelease/index.html:183
 #: data/content/prerelease/index.html:194
-#: data/content/prerelease/index.html:839
-#: data/content/prerelease/index.html:919
+#: data/content/prerelease/index.html:549
+#: data/content/prerelease/index.html:629
 msgid "Fedora Workstation"
 msgstr ""
 
@@ -368,7 +312,7 @@ msgstr ""
 #: data/content/index.html:153 data/content/index.html:162
 #: data/content/prerelease/index.html:136
 #: data/content/prerelease/index.html:145
-#: data/content/prerelease/index.html:881
+#: data/content/prerelease/index.html:591
 msgid "Workstation"
 msgstr ""
 
@@ -409,7 +353,7 @@ msgstr ""
 #: data/content/index.html:313 data/content/index.html:332
 #: data/content/index.html:349 data/content/index.html:358
 #: data/content/index.html:371 data/content/index.html:388
-#: data/content/index.html:399 data/content/prerelease/index.html:812
+#: data/content/index.html:399 data/content/prerelease/index.html:522
 msgid "Everything"
 msgstr ""
 
@@ -419,9 +363,9 @@ msgid "Experts only!"
 msgstr ""
 
 #: data/content/index.html:291 data/content/index.html:340
-#: data/content/index.html:379 data/content/prerelease/index.html:817
-#: data/content/prerelease/index.html:863
-#: data/content/prerelease/index.html:899
+#: data/content/index.html:379 data/content/prerelease/index.html:527
+#: data/content/prerelease/index.html:573
+#: data/content/prerelease/index.html:609
 msgid ""
 "Choose from thousands of packages to customize your installation; "
 "requires a fast network connection."
@@ -464,7 +408,7 @@ msgstr ""
 msgid "Support Resources"
 msgstr ""
 
-#: data/content/index.html:623 data/content/prerelease/index.html:962
+#: data/content/index.html:623 data/content/prerelease/index.html:672
 msgid "General Help Using Fedora"
 msgstr ""
 
@@ -671,18 +615,7 @@ msgstr ""
 #: data/content/alt/index.html:692 data/content/alt/index.html:703
 #: data/content/alt/index.html:754 data/content/alt/index.html:765
 #: data/content/alt/index.html:776 data/content/cloud/index.html:8
-#: data/content/cloud/index.html:16 data/content/prerelease/index.html:550
-#: data/content/prerelease/index.html:559
-#: data/content/prerelease/index.html:568
-#: data/content/prerelease/index.html:611
-#: data/content/prerelease/index.html:620
-#: data/content/prerelease/index.html:629
-#: data/content/prerelease/index.html:687
-#: data/content/prerelease/index.html:698
-#: data/content/prerelease/index.html:709
-#: data/content/prerelease/index.html:760
-#: data/content/prerelease/index.html:771
-#: data/content/prerelease/index.html:782
+#: data/content/cloud/index.html:16
 msgid "Fedora Cloud"
 msgstr ""
 
@@ -705,10 +638,6 @@ msgstr ""
 #: data/content/alt/index.html:787 data/content/prerelease/index.html:296
 #: data/content/prerelease/index.html:381
 #: data/content/prerelease/index.html:466
-#: data/content/prerelease/index.html:577
-#: data/content/prerelease/index.html:638
-#: data/content/prerelease/index.html:720
-#: data/content/prerelease/index.html:793
 msgid "Fedora Docker"
 msgstr ""
 
@@ -720,7 +649,7 @@ msgstr ""
 
 #: data/content/alt/index.html:291 data/content/alt/index.html:808
 #: data/content/alt/index.html:930 data/content/cloud/index.html:626
-#: data/content/prerelease/index.html:943
+#: data/content/prerelease/index.html:653
 msgid "Documentation"
 msgstr ""
 
@@ -734,7 +663,7 @@ msgstr ""
 
 #: data/content/alt/index.html:297 data/content/alt/index.html:814
 #: data/content/alt/index.html:936 data/content/cloud/index.html:632
-#: data/content/prerelease/index.html:949
+#: data/content/prerelease/index.html:659
 msgid "Email"
 msgstr ""
 
@@ -747,7 +676,7 @@ msgstr ""
 
 #: data/content/alt/index.html:303 data/content/alt/index.html:820
 #: data/content/alt/index.html:942 data/content/cloud/index.html:638
-#: data/content/prerelease/index.html:955
+#: data/content/prerelease/index.html:665
 msgid "Chat"
 msgstr ""
 
@@ -759,27 +688,24 @@ msgid ""
 msgstr ""
 
 #: data/content/alt/index.html:319 data/content/alt/index.html:512
-#: data/content/alt/index.html:645 data/content/prerelease/index.html:518
-#: data/content/prerelease/index.html:651
+#: data/content/alt/index.html:645
 msgid "Power Architecture"
 msgstr ""
 
 #: data/content/alt/index.html:324 data/content/alt/index.html:517
-#: data/content/prerelease/index.html:523
 msgid ""
 "PPC64 images are for installation on IBM Power systems or OpenPOWER "
 "systems."
 msgstr ""
 
 #: data/content/alt/index.html:415 data/content/alt/index.html:578
-#: data/content/alt/index.html:723 data/content/prerelease/index.html:584
-#: data/content/prerelease/index.html:729
+#: data/content/alt/index.html:723
 msgid ""
 "PPC64LE images are for installation on IBM Power systems or OpenPOWER "
 "systems."
 msgstr ""
 
-#: data/content/alt/index.html:650 data/content/prerelease/index.html:656
+#: data/content/alt/index.html:650
 msgid ""
 "These images are for installation on IBM Power systems or OpenPOWER "
 "systems."
@@ -1060,9 +986,9 @@ msgstr ""
 #: data/content/prerelease/index.html:53 data/content/prerelease/index.html:113
 #: data/content/prerelease/index.html:158
 #: data/content/prerelease/index.html:213
-#: data/content/prerelease/index.html:812
-#: data/content/prerelease/index.html:858
-#: data/content/prerelease/index.html:894
+#: data/content/prerelease/index.html:522
+#: data/content/prerelease/index.html:568
+#: data/content/prerelease/index.html:604
 #, python-format
 msgid "F%(rel)s %(state)s"
 msgstr ""
@@ -1154,32 +1080,32 @@ msgstr ""
 msgid "s390x"
 msgstr ""
 
-#: data/content/prerelease/index.html:937
+#: data/content/prerelease/index.html:647
 msgid "Testing Resources"
 msgstr ""
 
-#: data/content/prerelease/index.html:944
+#: data/content/prerelease/index.html:654
 #, python-format
 msgid ""
 "Some basic information about getting involved in Fedora's testing efforts"
 " is available on <a href=\"%s\">the Fedora QA wiki</a>."
 msgstr ""
 
-#: data/content/prerelease/index.html:950
+#: data/content/prerelease/index.html:660
 #, python-format
 msgid ""
 "Email discussion of Fedora testing is available on the mailing list at <a"
 " href=\"%s\">test@lists.fedoraproject.org</a>."
 msgstr ""
 
-#: data/content/prerelease/index.html:956
+#: data/content/prerelease/index.html:666
 #, python-format
 msgid ""
 "Discussion of Feora testing takes place in the <a href=\"%s\">#fedora-"
 "qa</a> IRC channel on <strong>irc.freenode.org.</strong>"
 msgstr ""
 
-#: data/content/prerelease/index.html:963
+#: data/content/prerelease/index.html:673
 #, python-format
 msgid ""
 "Sometimes you may encounter an issue with this spin that you can get help"
diff --git a/arm.fedoraproject.org/po/arm.fedoraproject.org.pot b/arm.fedoraproject.org/po/arm.fedoraproject.org.pot
index d449bcb..defa7d1 100644
--- a/arm.fedoraproject.org/po/arm.fedoraproject.org.pot
+++ b/arm.fedoraproject.org/po/arm.fedoraproject.org.pot
@@ -1,64 +1,76 @@
 # Translations template for PROJECT.
-# Copyright (C) 2016 ORGANIZATION
+# Copyright (C) 2017 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-11-22 12:46+0100\n"
+"POT-Creation-Date: 2017-03-14 15:38+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.3.4\n"
 
 #: data/content/index.html:8
 msgid "Fedora ARM"
 msgstr ""
 
-#: data/content/index.html:19 data/content/index.html:65
-#: data/content/index.html:101
+#: data/content/index.html:21 data/content/index.html:32
+#, python-format
+msgid ""
+"<strong>Fedora %(rel)s %(state)s</strong> released! <a "
+"href=\"%(link)s\">Test it now ></a>"
+msgstr ""
+
+#: data/content/index.html:43
+#, python-format
+msgid "Fedora %(rel)s released! Get it now."
+msgstr ""
+
+#: data/content/index.html:56 data/content/index.html:102
+#: data/content/index.html:138
 msgid "ARM<span class=\"sup\">®</span> Servers"
 msgstr ""
 
-#: data/content/index.html:24 data/content/index.html:70
-#: data/content/index.html:106
+#: data/content/index.html:61 data/content/index.html:107
+#: data/content/index.html:143
 msgid ""
 "These images are geared towards ARM-based computers used as servers, "
 "typically in a headless environment."
 msgstr ""
 
-#: data/content/index.html:32 data/content/index.html:79
-#: data/content/index.html:115 data/content/prerelease.html:46
+#: data/content/index.html:69 data/content/index.html:116
+#: data/content/index.html:152 data/content/prerelease.html:46
 #: data/content/prerelease.html:55
 msgid "Fedora Server"
 msgstr ""
 
-#: data/content/index.html:35 data/content/index.html:49
-#: data/content/index.html:199 data/content/index.html:227
+#: data/content/index.html:72 data/content/index.html:86
+#: data/content/index.html:236 data/content/index.html:264
 #: data/content/prerelease.html:67 data/content/prerelease.html:139
 #: data/content/prerelease.html:194
 #, python-format
 msgid "%sMB raw image"
 msgstr ""
 
-#: data/content/index.html:38 data/content/index.html:52
-#: data/content/index.html:80 data/content/index.html:89
-#: data/content/index.html:118 data/content/index.html:129
-#: data/content/index.html:160 data/content/index.html:174
-#: data/content/index.html:188 data/content/index.html:202
-#: data/content/index.html:216 data/content/index.html:230
-#: data/content/index.html:258 data/content/index.html:267
-#: data/content/index.html:276 data/content/index.html:285
-#: data/content/index.html:294 data/content/index.html:303
-#: data/content/index.html:332 data/content/index.html:343
-#: data/content/index.html:354 data/content/index.html:365
-#: data/content/index.html:376 data/content/index.html:387
+#: data/content/index.html:75 data/content/index.html:89
+#: data/content/index.html:117 data/content/index.html:126
+#: data/content/index.html:155 data/content/index.html:166
+#: data/content/index.html:197 data/content/index.html:211
+#: data/content/index.html:225 data/content/index.html:239
+#: data/content/index.html:253 data/content/index.html:267
+#: data/content/index.html:295 data/content/index.html:304
+#: data/content/index.html:313 data/content/index.html:322
+#: data/content/index.html:331 data/content/index.html:340
+#: data/content/index.html:369 data/content/index.html:380
+#: data/content/index.html:391 data/content/index.html:402
+#: data/content/index.html:413 data/content/index.html:424
 #: data/content/prerelease.html:52 data/content/prerelease.html:56
 #: data/content/prerelease.html:70 data/content/prerelease.html:74
 #: data/content/prerelease.html:88 data/content/prerelease.html:92
@@ -71,18 +83,18 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: data/content/index.html:38 data/content/index.html:52
-#: data/content/index.html:80 data/content/index.html:89
-#: data/content/index.html:118 data/content/index.html:129
-#: data/content/index.html:160 data/content/index.html:174
-#: data/content/index.html:188 data/content/index.html:202
-#: data/content/index.html:216 data/content/index.html:230
-#: data/content/index.html:258 data/content/index.html:267
-#: data/content/index.html:276 data/content/index.html:285
-#: data/content/index.html:294 data/content/index.html:303
-#: data/content/index.html:332 data/content/index.html:343
-#: data/content/index.html:354 data/content/index.html:365
-#: data/content/index.html:376 data/content/index.html:387
+#: data/content/index.html:75 data/content/index.html:89
+#: data/content/index.html:117 data/content/index.html:126
+#: data/content/index.html:155 data/content/index.html:166
+#: data/content/index.html:197 data/content/index.html:211
+#: data/content/index.html:225 data/content/index.html:239
+#: data/content/index.html:253 data/content/index.html:267
+#: data/content/index.html:295 data/content/index.html:304
+#: data/content/index.html:313 data/content/index.html:322
+#: data/content/index.html:331 data/content/index.html:340
+#: data/content/index.html:369 data/content/index.html:380
+#: data/content/index.html:391 data/content/index.html:402
+#: data/content/index.html:413 data/content/index.html:424
 #: data/content/prerelease.html:52 data/content/prerelease.html:56
 #: data/content/prerelease.html:70 data/content/prerelease.html:74
 #: data/content/prerelease.html:88 data/content/prerelease.html:92
@@ -94,32 +106,32 @@ msgstr ""
 msgid "Verify"
 msgstr ""
 
-#: data/content/index.html:46 data/content/index.html:88
-#: data/content/index.html:126 data/content/prerelease.html:64
+#: data/content/index.html:83 data/content/index.html:125
+#: data/content/index.html:163 data/content/prerelease.html:64
 #: data/content/prerelease.html:73
 msgid "Fedora Minimal"
 msgstr ""
 
-#: data/content/index.html:141 data/content/index.html:243
-#: data/content/index.html:315
+#: data/content/index.html:178 data/content/index.html:280
+#: data/content/index.html:352
 msgid "Desktop Computing"
 msgstr ""
 
-#: data/content/index.html:146 data/content/index.html:248
-#: data/content/index.html:320
+#: data/content/index.html:183 data/content/index.html:285
+#: data/content/index.html:357
 msgid ""
 "These images are for ARM-based mediacenters, kiosks, laptops, and other "
 "ARM-powered devices where a graphical interface is desired."
 msgstr ""
 
-#: data/content/index.html:154 data/content/index.html:257
-#: data/content/index.html:329 data/content/prerelease.html:82
+#: data/content/index.html:191 data/content/index.html:294
+#: data/content/index.html:366 data/content/prerelease.html:82
 #: data/content/prerelease.html:91
 msgid "Fedora Workstation"
 msgstr ""
 
-#: data/content/index.html:157 data/content/index.html:171
-#: data/content/index.html:185 data/content/index.html:213
+#: data/content/index.html:194 data/content/index.html:208
+#: data/content/index.html:222 data/content/index.html:250
 #: data/content/prerelease.html:49 data/content/prerelease.html:85
 #: data/content/prerelease.html:103 data/content/prerelease.html:121
 #: data/content/prerelease.html:157
@@ -127,41 +139,41 @@ msgstr ""
 msgid "%sGB raw image"
 msgstr ""
 
-#: data/content/index.html:168 data/content/index.html:266
-#: data/content/index.html:340 data/content/prerelease.html:100
+#: data/content/index.html:205 data/content/index.html:303
+#: data/content/index.html:377 data/content/prerelease.html:100
 #: data/content/prerelease.html:109
 msgid "KDE Plasma Desktop"
 msgstr ""
 
-#: data/content/index.html:182 data/content/index.html:275
-#: data/content/index.html:351 data/content/prerelease.html:118
+#: data/content/index.html:219 data/content/index.html:312
+#: data/content/index.html:388 data/content/prerelease.html:118
 #: data/content/prerelease.html:127
 msgid "Xfce Desktop"
 msgstr ""
 
-#: data/content/index.html:196 data/content/index.html:284
-#: data/content/index.html:362 data/content/prerelease.html:136
+#: data/content/index.html:233 data/content/index.html:321
+#: data/content/index.html:399 data/content/prerelease.html:136
 #: data/content/prerelease.html:145
 msgid "LXDE Desktop"
 msgstr ""
 
-#: data/content/index.html:210 data/content/index.html:293
-#: data/content/index.html:373 data/content/prerelease.html:154
+#: data/content/index.html:247 data/content/index.html:330
+#: data/content/index.html:410 data/content/prerelease.html:154
 #: data/content/prerelease.html:163
 msgid "MATE-Compiz Desktop"
 msgstr ""
 
-#: data/content/index.html:224 data/content/index.html:302
-#: data/content/index.html:384 data/content/prerelease.html:191
+#: data/content/index.html:261 data/content/index.html:339
+#: data/content/index.html:421 data/content/prerelease.html:191
 #: data/content/prerelease.html:200
 msgid "Sugar on a Stick"
 msgstr ""
 
-#: data/content/index.html:399 data/content/prerelease.html:217
+#: data/content/index.html:436 data/content/prerelease.html:217
 msgid "What is ARM Technology?"
 msgstr ""
 
-#: data/content/index.html:400 data/content/prerelease.html:218
+#: data/content/index.html:437 data/content/prerelease.html:218
 msgid ""
 "ARM microprocessors are the most widely-produced processor family in the "
 "world; they have historically been used in cell phones and embedded "
@@ -169,55 +181,55 @@ msgid ""
 "consumption servers."
 msgstr ""
 
-#: data/content/index.html:401 data/content/prerelease.html:219
+#: data/content/index.html:438 data/content/prerelease.html:219
 msgid ""
 "The Fedora ARM project is an initiative to bring Fedora to this processor"
 " family. The images provided here are versions of Fedora tailored for "
 "running in on ARM-based systems."
 msgstr ""
 
-#: data/content/index.html:412 data/content/prerelease.html:230
+#: data/content/index.html:449 data/content/prerelease.html:230
 msgid "Support Resources"
 msgstr ""
 
-#: data/content/index.html:417 data/content/prerelease.html:235
+#: data/content/index.html:454 data/content/prerelease.html:235
 msgid "Documentation"
 msgstr ""
 
-#: data/content/index.html:418 data/content/prerelease.html:236
+#: data/content/index.html:455 data/content/prerelease.html:236
 #, python-format
 msgid ""
 "Fedora ARM documentation and installation guides are available at the <a "
 "href=\"%s\">Fedora ARM wiki page</a>."
 msgstr ""
 
-#: data/content/index.html:421 data/content/prerelease.html:239
+#: data/content/index.html:458 data/content/prerelease.html:239
 msgid "Email"
 msgstr ""
 
-#: data/content/index.html:422 data/content/prerelease.html:240
+#: data/content/index.html:459 data/content/prerelease.html:240
 #, python-format
 msgid ""
 "Users and developers are also available on the mailing list at <a "
 "href=\"%s\">arm@lists.fedoraproject.org</a>."
 msgstr ""
 
-#: data/content/index.html:425 data/content/prerelease.html:243
+#: data/content/index.html:462 data/content/prerelease.html:243
 msgid "Chat"
 msgstr ""
 
-#: data/content/index.html:426 data/content/prerelease.html:244
+#: data/content/index.html:463 data/content/prerelease.html:244
 #, python-format
 msgid ""
 "Users and developers are available in the <a href=\"%s\">#fedora-arm</a> "
 "irc channel on <strong>irc.freenode.org</strong> for real-time chat."
 msgstr ""
 
-#: data/content/index.html:431 data/content/prerelease.html:249
+#: data/content/index.html:468 data/content/prerelease.html:249
 msgid "General Help Using Fedora"
 msgstr ""
 
-#: data/content/index.html:432 data/content/prerelease.html:250
+#: data/content/index.html:469 data/content/prerelease.html:250
 #, python-format
 msgid ""
 "Sometimes you may encounter an issue with this spin that you can get help"
@@ -225,16 +237,6 @@ msgid ""
 "available at the <a href=\"%s\">Fedora “Get Help” page</a>."
 msgstr ""
 
-#: data/content/index.html:445 data/content/index.html:456
-#, python-format
-msgid "Fedora %(rel)s %(state)s released! <a href=\"%(link)s\">Try it now ></a>"
-msgstr ""
-
-#: data/content/index.html:467
-#, python-format
-msgid "Fedora %(rel)s released! Try it now."
-msgstr ""
-
 #: data/content/prerelease.html:8
 msgid "Fedora ARM Prerelease Images"
 msgstr ""
diff --git a/getfedora.org/po/getfedora.pot b/getfedora.org/po/getfedora.pot
index 3e1e74c..f9b2565 100644
--- a/getfedora.org/po/getfedora.pot
+++ b/getfedora.org/po/getfedora.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-12 23:06+0100\n"
+"POT-Creation-Date: 2017-03-14 15:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/labs.fedoraproject.org/po/labs.fedoraproject.org.pot b/labs.fedoraproject.org/po/labs.fedoraproject.org.pot
index 73c7a9b..dbb435c 100644
--- a/labs.fedoraproject.org/po/labs.fedoraproject.org.pot
+++ b/labs.fedoraproject.org/po/labs.fedoraproject.org.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2016 ORGANIZATION
+# Copyright (C) 2017 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-12-04 14:17+0100\n"
+"POT-Creation-Date: 2017-03-14 15:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,84 +21,96 @@ msgstr ""
 msgid "Fedora Labs"
 msgstr ""
 
-#: data/content/index.html:23 data/content/index.html:83
+#: data/content/index.html:21 data/content/index.html:32
+#, python-format
+msgid ""
+"<strong>Fedora %(rel)s %(state)s</strong> released! <a "
+"href=\"%(link)s\">Test it now ></a>"
+msgstr ""
+
+#: data/content/index.html:43
+#, python-format
+msgid "Fedora %(rel)s released! Get it now."
+msgstr ""
+
+#: data/content/index.html:60 data/content/index.html:120
 #: data/content/prerelease.html:45
 msgid "Explore the Outer Space."
 msgstr ""
 
-#: data/content/index.html:24 data/content/index.html:84
+#: data/content/index.html:61 data/content/index.html:121
 msgid ""
 "Powerful completely open-source and free tool for amateurs and "
 "professionals."
 msgstr ""
 
-#: data/content/index.html:29 data/content/index.html:91
+#: data/content/index.html:66 data/content/index.html:128
 #: data/content/prerelease.html:67
 msgid "Open Creativity."
 msgstr ""
 
-#: data/content/index.html:30 data/content/index.html:92
+#: data/content/index.html:67 data/content/index.html:129
 msgid ""
 "Visual design, multimedia production, and publishing suite of free and "
 "open source creative tools."
 msgstr ""
 
-#: data/content/index.html:38 data/content/index.html:99
-#: data/content/index.html:107
+#: data/content/index.html:75 data/content/index.html:136
+#: data/content/index.html:144
 msgid "Play with Fedora Today!"
 msgstr ""
 
-#: data/content/index.html:39 data/content/index.html:100
-#: data/content/index.html:108
+#: data/content/index.html:76 data/content/index.html:137
+#: data/content/index.html:145
 msgid "A collection and perfect show-case of the best games available in Fedora."
 msgstr ""
 
-#: data/content/index.html:44 data/content/prerelease.html:110
+#: data/content/index.html:81 data/content/prerelease.html:110
 msgid "Unleash your inner musician."
 msgstr ""
 
-#: data/content/index.html:45
+#: data/content/index.html:82
 msgid ""
 "For audio enthusiasts and musicians who want to create, edit and produce "
 "audio and music on Linux."
 msgstr ""
 
-#: data/content/index.html:53 data/content/index.html:115
+#: data/content/index.html:90 data/content/index.html:152
 #: data/content/prerelease.html:132
 msgid "Dive into Robotics."
 msgstr ""
 
-#: data/content/index.html:54 data/content/index.html:116
+#: data/content/index.html:91 data/content/index.html:153
 msgid ""
 "A wide variety of free and open robotics software packages for beginners "
 "and experts in robotics."
 msgstr ""
 
-#: data/content/index.html:59 data/content/index.html:123
+#: data/content/index.html:96 data/content/index.html:160
 #: data/content/prerelease.html:154
 msgid "Open source scientific computing."
 msgstr ""
 
-#: data/content/index.html:60 data/content/index.html:124
+#: data/content/index.html:97 data/content/index.html:161
 msgid "A bundle of open source scientific and numerical tools used in research."
 msgstr ""
 
-#: data/content/index.html:69 data/content/index.html:131
+#: data/content/index.html:106 data/content/index.html:168
 #: data/content/prerelease.html:176
 msgid "Thorough, safe and secure."
 msgstr ""
 
-#: data/content/index.html:70 data/content/index.html:132
+#: data/content/index.html:107 data/content/index.html:169
 msgid ""
 "A safe test environment to work on security auditing, forensics, system "
 "rescue and teaching security testing methodologies."
 msgstr ""
 
-#: data/content/index.html:144 data/content/prerelease.html:216
+#: data/content/index.html:181 data/content/prerelease.html:216
 msgid "What is Fedora Labs?"
 msgstr ""
 
-#: data/content/index.html:145 data/content/prerelease.html:217
+#: data/content/index.html:182 data/content/prerelease.html:217
 msgid ""
 "Fedora Labs is a selection of curated bundles of purpose-driven software "
 "and content as curated and maintained by members of the Fedora Community."
@@ -111,8 +123,8 @@ msgstr ""
 #: data/content/design-suite/download/index.html:96
 #: data/content/design-suite/download/index.html:115
 #: data/content/games/download/index.html:90
-#: data/content/games/download/index.html:109 data/content/index.html:156
-#: data/content/index.html:175 data/content/jam/download/index.html:90
+#: data/content/games/download/index.html:109 data/content/index.html:193
+#: data/content/index.html:212 data/content/jam/download/index.html:90
 #: data/content/jam/download/index.html:109 data/content/prerelease.html:228
 #: data/content/prerelease.html:247
 #: data/content/robotics/download/index.html:90
@@ -124,7 +136,7 @@ msgstr ""
 msgid "Downloading"
 msgstr ""
 
-#: data/content/index.html:157 data/content/index.html:176
+#: data/content/index.html:194 data/content/index.html:213
 #: data/content/prerelease.html:229 data/content/prerelease.html:248
 msgid ""
 "You can download these tools as complete Fedora image, or you can install"
@@ -148,10 +160,10 @@ msgstr ""
 #: data/content/games/download/index.html:102
 #: data/content/games/download/index.html:123
 #: data/content/games/download/index.html:126
-#: data/content/games/download/index.html:129 data/content/index.html:158
-#: data/content/index.html:163 data/content/index.html:168
-#: data/content/index.html:189 data/content/index.html:192
-#: data/content/index.html:195 data/content/jam/download/index.html:92
+#: data/content/games/download/index.html:129 data/content/index.html:195
+#: data/content/index.html:200 data/content/index.html:205
+#: data/content/index.html:226 data/content/index.html:229
+#: data/content/index.html:232 data/content/jam/download/index.html:92
 #: data/content/jam/download/index.html:97
 #: data/content/jam/download/index.html:102
 #: data/content/jam/download/index.html:123
@@ -186,8 +198,8 @@ msgstr ""
 #: data/content/design-suite/download/index.html:101
 #: data/content/design-suite/download/index.html:119
 #: data/content/games/download/index.html:95
-#: data/content/games/download/index.html:113 data/content/index.html:161
-#: data/content/index.html:179 data/content/jam/download/index.html:95
+#: data/content/games/download/index.html:113 data/content/index.html:198
+#: data/content/index.html:216 data/content/jam/download/index.html:95
 #: data/content/jam/download/index.html:113 data/content/prerelease.html:233
 #: data/content/prerelease.html:251
 #: data/content/robotics/download/index.html:95
@@ -204,8 +216,8 @@ msgstr ""
 #: data/content/design-suite/download/index.html:102
 #: data/content/design-suite/download/index.html:120
 #: data/content/games/download/index.html:96
-#: data/content/games/download/index.html:114 data/content/index.html:162
-#: data/content/index.html:180 data/content/jam/download/index.html:96
+#: data/content/games/download/index.html:114 data/content/index.html:199
+#: data/content/index.html:217 data/content/jam/download/index.html:96
 #: data/content/jam/download/index.html:114 data/content/prerelease.html:234
 #: data/content/prerelease.html:252
 #: data/content/robotics/download/index.html:96
@@ -225,8 +237,8 @@ msgstr ""
 #: data/content/design-suite/download/index.html:106
 #: data/content/design-suite/download/index.html:123
 #: data/content/games/download/index.html:100
-#: data/content/games/download/index.html:117 data/content/index.html:166
-#: data/content/index.html:183 data/content/jam/download/index.html:100
+#: data/content/games/download/index.html:117 data/content/index.html:203
+#: data/content/index.html:220 data/content/jam/download/index.html:100
 #: data/content/jam/download/index.html:117 data/content/prerelease.html:238
 #: data/content/prerelease.html:255
 #: data/content/robotics/download/index.html:100
@@ -243,8 +255,8 @@ msgstr ""
 #: data/content/design-suite/download/index.html:107
 #: data/content/design-suite/download/index.html:124
 #: data/content/games/download/index.html:101
-#: data/content/games/download/index.html:118 data/content/index.html:167
-#: data/content/index.html:184 data/content/jam/download/index.html:101
+#: data/content/games/download/index.html:118 data/content/index.html:204
+#: data/content/index.html:221 data/content/jam/download/index.html:101
 #: data/content/jam/download/index.html:118 data/content/prerelease.html:239
 #: data/content/prerelease.html:256
 #: data/content/robotics/download/index.html:101
@@ -259,16 +271,6 @@ msgid ""
 "correspond with them."
 msgstr ""
 
-#: data/content/index.html:208 data/content/index.html:219
-#, python-format
-msgid "Fedora %(rel)s %(state)s released! <a href=\"%(link)s\">Try it now ></a>"
-msgstr ""
-
-#: data/content/index.html:230
-#, python-format
-msgid "Fedora %(rel)s released! Check it out in the Download section."
-msgstr ""
-
 #: data/content/prerelease.html:8
 msgid "Fedora Labs Prerelease Images"
 msgstr ""
diff --git a/spins.fedoraproject.org/po/spins.fedoraproject.org.pot b/spins.fedoraproject.org/po/spins.fedoraproject.org.pot
index be4242e..8271730 100644
--- a/spins.fedoraproject.org/po/spins.fedoraproject.org.pot
+++ b/spins.fedoraproject.org/po/spins.fedoraproject.org.pot
@@ -1,60 +1,72 @@
 # Translations template for PROJECT.
-# Copyright (C) 2016 ORGANIZATION
+# Copyright (C) 2017 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-11-22 12:45+0100\n"
+"POT-Creation-Date: 2017-03-14 15:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.3.4\n"
 
 #: data/content/index.html:8 data/templates/footer.html:43
 msgid "Fedora Spins"
 msgstr ""
 
-#: data/content/index.html:27 data/content/prerelease.html:47
+#: data/content/index.html:21 data/content/index.html:32
+#, python-format
+msgid ""
+"<strong>Fedora %(rel)s %(state)s</strong> released! <a "
+"href=\"%(link)s\">Test it now ></a>"
+msgstr ""
+
+#: data/content/index.html:43
+#, python-format
+msgid "Fedora %(rel)s released! Get it now."
+msgstr ""
+
+#: data/content/index.html:64 data/content/prerelease.html:47
 msgid "A complete, modern desktop built using the KDE Plasma Desktop."
 msgstr ""
 
-#: data/content/index.html:41 data/content/prerelease.html:69
+#: data/content/index.html:78 data/content/prerelease.html:69
 msgid "A complete, well-integrated Xfce Desktop."
 msgstr ""
 
-#: data/content/index.html:55 data/content/prerelease.html:91
+#: data/content/index.html:92 data/content/prerelease.html:91
 msgid "A light, fast, less-resource hungry desktop environment."
 msgstr ""
 
-#: data/content/index.html:69
+#: data/content/index.html:106
 msgid "A classic Fedora Desktop with an additional 3D Windows Manager."
 msgstr ""
 
-#: data/content/index.html:83
+#: data/content/index.html:120
 msgid "A modern desktop featuring traditional Gnome user experience."
 msgstr ""
 
-#: data/content/index.html:97 data/content/prerelease.html:157
+#: data/content/index.html:134 data/content/prerelease.html:179
 msgid "Discover. Reflect. Share. Learn."
 msgstr ""
 
-#: data/content/index.html:109
+#: data/content/index.html:146
 #, python-format
 msgid "Looking for more Fedora options? Try <a href=\"%s\">Fedora Labs</a>"
 msgstr ""
 
-#: data/content/index.html:119 data/content/prerelease.html:197
+#: data/content/index.html:156 data/content/prerelease.html:219
 msgid "What are Spins?"
 msgstr ""
 
-#: data/content/index.html:120 data/content/prerelease.html:198
+#: data/content/index.html:157 data/content/prerelease.html:220
 msgid ""
 "The default desktop environment of Fedora is GNOME, but if you prefer an "
 "alternative desktop environment such as KDE Plasma Desktop or Xfce, you "
@@ -63,16 +75,15 @@ msgid ""
 "choice."
 msgstr ""
 
-#: data/content/index.html:131 data/content/index.html:150
-#: data/content/prerelease.html:209 data/content/prerelease.html:228
 #: data/content/cinnamon/download/index.html:94
-#: data/content/cinnamon/download/index.html:113
-#: data/content/kde/download/index.html:94
+#: data/content/cinnamon/download/index.html:113 data/content/index.html:168
+#: data/content/index.html:187 data/content/kde/download/index.html:94
 #: data/content/kde/download/index.html:113
 #: data/content/lxde/download/index.html:94
 #: data/content/lxde/download/index.html:113
 #: data/content/mate-compiz/download/index.html:94
 #: data/content/mate-compiz/download/index.html:113
+#: data/content/prerelease.html:231 data/content/prerelease.html:250
 #: data/content/soas/download/index.html:99
 #: data/content/soas/download/index.html:118
 #: data/content/xfce/download/index.html:94
@@ -80,10 +91,9 @@ msgstr ""
 msgid "Downloading"
 msgstr ""
 
-#: data/content/index.html:132 data/content/index.html:151
 #: data/content/cinnamon/download/index.html:95
-#: data/content/cinnamon/download/index.html:114
-#: data/content/kde/download/index.html:95
+#: data/content/cinnamon/download/index.html:114 data/content/index.html:169
+#: data/content/index.html:188 data/content/kde/download/index.html:95
 #: data/content/kde/download/index.html:114
 #: data/content/lxde/download/index.html:95
 #: data/content/lxde/download/index.html:114
@@ -100,19 +110,15 @@ msgid ""
 "spins offer alternative download methods."
 msgstr ""
 
-#: data/content/index.html:133 data/content/index.html:138
-#: data/content/index.html:143 data/content/index.html:164
-#: data/content/index.html:167 data/content/index.html:170
-#: data/content/prerelease.html:211 data/content/prerelease.html:216
-#: data/content/prerelease.html:221 data/content/prerelease.html:242
-#: data/content/prerelease.html:245 data/content/prerelease.html:248
 #: data/content/cinnamon/download/index.html:96
 #: data/content/cinnamon/download/index.html:101
 #: data/content/cinnamon/download/index.html:106
 #: data/content/cinnamon/download/index.html:127
 #: data/content/cinnamon/download/index.html:130
-#: data/content/cinnamon/download/index.html:133
-#: data/content/kde/download/index.html:96
+#: data/content/cinnamon/download/index.html:133 data/content/index.html:170
+#: data/content/index.html:175 data/content/index.html:180
+#: data/content/index.html:201 data/content/index.html:204
+#: data/content/index.html:207 data/content/kde/download/index.html:96
 #: data/content/kde/download/index.html:101
 #: data/content/kde/download/index.html:106
 #: data/content/kde/download/index.html:127
@@ -130,6 +136,9 @@ msgstr ""
 #: data/content/mate-compiz/download/index.html:127
 #: data/content/mate-compiz/download/index.html:130
 #: data/content/mate-compiz/download/index.html:133
+#: data/content/prerelease.html:233 data/content/prerelease.html:238
+#: data/content/prerelease.html:243 data/content/prerelease.html:264
+#: data/content/prerelease.html:267 data/content/prerelease.html:270
 #: data/content/soas/download/index.html:101
 #: data/content/soas/download/index.html:106
 #: data/content/soas/download/index.html:111
@@ -145,16 +154,15 @@ msgstr ""
 msgid "Learn more"
 msgstr ""
 
-#: data/content/index.html:136 data/content/index.html:154
-#: data/content/prerelease.html:214 data/content/prerelease.html:232
 #: data/content/cinnamon/download/index.html:99
-#: data/content/cinnamon/download/index.html:117
-#: data/content/kde/download/index.html:99
+#: data/content/cinnamon/download/index.html:117 data/content/index.html:173
+#: data/content/index.html:191 data/content/kde/download/index.html:99
 #: data/content/kde/download/index.html:117
 #: data/content/lxde/download/index.html:99
 #: data/content/lxde/download/index.html:117
 #: data/content/mate-compiz/download/index.html:99
 #: data/content/mate-compiz/download/index.html:117
+#: data/content/prerelease.html:236 data/content/prerelease.html:254
 #: data/content/soas/download/index.html:104
 #: data/content/soas/download/index.html:122
 #: data/content/xfce/download/index.html:99
@@ -162,16 +170,15 @@ msgstr ""
 msgid "Using"
 msgstr ""
 
-#: data/content/index.html:137 data/content/index.html:155
-#: data/content/prerelease.html:215 data/content/prerelease.html:233
 #: data/content/cinnamon/download/index.html:100
-#: data/content/cinnamon/download/index.html:118
-#: data/content/kde/download/index.html:100
+#: data/content/cinnamon/download/index.html:118 data/content/index.html:174
+#: data/content/index.html:192 data/content/kde/download/index.html:100
 #: data/content/kde/download/index.html:118
 #: data/content/lxde/download/index.html:100
 #: data/content/lxde/download/index.html:118
 #: data/content/mate-compiz/download/index.html:100
 #: data/content/mate-compiz/download/index.html:118
+#: data/content/prerelease.html:237 data/content/prerelease.html:255
 #: data/content/soas/download/index.html:105
 #: data/content/soas/download/index.html:123
 #: data/content/xfce/download/index.html:100
@@ -182,16 +189,15 @@ msgid ""
 " or optical media to run the spin on hardware."
 msgstr ""
 
-#: data/content/index.html:141 data/content/index.html:158
-#: data/content/prerelease.html:219 data/content/prerelease.html:236
 #: data/content/cinnamon/download/index.html:104
-#: data/content/cinnamon/download/index.html:121
-#: data/content/kde/download/index.html:104
+#: data/content/cinnamon/download/index.html:121 data/content/index.html:178
+#: data/content/index.html:195 data/content/kde/download/index.html:104
 #: data/content/kde/download/index.html:121
 #: data/content/lxde/download/index.html:104
 #: data/content/lxde/download/index.html:121
 #: data/content/mate-compiz/download/index.html:104
 #: data/content/mate-compiz/download/index.html:121
+#: data/content/prerelease.html:241 data/content/prerelease.html:258
 #: data/content/soas/download/index.html:109
 #: data/content/soas/download/index.html:126
 #: data/content/xfce/download/index.html:104
@@ -199,16 +205,15 @@ msgstr ""
 msgid "Installing"
 msgstr ""
 
-#: data/content/index.html:142 data/content/index.html:159
-#: data/content/prerelease.html:220 data/content/prerelease.html:237
 #: data/content/cinnamon/download/index.html:105
-#: data/content/cinnamon/download/index.html:122
-#: data/content/kde/download/index.html:105
+#: data/content/cinnamon/download/index.html:122 data/content/index.html:179
+#: data/content/index.html:196 data/content/kde/download/index.html:105
 #: data/content/kde/download/index.html:122
 #: data/content/lxde/download/index.html:105
 #: data/content/lxde/download/index.html:122
 #: data/content/mate-compiz/download/index.html:105
 #: data/content/mate-compiz/download/index.html:122
+#: data/content/prerelease.html:242 data/content/prerelease.html:259
 #: data/content/soas/download/index.html:110
 #: data/content/soas/download/index.html:127
 #: data/content/xfce/download/index.html:105
@@ -219,16 +224,6 @@ msgid ""
 "the install process via a series of prompts."
 msgstr ""
 
-#: data/content/index.html:183 data/content/index.html:194
-#, python-format
-msgid "Fedora %(rel)s %(state)s released! <a href=\"%(link)s\">Try it now ></a>"
-msgstr ""
-
-#: data/content/index.html:205
-#, python-format
-msgid "Fedora %(rel)s released! Check it out in the Download section."
-msgstr ""
-
 #: data/content/prerelease.html:8
 msgid "Fedora Spins Prerelease Images"
 msgstr ""
@@ -265,33 +260,38 @@ msgstr ""
 
 #: data/content/prerelease.html:50 data/content/prerelease.html:54
 #: data/content/prerelease.html:72 data/content/prerelease.html:76
-#: data/content/prerelease.html:98 data/content/prerelease.html:116
-#: data/content/prerelease.html:120 data/content/prerelease.html:138
-#: data/content/prerelease.html:142
+#: data/content/prerelease.html:98 data/content/prerelease.html:138
+#: data/content/prerelease.html:142 data/content/prerelease.html:160
+#: data/content/prerelease.html:164
 #, python-format
 msgid "%s GB ISO Image"
 msgstr ""
 
-#: data/content/prerelease.html:94 data/content/prerelease.html:160
-#: data/content/prerelease.html:164
+#: data/content/prerelease.html:94 data/content/prerelease.html:116
+#: data/content/prerelease.html:120 data/content/prerelease.html:182
+#: data/content/prerelease.html:186
 #, python-format
 msgid "%s MB ISO Image"
 msgstr ""
 
 #: data/content/prerelease.html:113
-msgid "A classic Fedora Desktop. With wobbly Windows."
+msgid "A complete and lightweight Qt-based desktop experience."
 msgstr ""
 
 #: data/content/prerelease.html:135
+msgid "A classic Fedora Desktop. With wobbly Windows."
+msgstr ""
+
+#: data/content/prerelease.html:157
 msgid "Traditional layout, advanced features, easy to use."
 msgstr ""
 
-#: data/content/prerelease.html:178
+#: data/content/prerelease.html:200
 #: data/templates/generic/splash-checksum.html:8
 msgid "Verify your Download!"
 msgstr ""
 
-#: data/content/prerelease.html:179
+#: data/content/prerelease.html:201
 #: data/templates/generic/splash-checksum.html:9
 #, python-format
 msgid ""
@@ -301,17 +301,17 @@ msgid ""
 "href=\"../../%s/verify\">these instructions</a>."
 msgstr ""
 
-#: data/content/prerelease.html:182
+#: data/content/prerelease.html:204
 #: data/templates/generic/splash-checksum.html:12
 msgid "Validate 64bit!"
 msgstr ""
 
-#: data/content/prerelease.html:185
+#: data/content/prerelease.html:207
 #: data/templates/generic/splash-checksum.html:15
 msgid "Validate 32bit!"
 msgstr ""
 
-#: data/content/prerelease.html:210 data/content/prerelease.html:229
+#: data/content/prerelease.html:232 data/content/prerelease.html:251
 msgid ""
 "Spin downloads are offered via direct download, but you can also get them"
 " via Bittorrent. In this case you will need to install a Bittorrent "
@@ -577,31 +577,31 @@ msgstr ""
 msgid "Brasero is a simple and easy to use CD/DVD burning application."
 msgstr ""
 
-#: data/content/cinnamon/index.html:148
 #: data/content/cinnamon/download/index.html:146
-#: data/content/kde/index.html:182 data/content/kde/download/index.html:145
-#: data/content/lxde/index.html:148 data/content/lxde/download/index.html:146
-#: data/content/mate-compiz/index.html:153
+#: data/content/cinnamon/index.html:148
+#: data/content/kde/download/index.html:145 data/content/kde/index.html:182
+#: data/content/lxde/download/index.html:146 data/content/lxde/index.html:148
 #: data/content/mate-compiz/download/index.html:146
-#: data/content/soas/index.html:187 data/content/soas/download/index.html:151
-#: data/content/xfce/index.html:143 data/content/xfce/download/index.html:146
+#: data/content/mate-compiz/index.html:153
+#: data/content/soas/download/index.html:151 data/content/soas/index.html:187
+#: data/content/xfce/download/index.html:146 data/content/xfce/index.html:143
 msgid "Support Resources"
 msgstr ""
 
-#: data/content/cinnamon/index.html:153
 #: data/content/cinnamon/download/index.html:151
-#: data/content/kde/index.html:187 data/content/kde/download/index.html:150
-#: data/content/lxde/index.html:153 data/content/lxde/download/index.html:151
-#: data/content/mate-compiz/index.html:158
+#: data/content/cinnamon/index.html:153
+#: data/content/kde/download/index.html:150 data/content/kde/index.html:187
+#: data/content/lxde/download/index.html:151 data/content/lxde/index.html:153
 #: data/content/mate-compiz/download/index.html:151
-#: data/content/soas/index.html:66 data/content/soas/index.html:192
-#: data/content/soas/download/index.html:156 data/content/xfce/index.html:148
-#: data/content/xfce/download/index.html:151
+#: data/content/mate-compiz/index.html:158
+#: data/content/soas/download/index.html:156 data/content/soas/index.html:66
+#: data/content/soas/index.html:192 data/content/xfce/download/index.html:151
+#: data/content/xfce/index.html:148
 msgid "Chat"
 msgstr ""
 
-#: data/content/cinnamon/index.html:154
 #: data/content/cinnamon/download/index.html:152
+#: data/content/cinnamon/index.html:154
 #, python-format
 msgid ""
 "Users and developers are available in the <a href=\"%s\">#fedora-"
@@ -609,65 +609,65 @@ msgid ""
 "time chat."
 msgstr ""
 
-#: data/content/cinnamon/index.html:157
 #: data/content/cinnamon/download/index.html:155
-#: data/content/kde/index.html:191 data/content/kde/download/index.html:154
-#: data/content/lxde/index.html:157 data/content/lxde/download/index.html:155
-#: data/content/mate-compiz/index.html:162
+#: data/content/cinnamon/index.html:157
+#: data/content/kde/download/index.html:154 data/content/kde/index.html:191
+#: data/content/lxde/download/index.html:155 data/content/lxde/index.html:157
 #: data/content/mate-compiz/download/index.html:155
-#: data/content/soas/index.html:196 data/content/soas/download/index.html:160
-#: data/content/xfce/index.html:152 data/content/xfce/download/index.html:155
+#: data/content/mate-compiz/index.html:162
+#: data/content/soas/download/index.html:160 data/content/soas/index.html:196
+#: data/content/xfce/download/index.html:155 data/content/xfce/index.html:152
 msgid "Email"
 msgstr ""
 
-#: data/content/cinnamon/index.html:158
 #: data/content/cinnamon/download/index.html:156
-#: data/content/mate-compiz/index.html:163
+#: data/content/cinnamon/index.html:158
 #: data/content/mate-compiz/download/index.html:156
+#: data/content/mate-compiz/index.html:163
 #, python-format
 msgid ""
 "Users and developers are also available on the mailing list at <a "
 "href=\"%s\">users@lists.fedoraproject.org</a>."
 msgstr ""
 
-#: data/content/cinnamon/index.html:161
 #: data/content/cinnamon/download/index.html:159
-#: data/content/kde/index.html:195 data/content/kde/download/index.html:158
-#: data/content/lxde/index.html:161 data/content/lxde/download/index.html:159
-#: data/content/mate-compiz/index.html:166
+#: data/content/cinnamon/index.html:161
+#: data/content/kde/download/index.html:158 data/content/kde/index.html:195
+#: data/content/lxde/download/index.html:159 data/content/lxde/index.html:161
 #: data/content/mate-compiz/download/index.html:159
-#: data/content/soas/index.html:200 data/content/soas/download/index.html:164
-#: data/content/xfce/index.html:156 data/content/xfce/download/index.html:159
+#: data/content/mate-compiz/index.html:166
+#: data/content/soas/download/index.html:164 data/content/soas/index.html:200
+#: data/content/xfce/download/index.html:159 data/content/xfce/index.html:156
 msgid "Documentation"
 msgstr ""
 
-#: data/content/cinnamon/index.html:162
 #: data/content/cinnamon/download/index.html:160
+#: data/content/cinnamon/index.html:162
 #, python-format
 msgid ""
 "Specific documentation and tutorials are available at the <a "
 "href=\"%s\">Cinnamon project upstream website</a>."
 msgstr ""
 
-#: data/content/cinnamon/index.html:167
 #: data/content/cinnamon/download/index.html:165
-#: data/content/kde/index.html:201 data/content/kde/download/index.html:164
-#: data/content/lxde/index.html:167 data/content/lxde/download/index.html:165
-#: data/content/mate-compiz/index.html:172
+#: data/content/cinnamon/index.html:167
+#: data/content/kde/download/index.html:164 data/content/kde/index.html:201
+#: data/content/lxde/download/index.html:165 data/content/lxde/index.html:167
 #: data/content/mate-compiz/download/index.html:165
-#: data/content/soas/index.html:206 data/content/soas/download/index.html:170
-#: data/content/xfce/index.html:162 data/content/xfce/download/index.html:165
+#: data/content/mate-compiz/index.html:172
+#: data/content/soas/download/index.html:170 data/content/soas/index.html:206
+#: data/content/xfce/download/index.html:165 data/content/xfce/index.html:162
 msgid "General Help Using Fedora"
 msgstr ""
 
-#: data/content/cinnamon/index.html:168
 #: data/content/cinnamon/download/index.html:166
-#: data/content/kde/index.html:202 data/content/kde/download/index.html:165
-#: data/content/lxde/index.html:168 data/content/lxde/download/index.html:166
-#: data/content/mate-compiz/index.html:173
+#: data/content/cinnamon/index.html:168
+#: data/content/kde/download/index.html:165 data/content/kde/index.html:202
+#: data/content/lxde/download/index.html:166 data/content/lxde/index.html:168
 #: data/content/mate-compiz/download/index.html:166
-#: data/content/soas/index.html:207 data/content/soas/download/index.html:171
-#: data/content/xfce/index.html:163 data/content/xfce/download/index.html:166
+#: data/content/mate-compiz/index.html:173
+#: data/content/soas/download/index.html:171 data/content/soas/index.html:207
+#: data/content/xfce/download/index.html:166 data/content/xfce/index.html:163
 #, python-format
 msgid ""
 "Sometimes you may encounter an issue with this spin that you can get help"
@@ -1094,21 +1094,21 @@ msgid ""
 " molecule editor plus multiple simulators and calculators."
 msgstr ""
 
-#: data/content/kde/index.html:188 data/content/kde/download/index.html:151
+#: data/content/kde/download/index.html:151 data/content/kde/index.html:188
 #, python-format
 msgid ""
 "Users and developers are available in the <a href=\"%s\">#fedora-kde</a> "
 "IRC channel on <strong>irc.freenode.org</strong> for real-time chat."
 msgstr ""
 
-#: data/content/kde/index.html:192 data/content/kde/download/index.html:155
+#: data/content/kde/download/index.html:155 data/content/kde/index.html:192
 #, python-format
 msgid ""
 "Users and developers are also available on the mailing list at <a "
 "href=\"%s\">kde@lists.fedoraproject.org</a>."
 msgstr ""
 
-#: data/content/kde/index.html:196 data/content/kde/download/index.html:159
+#: data/content/kde/download/index.html:159 data/content/kde/index.html:196
 #, python-format
 msgid ""
 "Specific documentation and tutorials are available at the <a "
@@ -1251,21 +1251,21 @@ msgid ""
 "WavPack, Musepack, AAC, and Monkey's Audio files."
 msgstr ""
 
-#: data/content/lxde/index.html:154 data/content/lxde/download/index.html:152
+#: data/content/lxde/download/index.html:152 data/content/lxde/index.html:154
 #, python-format
 msgid ""
 "Users and developers are available in the <a href=\"%s\">#lxde</a> IRC "
 "channel on <strong>irc.freenode.org</strong> for real-time chat."
 msgstr ""
 
-#: data/content/lxde/index.html:158 data/content/lxde/download/index.html:156
+#: data/content/lxde/download/index.html:156 data/content/lxde/index.html:158
 #, python-format
 msgid ""
 "Users and developers are also available on the mailing list at <a "
 "href=\"%s\">lxde@lists.fedoraproject.org</a>."
 msgstr ""
 
-#: data/content/lxde/index.html:162 data/content/lxde/download/index.html:160
+#: data/content/lxde/download/index.html:160 data/content/lxde/index.html:162
 #, python-format
 msgid ""
 "Specific documentation and tutorials are available at the <a "
@@ -1395,16 +1395,16 @@ msgid ""
 "server."
 msgstr ""
 
-#: data/content/mate-compiz/index.html:159
 #: data/content/mate-compiz/download/index.html:152
+#: data/content/mate-compiz/index.html:159
 #, python-format
 msgid ""
 "Users and developers are available in the <a href=\"%s\">#fedora-mate</a>"
 " IRC channel on <strong>irc.freenode.org</strong> for real-time chat."
 msgstr ""
 
-#: data/content/mate-compiz/index.html:167
 #: data/content/mate-compiz/download/index.html:160
+#: data/content/mate-compiz/index.html:167
 #, python-format
 msgid ""
 "Specific documentation and tutorials are available at the <a "
@@ -1635,21 +1635,21 @@ msgid ""
 "options to add motion, speech and thought to creations."
 msgstr ""
 
-#: data/content/soas/index.html:193 data/content/soas/download/index.html:157
+#: data/content/soas/download/index.html:157 data/content/soas/index.html:193
 #, python-format
 msgid ""
 "Users and developers are available in the <a href=\"%s\">#sugar</a> IRC "
 "channel on <strong>irc.freenode.org</strong> for real-time chat."
 msgstr ""
 
-#: data/content/soas/index.html:197 data/content/soas/download/index.html:161
+#: data/content/soas/download/index.html:161 data/content/soas/index.html:197
 #, python-format
 msgid ""
 "Users and developers are also available on the mailing list at <a "
 "href=\"%s\">soas@lists.sugarlabs.org</a>."
 msgstr ""
 
-#: data/content/soas/index.html:201 data/content/soas/download/index.html:165
+#: data/content/soas/download/index.html:165 data/content/soas/index.html:201
 #, python-format
 msgid ""
 "Specific documentation and tutorials are available at the <a "
@@ -1726,21 +1726,21 @@ msgstr ""
 msgid "Manage and play your music with ease."
 msgstr ""
 
-#: data/content/xfce/index.html:149 data/content/xfce/download/index.html:152
+#: data/content/xfce/download/index.html:152 data/content/xfce/index.html:149
 #, python-format
 msgid ""
 "Users and developers are available in the <a href=\"%s\">#xfce</a> IRC "
 "channel on <strong>irc.freenode.org</strong> for real-time chat."
 msgstr ""
 
-#: data/content/xfce/index.html:153 data/content/xfce/download/index.html:156
+#: data/content/xfce/download/index.html:156 data/content/xfce/index.html:153
 #, python-format
 msgid ""
 "Users and developers are also available on the mailing list at <a "
 "href=\"%s\">xfce@lists.fedoraproject.org</a>."
 msgstr ""
 
-#: data/content/xfce/index.html:157 data/content/xfce/download/index.html:160
+#: data/content/xfce/download/index.html:160 data/content/xfce/index.html:157
 #, python-format
 msgid ""
 "Specific documentation and tutorials are available at the <a "

From a66be34e9391b6cd0f7dc707fa68d5b15d0dedb1 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 15 2017 22:14:27 +0000
Subject: [PATCH 34/39] add LXQt screenshot


---

diff --git a/spins.fedoraproject.org/static/images/screenshots/screenshot-lxqt.jpg b/spins.fedoraproject.org/static/images/screenshots/screenshot-lxqt.jpg
new file mode 100644
index 0000000..407a6e6
Binary files /dev/null and b/spins.fedoraproject.org/static/images/screenshots/screenshot-lxqt.jpg differ

From 39fa3adcd90c53a209bdd00bdc69c5937608367a Mon Sep 17 00:00:00 2001
From: veon <veon@fedoraproject.org>
Date: Mar 16 2017 23:13:17 +0000
Subject: [PATCH 35/39] #632 add icons ppc64 and ppc64le


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index 374bbb5..d230e66 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -308,13 +308,13 @@
             <div class="panel-heading">
               <h3 class="panel-title hidden-xs">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
-                <img src="/static/images/ppc.png" />
+                <img src="/static/images/ppc64.png" />
                 ${Markup(_('PowerPC Architecture (PPC64)'))}
                 </a>
               </h3>
               <h3 class="panel-title visible-xs">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
-                <img src="/static/images/ppc.png" />
+                <img src="/static/images/ppc64.png" />
                 ${Markup(_('PPC64'))}
                 </a>
               </h3>
@@ -393,13 +393,13 @@
             <div class="panel-heading">
               <h3 class="panel-title hidden-xs">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
-                <img src="/static/images/ppc.png" />
+                <img src="/static/images/ppc64le.png" />
                 ${Markup(_('PowerPC Architecture (PPC64LE)'))}
                 </a>
               </h3>
               <h3 class="panel-title visible-xs">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
-                <img src="/static/images/ppc.png" />
+                <img src="/static/images/ppc64le.png" />
                 ${Markup(_('PPC64LE'))}
                 </a>
               </h3>
@@ -478,13 +478,13 @@
             <div class="panel-heading">
               <h3 class="panel-title hidden-xs">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseFour">
-                <img src="/static/images/ppc.png" />
+                <img src="/static/images/s390x.png" />
                 ${Markup(_('s390x Architecture'))}
                 </a>
               </h3>
               <h3 class="panel-title visible-xs">
                 <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseFour">
-                <img src="/static/images/ppc.png" />
+                <img src="/static/images/s390x.png" />
                 ${Markup(_('s390x'))}
                 </a>
               </h3>
diff --git a/alt.fedoraproject.org/static/images/ppc64.png b/alt.fedoraproject.org/static/images/ppc64.png
new file mode 100644
index 0000000..1ca8a5c
Binary files /dev/null and b/alt.fedoraproject.org/static/images/ppc64.png differ
diff --git a/alt.fedoraproject.org/static/images/ppc64le.png b/alt.fedoraproject.org/static/images/ppc64le.png
new file mode 100644
index 0000000..83f1b11
Binary files /dev/null and b/alt.fedoraproject.org/static/images/ppc64le.png differ

From a0ed3f9aecab90ea13f3cdb389b4269a6e0c2be2 Mon Sep 17 00:00:00 2001
From: robyduck <robyduck@gmail.com>
Date: Mar 17 2017 11:17:57 +0000
Subject: [PATCH 36/39] Fix typo in alt.fpo prerelease


---

diff --git a/alt.fedoraproject.org/data/content/prerelease/index.html b/alt.fedoraproject.org/data/content/prerelease/index.html
index d230e66..86c9a69 100644
--- a/alt.fedoraproject.org/data/content/prerelease/index.html
+++ b/alt.fedoraproject.org/data/content/prerelease/index.html
@@ -663,7 +663,7 @@
         <div class="col-md-4 col-xs-12">
         <div class="col-xs-12 text-center">
           <h3><i class="fa fa-fw fa-lg header-icon fa-comments"></i>${_('Chat')}</h3>
-          <p>${Markup(_('Discussion of Feora testing takes place in the &lt;a href="%s"&gt;#fedora-qa&lt;/a&gt; IRC channel on &lt;strong&gt;irc.freenode.org.&lt;/strong&gt;') % ('http://webchat.freenode.net/?channels=fedora-qa'))}</p>
+          <p>${Markup(_('Discussion of Fedora testing takes place in the &lt;a href="%s"&gt;#fedora-qa&lt;/a&gt; IRC channel on &lt;strong&gt;irc.freenode.org.&lt;/strong&gt;') % ('http://webchat.freenode.net/?channels=fedora-qa'))}</p>
         </div>
         </div>
       </div>

From 71489150c3a239baae34f20586d644c6a2b42991 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 17 2017 20:32:27 +0000
Subject: [PATCH 37/39] alt.fpo POT update


---

diff --git a/alt.fedoraproject.org/po/alt.fedoraproject.org.pot b/alt.fedoraproject.org/po/alt.fedoraproject.org.pot
index e81aa81..6e2427c 100644
--- a/alt.fedoraproject.org/po/alt.fedoraproject.org.pot
+++ b/alt.fedoraproject.org/po/alt.fedoraproject.org.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-14 15:38+0100\n"
+"POT-Creation-Date: 2017-03-17 21:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1101,7 +1101,7 @@ msgstr ""
 #: data/content/prerelease/index.html:666
 #, python-format
 msgid ""
-"Discussion of Feora testing takes place in the <a href=\"%s\">#fedora-"
+"Discussion of Fedora testing takes place in the <a href=\"%s\">#fedora-"
 "qa</a> IRC channel on <strong>irc.freenode.org.</strong>"
 msgstr ""
 

From b43e7b6153052f5b60bd9fb54be921ac347d4bca Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Mar 17 2017 21:05:26 +0000
Subject: [PATCH 38/39] change font in PPC icons


---

diff --git a/alt.fedoraproject.org/static/images/ppc64.png b/alt.fedoraproject.org/static/images/ppc64.png
index 1ca8a5c..d4d41e0 100644
Binary files a/alt.fedoraproject.org/static/images/ppc64.png and b/alt.fedoraproject.org/static/images/ppc64.png differ
diff --git a/alt.fedoraproject.org/static/images/ppc64le.png b/alt.fedoraproject.org/static/images/ppc64le.png
index 83f1b11..2f2981f 100644
Binary files a/alt.fedoraproject.org/static/images/ppc64le.png and b/alt.fedoraproject.org/static/images/ppc64le.png differ

From bfa9c6c8baaf0f9f7e25d204e0a4a1516ecaa59e Mon Sep 17 00:00:00 2001
From: Máirín Duffy <duffy@redhat.com>
Date: Apr 01 2017 19:36:37 +0000
Subject: [PATCH 39/39] lxqt riow added and icon (still needs data)


---

diff --git a/arm.fedoraproject.org/data/content/prerelease.html b/arm.fedoraproject.org/data/content/prerelease.html
index b379322..771aec1 100644
--- a/arm.fedoraproject.org/data/content/prerelease.html
+++ b/arm.fedoraproject.org/data/content/prerelease.html
@@ -38,6 +38,7 @@
 
        <div class="high">
         <div class="row top-margin">
+<h3>ARM<span class="sup">®</span> Servers</h3>
          <div class="col-xs-12 white">
             <div class="col-xs-3 col-sm-1 text-center">
               <img class="img-responsive" src="/static/images/server.png" alt="Server" />
@@ -74,6 +75,7 @@
             <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/armhfp/images/Fedora-Minimal-armhfp-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="${path}/static/checksums/Fedora-Spins-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-armhfp-CHECKSUM">${_('Verify')}</a></p>
           </div>
          </div>
+<h3>Desktop Computing</h3>
          <div class="col-xs-12 white top-margin">
             <div class="col-xs-3 col-sm-1 text-center">
               <img class="img-responsive" src="/static/images/workstation.png" alt="Workstation" />
@@ -164,6 +166,24 @@
             <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/armhfp/images/Fedora-Mate-armhfp-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="${path}/static/checksums/Fedora-Spins-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-armhfp-CHECKSUM">${_('Verify')}</a></p>
           </div>
          </div>
+         <div class="col-xs-12 white">
+            <div class="col-xs-3 col-sm-1 text-center">
+              <img class="img-responsive" src="/static/images/lxqt.png" alt="LXQt" />
+            </div>
+            <div class="col-sm-3 hidden-xs">
+            <h3>${_('LXQt Desktop')}</h3>
+            </div>
+            <div class="col-sm-3 hidden-xs">
+            <p>${Markup(_('%sMB raw image')) % global_variables.iso_size['pre_ARM_LXDE']}</p>
+            </div>
+            <div class="col-sm-5 hidden-xs">
+            <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/armhfp/images/Fedora-LXDE-armhfp-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="${path}/static/checksums/Fedora-Spins-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-armhfp-CHECKSUM">${_('Verify')}</a></p>
+            </div>
+            <div class="col-xs-9 visible-xs">
+            <h3>${_('LXQt Desktop')}</h3>
+            <p class="download"><a href="${global_variables.path['download']}/test/${global_variables.release['next_id']}_${global_variables.release['curr_state']}/Spins/armhfp/images/Fedora-LXDE-armhfp-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-sda.raw.xz">${_('Download')}</a> | <a href="${path}/static/checksums/Fedora-Spins-${global_variables.release['next_arm_id']}_${global_variables.release['curr_arm_state']}-${global_variables.release['RC_pre_gold']}-armhfp-CHECKSUM">${_('Verify')}</a></p>
+          </div>
+         </div>
 <!--         <div class="col-xs-12 white">
             <div class="col-xs-3 col-sm-1 text-center">
               <img class="img-responsive" src="/static/images/cinnamon.png" alt="Cinnamon" />
diff --git a/arm.fedoraproject.org/static/images/lxqt.png b/arm.fedoraproject.org/static/images/lxqt.png
new file mode 100644
index 0000000..d594a14
Binary files /dev/null and b/arm.fedoraproject.org/static/images/lxqt.png differ

