From de659a478d6cd5f7e9963d87a77d8405db34feac Mon Sep 17 00:00:00 2001
From: Deb Adair <debadair@elastic.co>
Date: Mon, 25 Oct 2021 16:01:23 -0700
Subject: [PATCH] [Docs] Cleaning up the versions in the upgrade paths. Closes
 #116223

---
 docs/setup/upgrade.asciidoc | 56 +++++++++++++++----------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

diff --git a/docs/setup/upgrade.asciidoc b/docs/setup/upgrade.asciidoc
index bd93517a7a82f..f5ed03f85cc1a 100644
--- a/docs/setup/upgrade.asciidoc
+++ b/docs/setup/upgrade.asciidoc
@@ -1,55 +1,45 @@
 [[upgrade]]
 == Upgrade {kib}
 
-Depending on the {kib} version you're upgrading from, the upgrade process to {version}
-varies. The following upgrades are supported:
+You can always upgrade to the latest patch release or from one minor version 
+to another within the same major version series.
 
-* Between minor versions
-* From 5.6 to 6.8
-* From 6.8 to {prev-major-version}
-* From {prev-major-version} to {version}
-ifeval::[ "{version}" != "{minor-version}.0" ]
-* From any version since {minor-version}.0 to {version}
-endif::[]
+For major version upgrades:
 
-The following table shows the recommended upgrade paths to {version}.
+. Upgrade to the last minor version released before the new major version.
+. Use the Upgrade Assistant to determine what changes you need to make before the major version upgrade.
+. When you've addressed all the critical issues, upgrade {es} and then upgrade {kib}.
+
+IMPORTANT: You can upgrade to pre-release versions of 8.0 for testing, 
+but upgrading from a pre-release to the final GA version is not supported.
+Pre-releases should only be used for testing in a temporary environment.
+
+[discrete]
+[[upgrade-paths]]
+=== Recommended upgrade paths to 8.0
 
 [cols="<1,3",options="header",]
 |====
-|Upgrade from   
-|Recommended upgrade path to {version}
-
-ifeval::[ "{version}" != "{minor-version}.0" ]
-|A previous {minor-version} version (e.g., {minor-version}.0)
-|Upgrade to {version}
-endif::[]
+|Upgrading from   
+|Upgrade path 
 
-|{prev-major-version}
-|Upgrade to {version}
+|7.16
+|Upgrade to 8.0
 
-|7.0–7.7
+|6.8–7.15
 a|
-. Upgrade to {prev-major-version}
-. Upgrade to {version}
 
-|6.8
-a|
-. Upgrade to {prev-major-version}
-. Upgrade to {version}
+. Upgrade to 7.16
+. Upgrade to 8.0
 
 |6.0–6.7
 a|
 
 . Upgrade to 6.8
-. Upgrade to {prev-major-version}
-. Upgrade to {version}
+. Upgrade to 7.16
+. Upgrade to 8.0
 |====
 
-[WARNING]
-====
-The upgrade path from 6.8 to 7.0 is *not* supported.
-====
-
 [float]
 [[upgrade-before-you-begin]]
 === Before you begin