merging PR mattmakai#45 and editing the text

mattmakai · mattmakai · commit b0983f881877 · 2014-11-09T15:02:27.000-05:00
diff --git a/all.html b/all.html
@@ -188,6 +188,14 @@ <h2>Django tutorials</h2>
   to the web framework.</p>
 </li>
 <li>
+<p><a href="http://www.obeythetestinggoat.com/">Test-Driven Development with Python</a> 
+  focuses on web development using Django and JavaScript. This book uses 
+  the development of a website using the Django web framework as a real
+  world example of how to perform test-driven development (TDD). There is
+  also coverage of NoSQL, websockets and asynchronous responses. The book can
+  be read online for free or purchased in hard copy via O'Reilly.</p>
+</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 and is also a good spot to ask 
   questions about it.</p>
diff --git a/django.html b/django.html
@@ -95,12 +95,12 @@ <h2>Django tutorials</h2>
   to the web framework.</p>
 </li>
 <li>
-<p><a href="http://www.obeythetestinggoat.com/">Test-Driven Development with Python</a> focuses on web development using
-  Django, with some coverage of JavaScript (inescapable for any web programmer). This book uses a concrete 
-  example—the development of a website using the Django web framework, from scratch—to teach the TDD methodology,
-  and how it applies to web programming, from the basics of database integration and javascript, going via 
-  browser-automation tools like Selenium, to advanced (and trendy) topics like NoSQL, websockets and Async 
-  programming.The book is available to read online for free.</p>
+<p><a href="http://www.obeythetestinggoat.com/">Test-Driven Development with Python</a> 
+  focuses on web development using Django and JavaScript. This book uses 
+  the development of a website using the Django web framework as a real
+  world example of how to perform test-driven development (TDD). There is
+  also coverage of NoSQL, websockets and asynchronous responses. The book can
+  be read online for free or purchased in hard copy via O'Reilly.</p>
 </li>
 <li>
 <p>The <a href="http://www.reddit.com/r/django">Django subreddit</a> often has links to
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-11-09T23:19:26Z</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-11-09T15:02:04Z</updated></feed>
diff --git a/source/content/pages/02-web-frameworks/0202-django.markdown b/source/content/pages/02-web-frameworks/0202-django.markdown
@@ -79,12 +79,12 @@ syntax and language semantics first before diving into web development.
 * [Effective Django](http://effectivedjango.com/) is another free introduction
   to the web framework.
 
-* [Test-Driven Development with Python](http://www.obeythetestinggoat.com/) focuses on web development using
-  Django, with some coverage of JavaScript (inescapable for any web programmer). This book uses a concrete 
-  example—the development of a website using the Django web framework, from scratch—to teach the TDD methodology,
-  and how it applies to web programming, from the basics of database integration and javascript, going via 
-  browser-automation tools like Selenium, to advanced (and trendy) topics like NoSQL, websockets and Async 
-  programming.The book is available to read online for free.
+* [Test-Driven Development with Python](http://www.obeythetestinggoat.com/) 
+  focuses on web development using Django and JavaScript. This book uses 
+  the development of a website using the Django web framework as a real
+  world example of how to perform test-driven development (TDD). There is
+  also coverage of NoSQL, websockets and asynchronous responses. The book can
+  be read online for free or purchased in hard copy via O'Reilly.
 
 * The [Django subreddit](http://www.reddit.com/r/django) often has links to
   the latest resources for learning Django and is also a good spot to ask 

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-11-09T23:19:26Z</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-11-09T15:02:04Z</updated></feed>`