From 8ae2c062f5677ed7a1f7428f600114229c202125 Mon Sep 17 00:00:00 2001
From: Rich Bowen <rbowen@redhat.com>
Date: Jun 24 2020 16:05:41 +0000
Subject: Merge #13 `Updated download links for centos stream and centos linux`


---

diff --git a/_includes/centos-linux-download.html b/_includes/centos-linux-download.html
index 624d176..e9968fc 100644
--- a/_includes/centos-linux-download.html
+++ b/_includes/centos-linux-download.html
@@ -38,7 +38,7 @@
                 <table class="table table-striped table-bordered table-sm">
                     <thead>
                         <tr>
-                            <th><a href="https://wiki.centos.org/action/show/Manuals/ReleaseNotes/CentOS8.2004">Release Notes</a></th>
+                            <th><a href="https://wiki.centos.org/action/show/Manuals/ReleaseNotes/CentOS8">Release Notes</a></th>
                             <th><a href="https://lists.centos.org/pipermail/centos-announce/2020-June/035756.html">Release Email</a></th>
                             <th><a href="https://docs.centos.org">Documentation</a></th>
                         </tr>
@@ -60,6 +60,7 @@
                 </table>
             </div>
         </div>
+
         <div class="tab-pane" role="tabpanel" id="tab-2">
             <div class="table-responsive table-borderless">
                 <table class="table table-striped table-bordered table-sm">
@@ -72,34 +73,34 @@
                     </thead>
                     <tbody>
                         <tr>
-                            <td>x86_64</td>
-                            <td>RPM | SRPM</td>
-                            <td>Cloud | Docker | Vagrant</td>
+                            <td><a href="http://isoredirect.centos.org/centos/7/isos/x86_64/">x86_64</a></td>
+                            <td><a href="http://mirror.centos.org/centos/7/">RPMs</a> </td>
+                            <td>Cloud | Containers | Vagrant</td>
                         </tr>
                         <tr>
-                            <td>aarch64</td>
-                            <td>RPM | SRPM</td>
-                            <td>Cloud | Docker | Vagrant</td>
+                            <td><a href="http://isoredirect.centos.org/altarch/7/isos/aarch64/">ARM64 (aarch64)</a></td>
+                            <td><a href="http://mirror.centos.org/altarch/7/">RPMs</a> </td>
+                            <td>Cloud | Containers | Vagrant</td>
                         </tr>
                         <tr>
-                            <td>ppc64</td>
-                            <td>RPM | SRPM</td>
-                            <td>Cloud | Docker | Vagrant</td>
+                            <td><a href="http://isoredirect.centos.org/altarch/7/isos/ppc64/">IBM Power BE (ppc64)</a></td>
+                            <td><a href="http://mirror.centos.org/altarch/7/">RPMs</a> </td>
+                            <td>Cloud | Containers | Vagrant</td>
                         </tr>
                         <tr>
-                            <td>ppc64le</td>
-                            <td>RPM | SRPM</td>
-                            <td>Cloud | Docker | Vagrant</td>
+                            <td><a href="http://isoredirect.centos.org/altarch/7/isos/ppc64le/">IBM Power (ppc64le)</a></td>
+                            <td><a href="http://mirror.centos.org/altarch/7/">RPMs</a> </td>
+                            <td>Cloud | Containers | Vagrant</td>
                         </tr>
                         <tr>
-                            <td>armhfp</td>
-                            <td>RPM | SRPM</td>
-                            <td>Cloud | Docker | Vagrant</td>
+                            <td><a href="http://isoredirect.centos.org/altarch/7/isos/armhfp/">ARM32 (armhfp)</a></td>
+                            <td><a href="http://mirror.centos.org/altarch/7/">RPMs</a> </td>
+                            <td>Cloud | Containers | Vagrant</td>
                         </tr>
                         <tr>
-                            <td>i386</td>
-                            <td>RPM | SRPM</td>
-                            <td>Cloud | Docker | Vagrant</td>
+                            <td><a href="http://isoredirect.centos.org/altarch/7/isos/i386/">i386</a></td>
+                            <td><a href="http://mirror.centos.org/altarch/7/">RPMs</a> </td>
+                            <td>Cloud | Containers | Vagrant</td>
                         </tr>
                     </tbody>
                 </table>
@@ -108,17 +109,12 @@
                 <table class="table table-striped table-bordered table-sm">
                     <thead>
                         <tr>
-                            <th>Release Notes</th>
-                            <th>Release Email</th>
-                            <th>Documentation</th>
+                            <th><a href="https://wiki.centos.org/action/show/Manuals/ReleaseNotes/CentOS7">Release Notes</a></th>
+                            <th><a href="https://lists.centos.org/pipermail/centos-announce/2020-April/035696.html">Release Email</a></th>
+                            <th><a href="https://docs.centos.org">Documentation</a></th>
                         </tr>
                     </thead>
                     <tbody>
-                        <tr>
-                            <td>CentOS | RHEL</td>
-                            <td>CentOS</td>
-                            <td>RHEL</td>
-                        </tr>
                     </tbody>
                 </table>
             </div>
@@ -137,6 +133,8 @@
                 </table>
             </div>
         </div>
+
+
         <div class="tab-pane" role="tabpanel" id="tab-3">
             <div class="table-responsive table-borderless">
                 <table class="table table-striped table-bordered table-sm">
@@ -149,14 +147,14 @@
                     </thead>
                     <tbody>
                         <tr>
-                            <td>x86_64</td>
-                            <td>RPM | SRPM</td>
-                            <td>Cloud | Docker | Vagrant</td>
+                            <td><a href="http://isoredirect.centos.org/centos/6/isos/x86_64/">x86_64</a></td>
+                            <td><a href="http://mirror.centos.org/centos/6/">RPMs</a> </td>
+                            <td>Cloud | Containers | Vagrant</td>
                         </tr>
                         <tr>
-                            <td>i386</td>
-                            <td>RPM | SRPM</td>
-                            <td>Cloud | Docker | Vagrant</td>
+                            <td><a href="http://isoredirect.centos.org/centos/6/isos/i386/">i386</a></td>
+                            <td><a href="http://mirror.centos.org/centos/6/">RPMs</a> </td>
+                            <td>Cloud | Containers | Vagrant</td>
                         </tr>
                     </tbody>
                 </table>
@@ -165,18 +163,11 @@
                 <table class="table table-striped table-bordered table-sm">
                     <thead>
                         <tr>
-                            <th>Release Notes</th>
+                            <th><a href="https://wiki.centos.org/action/show/Manuals/ReleaseNotes/CentOS6">Release Notes</a></th>
                             <th>Release Email</th>
-                            <th>Documentation</th>
+                            <th><a href="https://docs.centos.org">Documentation</a></th>
                         </tr>
                     </thead>
-                    <tbody>
-                        <tr>
-                            <td>CentOS | RHEL</td>
-                            <td>CentOS</td>
-                            <td>RHEL</td>
-                        </tr>
-                    </tbody>
                 </table>
             </div>
             <div class="table-responsive table-borderless">
@@ -194,5 +185,7 @@
                 </table>
             </div>
         </div>
+
+
     </div>
 </div>
diff --git a/_includes/centos-stream-download.html b/_includes/centos-stream-download.html
index d3497de..2d225c5 100644
--- a/_includes/centos-stream-download.html
+++ b/_includes/centos-stream-download.html
@@ -15,19 +15,19 @@
                     </thead>
                     <tbody>
                         <tr>
-                            <td>x86_64</td>
-                            <td>RPM | SRPM</td>
-                            <td>Cloud | Docker | Vagrant</td>
+                            <td><a href="http://isoredirect.centos.org/centos/8-stream/isos/x86_64/">x86_64</a></td>
+                            <td><a href="http://mirror.centos.org/centos/8-stream/">RPMs</a></td>
+                            <td>Cloud | Containers | Vagrant</td>
                         </tr>
                         <tr>
-                            <td>aarch64</td>
-                            <td>RPM | SRPM</td>
-                            <td>Cloud | Docker | Vagrant</td>
+                            <td><a href="http://isoredirect.centos.org/centos/8-stream/isos/aarch64/">ARM64 (aarch64)</a></td>
+                            <td><a href="http://mirror.centos.org/centos/8-stream/">RPMs</a></td>
+                            <td>Cloud | Containers | Vagrant</td>
                         </tr>
                         <tr>
-                            <td>ppc64le</td>
-                            <td>RPM | SRPM</td>
-                            <td>Cloud | Docker | Vagrant</td>
+                            <td><a href="http://isoredirect.centos.org/centos/8-stream/isos/ppc64le/">IBM Power (ppc64le)</a></td>
+                            <td><a href="http://mirror.centos.org/centos/8-stream/">RPMs</a></td>
+                            <td>Cloud | Containers | Vagrant</td>
                         </tr>
                     </tbody>
                 </table>
@@ -41,13 +41,6 @@
                             <th>Documentation</th>
                         </tr>
                     </thead>
-                    <tbody>
-                        <tr>
-                            <td>CentOS | RHEL</td>
-                            <td>CentOS</td>
-                            <td>RHEL</td>
-                        </tr>
-                    </tbody>
                 </table>
             </div>
             <div class="table-responsive table-borderless">