From 4d567c7d8e718fba836f14211011b9a70f9c48f9 Mon Sep 17 00:00:00 2001
From: Cullen Rhodes <rhodes.cullen@gmail.com>
Date: Mon, 13 Feb 2017 18:41:01 +0000
Subject: [PATCH 1/3] Remove mention of the deploy button from Heroku docs
 (#953)

Commit 04a58d5 removed the Heroku instant deploy button but the docs
still mention this as an option, this commit updates the docs to reflect
this change.
---
 docs/deployment-on-heroku.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 843e230f..b84edfa4 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -3,7 +3,7 @@ Deployment on Heroku
 
 .. index:: Heroku
 
-You can either push the 'deploy' button in your generated README.rst or run these commands to deploy the project to Heroku:
+Run these commands to deploy the project to Heroku:
 
 .. code-block:: bash
 

From f298ef7722ac9a0ecf1e46be9d955bf79afa35d5 Mon Sep 17 00:00:00 2001
From: William Martin Stewart <zoidbergwill@gmail.com>
Date: Mon, 13 Feb 2017 20:44:02 +0200
Subject: [PATCH 2/3] Inconsistent title case in 404 (#974)

We should either title case it or just capitalise the first letter, imho.
---
 .../{{cookiecutter.project_slug}}/templates/404.html          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
index 0d7a787f..1687ef31 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
@@ -1,9 +1,9 @@
 {% raw %}{% extends "base.html" %}
 
-{% block title %}Page Not found{% endblock %}
+{% block title %}Page not found{% endblock %}
 
 {% block content %}
-<h1>Page Not found</h1>
+<h1>Page not found</h1>
 
 <p>This is not the page you were looking for.</p>
 {% endblock content %}{% endraw %}

From 059c4b822ed75a71e6577592daf34882e533094b Mon Sep 17 00:00:00 2001
From: Daniel Roy Greenfeld <pydanny@users.noreply.github.com>
Date: Mon, 13 Feb 2017 10:47:15 -0800
Subject: [PATCH 3/3] Change Docker to be an option, not the default.

---
 cookiecutter.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookiecutter.json b/cookiecutter.json
index 84bbe5ef..0bc2b90e 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -15,7 +15,7 @@
     "use_pycharm": "n",
     "windows": "n",
     "use_python3": "y",
-    "use_docker": "y",
+    "use_docker": "n",
     "use_heroku": "n",
     "use_elasticbeanstalk_experimental": "n",
     "use_compressor": "n",