updating django project template page. coding at the white house. cool

mattmakai · mattmakai · commit dc048a426725 · 2014-07-29T12:05:33.000-04:00
diff --git a/change-log.html b/change-log.html
@@ -46,6 +46,8 @@ <h1>Change Log</h1>
 <h2>2014</h2>
 <h3>July</h3>
 <ul>
+<li>Merged pull request for Django page and updated Django page with project 
+  template section.</li>
 <li>New Django example project resources.</li>
 <li>Rewrote parts of source control and CSS pages for clarity.</li>
 <li>Merged typo fixes PR #32.</li>
diff --git a/django.html b/django.html
@@ -206,9 +206,23 @@ <h2>Open source Django example projects</h2>
   <a href="https://www.twilio.com/blog/2014/07/build-an-ivr-system-with-twilio-and-django.html">blog post</a>
   with detailed explanations of each step.</p>
 </li>
+</ul>
+<h2>Django project templates</h2>
+<ul>
+<li>
+<p><a href="https://github.com/caktus/django-project-template">Caktus Group's Django project template</a> 
+  is Django 1.6+ ready.</p>
+</li>
 <li>
 <p><a href="https://github.com/pydanny/cookiecutter-django">Cookiecutter Django</a> is a 
-  project template from Daniel Greenfeld, for use with Audrey Roy's <a href="https://github.com/audreyr/cookiecutter">Cookiecutter</a>. Cool features and Heroku-ready.</p>
+  project template from Daniel Greenfield, for use with Audrey Roy's 
+  <a href="https://github.com/audreyr/cookiecutter">Cookiecutter</a>. Heroku 
+  deployment-ready.</p>
+</li>
+<li>
+<p><a href="https://github.com/twoscoops/django-twoscoops-project">Two Scoops Django project template</a>
+  is also from the PyDanny and Audrey Roy. This one provides a quick scaffold
+  described in the Two Scoops of Django book.</p>
 </li>
 </ul>
 <h2>Django learning checklist</h2>
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-29T07:30:14Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-29T12:05:19Z</updated></feed>
diff --git a/source/content/pages/02-web-frameworks/0203-django.markdown b/source/content/pages/02-web-frameworks/0203-django.markdown
@@ -173,8 +173,19 @@ existing framework.
   [blog post](https://www.twilio.com/blog/2014/07/build-an-ivr-system-with-twilio-and-django.html)
   with detailed explanations of each step.
 
+
+## Django project templates
+* [Caktus Group's Django project template](https://github.com/caktus/django-project-template) 
+  is Django 1.6+ ready.
+
 * [Cookiecutter Django](https://github.com/pydanny/cookiecutter-django) is a 
-  project template from Daniel Greenfeld, for use with Audrey Roy's [Cookiecutter](https://github.com/audreyr/cookiecutter). Cool features and Heroku-ready.
+  project template from Daniel Greenfield, for use with Audrey Roy's 
+  [Cookiecutter](https://github.com/audreyr/cookiecutter). Heroku 
+  deployment-ready.
+
+* [Two Scoops Django project template](https://github.com/twoscoops/django-twoscoops-project)
+  is also from the PyDanny and Audrey Roy. This one provides a quick scaffold
+  described in the Two Scoops of Django book.
 
 
 ## Django learning checklist
diff --git a/source/content/pages/10-misc/1005-change-log.markdown b/source/content/pages/10-misc/1005-change-log.markdown
@@ -24,6 +24,8 @@ the
 
 ## 2014
 ### July
+* Merged pull request for Django page and updated Django page with project 
+  template section.
 * New Django example project resources.
 * Rewrote parts of source control and CSS pages for clarity.
 * Merged typo fixes PR #32.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-29T07:30:14Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-29T12:05:19Z</updated></feed>`