From 89e751a357e579cfd37af6d606d0de3253e46a5c Mon Sep 17 00:00:00 2001
From: rbowen <rbowen@rcbowen.com>
Date: Jun 22 2020 13:36:04 +0000
Subject: [PATCH 1/2] Merge branch 'master' of ssh://git.centos.org/centos/centos.org


---

diff --git a/content/download.haml b/content/download.haml
index 90cff60..02dd5bf 100644
--- a/content/download.haml
+++ b/content/download.haml
@@ -17,7 +17,7 @@ title: Download CentOS
     .col-sm-12
       %p
         .downloadbutton
-          %a( href="http://isoredirect.centos.org/centos/8/isos/x86_64/CentOS-8.1.1911-x86_64-dvd1.iso" ) CentOS Linux DVD ISO
+          %a( href="http://isoredirect.centos.org/centos/8/isos/x86_64/CentOS-8.2.2004-x86_64-dvd1.iso" ) CentOS Linux DVD ISO
       %p
         .downloadbutton
           %a( href="http://isoredirect.centos.org/centos/8-stream/isos/x86_64/CentOS-Stream-8-x86_64-20191219-dvd1.iso" ) CentOS Stream DVD ISO
@@ -45,7 +45,7 @@ title: Download CentOS
       %hr
       %h2 Need a Cloud or Container Image?
       %p
-        %a( href="https://aws.amazon.com/marketplace/seller-profile?id=16cb8b03-256e-4dde-8f34-1b0f377efe89" ) Amazon Web Services
+        %a( href="https://wiki.centos.org/Cloud/AWS/#Official_CentOS_Linux_:_Public_Images" ) Amazon Web Services
       %p
         %a( href="https://registry.hub.docker.com/_/centos/" ) Docker registry
   .row

From 35c51525e1aa2eedf89269bbc0761b613a283183 Mon Sep 17 00:00:00 2001
From: rbowen <rbowen@rcbowen.com>
Date: Jun 22 2020 13:37:29 +0000
Subject: [PATCH 2/2] Add dates to devconf announce


---

diff --git a/content/index.erb b/content/index.erb
index d1874ed..63ba091 100644
--- a/content/index.erb
+++ b/content/index.erb
@@ -52,11 +52,11 @@ is_hidden: true
       <a class="pull-left" href="#">
         <img class="media-object img-rounded" src="/images/centoslogo-32.png" width="32" alt="..."></a>
       <div class="media-body">
-        <h4 class="media-heading">DevConf.US and Dojo</h4>
+        <h4 class="media-heading">September 23-25: DevConf.US and Dojo</h4>
         <p>The call for presentations for both <a
         href="http://devconf.us">DevConf.US</a> and the <a
         href="https://wiki.centos.org/Events/Dojo/DevconfUS2020">CentOS
-        Dojo</a> are now open. Both will be held online.</p>
+        Dojo</a> the day before are now open. Both will be held online.</p>
       </div>
     </div>