updating link to 2 scoops of Django for current 1.6 release

mattmakai · mattmakai · commit ed38b7f5e9bc · 2014-02-10T18:23:28.000-05:00
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-02-10T08:13:42Z</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-02-10T18:23:02Z</updated></feed>
diff --git a/source/content/pages/web-frameworks.rst b/source/content/pages/web-frameworks.rst
@@ -64,10 +64,13 @@ Web Framework Resources
 `Pyramid <http://www.pylonsproject.org/>`_, and
 `web.py <http://webpy.org/>`_ are the most common Python web frameworks.
 
+
+`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
+you're serious about learning how to correctly develop Django websites.
+
+
 `Effective Django <http://effectivedjango.com/>`_ and 
 `Tango with Django <http://www.tangowithdjango.com/book/>`_ are a great free
 introductions to using the most popular Python web framework.
 
-`2 Scoops of Django <http://twoscoopspress.org/products/two-scoops-of-django-1-5-e-book-bundle>`_ 
-by Daniel Greenfield and Audrey Roy is well worth the price of admission if
-you're serious about learning how to correctly develop Django websites.
diff --git a/web-frameworks.html b/web-frameworks.html
@@ -126,12 +126,12 @@ <h2>Web Framework Resources</h2>
 <a class="reference external" href="http://bottlepy.org/docs/dev/">Bottle</a>,
 <a class="reference external" href="http://www.pylonsproject.org/">Pyramid</a>, and
 <a class="reference external" href="http://webpy.org/">web.py</a> are the most common Python web frameworks.</p>
+<p><a class="reference external" 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
+you're serious about learning how to correctly develop Django websites.</p>
 <p><a class="reference external" href="http://effectivedjango.com/">Effective Django</a> and
 <a class="reference external" href="http://www.tangowithdjango.com/book/">Tango with Django</a> are a great free
 introductions to using the most popular Python web framework.</p>
-<p><a class="reference external" href="http://twoscoopspress.org/products/two-scoops-of-django-1-5-e-book-bundle">2 Scoops of Django</a>
-by Daniel Greenfield and Audrey Roy is well worth the price of admission if
-you're serious about learning how to correctly develop Django websites.</p>
 </div>
 
                                                                                                                                                                                                                               <br/>

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-02-10T08:13:42Z</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-02-10T18:23:02Z</updated></feed>`