Merge branch 'master' of github.com:pydanny/cookiecutter-django

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",

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
 

{{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 %}