updating django resources

mattmakai · mattmakai · commit 30346ff92e0a · 2014-11-27T09:31:00.000-05:00
diff --git a/all.html b/all.html
@@ -150,7 +150,7 @@ <h1>Django</h1>
 <a href="https://docs.djangoproject.com/en/dev/topics/templates/">templating system</a>,
 an <a href="https://docs.djangoproject.com/en/dev/topics/db/">object-relational mapper</a>,
 and <a href="https://docs.djangoproject.com/en/dev/topics/migrations/">database schema migrations</a>
-(as of version 1.7) are all included with the <a href="https://pypi.python.org/pypi/Django/1.6.2">Django framework</a>. 
+(as of version 1.7) are all included with the <a href="https://pypi.python.org/pypi/Django/">Django framework</a>. 
 Compare that included functionality to the Flask framework which requires a 
 separate library such as 
 <a href="https://flask-login.readthedocs.org/en/latest/">Flask-Login</a>
@@ -247,7 +247,7 @@ <h2>Django tutorials</h2>
   list of Django libraries and resources.</p>
 </li>
 <li>
-<p><a href="https://realpython.com/learn/start-django/">Starting a Django Project</a> answers the question, “How do I set up a Django (1.5, 1.6, or 1.7) project from scratch?”</p>
+<p><a href="https://realpython.com/learn/start-django/">Starting a Django Project</a> answers the question, “How do I set up a Django (1.5, 1.6, or /1.7) project from scratch?”</p>
 </li>
 <li>
 <p>The <a href="http://irisbeta.com/article/245366784/the-django-request-response-cycle/">Django Request-Response Cycle</a>
@@ -310,7 +310,9 @@ <h2>Django 1.7-specific resources</h2>
   <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-1-introduction-and-django-releases/">Part 1</a>,
   <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-2-migrations-in-django-16-and-17/">part 2</a> and
   <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-3-django-17-new-features/">part 3</a>
-  are currently available with further parts coming in the future.</p>
+  and
+  <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-4-upgrade-strategies/">part 4</a>
+  are now all available to read.</p>
 </li>
 </ul>
 <h2>Django ORM resources</h2>
diff --git a/django.html b/django.html
@@ -51,7 +51,7 @@ <h1>Django</h1>
 <a href="https://docs.djangoproject.com/en/dev/topics/templates/">templating system</a>,
 an <a href="https://docs.djangoproject.com/en/dev/topics/db/">object-relational mapper</a>,
 and <a href="https://docs.djangoproject.com/en/dev/topics/migrations/">database schema migrations</a>
-(as of version 1.7) are all included with the <a href="https://pypi.python.org/pypi/Django/1.6.2">Django framework</a>. 
+(as of version 1.7) are all included with the <a href="https://pypi.python.org/pypi/Django/">Django framework</a>. 
 Compare that included functionality to the Flask framework which requires a 
 separate library such as 
 <a href="https://flask-login.readthedocs.org/en/latest/">Flask-Login</a>
@@ -148,7 +148,7 @@ <h2>Django tutorials</h2>
   list of Django libraries and resources.</p>
 </li>
 <li>
-<p><a href="https://realpython.com/learn/start-django/">Starting a Django Project</a> answers the question, “How do I set up a Django (1.5, 1.6, or 1.7) project from scratch?”</p>
+<p><a href="https://realpython.com/learn/start-django/">Starting a Django Project</a> answers the question, “How do I set up a Django (1.5, 1.6, or /1.7) project from scratch?”</p>
 </li>
 <li>
 <p>The <a href="http://irisbeta.com/article/245366784/the-django-request-response-cycle/">Django Request-Response Cycle</a>
@@ -211,7 +211,9 @@ <h2>Django 1.7-specific resources</h2>
   <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-1-introduction-and-django-releases/">Part 1</a>,
   <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-2-migrations-in-django-16-and-17/">part 2</a> and
   <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-3-django-17-new-features/">part 3</a>
-  are currently available with further parts coming in the future.</p>
+  and
+  <a href="http://andrewsforge.com/article/upgrading-django-to-17/part-4-upgrade-strategies/">part 4</a>
+  are now all available to read.</p>
 </li>
 </ul>
 <h2>Django ORM resources</h2>
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-26T11:20:03Z</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-27T09:30:53Z</updated></feed>
diff --git a/source/content/pages/02-web-frameworks/0202-django.markdown b/source/content/pages/02-web-frameworks/0202-django.markdown
@@ -33,7 +33,7 @@ For example,
 [templating system](https://docs.djangoproject.com/en/dev/topics/templates/),
 an [object-relational mapper](https://docs.djangoproject.com/en/dev/topics/db/),
 and [database schema migrations](https://docs.djangoproject.com/en/dev/topics/migrations/)
-(as of version 1.7) are all included with the [Django framework](https://pypi.python.org/pypi/Django/1.6.2). 
+(as of version 1.7) are all included with the [Django framework](https://pypi.python.org/pypi/Django/). 
 Compare that included functionality to the Flask framework which requires a 
 separate library such as 
 [Flask-Login](https://flask-login.readthedocs.org/en/latest/)
@@ -121,7 +121,7 @@ syntax and language semantics first before diving into web development.
 * [django-awesome](https://github.com/rosarior/awesome-django) is a curated
   list of Django libraries and resources.
 
-* [Starting a Django Project](https://realpython.com/learn/start-django/) answers the question, “How do I set up a Django (1.5, 1.6, or 1.7) project from scratch?”
+* [Starting a Django Project](https://realpython.com/learn/start-django/) answers the question, “How do I set up a Django (1.5, 1.6, or /1.7) project from scratch?”
 
 * The [Django Request-Response Cycle](http://irisbeta.com/article/245366784/the-django-request-response-cycle/)
   explains what happens when you visit a webpage generated by Django.
@@ -172,7 +172,9 @@ syntax and language semantics first before diving into web development.
   [Part 1](http://andrewsforge.com/article/upgrading-django-to-17/part-1-introduction-and-django-releases/),
   [part 2](http://andrewsforge.com/article/upgrading-django-to-17/part-2-migrations-in-django-16-and-17/) and
   [part 3](http://andrewsforge.com/article/upgrading-django-to-17/part-3-django-17-new-features/)
-  are currently available with further parts coming in the future.
+  and
+  [part 4](http://andrewsforge.com/article/upgrading-django-to-17/part-4-upgrade-strategies/)
+  are now all available to read.
 
 
 ## Django ORM resources

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-26T11:20:03Z</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-27T09:30:53Z</updated></feed>`