Merge branch 'doc/geo-improvements-8.17' into 'master'

Geo: Small documentation changes and fixes

See merge request !1158

doc/gitlab-geo/configuration.md

@@ -65,7 +65,7 @@ logins opened on all nodes as we will be moving back and forth.
     sudo -i
     ```
 
-1. Create a new SSH key pair for the primary node. Choose the default location
+1. (Source install only): Create a new SSH key pair for the primary node. Choose the default location
    and leave the password blank by hitting 'Enter' three times:
 
     ```bash
@@ -74,7 +74,7 @@ logins opened on all nodes as we will be moving back and forth.
 
     Read more in [additional info for SSH key pairs](#additional-information-for-the-ssh-key-pairs).
 
-1. Get the contents of `id_rsa.pub` the was just created:
+1. Get the contents of `id_rsa.pub` for the git user:
 
     ```
     # Omnibus GitLab installations
@@ -86,6 +86,7 @@ logins opened on all nodes as we will be moving back and forth.
 
 1. Visit the primary node's **Admin Area ➔ Geo Nodes** (`/admin/geo_nodes`) in
    your browser.
+
 1. Add the primary node by providing its full URL and the public SSH key
    you created previously. Make sure to check the box 'This is a primary node'
    when adding it.

doc/gitlab-geo/database.md

@@ -32,11 +32,11 @@ and `secondary` as either `slave` or `standby` server (read-only).
 
 The following guide assumes that:
 
-- You are using PostgreSQL 9.1 or later which includes the
-  [`pg_basebackup` tool][pgback]. As of this writing, the latest Omnibus
-  packages (8.5) have version 9.2.
+- You are using PostgreSQL 9.2 or later which includes the
+  [`pg_basebackup` tool][pgback]. If you are using Omnibus it includes the required
+  PostgreSQL version for Geo.
 - You have a primary server already set up (the GitLab server you are
-  replicating from), running PostgreSQL 9.2.x, and you
+  replicating from), running Omnibus' PostgreSQL (or equivalent version), and you
   have a new secondary server set up on the same OS and PostgreSQL version. If
   you are using Omnibus, make sure the GitLab version is the same on all nodes.
 - The IP of the primary server for our examples will be `1.2.3.4`, whereas the
@@ -182,6 +182,7 @@ The following guide assumes that:
     postgresql['max_wal_senders'] = 10
     postgresql['wal_keep_segments'] = 10
     postgresql['hot_standby'] = "on"
+    gitlab_rails['auto_migrate'] = false # prevents migrations to be executed on the secondary server
     ```
 
 1. [Reconfigure GitLab][] for the changes to take effect.