summaryrefslogtreecommitdiff
path: root/doc/update
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 15:08:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-29 15:08:14 +0000
commit6e33325c1458cb31b4d36a7eec817fa00ec3faaf (patch)
tree615b51cfaa9838b427ecc5c02bb40cafed31f356 /doc/update
parentbae24262df90b1b16e012360d04a28d54a07be3f (diff)
downloadgitlab-ce-6e33325c1458cb31b4d36a7eec817fa00ec3faaf.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/update')
-rw-r--r--doc/update/README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/update/README.md b/doc/update/README.md
index 8056460ceaa..4f529336344 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -22,7 +22,7 @@ Based on your installation, choose a section below that fits your needs.
source](upgrading_from_source.md) - The guidelines for upgrading Community
Edition and Enterprise Edition from source.
- [Patch versions](patch_versions.md) guide includes the steps needed for a
- patch version, eg. 6.2.0 to 6.2.1, and apply to both Community and Enterprise
+ patch version, such as 6.2.0 to 6.2.1, and apply to both Community and Enterprise
Editions.
In the past we used separate documents for the upgrading instructions, but we
@@ -178,7 +178,7 @@ 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](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
+ to a version upgrade: stop the server, get the code, update configuration 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](https://docs.gitlab.com/omnibus/update/README.html#updating-community-edition-to-enterprise-edition) - Follow this guide to update your Omnibus