Add latest changes from gitlab-org/gitlab@13-0-stable-ee

4 files changed, 14 insertions, 28 deletions

diff --git a/doc/update/README.md b/doc/update/README.md
index c7be3f3cb2b..8056460ceaa 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -13,7 +13,7 @@ Based on your installation, choose a section below that fits your needs.
 
 ## Omnibus Packages
 
-- The [Omnibus update guide][omni-update]
+- The [Omnibus update guide](https://docs.gitlab.com/omnibus/update/README.html)
   contains the steps needed to update an Omnibus GitLab package.
 
 ## Installation from source
@@ -29,14 +29,14 @@ In the past we used separate documents for the upgrading instructions, but we
 have since switched to using a single document. The old upgrading guidelines
 can still be found in the Git repository:
 
-- [Old upgrading guidelines for Community Edition][old-ce-upgrade-docs]
-- [Old upgrading guidelines for Enterprise Edition][old-ee-upgrade-docs]
+- [Old upgrading guidelines for Community Edition](https://gitlab.com/gitlab-org/gitlab-foss/tree/11-8-stable/doc/update)
+- [Old upgrading guidelines for Enterprise Edition](https://gitlab.com/gitlab-org/gitlab/tree/11-8-stable-ee/doc/update)
 
 ## Installation using Docker
 
 GitLab provides official Docker images for both Community and Enterprise
 editions. They are based on the Omnibus package and instructions on how to
-update them are in [a separate document][omni-docker].
+update them are in [a separate document](https://docs.gitlab.com/omnibus/docker/README.html).
 
 ## Upgrading without downtime
 
@@ -106,7 +106,7 @@ meet the other online upgrade requirements mentioned above.
 
 ### Steps
 
-Steps to [upgrade without downtime][omni-zero-downtime].
+Steps to [upgrade without downtime](https://docs.gitlab.com/omnibus/update/README.html#zero-downtime-updates).
 
 ## Checking for background migrations before upgrading
 
@@ -163,8 +163,8 @@ of the `background_migration` queue, [check for background migrations before upg
 
 ## Upgrading between editions
 
-GitLab comes in two flavors: [Community Edition][ce] which is MIT licensed,
-and [Enterprise Edition][ee] which builds on top of the Community Edition and
+GitLab comes in two flavors: [Community Edition](https://about.gitlab.com/features/#community) which is MIT licensed,
+and [Enterprise Edition](https://about.gitlab.com/features/#enterprise) which builds on top of the Community Edition and
 includes extra features mainly aimed at organizations with more than 100 users.
 
 Below you can find some guides to help you change editions easily.
@@ -177,17 +177,17 @@ The following guides are for subscribers of the Enterprise Edition only.
 If you wish to upgrade your GitLab installation from Community to Enterprise
 Edition, follow the guides below based on the installation method:
 
-- [Source CE to EE update guides][source-ce-to-ee] - The steps are very similar
+- [Source CE to EE update guides](upgrading_from_ce_to_ee.md) - The steps are very similar
   to a version upgrade: stop the server, get the code, update config files for
   the new functionality, install libraries and do migrations, update the init
   script, start the application and check its status.
-- [Omnibus CE to EE][omni-ce-ee] - Follow this guide to update your Omnibus
+- [Omnibus CE to EE](https://docs.gitlab.com/omnibus/update/README.html#updating-community-edition-to-enterprise-edition) - Follow this guide to update your Omnibus
   GitLab Community Edition to the Enterprise Edition.
 
 ### Enterprise to Community Edition
 
 If you need to downgrade your Enterprise Edition installation back to Community
-Edition, you can follow [this guide][ee-ce] to make the process as smooth as
+Edition, you can follow [this guide](../downgrade_ee_to_ce/README.md) to make the process as smooth as
 possible.
 
 ## Version specific upgrading instructions
@@ -227,15 +227,3 @@ for more information.
 - [Restoring from backup after a failed upgrade](restore_after_failure.md)
 - [Upgrading PostgreSQL Using Slony](upgrading_postgresql_using_slony.md), for
   upgrading a PostgreSQL database with minimal downtime.
-
-[omnidocker]: https://docs.gitlab.com/omnibus/docker/README.html
-[old-ee-upgrade-docs]: https://gitlab.com/gitlab-org/gitlab/tree/11-8-stable-ee/doc/update
-[old-ce-upgrade-docs]: https://gitlab.com/gitlab-org/gitlab-foss/tree/11-8-stable/doc/update
-[source-ce-to-ee]: upgrading_from_ce_to_ee.md
-[ee-ce]: ../downgrade_ee_to_ce/README.md
-[ce]: https://about.gitlab.com/features/#community
-[ee]: https://about.gitlab.com/features/#enterprise
-[omni-ce-ee]: https://docs.gitlab.com/omnibus/update/README.html#updating-community-edition-to-enterprise-edition
-[omni-docker]: https://docs.gitlab.com/omnibus/docker/README.html
-[omni-update]: https://docs.gitlab.com/omnibus/update/README.html
-[omni-zero-downtime]: https://docs.gitlab.com/omnibus/update/README.html#zero-downtime-updates
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md
index aaa464dfdcb..f226ad9ac28 100644
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
@@ -12,7 +12,7 @@ You can select the tag in the version dropdown in the top left corner of GitLab
 
 ### 0. Backup
 
-It's useful to make a backup just in case things go south. Depending on the installation method, backup commands vary, see the [backing up and restoring GitLab](../raketasks/backup_restore.md#creating-a-backup-of-the-gitlab-system) documentation.
+It's useful to make a backup just in case things go south. Depending on the installation method, backup commands vary. See the [backing up and restoring GitLab](../raketasks/backup_restore.md) documentation.
 
 ### 1. Stop server
 
diff --git a/doc/update/restore_after_failure.md b/doc/update/restore_after_failure.md
index e01ae409bb3..c850bbff1cf 100644
--- a/doc/update/restore_after_failure.md
+++ b/doc/update/restore_after_failure.md
@@ -10,9 +10,9 @@ the previous version you were using.
 
 First, roll back the code or package. For source installations this involves
 checking out the older version (branch or tag). For Omnibus installations this
-means installing the older .deb or .rpm package. Then, restore from a backup.
+means installing the older `.deb` or `.rpm` package. Then, restore from a backup.
 Follow the instructions in the
-[Backup and Restore](../raketasks/backup_restore.md#restore)
+[Backup and Restore](../raketasks/backup_restore.md#restore-gitlab)
 documentation.
 
 ## Potential problems on the next upgrade
diff --git a/doc/update/upgrading_from_ce_to_ee.md b/doc/update/upgrading_from_ce_to_ee.md
index 28d5fe7aa5f..2415d3b2741 100644
--- a/doc/update/upgrading_from_ce_to_ee.md
+++ b/doc/update/upgrading_from_ce_to_ee.md
@@ -7,7 +7,7 @@ comments: false
 NOTE: **NOTE** In the past we used separate documents for upgrading from
 Community Edition to Enterprise Edition. These documents can be found in the
 [`doc/update` directory of Enterprise Edition's source
-code][old-ee-upgrade-docs].
+code](https://gitlab.com/gitlab-org/gitlab/tree/11-8-stable-ee/doc/update).
 
 If you want to upgrade the version only, for example 11.8 to 11.9, *without* changing the
 GitLab edition you are using (Community or Enterprise), see the
@@ -133,5 +133,3 @@ Example:
 
 Additional instructions here.
 -->
-
-[old-ee-upgrade-docs]: https://gitlab.com/gitlab-org/gitlab/tree/11-8-stable-ee/doc/update