From ab3a0f0d3ef029fc45c53b0012a2e4247a51d4a0 Mon Sep 17 00:00:00 2001
From: Josh Heyer <63653723+josh-heyer@users.noreply.github.com>
Date: Thu, 3 Aug 2023 16:02:53 -0700
Subject: [PATCH] Adjust admonition calling out EOL versions in release notes
 Addresses #2532

---
 docs/src/release_notes/old/v1.15.md | 4 ++--
 docs/src/release_notes/old/v1.16.md | 4 ++--
 docs/src/release_notes/old/v1.17.md | 4 ++--
 docs/src/release_notes/old/v1.18.md | 9 ++-------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/docs/src/release_notes/old/v1.15.md b/docs/src/release_notes/old/v1.15.md
index 6e3736af09..ae194cd5bc 100644
--- a/docs/src/release_notes/old/v1.15.md
+++ b/docs/src/release_notes/old/v1.15.md
@@ -7,8 +7,8 @@ For a complete list of changes, please refer to the
 on the release branch in GitHub.
 
 !!! Warning
-    Version 1.15 has reached End-of-Life (EOL). Version 1.15.5 is the last
-    that will be released for the 1.15 minor version.
+    This is expected to be the last release in the 1.15.X series. 
+    Users are encouraged to update to a newer minor version soon.
 
 ##  Version 1.15.5
 
diff --git a/docs/src/release_notes/old/v1.16.md b/docs/src/release_notes/old/v1.16.md
index 913123fe54..172e4e80c2 100644
--- a/docs/src/release_notes/old/v1.16.md
+++ b/docs/src/release_notes/old/v1.16.md
@@ -11,8 +11,8 @@ on the release branch in GitHub.
 **Release date:** Dec 21, 2022
 
 !!! Warning
-    Version 1.16 has reached End-of-Life (EOL). Version 1.16.5 is the last
-    that will be released for the 1.16 minor version.
+    This is expected to be the last release in the 1.16.X series. 
+    Users are encouraged to update to a newer minor version soon.
 
 Important announcements:
 
diff --git a/docs/src/release_notes/old/v1.17.md b/docs/src/release_notes/old/v1.17.md
index 6a474ac387..e9de02e0ba 100644
--- a/docs/src/release_notes/old/v1.17.md
+++ b/docs/src/release_notes/old/v1.17.md
@@ -11,8 +11,8 @@ on the release branch in GitHub.
 **Release date:** March 20, 2023
 
 !!! Warning
-    Version 1.17 has reached End-of-Life (EOL). Version 1.17.5 is the last
-    that will be released for the 1.17 minor version.
+    This is expected to be the last release in the 1.17.X series. 
+    Users are encouraged to update to a newer minor version soon.
 
 Enhancements:
 
diff --git a/docs/src/release_notes/old/v1.18.md b/docs/src/release_notes/old/v1.18.md
index f4396b42c0..96f88c1386 100644
--- a/docs/src/release_notes/old/v1.18.md
+++ b/docs/src/release_notes/old/v1.18.md
@@ -11,8 +11,8 @@ on the release branch in GitHub.
 **Release date:** June 12, 2023
 
 !!! Warning
-    Version 1.18 has reached End-of-Life (EOL). Version 1.18.5 is the last
-    that will be released for the 1.18 minor version.
+    This is expected to be the last release in the 1.18.X series. 
+    Users are encouraged to update to a newer minor version soon.
 
 Enhancements:
 
@@ -58,11 +58,6 @@ Fixes:
 
 **Release date:** April 27, 2023
 
-!!! Warning
-    **Version 1.18 will reach its End-of-Life (EOL) on May 27, 2023**.
-    If you haven't upgraded yet, please start planning an upgrade
-    as soon as possible.
-
 !!! Important
     CloudNativePG is dropping support for PostgreSQL 10, as PostgreSQL 10
     reached End-of-Life (EOL) in November 2022. Versions 11 and newer are