Merge branch '6-0-stable' of github.com:gitlabhq/gitlabhq into 6-0-stable

doc/install/databases.md

@@ -14,6 +14,9 @@ GitLab supports the following databases:
     # Pick a database root password (can be anything), type it and press enter
     # Retype the database root password and press enter
+    # Secure your installation.
+    sudo mysql_secure_installation
+    
     # Login to MySQL
     mysql -u root -p

doc/update/5.4-to-6.0.md

@@ -90,7 +90,7 @@ Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0.
 ```bash
 sudo rm /etc/init.d/gitlab
-sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/master/lib/support/init.d/gitlab
+sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/6-0-stable/lib/support/init.d/gitlab
 sudo chmod +x /etc/init.d/gitlab
 ```

lib/support/nginx/gitlab

 # GITLAB
 # Maintainer: @randx
-# App Version: 5.0
+# App Version: 6.0
 upstream gitlab {
   server unix:/home/git/gitlab/tmp/sockets/gitlab.socket;