updating django 1.7 section with Andrew Pinkman's awesome guide

mattmakai · mattmakai · commit 17143eaacd0d · 2014-10-02T06:19:07.000-07:00
diff --git a/all.html b/all.html
@@ -266,13 +266,22 @@ <h2>Django 1.7-specific resources</h2>
 </li>
 <li>
 <p><a href="http://pyvideo.org/video/2630/designing-djangos-migrations">Designing Django's Migrations</a>
-  covers Django 1.7's new migrations from the main programmer Andrew Godwin.</p>
+  covers Django 1.7's new migrations from the main programmer 
+  of South and now Django's built-in migrations, Andrew Godwin.</p>
 </li>
 <li>
 <p>Real Python's <a href="https://realpython.com/blog/python/django-migrations-a-primer/">migrations primer</a>
   explores the difference between South's migrations and the built-in
   Django 1.7 migrations as well as how you use them.</p>
 </li>
+<li>
+<p>Andrew Pinkman's "Upgrading to Django 1.7" series is great learning
+  material for understanding what's changed in this major released and
+  how to adapt your Django project.
+  <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-1-introduction-and-django-releases/">Part 1</a> 
+  and <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-2-migrations-in-django-16-and-17/">part 2</a>
+  are available with further parts coming in the future.</p>
+</li>
 </ul>
 <h2>Django ORM resources</h2>
 <p>The <a href="https://docs.djangoproject.com/en/dev/topics/db/">Django ORM</a> works well
diff --git a/django.html b/django.html
@@ -178,13 +178,22 @@ <h2>Django 1.7-specific resources</h2>
 </li>
 <li>
 <p><a href="http://pyvideo.org/video/2630/designing-djangos-migrations">Designing Django's Migrations</a>
-  covers Django 1.7's new migrations from the main programmer Andrew Godwin.</p>
+  covers Django 1.7's new migrations from the main programmer 
+  of South and now Django's built-in migrations, Andrew Godwin.</p>
 </li>
 <li>
 <p>Real Python's <a href="https://realpython.com/blog/python/django-migrations-a-primer/">migrations primer</a>
   explores the difference between South's migrations and the built-in
   Django 1.7 migrations as well as how you use them.</p>
 </li>
+<li>
+<p>Andrew Pinkman's "Upgrading to Django 1.7" series is great learning
+  material for understanding what's changed in this major released and
+  how to adapt your Django project.
+  <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-1-introduction-and-django-releases/">Part 1</a> 
+  and <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-2-migrations-in-django-16-and-17/">part 2</a>
+  are available with further parts coming in the future.</p>
+</li>
 </ul>
 <h2>Django ORM resources</h2>
 <p>The <a href="https://docs.djangoproject.com/en/dev/topics/db/">Django ORM</a> works well
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-10-01T14:51:04Z</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-10-02T06:18:32Z</updated></feed>
diff --git a/source/content/pages/02-web-frameworks/0202-django.markdown b/source/content/pages/02-web-frameworks/0202-django.markdown
@@ -144,12 +144,20 @@ syntax and language semantics first before diving into web development.
   package.
 
 * [Designing Django's Migrations](http://pyvideo.org/video/2630/designing-djangos-migrations)
-  covers Django 1.7's new migrations from the main programmer Andrew Godwin.
+  covers Django 1.7's new migrations from the main programmer 
+  of South and now Django's built-in migrations, Andrew Godwin.
 
 * Real Python's [migrations primer](https://realpython.com/blog/python/django-migrations-a-primer/)
   explores the difference between South's migrations and the built-in
   Django 1.7 migrations as well as how you use them.
 
+* Andrew Pinkman's "Upgrading to Django 1.7" series is great learning
+  material for understanding what's changed in this major released and
+  how to adapt your Django project.
+  [Part 1](http://andrewsforge.com/article/upgrading-django-to-17/part-1-introduction-and-django-releases/) 
+  and [part 2](http://andrewsforge.com/article/upgrading-django-to-17/part-2-migrations-in-django-16-and-17/)
+  are available with further parts coming in the future.
+
 
 ## Django ORM resources
 The [Django ORM](https://docs.djangoproject.com/en/dev/topics/db/) works well

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-10-01T14:51:04Z</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-10-02T06:18:32Z</updated></feed>`