summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytses@gmail.com>2014-02-10 14:37:32 +0100
committerSytse Sijbrandij <sytses@gmail.com>2014-02-10 14:37:32 +0100
commit189ae623ca44a282d6df2c17e385d725f34b85a5 (patch)
tree71cc57f9073e062c3cc5da7d2002afee2d51edb6
parent5a098e84e4de30d95ba5e0a3a7bbd81813cf3305 (diff)
parent898d4fe37d6461daf5b4e2c31620cf9e11e682f0 (diff)
downloadgitlab-ce-189ae623ca44a282d6df2c17e385d725f34b85a5.tar.gz
Merge pull request #6283 from Razer6/fix_dead_links
Fixes #6187, Update dead links
-rw-r--r--doc/update/5.4-to-6.0.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md
index bcba3ee4d05..a1a406fe7e9 100644
--- a/doc/update/5.4-to-6.0.md
+++ b/doc/update/5.4-to-6.0.md
@@ -87,8 +87,8 @@ sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0.
-* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/unicorn.rb.example but with your settings.
+* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example but with your settings.
+* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/unicorn.rb.example but with your settings.
### 7. Update Init script