From ad19adfdc0b0934d44d1079bdbd25ad22275a3aa Mon Sep 17 00:00:00 2001
From: Justin Campbell <justin@justincampbell.me>
Date: Tue, 31 Mar 2015 15:49:10 -0700
Subject: [PATCH 1/3] providers/heroku: Add region to example

...since it's required
---
 website/source/docs/providers/heroku/r/app.html.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/source/docs/providers/heroku/r/app.html.markdown b/website/source/docs/providers/heroku/r/app.html.markdown
index d05bd2fb0..9e51d62f2 100644
--- a/website/source/docs/providers/heroku/r/app.html.markdown
+++ b/website/source/docs/providers/heroku/r/app.html.markdown
@@ -17,6 +17,7 @@ create and manage applications on Heroku.
 # Create a new Heroku app
 resource "heroku_app" "default" {
     name = "my-cool-app"
+    region = "us"
 
     config_vars {
         FOOBAR = "baz"

From 6d3425f9619a56252e1eacd21a3a4f930208455c Mon Sep 17 00:00:00 2001
From: Justin Campbell <justin@justincampbell.me>
Date: Tue, 31 Mar 2015 15:50:00 -0700
Subject: [PATCH 2/3] providers/heroku: Document environment variables

---
 website/source/docs/providers/heroku/index.html.markdown | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/website/source/docs/providers/heroku/index.html.markdown b/website/source/docs/providers/heroku/index.html.markdown
index b04fd001c..696a41963 100644
--- a/website/source/docs/providers/heroku/index.html.markdown
+++ b/website/source/docs/providers/heroku/index.html.markdown
@@ -33,6 +33,8 @@ resource "heroku_app" "default" {
 
 The following arguments are supported:
 
-* `api_key` - (Required) Heroku API token
-* `email` - (Required) Email to be notified by Heroku
+* `api_key` - (Required) Heroku API token. It must be provided, but it can also
+  be sourced from the `HEROKU_API_KEY` environment variable.
+* `email` - (Required) Email to be notified by Heroku. It must be provided, but
+  it can also be sourced from the `HEROKU_EMAIL` environment variable.
 

From 9b3826cf368f01d8309b852df62e98466576103c Mon Sep 17 00:00:00 2001
From: Justin Campbell <justin@justincampbell.me>
Date: Tue, 31 Mar 2015 16:23:20 -0700
Subject: [PATCH 3/3] providers/heroku: Add heroku-postgres to example

---
 website/source/docs/providers/heroku/r/addon.html.markdown | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/website/source/docs/providers/heroku/r/addon.html.markdown b/website/source/docs/providers/heroku/r/addon.html.markdown
index d39cb1e8b..f9907597a 100644
--- a/website/source/docs/providers/heroku/r/addon.html.markdown
+++ b/website/source/docs/providers/heroku/r/addon.html.markdown
@@ -19,6 +19,12 @@ resource "heroku_app" "default" {
     name = "test-app"
 }
 
+# Create a database, and configure the app to use it
+resource "heroku_addon" "database" {
+  app = "${heroku_app.default.name}"
+  plan = "heroku-postgresql:hobby-basic"
+}
+
 # Add a web-hook addon for the app
 resource "heroku_addon" "webhook" {
     app = "${heroku_app.default.name}"