Merge branch 'jramsay-fix-alignment-geo-docs' into 'master'

Fix broken alignment of database password in geo docs

Closes #4483

See merge request gitlab-org/gitlab-ee!3939

changelogs/unreleased-ee/jramsay-fix-alignment-geo-docs.yml

+---
+title: Fix broken alignment of database password in geo docs
+merge_request: 3939
+author:
+type: other

doc/gitlab-geo/database.md

@@ -68,26 +68,26 @@ The following guide assumes that:
 
     This command will use your defined `external_url` in `/etc/gitlab/gitlab.rb`.
     
-1. Make sure your the `gitlab` database user has a password defined
+1. GitLab 10.4 and up only: Make sure your the `gitlab` database user has a password defined
 
-   Generate a MD5 hash of the desired password:
+    Generate a MD5 hash of the desired password:
    
-   ```bash
-   gitlab-ctl pg-password-md5 gitlab
-   # Enter password: mypassword
-   # Confirm password: mypassword
-   # fca0b89a972d69f00eb3ec98a5838484
-   ```
+    ```bash
+    gitlab-ctl pg-password-md5 gitlab
+    # Enter password: mypassword
+    # Confirm password: mypassword
+    # fca0b89a972d69f00eb3ec98a5838484
+    ```
    
-   Edit `/etc/gitlab/gitlab.rb`:
+    Edit `/etc/gitlab/gitlab.rb`:
    
-   ```ruby
-   # Fill with the hash generated by `gitlab-ctl pg-password-md5 gitlab` 
-   postgresql['sql_user_password'] = 'fca0b89a972d69f00eb3ec98a5838484'
+    ```ruby
+    # Fill with the hash generated by `gitlab-ctl pg-password-md5 gitlab` 
+    postgresql['sql_user_password'] = 'fca0b89a972d69f00eb3ec98a5838484'
 
-   # If you have HA setup, this must be present in all nodes as well
-   gitlab_rails['db_password'] = 'mypassword'
-   ```
+    # If you have HA setup, this must be present in all nodes as well
+    gitlab_rails['db_password'] = 'mypassword'
+    ```
 
 1. Omnibus GitLab already has a [replication user](https://wiki.postgresql.org/wiki/Streaming_Replication)
    called `gitlab_replicator`. You must set the password for this user manually.