working on djnago explanation

mattmakai · mattmakai · commit e207761667ec · 2014-05-02T17:25:24.000-04:00
diff --git a/django.html b/django.html
@@ -57,11 +57,13 @@ <h1>Django</h1>
 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>. 
-Compare that functionality to the Flask framework which requires a separate
-library such as <a href="https://flask-login.readthedocs.org/en/latest/">Flask-Login</a>
-to perform user authentication. The batteries-includes and extensibility 
-philosophies are simply two different ways to tackle framework building. 
-Neither philosophy is inherently better than the other.</p>
+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>
+to perform user authentication. </p>
+<p>The batteries-includes and extensibility philosophies are simply two different 
+ways to tackle framework building.  Neither philosophy is inherently better 
+than the other.</p>
 <h2>Why is Django a good web framework choice?</h2>
 <p>The Django project's stability, performance and community have grown 
 tremendously over the past decade since the framework's creation. Detailed
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-05-02T17:07:54Z</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-05-02T17:25:18Z</updated></feed>
diff --git a/source/content/pages/02-web-frameworks/0203-django.markdown b/source/content/pages/02-web-frameworks/0203-django.markdown
@@ -30,11 +30,14 @@ For example,
 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). 
-Compare that functionality to the Flask framework which requires a separate
-library such as [Flask-Login](https://flask-login.readthedocs.org/en/latest/)
-to perform user authentication. The batteries-includes and extensibility 
-philosophies are simply two different ways to tackle framework building. 
-Neither philosophy is inherently better than the other.
+Compare that included functionality to the Flask framework which requires a 
+separate library such as 
+[Flask-Login](https://flask-login.readthedocs.org/en/latest/)
+to perform user authentication. 
+
+The batteries-includes and extensibility philosophies are simply two different 
+ways to tackle framework building.  Neither philosophy is inherently better 
+than the other.
 
 
 ## Why is Django a good web framework choice?

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-05-02T17:07:54Z</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-05-02T17:25:18Z</updated></feed>`