adding new video from djangocon 2014

mattmakai · mattmakai · commit 35d404a0036e · 2014-09-20T11:04:26.000-04:00
diff --git a/all.html b/all.html
@@ -225,6 +225,12 @@ <h2>Django tutorials</h2>
 <h2>Django videos</h2>
 <ul>
 <li>
+<p>Kate Heddleston and I gave a talk at DjangoCon 2014 called
+  <a href="https://www.youtube.com/watch?v=QrFEKghISEI">Choose Your Own Django Deployment Adventure</a>
+  which walked through many of the scenarios you'd face when deploying your
+  first Django website.</p>
+</li>
+<li>
 <p><a href="https://godjango.com/">GoDjango</a> screencasts and tutorials are free short
   videos for learning how to build Django applications.</p>
 </li>
diff --git a/django.html b/django.html
@@ -137,6 +137,12 @@ <h2>Django tutorials</h2>
 <h2>Django videos</h2>
 <ul>
 <li>
+<p>Kate Heddleston and I gave a talk at DjangoCon 2014 called
+  <a href="https://www.youtube.com/watch?v=QrFEKghISEI">Choose Your Own Django Deployment Adventure</a>
+  which walked through many of the scenarios you'd face when deploying your
+  first Django website.</p>
+</li>
+<li>
 <p><a href="https://godjango.com/">GoDjango</a> screencasts and tutorials are free short
   videos for learning how to build Django applications.</p>
 </li>
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-09-19T09:17: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-09-20T10:59:13Z</updated></feed>
diff --git a/source/content/pages/02-web-frameworks/0202-django.markdown b/source/content/pages/02-web-frameworks/0202-django.markdown
@@ -111,6 +111,11 @@ syntax and language semantics first before diving into web development.
 
 
 ## Django videos
+* Kate Heddleston and I gave a talk at DjangoCon 2014 called
+  [Choose Your Own Django Deployment Adventure](https://www.youtube.com/watch?v=QrFEKghISEI)
+  which walked through many of the scenarios you'd face when deploying your
+  first Django website.
+
 * [GoDjango](https://godjango.com/) screencasts and tutorials are free short
   videos for learning how to build Django applications.
 

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-09-19T09:17: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-09-20T10:59:13Z</updated></feed>`