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

mattmakai · mattmakai · commit 36eab93709fa · 2014-07-30T06:23:31.000-04:00
Fix small typo created while moving text
diff --git a/django.html b/django.html
@@ -215,7 +215,7 @@ <h2>Django project templates</h2>
 </li>
 <li>
 <p><a href="https://github.com/pydanny/cookiecutter-django">Cookiecutter Django</a> is a 
-  project template from Daniel Greenfield, for use with Audrey Roy's 
+  project template from Daniel Greenfeld, for use with Audrey Roy's 
   <a href="https://github.com/audreyr/cookiecutter">Cookiecutter</a>. Heroku 
   deployment-ready.</p>
 </li>
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-29T12:05:19Z</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-29T13:56:03Z</updated></feed>
diff --git a/source/content/pages/02-web-frameworks/0203-django.markdown b/source/content/pages/02-web-frameworks/0203-django.markdown
@@ -179,7 +179,7 @@ existing framework.
   is Django 1.6+ ready.
 
 * [Cookiecutter Django](https://github.com/pydanny/cookiecutter-django) is a 
-  project template from Daniel Greenfield, for use with Audrey Roy's 
+  project template from Daniel Greenfeld, for use with Audrey Roy's 
   [Cookiecutter](https://github.com/audreyr/cookiecutter). Heroku 
   deployment-ready.
 

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-29T12:05:19Z</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-29T13:56:03Z</updated></feed>`