adding new django resource for migrations

mattmakai · mattmakai · commit 6550c3b182de · 2015-05-25T06:33:07.000-07:00
diff --git a/all.html b/all.html
@@ -1531,6 +1531,11 @@ <h2>Django ORM resources</h2>
   explains why South was not directly integrated into Django, how migrations
   are built and shows how backwards migrations work.</p>
 </li>
+<li>
+<p><a href="http://www.rkblog.rk.edu.pl/w/p/squashing-and-optimizing-migrations-django/">Squashing and optimizing migrations in Django</a>
+  shows a simple example with code for how to use the migrations integrated
+  into Django 1.7.</p>
+</li>
 </ul>
 <h2>Static and media files</h2>
 <p>Deploying and handling static and media files can be confusing for new
@@ -5912,6 +5917,8 @@ <h1>Change Log</h1>
 <h2>2015</h2>
 <h3>May</h3>
 <ul>
+<li>Added new <a href="/django.html">Django</a> resources, especially around migrations
+  in Django 1.7+.</li>
 <li>Worked on making <a href="/why-use-python.html">Why Use Python?</a> page specific to
   that topic now that the <a href="/enterprise-python.html">Enterprise Python</a> page
   contains enterprise-y info.</li>
diff --git a/change-log.html b/change-log.html
@@ -42,6 +42,8 @@ <h1>Change Log</h1>
 <h2>2015</h2>
 <h3>May</h3>
 <ul>
+<li>Added new <a href="/django.html">Django</a> resources, especially around migrations
+  in Django 1.7+.</li>
 <li>Worked on making <a href="/why-use-python.html">Why Use Python?</a> page specific to
   that topic now that the <a href="/enterprise-python.html">Enterprise Python</a> page
   contains enterprise-y info.</li>
diff --git a/django.html b/django.html
@@ -356,6 +356,11 @@ <h2>Django ORM resources</h2>
   explains why South was not directly integrated into Django, how migrations
   are built and shows how backwards migrations work.</p>
 </li>
+<li>
+<p><a href="http://www.rkblog.rk.edu.pl/w/p/squashing-and-optimizing-migrations-django/">Squashing and optimizing migrations in Django</a>
+  shows a simple example with code for how to use the migrations integrated
+  into Django 1.7.</p>
+</li>
 </ul>
 <h2>Static and media files</h2>
 <p>Deploying and handling static and media files can be confusing for new
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-05-24T13:30:57Z</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-05-25T06:32:56Z</updated></feed>
diff --git a/source/content/pages/04-web-development/02-django.markdown b/source/content/pages/04-web-development/02-django.markdown
@@ -294,6 +294,10 @@ existing framework.
   explains why South was not directly integrated into Django, how migrations
   are built and shows how backwards migrations work.
 
+* [Squashing and optimizing migrations in Django](http://www.rkblog.rk.edu.pl/w/p/squashing-and-optimizing-migrations-django/)
+  shows a simple example with code for how to use the migrations integrated
+  into Django 1.7.
+
 
 ## Static and media files
 Deploying and handling static and media files can be confusing for new
diff --git a/source/content/pages/13-meta/02-change-log.markdown b/source/content/pages/13-meta/02-change-log.markdown
@@ -14,6 +14,8 @@ the
 
 ## 2015
 ### May
+* Added new [Django](/django.html) resources, especially around migrations
+  in Django 1.7+.
 * Worked on making [Why Use Python?](/why-use-python.html) page specific to
   that topic now that the [Enterprise Python](/enterprise-python.html) page
   contains enterprise-y info.

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-05-24T13:30:57Z</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-05-25T06:32:56Z</updated></feed>`