summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-10-02 12:24:23 +0000
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-10-02 12:24:23 +0000
commit798977c87b61f2f7ae000cee3d1c5fc232ec0754 (patch)
treec70e51ecd53b6648f41171a7f295648920594801
parent9e78949e48a0dab5a82a70b17548848807d81586 (diff)
parent1489b8d50eb420b884d5d7b142d55a718a76ea82 (diff)
downloadgitlab-ce-798977c87b61f2f7ae000cee3d1c5fc232ec0754.tar.gz
Merge branch 'missing_update_links' into 'master'
Missing omnibus update links in help/update I took the liberty and refactored it a little. Open issue https://gitlab.com/gitlab-org/omnibus-gitlab/issues/269 Here is a screen ![gitlab_update_page](https://gitlab.com/uploads/axil/gitlab-ce/0395154f23/gitlab_update_page.png) See merge request !202
-rw-r--r--doc/update/README.md20
1 files changed, 16 insertions, 4 deletions
diff --git a/doc/update/README.md b/doc/update/README.md
index 9a6f09b370a..30e9137d7b7 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -1,4 +1,16 @@
-- [The individual upgrade guides](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update)
-- [Upgrader](upgrader.md)
-- [Patch versions](patch_versions.md)
-- [MySQL to PostgreSQL](mysql_to_postgresql.md)
+Depending on the installation method and your GitLab version, there are multiple update guides. Choose one that fits your needs.
+
+## Omnibus Packages
+
+- [Omnibus update guide](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/update.md) contains the steps needed to update a GitLab [package](https://about.gitlab.com/downloads/).
+
+## Manual Installation
+
+- [The individual upgrade guides](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update) are for those who have installed GitLab manually.
+- [The CE to EE update guides](https://gitlab.com/subscribers/gitlab-ee/tree/master/doc/update) are for subscribers of the Enterprise Edition only. The steps are very similar to a version upgrade: stop the server, get the code, update config files for the new functionality, install libs and do migrations, update the init script, start the application and check the application status.
+- [Upgrader](upgrader.md) is an automatic ruby script that performs the update for manual installations.
+- [Patch versions](patch_versions.md) guide includes the steps needed for a patch version, eg. 6.2.0 to 6.2.1.
+
+## Miscellaneous
+
+- [MySQL to PostgreSQL](mysql_to_postgresql.md) guides you through migrating your database from MySQL to PostrgreSQL.