Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 3 deletions

diff --git a/doc/update/README.md b/doc/update/README.md
index 510a8fb31fb..255abc7b523 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -131,7 +131,7 @@ sudo -u git -H bundle exec rails runner -e production 'puts Sidekiq::Queue.new("
 Major versions are reserved for backwards incompatible changes. We recommend that
 you first upgrade to the latest available minor version within your major version.
 Please follow the [Upgrade Recommendations](../policy/maintenance.md#upgrade-recommendations)
-to identify the ideal upgrade path.
+to identify a supported upgrade path.
 
 Before upgrading to a new major version, you should ensure that any background
 migration jobs from previous releases have been completed. To see the current size
@@ -183,11 +183,18 @@ users first upgrade to the latest 11.11 patch release. Once upgraded to 11.11.x,
 users can upgrade to 12.0.x. Failure to do so may result in database migrations
 not being applied, which could lead to application errors.
 
-Example 1: you are currently using GitLab 11.11.3, which is the latest patch
+It is also required that you upgrade to 12.0.x before moving to a later version
+of 12.x.
+
+Example 1: you are currently using GitLab 11.11.8, which is the latest patch
 release for 11.11.x. You can upgrade as usual to 12.0.x.
 
 Example 2: you are currently using a version of GitLab 10.x. To upgrade, first
-upgrade to 11.11.3. Once upgraded to 11.11.3 you can safely upgrade to 12.0.x.
+upgrade to the last 10.x release (10.8.7) then the last 11.x release (11.11.8).
+Once upgraded to 11.11.8 you can safely upgrade to 12.0.x.
+
+See our [documentation on upgrade paths](../policy/maintenance.md#upgrade-recommendations)
+for more information.
 
 ## Miscellaneous