Merge pull request mattmakai#33 from dirtycoder/gh-pages

mattmakai · mattmakai · commit 39f0d4975aff · 2014-07-29T09:16:41.000-04:00
Merged two lines about the Django subreddit
diff --git a/django.html b/django.html
@@ -87,7 +87,7 @@ <h2>Django tutorials</h2>
 </li>
 <li>
 <p><a href="http://twoscoopspress.com/products/two-scoops-of-django-1-6">2 Scoops of Django</a> 
-  by Daniel Greenfield and Audrey Roy is well worth the price of admission if
+  by Daniel Greenfeld and Audrey Roy is well worth the price of admission if
   you're serious about learning how to correctly develop Django websites.</p>
 </li>
 <li>
@@ -96,7 +96,8 @@ <h2>Django tutorials</h2>
 </li>
 <li>
 <p>The <a href="http://www.reddit.com/r/django">Django subreddit</a> often has links to
-  the latest resources for learning Django.</p>
+  the latest resources for learning Django and is also a good spot to ask 
+  questions about it.</p>
 </li>
 <li>
 <p>Lincoln Loop wrote a 
@@ -116,10 +117,6 @@ <h2>Django tutorials</h2>
   explains the architecture of the resulting set up and includes Chef scripts
   to automate the deployment.</p>
 </li>
-<li>
-<p>The <a href="http://www.reddit.com/r/django">Django subreddit</a> is a good spot to
-  learn about Django and ask questions.</p>
-</li>
 </ul>
 <h2>Django videos</h2>
 <ul>
@@ -209,6 +206,10 @@ <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>
+<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>
+</li>
 </ul>
 <h2>Django learning checklist</h2>
 <p><i class="fa fa-check-square-o"></i> 
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-29T05:26:08Z</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-29T07:30:14Z</updated></feed>
diff --git a/flask.html b/flask.html
@@ -171,6 +171,10 @@ <h2>Open source Flask example projects</h2>
   starting point for new Flask projects.</p>
 </li>
 <li>
+<p><a href="https://github.com/sloria/cookiecutter-flask">Cookiecutter Flask</a> is a project
+  template for use with <a href="https://github.com/audreyr/cookiecutter">Cookiecutter</a>.</p>
+</li>
+<li>
 <p><a href="https://github.com/mjhea0/flaskr-tdd">Flaskr TDD</a> takes the official Flask
   tutorial and adds test driven development and JQuery to the project. </p>
 </li>
diff --git a/source/content/pages/02-web-frameworks/0203-django.markdown b/source/content/pages/02-web-frameworks/0203-django.markdown
@@ -73,14 +73,15 @@ syntax and language semantics first before diving into web development.
   framework learning curve.
 
 * [2 Scoops of Django](http://twoscoopspress.com/products/two-scoops-of-django-1-6) 
-  by Daniel Greenfield and Audrey Roy is well worth the price of admission if
+  by Daniel Greenfeld and Audrey Roy is well worth the price of admission if
   you're serious about learning how to correctly develop Django websites.
 
 * [Effective Django](http://effectivedjango.com/) is another free introduction
   to the web framework.
 
 * The [Django subreddit](http://www.reddit.com/r/django) often has links to
-  the latest resources for learning Django.
+  the latest resources for learning Django and is also a good spot to ask 
+  questions about it.
 
 * Lincoln Loop wrote a 
   [Django Best Practices guide](http://lincolnloop.com/django-best-practices/)
@@ -96,9 +97,6 @@ syntax and language semantics first before diving into web development.
   explains the architecture of the resulting set up and includes Chef scripts
   to automate the deployment.
 
-* The [Django subreddit](http://www.reddit.com/r/django) is a good spot to
-  learn about Django and ask questions.
-
 
 ## Django videos
 * [GoDjango](https://godjango.com/) screencasts and tutorials are free short
@@ -175,6 +173,9 @@ 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.
 
+* [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.
+
 
 ## Django learning checklist
 <i class="fa fa-check-square-o"></i> 
diff --git a/source/content/pages/02-web-frameworks/0205-flask.markdown b/source/content/pages/02-web-frameworks/0205-flask.markdown
@@ -136,6 +136,9 @@ book which is an excellent learning resource.
 * [Flask Foundation](https://github.com/JackStouffer/Flask-Foundation) is a
   starting point for new Flask projects.
 
+* [Cookiecutter Flask](https://github.com/sloria/cookiecutter-flask) is a project
+  template for use with [Cookiecutter](https://github.com/audreyr/cookiecutter).
+
 * [Flaskr TDD](https://github.com/mjhea0/flaskr-tdd) takes the official Flask
   tutorial and adds test driven development and JQuery to the project. 
 

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-29T05:26:08Z</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-29T07:30:14Z</updated></feed>`