Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2 files changed, 7 insertions, 7 deletions

diff --git a/doc/install/databases.md b/doc/install/databases.md
index 6477e1c967c..be7bc0aad2e 100644
--- a/doc/install/databases.md
+++ b/doc/install/databases.md
@@ -58,7 +58,7 @@ GitLab supports the following databases:
     sudo -u postgres psql -d template1
 
     # Create a user for GitLab. (change $password to a real password)
-    template1=# CREATE USER git WITH PASSWORD '$password';
+    template1=# CREATE USER git;
 
     # Create the GitLab production database & grant all privileges on database
     template1=# CREATE DATABASE gitlabhq_production OWNER git;
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 03ea5fbb28f..933799776bd 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -216,18 +216,18 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
     # Mysql
     sudo -u git cp config/database.yml.mysql config/database.yml
 
-    or
-
-    # PostgreSQL
-    sudo -u git cp config/database.yml.postgresql config/database.yml
-
     # Make sure to update username/password in config/database.yml.
     # You only need to adapt the production settings (first part).
     # If you followed the database guide then please do as follows:
-    # Change 'root' to 'gitlab'
     # Change 'secure password' with the value you have given to $password
     # You can keep the double quotes around the password
     sudo -u git -H editor config/database.yml
+
+    or
+
+    # PostgreSQL
+    sudo -u git cp config/database.yml.postgresql config/database.yml
+
     
     # Make config/database.yml readable to git only
     sudo -u git -H chmod o-rwx config/database.yml