From dc56516c27d14fb7b668ce35c90152690532d163 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Wed, 10 Jan 2018 11:31:29 -0500
Subject: [PATCH 1/3] Explain use of `pg_config`

---
 user/database-setup.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/user/database-setup.md b/user/database-setup.md
index 81b681436e3..58045de15d1 100644
--- a/user/database-setup.md
+++ b/user/database-setup.md
@@ -199,6 +199,23 @@ before_install:
 ```
 {: data-file=".travis.yml"}
 
+### Using `pg_config`
+
+If your builds rely on the use of the `pg_config` command, you need to install an additional
+apt package `postgresql-server-dev-X.Y` for the version of PostgreSQL you are using in order
+to obtain meaningful output from the command.
+
+For example:
+
+```yaml
+addons:
+  apt:
+    packages:
+      - postgresql-server-dev-9.4
+```
+
+See [this GitHub issue](https://github.com/travis-ci/travis-ci/issues/9011) for additional details.
+
 ## MariaDB
 
 MariaDB is a community-developed fork of MySQL. It is available as an addon on Travis CI.

From 004d173d3ec8860cfc91a22485a8f84b9e59a5ae Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Mon, 22 Jan 2018 10:38:15 -0500
Subject: [PATCH 2/3] Clarify `X.Y` in `pg_config` use

---
 user/database-setup.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user/database-setup.md b/user/database-setup.md
index 58045de15d1..36956d999b0 100644
--- a/user/database-setup.md
+++ b/user/database-setup.md
@@ -201,9 +201,9 @@ before_install:
 
 ### Using `pg_config`
 
-If your builds rely on the use of the `pg_config` command, you need to install an additional
-apt package `postgresql-server-dev-X.Y` for the version of PostgreSQL you are using in order
-to obtain meaningful output from the command.
+If your builds rely on the `pg_config` command, you need to install an additional
+apt package `postgresql-server-dev-X.Y`, where `X.Y` matches the version of PostgreSQL
+you are using.
 
 For example:
 

From 0e88ebbba348a24082351ffcdaf1fbf4e15dc70a Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Mon, 22 Jan 2018 10:39:31 -0500
Subject: [PATCH 3/3] Explicitly specify `X.Y` in pg_config example

---
 user/database-setup.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user/database-setup.md b/user/database-setup.md
index 36956d999b0..368ea96c4ba 100644
--- a/user/database-setup.md
+++ b/user/database-setup.md
@@ -209,6 +209,7 @@ For example:
 
 ```yaml
 addons:
+  postgresql: '9.4'
   apt:
     packages:
       - postgresql-server-dev-9.4