Merge branch 'master' of github.com:gitlabhq/gitlabhq

app/views/projects/merge_requests/show/_mr_accept.html.haml

@@ -60,7 +60,7 @@
 
   .automerge_widget.already_cannot_be_merged.hide
     .bs-callout.bs-callout-info
-      %strong This merge request already can not be merged. Try to reload page.
+      %strong This merge request can not be merged. Try to reload the page.
 
   .merge-in-progress.hide
     .bs-callout.bs-callout-success

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