Merge branch 'nginx_alternatives_in_recipes' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents da07665b d3e94eef
Showing 1 changed file with 2 additions and 2 deletions Show diff stats
doc/install/installation.md
@@ -280,8 +280,8 @@ However there are still a few steps left.
 # 7. Nginx
  
 **Note:**
-If you can't or don't want to use Nginx as your web server, have a look at the
-[`Advanced Setup Tips`](./installation.md#advanced-setup-tips) section.
+Nginx is the officially supported web server for GitLab. If you cannot or do not want to use Nginx as your web server, have a look at the
+[GitLab recipes](https://github.com/gitlabhq/gitlab-recipes).
  
 ## Installation
     sudo apt-get install -y nginx
...	...	@@ -280,8 +280,8 @@ However there are still a few steps left.
280	280	# 7. Nginx
281	281
282	282	Note:
283		-If you can't or don't want to use Nginx as your web server, have a look at the
284		-[`Advanced Setup Tips`](./installation.md#advanced-setup-tips) section.
	283	+Nginx is the officially supported web server for GitLab. If you cannot or do not want to use Nginx as your web server, have a look at the
	284	+[GitLab recipes](https://github.com/gitlabhq/gitlab-recipes).
285	285
286	286	## Installation
287	287	sudo apt-get install -y nginx
...	...