From 10af55536b6d98944930481eee34052f2266e5bd Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@rcbowen.com>
Date: Nov 15 2021 18:43:18 +0000
Subject: Merge branch 'master' of ssh://git.centos.org/forks/rbowen/centos/centos.org


---

diff --git a/_includes/centos-linux-download.html b/_includes/centos-linux-download.html
index bfc5110..a3c7d37 100644
--- a/_includes/centos-linux-download.html
+++ b/_includes/centos-linux-download.html
@@ -53,8 +53,8 @@
                     </thead>
                     <tbody>
                         <tr>
-                            <td>2021-12-31<a
-                            href="/centos-linux-eol/">*</a>&nbsp;<br></td>
+                            <td>2021-12-31
+                            <a href="/centos-linux-eol/">(<em>See details of how EOL will be handled</em>)</a>&nbsp;<br></td>
                         </tr>
                     </tbody>
                 </table>
diff --git a/_includes/centos-news.html b/_includes/centos-news.html
index 260e4eb..ece49f4 100644
--- a/_includes/centos-news.html
+++ b/_includes/centos-news.html
@@ -2,24 +2,23 @@
 <div class="card" style="border: none;">
 
     <div class="card-body">
-        <h4 class="card-title">October 7th, 8th CentOS Dojo</h4>
-        <p class="card-text">
-        The schedule and registration for the upcoming <a
-        href="https://wiki.centos.org/Events/Dojo/October2021">CentOS
-        Dojo</a> are now available. The event will include a Board of
-        Directors "Ask me anything" and a hands-on tutorial on how to
-        contribute changes into CentOS Stream.
+        <h4 class="card-title">Reminder: CentOS Linux 8 is EOL on
+        December 31st</h4>
+        <p class="card-text">CentOS Linux 8 will reach End Of Life (EOL)
+        on December 31st, 2021. We recommend migrating to CentOS Stream
+        8 before that time. See <a
+        href="https://centos.org/cl-vs-cs/">this comparision of CentOS
+        Linux and CentOS Stream</a> for more information.
         </p>
     </div>
 
     <div class="card-body">
-        <h4 class="card-title">CentOS Linux 8 (2105) Released </h4>
+        <h4 class="card-title">October CentOS Dojo Videos</h4>
         <p class="card-text">
-        <a
-        href="https://blog.centos.org/2021/06/centos-linux-8-2105-released/">We
-        are pleased to announce the release of CentOS Linux 8
-        (2105).</a>
+        All video and slides from the October CentOS Dojo are now <a
+        href="https://wiki.centos.org/Events/Dojo/October2021">available
+        on the event website</a>.
         </p>
     </div>
-    
+
 </div>
diff --git a/_includes/centos-stream-download.html b/_includes/centos-stream-download.html
index c2a30d0..20c351d 100644
--- a/_includes/centos-stream-download.html
+++ b/_includes/centos-stream-download.html
@@ -18,9 +18,9 @@
                     </thead>
                     <tbody>
                         <tr>
-                            <td><a href="https://lists.centos.org/pipermail/centos-devel/2021-April/076802.html">Coming soon</a></td>
-                            <td><a href="https://lists.centos.org/pipermail/centos-devel/2021-April/076802.html">Coming soon</a></td>
-                            <td><a href="https://lists.centos.org/pipermail/centos-devel/2021-April/076802.html">Coming soon</a></td>
+                            <td><a href="https://mirrors.centos.org/mirrorlist?path=/9-stream/BaseOS/x86_64/iso/CentOS-Stream-9-latest-x86_64-dvd1.iso&redirect=1&protocol=https">x86_64</a></td>
+                            <td><a href="http://mirror.stream.centos.org/9-stream/">RPMs</a></td>
+                            <td><a href="https://cloud.centos.org/centos/9-stream/">Cloud</a> | <a href="https://quay.io/centos/centos:stream9">Containers</a></td>
                         </tr>
                     </tbody>
                 </table>
@@ -29,17 +29,6 @@
                 <table class="table table-striped table-bordered table-sm">
                     <thead>
                         <tr>
-                            <th>Release Notes</th>
-                            <th>Release Email</th>
-                            <th>Documentation</th>
-                        </tr>
-                    </thead>
-                </table>
-            </div>
-            <div class="table-responsive table-borderless">
-                <table class="table table-striped table-bordered table-sm">
-                    <thead>
-                        <tr>
                             <th>End-of-life</th>
                         </tr>
                     </thead>
@@ -86,17 +75,6 @@
                 <table class="table table-striped table-bordered table-sm">
                     <thead>
                         <tr>
-                            <th>Release Notes</th>
-                            <th>Release Email</th>
-                            <th>Documentation</th>
-                        </tr>
-                    </thead>
-                </table>
-            </div>
-            <div class="table-responsive table-borderless">
-                <table class="table table-striped table-bordered table-sm">
-                    <thead>
-                        <tr>
                             <th>End-of-life</th>
                         </tr>
                     </thead>