Merge branch '6-9-stable' into 6-9-stable-ee

Jacob Vosmaer
2 parents dc889704 3ab4cfc7
Showing 1 changed file with 3 additions and 0 deletions Show diff stats
doc/update.md
@@ -8,6 +8,9 @@ Please make sure you are viewing this file on the master branch.
  
 ## Updating from GitLab 6.6.x or higher to 6.8.x
  
+The procedure can also be used to upgrade from a CE omnibus package to an EE
+omnibus package.
+
 First, download the latest [CE](https://www.gitlab.com/downloads/) or
 [EE (subscribers only)](https://gitlab.com/subscribers/gitlab-ee/blob/master/doc/install/packages.md)
 package to your GitLab server.
...	...	@@ -8,6 +8,9 @@ Please make sure you are viewing this file on the master branch.
8	8
9	9	## Updating from GitLab 6.6.x or higher to 6.8.x
10	10
	11	+The procedure can also be used to upgrade from a CE omnibus package to an EE
	12	+omnibus package.
	13	+
11	14	First, download the latest [CE](https://www.gitlab.com/downloads/) or
12	15	[EE (subscribers only)](https://gitlab.com/subscribers/gitlab-ee/blob/master/doc/install/packages.md)
13	16	package to your GitLab server.
...	...