new django resource

mattmakai · mattmakai · commit e99ead13cb0b · 2015-04-14T11:52:15.000-04:00
diff --git a/all.html b/all.html
@@ -1226,6 +1226,10 @@ <h2>Django tutorials</h2>
   which often provoke heated debate in the Django community for whether they
   are a time saver or "too much magic" for the framework.</p>
 </li>
+<li>
+<p><a href="https://www.digitalocean.com/community/tutorials/how-to-serve-django-applications-with-uwsgi-and-nginx-on-ubuntu-14-04">How to serve Django apps with uWSGI and Nginx on 14.04</a>
+  is a detailed tutorial that walks through each step in the deployment process.</p>
+</li>
 </ul>
 <h2>Django videos</h2>
 <p><div class="well" style="margin-top: 20px;">
diff --git a/django.html b/django.html
@@ -185,6 +185,10 @@ <h2>Django tutorials</h2>
   which often provoke heated debate in the Django community for whether they
   are a time saver or "too much magic" for the framework.</p>
 </li>
+<li>
+<p><a href="https://www.digitalocean.com/community/tutorials/how-to-serve-django-applications-with-uwsgi-and-nginx-on-ubuntu-14-04">How to serve Django apps with uWSGI and Nginx on 14.04</a>
+  is a detailed tutorial that walks through each step in the deployment process.</p>
+</li>
 </ul>
 <h2>Django videos</h2>
 <p><div class="well" style="margin-top: 20px;">
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>2015-04-13T02:23: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>2015-04-14T11:52:08Z</updated></feed>
diff --git a/source/content/pages/04-web-development/02-django.markdown b/source/content/pages/04-web-development/02-django.markdown
@@ -146,6 +146,9 @@ While you're learning about Django you should also read up on
   which often provoke heated debate in the Django community for whether they
   are a time saver or "too much magic" for the framework.
 
+* [How to serve Django apps with uWSGI and Nginx on 14.04](https://www.digitalocean.com/community/tutorials/how-to-serve-django-applications-with-uwsgi-and-nginx-on-ubuntu-14-04)
+  is a detailed tutorial that walks through each step in the deployment process.
+
 
 ## Django videos
 <div class="well" style="margin-top: 20px;">

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>2015-04-13T02:23: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>2015-04-14T11:52:08Z</updated></feed>`