Merge branch 'postgresql-10.9-on-gitlab-12-2' into 'master'

Update PG database docs for GitLab 12.x, not only for GitLab 12.0

See merge request gitlab-org/omnibus-gitlab!3589

doc/settings/database.md

@@ -403,9 +403,9 @@ The next time a reconfigure is triggered, the migration steps will not be perfor
 **As of GitLab 11.11, PostgreSQL 9.6.X and 10.7 are shipped with Omnibus GitLab.**
-You can follow the instructions for manually upgrading PostgreSQL to 10.7.
-For GitLab 12.0, we will be automatically upgrading the database to 10.7 unless specifically opted out. To opt out, run
+You can follow the instructions for manually upgrading PostgreSQL to 10.x.
+For GitLab 12.0 or later, we will be automatically upgrading the database to 10.x unless specifically opted out. To opt out, run
 ```shell
 sudo touch /etc/gitlab/disable-postgresql-upgrade

doc/update/gitlab_12_changes.md

@@ -47,7 +47,7 @@ DSS 3.1 standard.
 ## Upgrade to Postgres 10
-Postgres will automatically be upgraded to 10.7 unless specifically opted
+Postgres will automatically be upgraded to 10.x unless specifically opted
 out during the upgrade. To opt out you must execute the following before
 performing the upgrade of GitLab.