From 5456b792d4fc22d0978002c9c07927f0dea4a975 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 24 Nov 2020 12:53:10 +0100
Subject: F31 is EOL

---
 fedora/29/index.html | 2 +-
 fedora/30/index.html | 2 +-
 fedora/31/index.html | 3 +++
 index.html           | 9 ++-------
 wizard/index.php     | 8 ++++----
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/fedora/29/index.html b/fedora/29/index.html
index 869a7669..f1f6f8d1 100644
--- a/fedora/29/index.html
+++ b/fedora/29/index.html
@@ -22,7 +22,7 @@
 			<div id="main">
 				<div id="content">
 				        <h2>Fedora release 29</h2>
-						<p>Fedora 29 has reach its "End Of Life" in November 2019.<br/>
+						<p>Fedora 29 has reached its <b>"End Of Life"</b> in November 2019.<br/>
 						You <b>MUST</b> consider upgrading to a supported release.</p>
 						<p>&nbsp;</p>
 					<h3>modular</h3>
diff --git a/fedora/30/index.html b/fedora/30/index.html
index 096690ea..7af8a7fd 100644
--- a/fedora/30/index.html
+++ b/fedora/30/index.html
@@ -22,7 +22,7 @@
 			<div id="main">
 				<div id="content">
 				        <h2>Fedora release 30</h2>
-						<p>Fedora 30 has reach its "End Of Life" in May 2020.<br/>
+						<p>Fedora 30 has reached its <b>"End Of Life"</b> in May 2020.<br/>
 						You <b>MUST</b> consider upgrading to a supported release.</p>
 						<p>&nbsp;</p>
 					<h3>modular</h3>
diff --git a/fedora/31/index.html b/fedora/31/index.html
index 103d453c..7c2f4e87 100644
--- a/fedora/31/index.html
+++ b/fedora/31/index.html
@@ -22,6 +22,9 @@
 			<div id="main">
 				<div id="content">
 				        <h2>Fedora release 31</h2>
+						<p>Fedora 31 has reached its <b>"End Of Life"</b> in November 2020.<br/>
+						You <b>MUST</b> consider upgrading to a supported release.</p>
+						<p>&nbsp;</p>
 					<h3>modular</h3>
 					<ul class="pkglist">
 						<li>
diff --git a/index.html b/index.html
index b8a7b6aa..3f2f43ff 100644
--- a/index.html
+++ b/index.html
@@ -289,11 +289,6 @@
 							repository auto-configuration package :
 							<a href="fedora/remi-release-32.rpm">remi-release-32.rpm</a>
 						</li>
-						<li>
-							<a href="fedora/31/" class="inpage">Fedora 31</a> -
-							repository auto-configuration package :
-							<a href="fedora/remi-release-31.rpm">remi-release-31.rpm</a>
-						</li>
 					</ul>
 					<h3>EOL Enterprise Linux - No more package update - Upgrade strongly recommended</h3>
 					<ul class="pkglist">
@@ -308,11 +303,11 @@
 						</li>
 					</ul>
 <!--
+-->
 					<h3>EOL Fedora - All packages are maintained - Upgrade heartily recommended</h3>
 					<ul class="pkglist">
-						<li><a href="fedora/30/" class="inpage">Fedora 30</a></li>
+						<li><a href="fedora/31/" class="inpage">Fedora 31</a></li>
 					</ul>
--->
 
 					<h3>EOL Fedora - No more package update - Upgrade is mandatory</h3>
 					<ul class="pkglist">
diff --git a/wizard/index.php b/wizard/index.php
index 49941728..ede84df0 100644
--- a/wizard/index.php
+++ b/wizard/index.php
@@ -8,7 +8,7 @@
 		<link rel="shortcut icon" href="/favicon.ico" />
 </head>
 <?php
-define('FC_EOL', 30);
+define('FC_EOL', 31);
 define('FC_DEV', 34);
 define('EL_EOL', 5);
 define('EL_DEV', 9);
@@ -56,7 +56,7 @@ $osname = [
     'CentOS 6'  => 'CentOS 6 (maintained until November 2020)',
     'Fedora 33' => 'Fedora 33',
     'Fedora 32' => 'Fedora 32',
-    'Fedora 31' => 'Fedora 31 (maintained until November 2020)',
+    'Fedora 31' => 'Fedora 31 (End of life since November 2020)',
 ];
 $grpname = [
     'RHEL'    => 'Red Hat Enterprise Linux',
@@ -81,7 +81,7 @@ $phpvers = [
 ];
 $phpname = [
 	':devel'  => 'Development version, not ready for production',
-		'8.0' => '8.0.0RC3',
+		'8.0' => '8.0.0RC5',
 	':stable' => 'Stable versions - usage recommended',
 		'7.4' => '7.4.12 (active support until November 2021)',
 		'7.3' => '7.3.24 (active support until December 2020)',
@@ -170,7 +170,7 @@ if ($os) {
         printf("<li><b>WARNING: %s</b> will reach its <b>end of life</b> in November 2020, in <b>$days days</b>, upgrade is strongly recommended.</li><br />", $os);
     }
     if (($dist == 'Fedora' && $ver<=FC_EOL) || ($dist != 'Fedora' && $ver<=EL_EOL)) {
-        printf("<li><b>%s</b> have reached its <b>end of life</b>, upgrade is strongly recommended.</li><br />", $os);
+        printf("<li><b>%s</b> has reached its <b>end of life</b>, upgrade is strongly recommended.</li><br />", $os);
     }
     if (($dist == 'Fedora' && $ver>=FC_DEV) || ($dist != 'Fedora' && $ver>=EL_DEV)) {
         printf("<li><b>WARNING: %s</b> is a <b>development</b> version, not ready for production.</li><br />", $os);
-- 
cgit